Work towards testing framework. CxxTest.

CMakeLists.txt

@@ -158,7 +158,7 @@ if(COMPILER_SUPPORTS_OPENMP AND LEMMA_USE_OPENMP )
 endif()
 
 set(LEMMA_VERSION_MAJOR "0")
-set(LEMMA_VERSION_MINOR "0")
+set(LEMMA_VERSION_MINOR "1")
 set(LEMMA_VERSION_PATCH "1")
 set(LEMMA_VERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}")
 
@@ -172,6 +172,23 @@ include_directories ("${PROJECT_SOURCE_DIR}/LemmaCore/include")
 include_directories ("${CMAKE_INSTALL_PREFIX}/include/eigen3")
 include_directories ("${CMAKE_INSTALL_PREFIX}/include/")
 link_directories ("${CMAKE_INSTALL_PREFIX}/lib/")
+
+option (LEMMA_ENABLE_TESTING  "Turn on unit testing" ON)
+if (LEMMA_ENABLE_TESTING)
+find_package(CxxTest REQUIRED)
+if(CXXTEST_FOUND)
+    include_directories(${CXXTEST_INCLUDE_DIR})
+    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)
+    #target_link_libraries(unittest_foo foo) # as needed
+	else()
+	message(FATAL_ERROR "CxxTest not found.")
+	endif()
+endif()
+
 add_subdirectory (LemmaCore) 
 
 ########################################################################
@@ -182,9 +199,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

LemmaCore/CMakeLists.txt

@@ -33,6 +33,11 @@ endif()
 
 target_link_libraries(lemmacore "yaml-cpp")
 
+# Testing
+if (LEMMA_ENABLE_TESTING)
+	add_subdirectory(testing)
+endif()
+
 # Install
 install ( TARGETS lemmacore DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
 

LemmaCore/examples/CMakeLists.txt

@@ -31,6 +31,3 @@ add_executable( filter  filter.cpp )
 target_link_libraries(filter "lemmacore")
 
 
-
-
-

LemmaCore/testing/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_executable(testOne testOne.cpp)
+add_executable(testTwo testTwo.cpp)
+add_test( testLemmaCoreOne testOne )
+add_test( testLemmaCoreTwo testTwo )

LemmaCore/testing/testOne.cpp

@@ -0,0 +1,23 @@
+/* This file is part of Lemma, a geophysical modelling and inversion API.
+ * More information is available at http://lemmasoftware.org
+ */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * @file
+ * @date      06/14/2016 09:30:38 PM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2016, University of Utah
+ * @copyright Copyright (c) 2016, Trevor Irons & Lemma Software, LLC
+ */
+
+int main() {
+    return 0;
+}
+

LemmaCore/testing/testTwo.cpp

@@ -0,0 +1,23 @@
+/* This file is part of Lemma, a geophysical modelling and inversion API.
+ * More information is available at http://lemmasoftware.org
+ */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * @file
+ * @date      06/14/2016 09:43:43 PM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2016, University of Utah
+ * @copyright Copyright (c) 2016, Trevor Irons & Lemma Software, LLC
+ */
+
+int main() {
+    return 0;
+}
+

src/myTestSuite.h

@@ -0,0 +1,32 @@
+/* This file is part of Lemma, a geophysical modelling and inversion API.
+ * More information is available at http://lemmasoftware.org
+ */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * @file
+ * @date      06/14/2016 10:06:34 PM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2016, University of Utah
+ * @copyright Copyright (c) 2016, Trevor Irons & Lemma Software, LLC
+ */
+
+          // MyTestSuite.h
+          #include <cxxtest/TestSuite.h>
+
+          class MyTestSuite : public CxxTest::TestSuite
+          {
+          public:
+             void testAddition( void )
+             {
+                TS_ASSERT( 1 + 1 > 1 );
+                TS_ASSERT_EQUALS( 1 + 1, 2 );
+             }
+          };
+

src/test.cpp

@@ -20,36 +20,10 @@
 #include <iostream>
 #include "LemmaConfig.h"
 #include "lemma.h"
-#include "dipolesource.h"
 
 using namespace Lemma;
 
 int main() {
     std::cout << "Hello Lemma " << LEMMA_VERSION_MAJOR << "\t" << LEMMA_VERSION_MINOR << std::endl;
-//    std::cout << "thingy()\t" << thingy() << std::endl;
-
-    // Test with a single dipole
-    DipoleSource *dipole = DipoleSource::New();
-        dipole->SetType(GROUNDEDELECTRICDIPOLE);
-            //dipole->SetPolarisation(1., 0.0,  1.0);
-        //    dipole->SetPolarisation(XPOLARISATION);
-        dipole->SetPolarisation(YPOLARISATION);
-        //dipole->SetPolarisation(ZPOLARISATION);
-
-        /////////////
-        //dipole->SetType(MAGNETICDIPOLE);
-            //dipole->SetPolarisation(0., 0.0,  1.0);
-            //dipole->SetPolarisation(XPOLARISATION);
-        //dipole->SetPolarisation(YPOLARISATION);
-        //dipole->SetPolarisation(ZPOLARISATION);
-
-        //dipole->SetMoment(1);
-        //dipole->SetLocation(1,1,-.0100328);
-        dipole->SetLocation(0., 0., -0.001);
-        //dipole->SetLocation(-2.5,1.25,0);
-        dipole->SetNumberOfFrequencies(1);
-        dipole->SetFrequency(0, 2e7);
-
-    std::cout << *dipole << std::endl;
 }