From c2cf07329f27f419a5ae84cef7ed844cf95e4c18 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Fri, 30 Mar 2007 21:02:13 +0000 Subject: [PATCH] seperate qt unittests into subdirectories I wanted to move the various qt unit tests into subdirectories to make it a bit cleaner to add more tests. --- makelib/TestMacros.cmake | 43 ++++++++++++++++++ qui/CMakeLists.txt | 2 + qui/seqbrowser/test/CMakeLists.txt | 5 +++ .../test/TestSequenceBrowser.cpp | 0 .../test/TestSequenceBrowser.hpp | 0 .../test/TestSequenceDescription.cpp | 0 .../test/TestSequenceDescription.hpp | 0 qui/subanalysis/test/CMakeLists.txt | 4 ++ .../test/TestSequenceLocationModel.cpp | 0 .../test/TestSequenceLocationModel.hpp | 0 qui/test/CMakeLists.txt | 44 +------------------ 11 files changed, 56 insertions(+), 42 deletions(-) create mode 100644 makelib/TestMacros.cmake create mode 100644 qui/seqbrowser/test/CMakeLists.txt rename qui/{ => seqbrowser}/test/TestSequenceBrowser.cpp (100%) rename qui/{ => seqbrowser}/test/TestSequenceBrowser.hpp (100%) rename qui/{ => seqbrowser}/test/TestSequenceDescription.cpp (100%) rename qui/{ => seqbrowser}/test/TestSequenceDescription.hpp (100%) create mode 100644 qui/subanalysis/test/CMakeLists.txt rename qui/{ => subanalysis}/test/TestSequenceLocationModel.cpp (100%) rename qui/{ => subanalysis}/test/TestSequenceLocationModel.hpp (100%) diff --git a/makelib/TestMacros.cmake b/makelib/TestMacros.cmake new file mode 100644 index 0000000..47f9432 --- /dev/null +++ b/makelib/TestMacros.cmake @@ -0,0 +1,43 @@ + +#deal with some debian wierdness +#FIND_PROGRAM(QT_QMAKE_EXECUTABLE qmake-qt4 ) +#FIND_PROGRAM(QT_MOC_EXECUTABLE moc-qt4 ) + +FIND_PACKAGE(Qt4) +SET(QT_USE_QTOPENGL 1) +IF(QT_QTASSISTANT_FOUND) + SET(QT_USE_QTNETWORK 1) + SET(QT_USE_QTASSISTANT 1) +ENDIF(QT_QTASSISTANT_FOUND) +INCLUDE( ${QT_USE_FILE} ) +FIND_PACKAGE(OpenGL) +FIND_PACKAGE(Boost) +FIND_PACKAGE(PythonLibs) + +IF(QT4_FOUND) + SET(qui_test_libs + mussa_qui + mussa_core + ${QT_LIBRARIES} + ${OPENGL_gl_LIBRARY} + ${BOOST_PROGRAM_OPTIONS_LIBRARY} + ${BOOST_FILESYSTEM_LIBRARY} + ${BOOST_SERIALIZATION_LIBRARY} + ${QT_QTTEST_LIBRARY} + ) + + MACRO(MAKE_QUI_UNITTEST basename) + SET(extra_libs ${ARGN}) + QT4_WRAP_CPP(${basename}_MOC_CXX ${basename}.hpp) + GET_FILENAME_COMPONENT(${basename}_MOC_DIR ${${basename}_MOC_CXX} PATH) + SET(${basename}_SRC ${basename}.cpp) + INCLUDE_DIRECTORIES(${${basename}_MOC_DIR}) + SET_SOURCE_FILES_PROPERTIES(${${basename}_SRC} + PROPERTIES COMPILE_FLAGS "-fPIC" + ) + ADD_EXECUTABLE(${basename} ${${basename}_MOC_CXX} ${${basename}_SRC}) + SET_TARGET_PROPERTIES(${basename} PROPERTIES COMPILE_FLAGS "-fPIC") + TARGET_LINK_LIBRARIES(${basename} ${qui_test_libs} ${extra_libs}) + ADD_TEST(${basename} ${basename}) + ENDMACRO(MAKE_QUI_UNITTEST) +ENDIF(QT4_FOUND) \ No newline at end of file diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt index 53c9457..206dce7 100644 --- a/qui/CMakeLists.txt +++ b/qui/CMakeLists.txt @@ -108,3 +108,5 @@ SET_TARGET_PROPERTIES( ADD_SUBDIRECTORY( test ) +ADD_SUBDIRECTORY( seqbrowser/test ) +ADD_SUBDIRECTORY( subanalysis/test ) diff --git a/qui/seqbrowser/test/CMakeLists.txt b/qui/seqbrowser/test/CMakeLists.txt new file mode 100644 index 0000000..73aeb2a --- /dev/null +++ b/qui/seqbrowser/test/CMakeLists.txt @@ -0,0 +1,5 @@ + +INCLUDE( TestMacros ) + +MAKE_QUI_UNITTEST(TestSequenceBrowser) +MAKE_QUI_UNITTEST(TestSequenceDescription) \ No newline at end of file diff --git a/qui/test/TestSequenceBrowser.cpp b/qui/seqbrowser/test/TestSequenceBrowser.cpp similarity index 100% rename from qui/test/TestSequenceBrowser.cpp rename to qui/seqbrowser/test/TestSequenceBrowser.cpp diff --git a/qui/test/TestSequenceBrowser.hpp b/qui/seqbrowser/test/TestSequenceBrowser.hpp similarity index 100% rename from qui/test/TestSequenceBrowser.hpp rename to qui/seqbrowser/test/TestSequenceBrowser.hpp diff --git a/qui/test/TestSequenceDescription.cpp b/qui/seqbrowser/test/TestSequenceDescription.cpp similarity index 100% rename from qui/test/TestSequenceDescription.cpp rename to qui/seqbrowser/test/TestSequenceDescription.cpp diff --git a/qui/test/TestSequenceDescription.hpp b/qui/seqbrowser/test/TestSequenceDescription.hpp similarity index 100% rename from qui/test/TestSequenceDescription.hpp rename to qui/seqbrowser/test/TestSequenceDescription.hpp diff --git a/qui/subanalysis/test/CMakeLists.txt b/qui/subanalysis/test/CMakeLists.txt new file mode 100644 index 0000000..e0bfa6f --- /dev/null +++ b/qui/subanalysis/test/CMakeLists.txt @@ -0,0 +1,4 @@ + +INCLUDE( TestMacros ) + +MAKE_QUI_UNITTEST(TestSequenceLocationModel) diff --git a/qui/test/TestSequenceLocationModel.cpp b/qui/subanalysis/test/TestSequenceLocationModel.cpp similarity index 100% rename from qui/test/TestSequenceLocationModel.cpp rename to qui/subanalysis/test/TestSequenceLocationModel.cpp diff --git a/qui/test/TestSequenceLocationModel.hpp b/qui/subanalysis/test/TestSequenceLocationModel.hpp similarity index 100% rename from qui/test/TestSequenceLocationModel.hpp rename to qui/subanalysis/test/TestSequenceLocationModel.hpp diff --git a/qui/test/CMakeLists.txt b/qui/test/CMakeLists.txt index d590c38..d1668c7 100644 --- a/qui/test/CMakeLists.txt +++ b/qui/test/CMakeLists.txt @@ -1,44 +1,4 @@ -#deal with some debian wierdness -FIND_PROGRAM(QT_QMAKE_EXECUTABLE qmake-qt4 ) -FIND_PROGRAM(QT_MOC_EXECUTABLE moc-qt4 ) + +INCLUDE( TestMacros ) -FIND_PACKAGE(Qt4) -SET(QT_USE_QTOPENGL 1) -IF(QT_QTASSISTANT_FOUND) - SET(QT_USE_QTNETWORK 1) - SET(QT_USE_QTASSISTANT 1) -ENDIF(QT_QTASSISTANT_FOUND) -INCLUDE( ${QT_USE_FILE} ) -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(Boost) -FIND_PACKAGE(PythonLibs) - -SET(libs - mussa_qui - mussa_core - ${QT_LIBRARIES} - ${OPENGL_gl_LIBRARY} - ${BOOST_PROGRAM_OPTIONS_LIBRARY} - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_SERIALIZATION_LIBRARY} - ${QT_QTTEST_LIBRARY} - ) - -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) - INCLUDE_DIRECTORIES(${${basename}_MOC_DIR}) - SET_SOURCE_FILES_PROPERTIES(${${basename}_SRC} - PROPERTIES COMPILE_FLAGS "-fPIC" - ) - ADD_EXECUTABLE(${basename} ${${basename}_MOC_CXX} ${${basename}_SRC}) - SET_TARGET_PROPERTIES(${basename} PROPERTIES COMPILE_FLAGS "-fPIC") - TARGET_LINK_LIBRARIES(${basename} ${libs}) - ADD_TEST(${basename} ${basename}) -ENDMACRO(MAKE_QUI_UNITTEST) - -MAKE_QUI_UNITTEST(TestSequenceLocationModel) -MAKE_QUI_UNITTEST(TestSequenceBrowser) -MAKE_QUI_UNITTEST(TestSequenceDescription) MAKE_QUI_UNITTEST(TestColorSharing) -- 2.30.2