Re #11756. Done unit tests.

mantidproject · May 19, 2015 · 6b30a4b · 6b30a4b
1 parent 5a18e4c
commit 6b30a4b
Show file tree

Hide file tree

Showing 22 changed files with 224 additions and 51 deletions.
diff --git a/Code/Mantid/Framework/API/test/CMakeLists.txt b/Code/Mantid/Framework/API/test/CMakeLists.txt
@@ -10,13 +10,18 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/NexusTestHelper.cpp
       )
 
-  if ( GMOCK_FOUND AND GTEST_FOUND )
-    cxxtest_add_test ( APITest ${TEST_FILES} ${GMOCK_TEST_FILES})
-    target_link_libraries( APITest LINK_PRIVATE API ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES}  )
-  else ()
-    cxxtest_add_test ( APITest ${TEST_FILES} )
-    target_link_libraries( APITest LINK_PRIVATE API  )
-  endif()
+  cxxtest_add_test ( APITest ${TEST_FILES} ${GMOCK_TEST_FILES})
+  target_link_libraries( APITest LINK_PRIVATE 
+		API
+		Geometry
+		Kernel
+		Nexus
+		${NEXUS_LIBRARIES}
+		${Boost_LIBRARIES}
+		${POCO_LIBRARIES}
+		${GMOCK_LIBRARIES} 
+		${GTEST_LIBRARIES}  )
+
   add_dependencies ( FrameworkTests APITest )
   # Test data
   add_dependencies ( APITest StandardTestData )

diff --git a/Code/Mantid/Framework/Algorithms/test/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/test/CMakeLists.txt
@@ -38,7 +38,17 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/ScopedFileHelper.cpp
                         )
   cxxtest_add_test ( AlgorithmsTest ${TEST_FILES} )
-  target_link_libraries ( AlgorithmsTest LINK_PRIVATE Algorithms DataHandling ${GMOCK_LIBRARIES} )
+  target_link_libraries ( AlgorithmsTest LINK_PRIVATE 
+		Algorithms 
+		API
+		DataHandling
+		DataObjects
+		Geometry
+		Kernel
+		Nexus
+		${Boost_LIBRARIES}
+		${POCO_LIBRARIES}
+		${GMOCK_LIBRARIES} )
   add_dependencies ( AlgorithmsTest Crystal CurveFitting )
   add_dependencies ( FrameworkTests AlgorithmsTest )
   # Test data

diff --git a/Code/Mantid/Framework/Crystal/test/CMakeLists.txt b/Code/Mantid/Framework/Crystal/test/CMakeLists.txt
@@ -9,7 +9,18 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/WorkspaceCreationHelper.cpp
                         ../../TestHelpers/src/MDEventsTestHelper.cpp )
   cxxtest_add_test ( CrystalTest ${TEST_FILES} )
-  target_link_libraries ( CrystalTest LINK_PRIVATE Crystal DataHandling MDAlgorithms ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES})
+  target_link_libraries ( CrystalTest LINK_PRIVATE 
+		Crystal
+		API
+		DataHandling 
+		DataObjects
+		Geometry
+		Kernel
+		MDAlgorithms
+		${Boost_LIBRARIES}
+		${POCO_LIBRARIES}
+		${GMOCK_LIBRARIES} 
+		${GTEST_LIBRARIES})
   add_dependencies ( CrystalTest Algorithms CurveFitting )
   add_dependencies ( FrameworkTests CrystalTest )
   # Test data

diff --git a/Code/Mantid/Framework/CurveFitting/test/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/test/CMakeLists.txt
@@ -10,7 +10,18 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/StartFrameworkManager.cpp
   )
   cxxtest_add_test ( CurveFittingTest ${TEST_FILES}  )
-  target_link_libraries( CurveFittingTest LINK_PRIVATE CurveFitting DataHandling DataObjects ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES})
+  target_link_libraries( CurveFittingTest LINK_PRIVATE 
+		CurveFitting
+		API
+		DataHandling 
+		DataObjects
+		Geometry
+		Kernel
+		${GSL_LIBRARIES}
+		${Boost_LIBRARIES}
+		${POCO_LIBRARIES}
+		${GMOCK_LIBRARIES} 
+		${GTEST_LIBRARIES})
   add_dependencies ( CurveFittingTest Algorithms )
   add_dependencies ( FrameworkTests CurveFittingTest )
   # Test data

