split unittests into seperate executables

ticket:208
I decided it was easer to debug my unittests when they were
in smaller pieces.

diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt
index 607b9e9e79bdd5b7892b305c2dd171945867451b..39815c2ab80a210ff2b94789343168200d67d3fc 100644 (file)
--- a/alg/test/CMakeLists.txt
+++ b/alg/test/CMakeLists.txt
@@ -4,22 +4,6 @@ FIND_PACKAGE(Qt4)
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE(Platform)
 
-SET(SOURCES 
-      test_alphabet.cpp 
-      test_annotation_color.cpp 
-      test_color.cpp 
-      test_conserved_path.cpp
-      test_flp.cpp 
-      test_glseqbrowser.cpp 
-      test_glsequence.cpp
-      test_main.cpp
-      test_mussa.cpp 
-      test_nway.cpp 
-      test_sequence.cpp 
-      test_sequence_location.cpp )
-
-GET_MUSSA_COMPILE_FLAGS(ALG_TEST_CFLAGS)
-GET_MUSSA_LINK_FLAGS(ALG_TEST_LDFLAGS)
 # dont you love the number of \ you need to make sure the " shows up in
 # the C compiler?
 SET(EXAMPLE_DIR ${CMAKE_SOURCE_DIR}/examples)
@@ -27,25 +11,45 @@ IF(WIN32)
   STRING(REGEX REPLACE "/" "\\\\\\\\\\\\\\\\" EXAMPLE_DIR ${EXAMPLE_DIR})
 ENDIF(WIN32)
 
-SET_SOURCE_FILES_PROPERTIES(
-  ${SOURCES} 
-  COMPILE_FLAGS "-DEXAMPLE_DIR=\\\"${EXAMPLE_DIR}\\\" ${ALG_TEST_CFLAGS}"
-)
+# get our platform specific flags
+GET_MUSSA_COMPILE_FLAGS(ALG_TEST_CFLAGS)
+GET_MUSSA_LINK_FLAGS(ALG_TEST_LDFLAGS)
 
-ADD_EXECUTABLE(unittest ${SOURCES})
-ADD_TEST(core_test ${CMAKE_BINARY_DIR}/alg/test/unittest)
-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg})
-TARGET_LINK_LIBRARIES(unittest 
-                        mussa_core
-                        ${QT_LIBRARIES}
-                        ${BOOST_FILESYSTEM_LIBRARY}
-                        ${BOOST_UNIT_TEST_LIBRARY} 
-                        ${BOOST_SERIALIZATION_LIBRARY}
-                        ${OPENGL_gl_LIBRARY})
+SET(ALG_TEST_LIBS
+      mussa_core
+      ${QT_LIBRARIES}
+      ${BOOST_FILESYSTEM_LIBRARY}
+      ${BOOST_UNIT_TEST_LIBRARY} 
+      ${BOOST_SERIALIZATION_LIBRARY}
+      ${OPENGL_gl_LIBRARY}
+)
 
-SET_TARGET_PROPERTIES(
-  unittest PROPERTIES
+MACRO(MAKE_ALG_UNITTEST basename)
+  SET(${basename}_SRC ${basename}.cpp)
+  SET_SOURCE_FILES_PROPERTIES(${${basename}_SRC} 
+      COMPILE_FLAGS "-DEXAMPLE_DIR=\\\"${EXAMPLE_DIR}\\\" ${ALG_TEST_CFLAGS}"
+  )
+  ADD_EXECUTABLE(${basename} ${${basename}_SRC})
+  TARGET_LINK_LIBRARIES(${basename} ${ALG_TEST_LIBS}) # ${${basename}_extra_libs})
+  
+  SET_TARGET_PROPERTIES(
+    ${basename}
+    PROPERTIES
     COMPILE_FLAGS "${ALG_TEST_CFLAGS}"
     LINK_FLAGS "${ALG_TEST_LDFLAGS}"
-)
+  )
+  ADD_TEST(${basename} ${basename})
+ENDMACRO(MAKE_ALG_UNITTEST)
 
+#add all our main tests
+MAKE_ALG_UNITTEST( test_alphabet )
+MAKE_ALG_UNITTEST( test_annotation_color )
+MAKE_ALG_UNITTEST( test_color )
+MAKE_ALG_UNITTEST( test_conserved_path )
+MAKE_ALG_UNITTEST( test_flp )
+MAKE_ALG_UNITTEST( test_glseqbrowser )
+MAKE_ALG_UNITTEST( test_glsequence )
+MAKE_ALG_UNITTEST( test_mussa )
+MAKE_ALG_UNITTEST( test_nway )
+MAKE_ALG_UNITTEST( test_sequence )
+MAKE_ALG_UNITTEST( test_sequence_location )

diff --git a/alg/test/test_alphabet.cpp b/alg/test/test_alphabet.cpp
index 076acea7d0f54d94bd01f42abd4f4a7c8af46985..7758556beb1ee587dca9ac2e09a553cc8450ba49 100644 (file)
--- a/alg/test/test_alphabet.cpp
+++ b/alg/test/test_alphabet.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <boost/archive/text_oarchive.hpp>

diff --git a/alg/test/test_annotation_color.cpp b/alg/test/test_annotation_color.cpp
index 2e907e9442ed2add2fdefc4a32fddd31fffdeb31..7d2a885f8594e027c2aaf1e501f9f693f3a2afcd 100644 (file)
--- a/alg/test/test_annotation_color.cpp
+++ b/alg/test/test_annotation_color.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include "alg/annotation_colors.hpp"

