Remove Python code and make abstract again.

The Python code was removed as this required a linking of GammaLib with the Python library, which we want to avoid. Linking to Python should only be required by the Python wrappers. As we created a specific Python test suite GPythonTestSuite for Python unit tests, we can make GTestSuite abstract again, which is cleaner.

Remove Python code and make abstract again.
The Python code was removed as this required a linking of GammaLib with the Python library, which we want to avoid. Linking to Python should only be required by the Python wrappers. As we created a specific Python test suite GPythonTestSuite for Python unit tests, we can make GTestSuite abstract again, which is cleaner.
Jürgen Knödlseder
1 parent 2e2d3d18
Showing 2 changed files with 9 additions and 51 deletions
include/GTestSuite.hpp
src/test/GTestSuite.cpp
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file GTestSuite.hpp
- * @brief Test suite class definition
+ * @brief Abstract test suite class definition
  * @author Jean-Baptiste Cayrou
  */
@@ -45,7 +45,7 @@ typedef void (GTestSuite::*pfunction)(void);
 /***********************************************************************//**
  * @class GTestSuite
  *
- * @brief Test suite base class for unit testing on GammaLib fixtures
+ * @brief Abstract test suite class for unit testing on GammaLib fixtures
  *
  * @todo Detailed explanation.
  ***************************************************************************/
@@ -63,11 +63,13 @@ public:
     GTestCase&       operator[](const int& index);
     const GTestCase& operator[](const int& index) const;
+    // Pure virtual methods
+    virtual void              set(void) = 0;
+
     // Other methods
     void                      clear(void);
     int                       size(void) const;
     void                      append(pfunction function, const std::string& name);
-    virtual void              set(void);
     virtual bool              run(void);
     std::string               name(void) const;
     void                      name(const std::string& name);
@@ -106,6 +108,8 @@ protected:
     // Protected members
     std::string              m_name;       //!< Name of the test suite
+    std::vector<std::string> m_names;      //!< Names of test functions
+    std::vector<pfunction>   m_functions;  //!< Test functions of this suite
     std::vector<GTestCase*>  m_tests;      //!< List of test results
     std::vector<GTestCase*>  m_stack_try;  //!< Stack for nested try blocks
     int                      m_index;      //!< Index of actual test function
@@ -113,12 +117,6 @@ protected:
     int                      m_errors;     //!< Number of errors
     GLog                     m_log;        //!< Log
     time_t                   m_timestamp;  //!< Timestamp
-
-    // Public members so that the the swig extension can access them
-public:
-    std::vector<std::string> m_names;      //!< Names of test functions
-    std::vector<pfunction>   m_functions;  //!< Test functions of this suite
-    std::vector<void*>       m_py_object;  //!< Test Python functions of this suite
 };
 #endif /* GTESTSUITE_HPP */
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file GTestSuite.cpp
- * @brief Test Suite class implementation
+ * @brief Abstract test Suite class implementation
  * @author Jean-Baptiste Cayrou
  */
@@ -44,11 +44,6 @@ pthread_attr_t gomp_thread_attr;
 #endif
 #endif
-/* __ Python section ____________________________________________________ */
-#ifdef HAVE_PYTHON
-#include "Python.h"
-#endif
-
 /* __ Method name definitions ____________________________________________ */
 #define G_OP_ACCESS                            "GTestSuite::operator[](int&)"
 #define G_TRY_SUCCESS                        "GTestSuite::test_try_success()"
@@ -246,7 +241,6 @@ void GTestSuite::append(const pfunction function, const std::string&amp; name)
 {
     // Add test function pointer and name to suite
     m_functions.push_back(function);
-    m_py_object.push_back(NULL);
     m_names.push_back(name);
     // Return
@@ -255,21 +249,6 @@ void GTestSuite::append(const pfunction function, const std::string&amp; name)
 /***********************************************************************//**
- * @brief Set test functions
- *
- * Dummy set method that does not set any test function. This method does
- * only exist since Python version < 3 does not know abstract classes, but
- * we want to use GTestSuite to derive Python test classes. Thus, GTestSuite
- * is not abstract.
- ***************************************************************************/
-void GTestSuite::set(void)
-{
-    // Return
-    return;
-}
-
-
-/***********************************************************************//**
  * @brief Run all tests in test suite
  *
  * Executes all test functions that have been appended to the test suite.
@@ -297,11 +276,7 @@ bool GTestSuite::run(void)
     for (m_index = 0; m_index < m_functions.size(); ++m_index) {
         // Continue only if function is valid
-        #ifdef HAVE_PYTHON
-        if (m_functions[m_index] != NULL || m_py_object[m_index] != NULL) {
-        #else
         if (m_functions[m_index] != NULL) {
-        #endif
             // Save the number of errors and failures before test
             // execution. We use this after the test to see if
@@ -328,22 +303,9 @@ bool GTestSuite::run(void)
             clock_t t_start = clock();
             #endif
-            // Execute test function. If Python bindings are enabled we check
-            // if we have a C++ function or a Python object.
+            // Execute test function
             try {
-                #ifdef HAVE_PYTHON
-                if (m_functions[m_index] != NULL) {
-                    (this->*(m_functions[m_index]))();
-                }
-                else if (m_py_object[m_index] != NULL) {
-                    PyObject* args = Py_BuildValue("()");
-                    PyObject* func = static_cast<PyObject*>(m_py_object[m_index]);
-                    PyEval_CallObject(func, args);
-                    Py_DECREF(args);
-                }
-                #else
                 (this->*(m_functions[m_index]))();
-                #endif
             }
             catch(std::exception& e) {
@@ -890,7 +852,6 @@ void GTestSuite::init_members(void)
     // Initialise members
     m_name      = "Unnamed Test Suite";
     m_functions.clear();
-    m_py_object.clear();
     m_names.clear();
     m_tests.clear();
     m_stack_try.clear();
@@ -920,7 +881,6 @@ void GTestSuite::copy_members(const GTestSuite&amp; suite)
     // Copy members
     m_name       = suite.m_name;
     m_functions  = suite.m_functions;
-    m_py_object  = suite.m_py_object;
     m_names      = suite.m_names;
     m_tests      = suite.m_tests;
     m_stack_try  = suite.m_stack_try;