diff --git a/Code/Mantid/Framework/DataHandling/test/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/test/CMakeLists.txt
@@ -12,7 +12,17 @@ if ( CXXTEST_FOUND )
       )
 
   cxxtest_add_test ( DataHandlingTest ${TEST_FILES} )
-  target_link_libraries( DataHandlingTest LINK_PRIVATE DataHandling ${HDF5_LIBRARIES} )
+  target_link_libraries( DataHandlingTest LINK_PRIVATE 
+			API
+			DataHandling
+			DataObjects
+			Geometry
+			Kernel
+			Nexus
+			${NEXUS_LIBRARIES}
+			${Boost_LIBRARIES}
+		    ${POCO_LIBRARIES}
+			${HDF5_LIBRARIES} )
   add_dependencies ( DataHandlingTest Algorithms MDAlgorithms )
   add_dependencies ( FrameworkTests DataHandlingTest )
   # Test data

diff --git a/Code/Mantid/Framework/DataObjects/test/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/test/CMakeLists.txt
@@ -14,7 +14,17 @@ if ( CXXTEST_FOUND )
   )
 
   cxxtest_add_test ( DataObjectsTest ${TEST_FILES} )
-  target_link_libraries( DataObjectsTest LINK_PRIVATE DataObjects ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES})
+  target_link_libraries( DataObjectsTest LINK_PRIVATE 
+			API
+			DataObjects 
+			Geometry
+			Kernel
+			${NEXUS_LIBRARIES}
+			${JSONCPP_LIBRARIES}
+			${Boost_LIBRARIES}
+		    ${POCO_LIBRARIES}
+			${GMOCK_LIBRARIES} 
+			${GTEST_LIBRARIES})
   # Specify implicit dependency, but don't link to it
   add_dependencies ( DataObjectsTest UserAlgorithms )
   add_dependencies ( FrameworkTests DataObjectsTest )

diff --git a/Code/Mantid/Framework/Geometry/test/CMakeLists.txt b/Code/Mantid/Framework/Geometry/test/CMakeLists.txt
@@ -12,13 +12,16 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/LoggingCleaner.cpp
   )
 