diff --git a/alg/test/test_color.cpp b/alg/test/test_color.cpp
index 63e6a84787bb6aadd20a2f16a034e3d8c29a4a3b..c2687874e1d7ab0744f09418c021972db17ea8e0 100644 (file)
--- a/alg/test/test_color.cpp
+++ b/alg/test/test_color.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <string>

diff --git a/alg/test/test_conserved_path.cpp b/alg/test/test_conserved_path.cpp
index d90f7618e6643ed333aa5754114efb7ceab51245..ed772b6995ecc3e268cd9f9d6900a0e8ed01730b 100644 (file)
--- a/alg/test/test_conserved_path.cpp
+++ b/alg/test/test_conserved_path.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/assign/std/vector.hpp>
 using namespace boost::assign;

diff --git a/alg/test/test_flp.cpp b/alg/test/test_flp.cpp
index 50c621843bf4c6e1a420fc56357351b445ea6325..e606f98e82df1cd2050b88d424cb29df5e966290 100644 (file)
--- a/alg/test/test_flp.cpp
+++ b/alg/test/test_flp.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <iostream>
 #include <list>
 

diff --git a/alg/test/test_glseqbrowser.cpp b/alg/test/test_glseqbrowser.cpp
index 8dae0d0feee8fbc8d35ecc857570a06408caa514..4698260bde35df4ab9a9ced5bf6a4aa462f2e5c2 100644 (file)
--- a/alg/test/test_glseqbrowser.cpp
+++ b/alg/test/test_glseqbrowser.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/assign/std/vector.hpp>
 using namespace boost::assign;

diff --git a/alg/test/test_glsequence.cpp b/alg/test/test_glsequence.cpp
index 179f6329fe00eb58ad86ec14afb7432758561581..eb06f067920dff045436a30285f7aadd420421e1 100644 (file)
--- a/alg/test/test_glsequence.cpp
+++ b/alg/test/test_glsequence.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/shared_ptr.hpp>

diff --git a/alg/test/test_main.cpp b/alg/test/test_main.cpp
deleted file mode 100644 (file)
index 39987f2..0000000
--- a/alg/test/test_main.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
-

diff --git a/alg/test/test_mussa.cpp b/alg/test/test_mussa.cpp
index 4e0340df08123ebecb66ef2ff4e904f3f88866b3..4d966272ccb6592b30f1011410b9c458c1650184 100644 (file)
--- a/alg/test/test_mussa.cpp
+++ b/alg/test/test_mussa.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>

diff --git a/alg/test/test_nway.cpp b/alg/test/test_nway.cpp
index cfeef259b7e71a3ee75a558a0b68a0ece7983b81..9bd8b6432d7e218883da1e13a0aee58e67638fb2 100644 (file)
--- a/alg/test/test_nway.cpp
+++ b/alg/test/test_nway.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/filesystem/path.hpp>
 namespace fs = boost::filesystem;

diff --git a/alg/test/test_sequence.cpp b/alg/test/test_sequence.cpp
index 19904d0df26e700d867dd2944fd2bfca2f805f5c..15e11ed8d016ceeb100e204de5e19f10eb453007 100644 (file)
--- a/alg/test/test_sequence.cpp
+++ b/alg/test/test_sequence.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>

diff --git a/alg/test/test_sequence_location.cpp b/alg/test/test_sequence_location.cpp
index 048a0bed93be44013e105511c549a31d939e3fdd..dd97d08597eb6297047ad0979530965ee8d9650e 100644 (file)
--- a/alg/test/test_sequence_location.cpp
+++ b/alg/test/test_sequence_location.cpp
@@ -1,3 +1,4 @@
+#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include "alg/sequence_location.hpp"

diff --git a/qui/test/CMakeLists.txt b/qui/test/CMakeLists.txt
index c41b2cd634c82be51948f1ff6c418965476b948d..d590c38d0ab8ed6ee5378bb1ff7a301fa61a7193 100644 (file)
--- a/qui/test/CMakeLists.txt
+++ b/qui/test/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(libs
         ${QT_QTTEST_LIBRARY}
       )
 
-MACRO(MAKE_UNITTEST basename)
+MACRO(MAKE_QUI_UNITTEST basename)
   QT4_WRAP_CPP(${basename}_MOC_CXX  ${basename}.hpp)
   GET_FILENAME_COMPONENT(${basename}_MOC_DIR ${${basename}_MOC_CXX} PATH)
   SET(${basename}_SRC ${basename}.cpp)
@@ -36,9 +36,9 @@ MACRO(MAKE_UNITTEST basename)
   SET_TARGET_PROPERTIES(${basename} PROPERTIES COMPILE_FLAGS "-fPIC")
   TARGET_LINK_LIBRARIES(${basename} ${libs})
   ADD_TEST(${basename} ${basename})
-ENDMACRO(MAKE_UNITTEST)
+ENDMACRO(MAKE_QUI_UNITTEST)
 
-MAKE_UNITTEST(TestSequenceLocationModel)
-MAKE_UNITTEST(TestSequenceBrowser)
-MAKE_UNITTEST(TestSequenceDescription)
-MAKE_UNITTEST(TestColorSharing)
+MAKE_QUI_UNITTEST(TestSequenceLocationModel)
+MAKE_QUI_UNITTEST(TestSequenceBrowser)
+MAKE_QUI_UNITTEST(TestSequenceDescription)
+MAKE_QUI_UNITTEST(TestColorSharing)