Separate other Python unit tests. Refs #6263

Code/Mantid/Framework/Algorithms/CMakeLists.txt

@@ -409,6 +409,18 @@ set ( INC_FILES
 	inc/MantidAlgorithms/XDataConverter.h
 )
 
+set(SRC_UNITY_IGNORE_FILES src/AlignDetectors.cpp
+    src/FFTSmooth.cpp 
+    src/FFTSmooth2.cpp
+    src/FilterBadPulses.cpp
+    src/SetUncertainties.cpp
+    )
+
+if(UNITY_BUILD)
+  include(UnityBuild)
+  enable_unity_build(Algorithms SRC_FILES SRC_UNITY_IGNORE_FILES 10)
+endif(UNITY_BUILD)
+
 set ( TEST_FILES
 	#	CalMuonDeadTimeTest.h
 	# CountEventsInPulsesTest.h
@@ -590,21 +602,7 @@ set ( TEST_FILES
 	WorkspaceGroupTest.h
 )
 
-set(SRC_UNITY_IGNORE_FILES src/AlignDetectors.cpp
-    src/FFTSmooth.cpp 
-    src/FFTSmooth2.cpp
-    src/FilterBadPulses.cpp
-    src/SetUncertainties.cpp
-    )
-
-# Python unit tests
-set ( TEST_PY_FILES NormaliseToUnityTest.py
-)
-
-if(UNITY_BUILD)
-  include(UnityBuild)
-  enable_unity_build(Algorithms SRC_FILES SRC_UNITY_IGNORE_FILES 10)
-endif(UNITY_BUILD)
+set ( TEST_PY_FILES NormaliseToUnityTest.py )
 
 # Add a precompiled header where they are supported
 ADD_PRECOMPILED_HEADER( inc/MantidAlgorithms/PrecompiledHeader.h MantidAlgorithms src/PrecompiledHeader.cpp SRC_FILES INC_FILES )

Code/Mantid/Framework/Algorithms/test/CMakeLists.txt

@@ -45,10 +45,6 @@ endif ()
 
 # python unit tests
 if (PYUNITTEST_FOUND)
-  pyunittest_add_test ( AlgorithmPythonUnitTests.py ${TEST_PY_FILES} )
-  add_dependencies ( AlgorithmPythonUnitTests.py PythonAPI )
-  add_dependencies ( FrameworkTests AlgorithmPythonUnitTests.py )
-  # Add to the 'UnitTests' group in VS
-  set_property ( TARGET AlgorithmPythonUnitTests.py PROPERTY FOLDER "UnitTests" )
+  pyunittest_add_test_two ( ${CMAKE_CURRENT_SOURCE_DIR} AlgorithmsPythonTest ${TEST_PY_FILES} )
 endif ()
 

Code/Mantid/Framework/PythonAPI/CMakeLists.txt

@@ -37,12 +37,11 @@ set ( INC_FILES
 # Python files that need copying across
 set ( PY_FILES MantidFramework.py __init__.py setup.py mantidsimple.py)
 
-# cxxtest unit tests
-set ( TEST_FILES
-	PythonFrameworkTests.h
-)
+if(UNITY_BUILD)
+  include(UnityBuild)
+  enable_unity_build(PythonAPI SRC_FILES SRC_UNITY_IGNORE_FILES 10)
+endif(UNITY_BUILD)
 
-# Python unit tests
 set ( TEST_PY_FILES 
   GoniometerTest.py
   ImportTest.py
@@ -63,10 +62,7 @@ set ( TEST_PY_FILES
   WorkspaceHistoryTest.py
 )
 
-if(UNITY_BUILD)
-  include(UnityBuild)
-  enable_unity_build(PythonAPI SRC_FILES SRC_UNITY_IGNORE_FILES 10)
-endif(UNITY_BUILD)
+
 
 ###########################################################################
 # Clear stale pyc files

Code/Mantid/Framework/PythonAPI/test/CMakeLists.txt

+# cxxtest unit tests
 if ( CXXTEST_FOUND )
-  include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
+  set ( TEST_FILES
+    PythonFrameworkTests.h
+  )
 
+  include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
   include_directories ( ../../TestHelpers/inc )
   cxxtest_add_test ( PythonAPITest ${TEST_FILES} )
   target_link_libraries( PythonAPITest PythonAPI )
@@ -12,13 +16,9 @@ if ( CXXTEST_FOUND )
   set_property ( TARGET PythonAPITest PROPERTY FOLDER "UnitTests" )
 endif ()
 
-# python unit tests
+# Python unit tests
 if (PYUNITTEST_FOUND)
-  pyunittest_add_test ( VanillaPythonTest.py ${TEST_PY_FILES} "" )
-  add_dependencies ( VanillaPythonTest.py PythonAPI Algorithms )
-  add_dependencies ( FrameworkTests VanillaPythonTest.py )
-  # Add to the 'UnitTests' group in VS
-  set_property ( TARGET PrepareVanillaPythonTest.py PROPERTY FOLDER "UnitTests/Python" )
-  set_property ( TARGET VanillaPythonTest.py PROPERTY FOLDER "UnitTests/Python" )
+  # Add test targets
+  pyunittest_add_test_two ( ${CMAKE_CURRENT_SOURCE_DIR} PythonAPI ${TEST_PY_FILES} )
 endif ()
 

Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt

@@ -67,7 +67,10 @@ set ( INC_FILES
               
 set ( TEST_FILES SANSSolidAngleCorrectionTest.h )
 
-set ( TEST_PY_FILES EQSANSQ2DTest.py SANSBeamFluxCorrectionTest.py )
+set ( TEST_PY_FILES 
+  EQSANSQ2DTest.py 
+  SANSBeamFluxCorrectionTest.py 
+)
 
 if(UNITY_BUILD)
   include(UnityBuild)

Code/Mantid/Framework/WorkflowAlgorithms/test/CMakeLists.txt

@@ -12,10 +12,6 @@ endif ()
 
 # python unit tests
 if (PYUNITTEST_FOUND)
-  pyunittest_add_test ( PythonWorkflowAlgorithmsTest.py ${TEST_PY_FILES} )
-  add_dependencies ( PythonWorkflowAlgorithmsTest.py PythonAPI )
-  add_dependencies ( FrameworkTests PythonWorkflowAlgorithmsTest.py )
-  # Add to the 'UnitTests' group in VS
-  set_property ( TARGET PythonWorkflowAlgorithmsTest.py PROPERTY FOLDER "UnitTests" )
+  pyunittest_add_test_two ( ${CMAKE_CURRENT_SOURCE_DIR} PythonWorkflowAlgorithmsTest ${TEST_PY_FILES} )
 endif ()
 

Code/Mantid/scripts/CMakeLists.txt

@@ -2,12 +2,7 @@ set ( TEST_PY_FILES test/ReducerTest.py )
 
 # python unit tests
 if (PYUNITTEST_FOUND)
-  pyunittest_add_test ( PythonReductionTest.py ${TEST_PY_FILES} )
-  add_dependencies ( PythonReductionTest.py PythonAPI )
-  add_dependencies ( FrameworkTests PythonReductionTest.py )
-  # Add to the 'UnitTests' group in VS
-  set_property ( TARGET PreparePythonReductionTest.py PROPERTY FOLDER "UnitTests/Python" )
-  set_property ( TARGET PythonReductionTest.py PROPERTY FOLDER "UnitTests/Python" )
+  pyunittest_add_test_two ( ${CMAKE_CURRENT_SOURCE_DIR}/test PythonScriptsTest ${TEST_PY_FILES} )
 endif ()
 
 # Ensure we don't get stale pyc files around