-  if ( GMOCK_FOUND AND GTEST_FOUND )
-    cxxtest_add_test ( GeometryTest ${TEST_FILES} ${GMOCK_TEST_FILES})
-    target_link_libraries( GeometryTest LINK_PRIVATE Geometry ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
-  else ()
-    cxxtest_add_test ( GeometryTest ${TEST_FILES} )
-    target_link_libraries( GeometryTest LINK_PRIVATE Geometry )
-  endif()
+  cxxtest_add_test ( GeometryTest ${TEST_FILES} ${GMOCK_TEST_FILES})
+  target_link_libraries( GeometryTest LINK_PRIVATE 
+			Geometry
+			Kernel
+			${NEXUS_LIBRARIES}
+			${GSL_LIBRARIES}
+			${Boost_LIBRARIES}
+		    ${POCO_LIBRARIES}
+			${GMOCK_LIBRARIES} 
+			${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests GeometryTest )
   # Add to the 'FrameworkTests' group in VS

diff --git a/Code/Mantid/Framework/ICat/test/CMakeLists.txt b/Code/Mantid/Framework/ICat/test/CMakeLists.txt
@@ -10,7 +10,15 @@ if ( CXXTEST_FOUND )
 
   # The actual test suite
   cxxtest_add_test ( ICatTest ${TEST_FILES} )
-  target_link_libraries( ICatTest LINK_PRIVATE ICat )
+  target_link_libraries( ICatTest LINK_PRIVATE 
+			ICat
+			API
+			DataObjects
+			Geometry
+			Kernel
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			)
   add_dependencies ( FrameworkTests ICatTest )
 
   # Add to the 'FrameworkTests' group in VS

diff --git a/Code/Mantid/Framework/Kernel/test/CMakeLists.txt b/Code/Mantid/Framework/Kernel/test/CMakeLists.txt
@@ -8,7 +8,13 @@ if ( CXXTEST_FOUND )
   set ( TESTHELPER_SRCS ../../TestHelpers/src/NexusTestHelper.cpp ../../TestHelpers/src/LoggingCleaner.cpp )
 
   cxxtest_add_test ( KernelTest ${TEST_FILES} )
-  target_link_libraries( KernelTest LINK_PRIVATE Kernel ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
+  target_link_libraries( KernelTest LINK_PRIVATE 
+			Kernel
+			${NEXUS_LIBRARIES}
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES} 
+			${GMOCK_LIBRARIES} 
+			${GTEST_LIBRARIES} )
   add_dependencies ( FrameworkTests KernelTest )
   # Test data
   add_dependencies ( KernelTest StandardTestData )

diff --git a/Code/Mantid/Framework/LiveData/test/CMakeLists.txt b/Code/Mantid/Framework/LiveData/test/CMakeLists.txt
@@ -13,7 +13,15 @@ if ( CXXTEST_FOUND )
       )
 
   cxxtest_add_test ( LiveDataTest ${TEST_FILES} )
-  target_link_libraries( LiveDataTest LINK_PRIVATE LiveData )
+  target_link_libraries( LiveDataTest LINK_PRIVATE 
+			API
+			DataObjects
+			Geometry
+			Kernel
+			LiveData
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			)
   add_dependencies ( LiveDataTest DataHandling Algorithms MDAlgorithms )
   add_dependencies ( FrameworkTests LiveDataTest )
   # Test data

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/test/CMakeLists.txt
@@ -13,13 +13,24 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/WorkspaceCreationHelper.cpp
                          )
 
-  if ( GMOCK_FOUND AND GTEST_FOUND )
-    cxxtest_add_test ( MDAlgorithmsTest ${TEST_FILES} ${GMOCK_TEST_FILES})
-    target_link_libraries( MDAlgorithmsTest LINK_PRIVATE MDAlgorithms DataHandling CurveFitting Nexus ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} ${NEXUS_LIBRARIES} ${HDF5_LIBRARIES} )
-  else ()
-    cxxtest_add_test ( MDAlgorithmsTest ${TEST_FILES} )
-    target_link_libraries( MDAlgorithmsTest LINK_PRIVATE MDAlgorithms Nexus ${NEXUS_LIBRARIES} ${HDF5_LIBRARIES} )
-  endif ()
+  cxxtest_add_test ( MDAlgorithmsTest ${TEST_FILES} ${GMOCK_TEST_FILES})
+  target_link_libraries( MDAlgorithmsTest LINK_PRIVATE 
+			API
+			DataHandling 
+			DataObjects
+			CurveFitting 
+			Geometry
+			Kernel
+			MDAlgorithms 
+			Nexus 
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			${MUPARSER_LIBRARIES}
+			${GMOCK_LIBRARIES} 
+			${GTEST_LIBRARIES} 
+			${NEXUS_LIBRARIES} 
+			${HDF5_LIBRARIES} )
+
   add_dependencies ( MDAlgorithmsTest DataHandling Algorithms CurveFitting )
   add_dependencies ( FrameworkTests MDAlgorithmsTest )
   # Test data

diff --git a/Code/Mantid/Framework/PythonInterface/test/cpp/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/test/cpp/CMakeLists.txt
@@ -15,7 +15,15 @@ if ( CXXTEST_FOUND )
   if ( WIN32 )
     set_target_properties( PythonInterfaceCppTest PROPERTIES COMPILE_FLAGS "/w44244" )
   endif ()
-  target_link_libraries( PythonInterfaceCppTest LINK_PRIVATE PythonKernelModule PythonAPIModule ${PYTHON_LIBRARIES} )
+  target_link_libraries( PythonInterfaceCppTest LINK_PRIVATE 
+			API
+			Geometry
+			Kernel
+			PythonKernelModule 
+			PythonAPIModule 
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			${PYTHON_LIBRARIES} )
   add_dependencies ( FrameworkTests PythonInterfaceCppTest )
   # Add to the 'UnitTests' group in VS
   set_property ( TARGET PythonInterfaceCppTest PROPERTY FOLDER "UnitTests" )

