Made changes to testing protocol

CMakeLists.txt

@@ -204,8 +204,8 @@ if(CXXTEST_FOUND)
     enable_testing()
     #CXXTEST_ADD_TEST(tester_executable runner.cpp
     #                    ${CMAKE_CURRENT_SOURCE_DIR}/src/myTestsuite.h)
-	CXXTEST_ADD_TEST(unittest_foo foo_test.cc
-                      ${CMAKE_CURRENT_SOURCE_DIR}/src/myTestSuite.h)
+	#CXXTEST_ADD_TEST(unittest_foo foo_test.cc
+    #                  ${CMAKE_CURRENT_SOURCE_DIR}/src/myTestSuite.h)
     #target_link_libraries(unittest_foo foo) # as needed
 #	else()
 #	message(FATAL_ERROR "CxxTest not found.")
@@ -222,10 +222,9 @@ add_subdirectory (Modules)
 # 
 include_directories(${CMAKE_INSTALL_PREFIX}/include)
 
-add_executable(Hello "${PROJECT_SOURCE_DIR}/src/test.cpp")
-target_link_libraries(Hello lemmacore)
-add_dependencies(Hello YAML-CPP)
-
+#add_executable(Hello "${PROJECT_SOURCE_DIR}/src/test.cpp")
+#target_link_libraries(Hello lemmacore)
+#add_dependencies(Hello YAML-CPP)
 
 # add a target to generate API documentation with Doxygen
 # ALL make documentation build by default if possible

LemmaCore/include/EarthModel.h

@@ -90,6 +90,11 @@ namespace Lemma {
             /// \mathbf{B}_0 \Vert \f$ in Gauss units
             Real GetMagneticFieldMagnitudeInGauss( );
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     =======================

LemmaCore/include/Filter.h

@@ -39,6 +39,11 @@ namespace Lemma {
 
             // ====================  INQUIRY       =======================
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     =======================

LemmaCore/include/Grid.h

@@ -42,6 +42,11 @@ class Grid : public LemmaObject {
 
         // ====================  INQUIRY       ===================================
 
+        /** Returns the name of the underlying class, similiar to Python's type */
+        virtual inline std::string GetName() const {
+            return this->CName;
+        }
+
     protected:
 
         // ====================  LIFECYCLE     ===================================

LemmaCore/include/GridReader.h

@@ -51,6 +51,11 @@ namespace Lemma {
 
             // ====================  INQUIRY       =======================
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     =======================
@@ -65,6 +70,9 @@ namespace Lemma {
 
         private:
 
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "GridReader";
+
             // ====================  DATA MEMBERS  =========================
 
     }; // -----  end of class  GridReader  -----

LemmaCore/include/Instrument.h

@@ -41,6 +41,11 @@ namespace Lemma {
 
 			// ====================  INQUIRY       ===========================
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
 			// ====================  DATA MEMBERS  ===========================
 
 		protected:

LemmaCore/include/LayeredEarth.h

@@ -85,6 +85,11 @@ namespace Lemma {
             YAML::Node Serialize() const;
             //static LayeredEarth* DeSerialize(const YAML::Node& node);
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
 		protected:
 
 			// ====================  LIFECYCLE     ===========================

LemmaCore/include/LemmaCore

@@ -30,10 +30,10 @@
 #include "RectilinearGridReader.h"
 #include "RectilinearGridVTKExporter.h"
 #include "WindowFilter.h"
+// helpers and utilities
 #include "banner.h"
 #include "helper.h"
 #include "timer.h"
-
 #endif   // ----- #ifndef LEMMAINCLUDE_INC  -----
 
 /* vim: set tabstop=4 expandtab: */

LemmaCore/include/RectilinearGrid.h

@@ -141,6 +141,11 @@ namespace Lemma {
 
             // ====================  INQUIRY       =======================
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     =======================

LemmaCore/include/RectilinearGridReader.h

@@ -73,6 +73,11 @@ namespace Lemma {
 
             // ====================  INQUIRY       =======================
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     =======================

LemmaCore/include/RectilinearGridVTKExporter.h

@@ -83,6 +83,11 @@ class RectilinearGridVTKExporter : public LemmaObject {
      */
     void WriteVTKGrid( const std::string& name );
 
+    /** Returns the name of the underlying class, similiar to Python's type */
+    virtual inline std::string GetName() const {
+        return this->CName;
+    }
+
     protected:
 
     // ====================  LIFECYCLE     =======================
@@ -96,7 +101,7 @@ class RectilinearGridVTKExporter : public LemmaObject {
     private:
 
     /** ASCII string representation of the class name */
-    static constexpr auto CName = "VTKRectilinearGridVTKExporter";
+    static constexpr auto CName = "RectilinearGridVTKExporter";
 
     void BuildVTKRectilinearGrid();
 

LemmaCore/include/WindowFilter.h

@@ -76,6 +76,11 @@ namespace Lemma {
             /// Returns a Vector of the filter coefficients.
             VectorXr GetFilterCoefficients( );
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return this->CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     =======================

LemmaCore/testing/CMakeLists.txt

@@ -1,4 +1,11 @@
-add_executable(testOne testOne.cpp)
-add_executable(testTwo testTwo.cpp)
-add_test( testLemmaCoreOne testOne )
-add_test( testLemmaCoreTwo testTwo )
+#add_executable(testOne testOne.cpp)
+#add_executable(testTwo testTwo.cpp)
+#add_test( testLemmaCoreOne testOne )
+#add_test( testLemmaCoreTwo testTwo )
+
+CXXTEST_ADD_TEST(unittest_GetNameCheck GetNameCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/GetNameCheck.h)
+target_link_libraries(unittest_GetNameCheck "lemmacore")
+
+CXXTEST_ADD_TEST(unittest_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
+target_link_libraries(unittest_SerializeCheck "lemmacore")
+ 

src/myTestSuite.h

@@ -26,7 +26,7 @@ class MyTestSuite : public CxxTest::TestSuite
     void testAddition( void )
     {
         TS_ASSERT( 1 + 1 > 1 );
-        TS_ASSERT( 1 - 1 > 1 );
+        TS_ASSERT( 3 - 1 > 1 );
         TS_ASSERT_EQUALS( 1 + 1, 2 );
     }
 };