From cb2e5d3b124c7b3cb3d8ece4a08487320766a88d Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Fri, 30 Aug 2019 15:22:17 +0100
Subject: [PATCH] Move ISIS powder tests to isis_powder subdirectory
---
scripts/CMakeLists.txt | 1 +
scripts/Diffraction/isis_powder/CMakeLists.txt | 18 ++++++++++++++++++
.../test}/ISISPowderAbsorptionTest.py | 0
.../test}/ISISPowderAbstractInstrumentTest.py | 0
.../isis_powder/test}/ISISPowderCommonTest.py | 0
.../test}/ISISPowderFocusCropTest.py | 0
.../test}/ISISPowderGemOutputTest.py | 0
.../test}/ISISPowderInstrumentSettingsTest.py | 0
.../test}/ISISPowderRunDetailsTest.py | 0
.../test}/ISISPowderSampleDetailsTest.py | 0
.../test}/ISISPowderYamlParserTest.py | 0
.../Diffraction/isis_powder/test/__init__.py | 6 ++++++
scripts/test/CMakeLists.txt | 1 -
scripts/test/isis_powder/CMakeLists.txt | 18 ------------------
14 files changed, 25 insertions(+), 19 deletions(-)
create mode 100644 scripts/Diffraction/isis_powder/CMakeLists.txt
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderAbsorptionTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderAbstractInstrumentTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderCommonTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderFocusCropTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderGemOutputTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderInstrumentSettingsTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderRunDetailsTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderSampleDetailsTest.py (100%)
rename scripts/{test/isis_powder => Diffraction/isis_powder/test}/ISISPowderYamlParserTest.py (100%)
create mode 100644 scripts/Diffraction/isis_powder/test/__init__.py
delete mode 100644 scripts/test/isis_powder/CMakeLists.txt
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index b096bbade44..c213cef13a5 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -86,6 +86,7 @@ install(FILES ${_scripts_pth_install}
# Testing
add_subdirectory(test)
+add_subdirectory(Diffraction/isis_powder)
# Ensure we don't get stale pyc files around
clean_orphaned_pyc_files(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/scripts/Diffraction/isis_powder/CMakeLists.txt b/scripts/Diffraction/isis_powder/CMakeLists.txt
new file mode 100644
index 00000000000..245d5f2ba81
--- /dev/null
+++ b/scripts/Diffraction/isis_powder/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Tests for ISIS Powder
+
+set(TEST_PY_FILES
+ test/ISISPowderAbsorptionTest.py
+ test/ISISPowderAbstractInstrumentTest.py
+ test/ISISPowderCommonTest.py
+ test/ISISPowderGemOutputTest.py
+ test/ISISPowderInstrumentSettingsTest.py
+ test/ISISPowderRunDetailsTest.py
+ test/ISISPowderSampleDetailsTest.py
+ test/ISISPowderYamlParserTest.py
+ test/ISISPowderFocusCropTest.py
+)
+
+check_tests_valid(${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES})
+
+pyunittest_add_test(${CMAKE_CURRENT_SOURCE_DIR} python.IsisPowder
+ ${TEST_PY_FILES})
diff --git a/scripts/test/isis_powder/ISISPowderAbsorptionTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderAbsorptionTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
diff --git a/scripts/test/isis_powder/ISISPowderAbstractInstrumentTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderAbstractInstrumentTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
diff --git a/scripts/test/isis_powder/ISISPowderCommonTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderCommonTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
diff --git a/scripts/test/isis_powder/ISISPowderFocusCropTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderFocusCropTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
diff --git a/scripts/test/isis_powder/ISISPowderGemOutputTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderGemOutputTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
diff --git a/scripts/test/isis_powder/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderInstrumentSettingsTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
diff --git a/scripts/test/isis_powder/ISISPowderRunDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderRunDetailsTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
diff --git a/scripts/test/isis_powder/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderSampleDetailsTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
diff --git a/scripts/test/isis_powder/ISISPowderYamlParserTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderYamlParserTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
diff --git a/scripts/Diffraction/isis_powder/test/__init__.py b/scripts/Diffraction/isis_powder/test/__init__.py
new file mode 100644
index 00000000000..d43ca442a3b
--- /dev/null
+++ b/scripts/Diffraction/isis_powder/test/__init__.py
@@ -0,0 +1,6 @@
+# Mantid Repository : https://github.com/mantidproject/mantid
+#
+# Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI,
+# NScD Oak Ridge National Laboratory, European Spallation Source
+# & Institut Laue - Langevin
+# SPDX - License - Identifier: GPL - 3.0 +
diff --git a/scripts/test/CMakeLists.txt b/scripts/test/CMakeLists.txt
index 29dcaeb11f2..0e0ada5db78 100644
--- a/scripts/test/CMakeLists.txt
+++ b/scripts/test/CMakeLists.txt
@@ -60,7 +60,6 @@ unset(PYUNITTEST_QT_API)
# Additional tests
add_subdirectory(directtools)
-add_subdirectory(isis_powder)
add_subdirectory(MultiPlotting)
add_subdirectory(Muon)
add_subdirectory(SANS)
diff --git a/scripts/test/isis_powder/CMakeLists.txt b/scripts/test/isis_powder/CMakeLists.txt
deleted file mode 100644
index 0947470963b..00000000000
--- a/scripts/test/isis_powder/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Tests for ISIS Powder
-
-set(TEST_PY_FILES
- ISISPowderAbsorptionTest.py
- ISISPowderAbstractInstrumentTest.py
- ISISPowderCommonTest.py
- ISISPowderGemOutputTest.py
- ISISPowderInstrumentSettingsTest.py
- ISISPowderRunDetailsTest.py
- ISISPowderSampleDetailsTest.py
- ISISPowderYamlParserTest.py
- ISISPowderFocusCropTest.py)
-
-check_tests_valid(${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES})
-
-# Prefix for test name=PythonAlgorithms
-pyunittest_add_test(${CMAKE_CURRENT_SOURCE_DIR} python.IsisPowder
- ${TEST_PY_FILES})
--
GitLab