diff --git a/Code/Mantid/Framework/PythonInterface/test/testhelpers/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/test/testhelpers/CMakeLists.txt
@@ -32,7 +32,17 @@ set_python_properties( PythonWorkspaceCreationHelper WorkspaceCreationHelper )
 set_target_output_directory ( PythonWorkspaceCreationHelper ${OUTPUT_DIR} .pyd )
 # Override folder
 set_property ( TARGET PythonWorkspaceCreationHelper PROPERTY FOLDER "UnitTests/Python" )
-target_link_libraries ( PythonWorkspaceCreationHelper LINK_PRIVATE PythonAPIModule DataObjects DataHandling )
+target_link_libraries ( PythonWorkspaceCreationHelper LINK_PRIVATE 
+		PythonAPIModule 
+		DataObjects 
+		DataHandling
+		API
+		Kernel
+		Geometry
+		${PYTHON_LIBRARIES}
+		${Boost_LIBRARIES}
+		${POCO_LIBRARIES}
+		)
 
 # Overall testhelpers target
 add_custom_target ( testhelpers DEPENDS PythonWorkspaceCreationHelper )

diff --git a/Code/Mantid/Framework/RemoteAlgorithms/test/CMakeLists.txt b/Code/Mantid/Framework/RemoteAlgorithms/test/CMakeLists.txt
@@ -2,7 +2,14 @@ if ( CXXTEST_FOUND )
   include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
 
   cxxtest_add_test ( RemoteAlgorithmsTest ${TEST_FILES} )
-  target_link_libraries ( RemoteAlgorithmsTest LINK_PRIVATE RemoteAlgorithms ${GMOCK_LIBRARIES} )
+  target_link_libraries ( RemoteAlgorithmsTest LINK_PRIVATE 
+			API
+			Geometry
+			Kernel
+			RemoteAlgorithms 
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			${GMOCK_LIBRARIES} )
   add_dependencies ( FrameworkTests RemoteAlgorithmsTest )
   # Test data. Not using any for now. Remember to uncomment if data is added for these remote alg. tests
   # add_dependencies ( RemoteAlgorithmsTest StandardTestData )

diff --git a/Code/Mantid/Framework/RemoteJobManagers/test/CMakeLists.txt b/Code/Mantid/Framework/RemoteJobManagers/test/CMakeLists.txt
@@ -2,7 +2,13 @@ if ( CXXTEST_FOUND )
   include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
 
   cxxtest_add_test ( RemoteJobManagersTest ${TEST_FILES} )
-  target_link_libraries ( RemoteJobManagersTest LINK_PRIVATE RemoteJobManagers ${GMOCK_LIBRARIES} )
+  target_link_libraries ( RemoteJobManagersTest LINK_PRIVATE 
+			API
+			Kernel
+			RemoteJobManagers 
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			${GMOCK_LIBRARIES} )
   add_dependencies ( FrameworkTests RemoteJobManagersTest )
   # Test data. Not using any for now. Remember to uncomment if data is added for these remote job managers
   # add_dependencies ( RemoteJobManagersTest StandardTestData )

diff --git a/Code/Mantid/Framework/SINQ/test/CMakeLists.txt b/Code/Mantid/Framework/SINQ/test/CMakeLists.txt
@@ -7,13 +7,17 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/ComponentCreationHelper.cpp
                         ../../TestHelpers/src/WorkspaceCreationHelper.cpp )
 
-  if ( GMOCK_FOUND AND GTEST_FOUND )
-    cxxtest_add_test ( PSISINQTest ${TEST_FILES} ${GMOCK_TEST_FILES})
-    target_link_libraries ( PSISINQTest LINK_PRIVATE SINQ  CurveFitting ${MANTIDLIBS} ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
-  else ()
-    cxxtest_add_test ( PSISINQTest ${TEST_FILES} )
-    target_link_libraries ( PSISINQTest LINK_PRIVATE SINQ  CurveFitting ${MANTIDLIBS} )
-  endif()
+  cxxtest_add_test ( PSISINQTest ${TEST_FILES} ${GMOCK_TEST_FILES})
+  target_link_libraries ( PSISINQTest LINK_PRIVATE 
+			API
+			Geometry
+			Kernel
+			SINQ  
+			CurveFitting 
+			${MANTIDLIBS} 
+			${GMOCK_LIBRARIES} 
+			${GTEST_LIBRARIES} )
+
   # Test data
   add_dependencies ( PSISINQTest StandardTestData )
 

diff --git a/Code/Mantid/Framework/ScriptRepository/test/CMakeLists.txt b/Code/Mantid/Framework/ScriptRepository/test/CMakeLists.txt
@@ -4,13 +4,16 @@ if ( CXXTEST_FOUND )
   include_directories ( ../../ScriptRepository/inc )
   include_directories ( ../ )
 
-  if ( GMOCK_FOUND AND GTEST_FOUND )
-    cxxtest_add_test ( ScriptRepositoryTest ${TEST_FILES} ${GMOCK_TEST_FILES})   
-    target_link_libraries( ScriptRepositoryTest LINK_PRIVATE ScriptRepository ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES}  )
-  else ()
-    cxxtest_add_test ( ScriptRepositoryTest ${TEST_FILES} )
-    target_link_libraries( ScriptRepositoryTest LINK_PRIVATE ScriptRepository  )
-  endif()
+  cxxtest_add_test ( ScriptRepositoryTest ${TEST_FILES} ${GMOCK_TEST_FILES})   
+  target_link_libraries( ScriptRepositoryTest LINK_PRIVATE 
+			API
+			Kernel
+			ScriptRepository 
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			${GMOCK_LIBRARIES} 
+			${GTEST_LIBRARIES}  )
+
   add_dependencies ( FrameworkTests ScriptRepositoryTest )
   # Add to the 'FrameworkTests' group in VS
   set_property ( TARGET ScriptRepositoryTest PROPERTY FOLDER "UnitTests" )

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/test/CMakeLists.txt b/Code/Mantid/Framework/WorkflowAlgorithms/test/CMakeLists.txt
@@ -9,7 +9,17 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/ComponentCreationHelper.cpp
                         ../../TestHelpers/src/WorkspaceCreationHelper.cpp )
   cxxtest_add_test ( WorkflowAlgorithmsTest ${TEST_FILES} )
-  target_link_libraries ( WorkflowAlgorithmsTest LINK_PRIVATE WorkflowAlgorithms Algorithms DataHandling )
+  target_link_libraries ( WorkflowAlgorithmsTest LINK_PRIVATE 
+			WorkflowAlgorithms 
+			API
+			Algorithms 
+			DataHandling 
+			DataObjects
+			Geometry
+			Kernel
+			${Boost_LIBRARIES}
+			${POCO_LIBRARIES}
+			)
   add_dependencies ( WorkflowAlgorithmsTest CurveFitting )
   add_dependencies ( FrameworkTests WorkflowAlgorithmsTest )
   # Test data

diff --git a/Code/Mantid/MantidQt/API/test/CMakeLists.txt b/Code/Mantid/MantidQt/API/test/CMakeLists.txt
@@ -12,7 +12,17 @@ if ( CXXTEST_FOUND )
         )
 
     cxxtest_add_test ( MantidQtAPITest ${TEST_FILES} )
-    target_link_libraries( MantidQtAPITest LINK_PRIVATE MantidQtAPI DataObjects ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
+    target_link_libraries( MantidQtAPITest LINK_PRIVATE 
+				MantidQtAPI 
+				API
+				DataObjects 
+				Geometry
+				Kernel
+				${QT_LIBRARIES}
+				${Boost_LIBRARIES}
+			    ${POCO_LIBRARIES} 
+				${GMOCK_LIBRARIES} 
+				${GTEST_LIBRARIES} )
     add_dependencies( GUITests MantidQtAPITest )
 
     # Add to the 'UnitTests' group in VS