disorderedmaterials · trisyoungs · Jun 23, 2026 · Jun 26, 2026 · Jun 26, 2026 · Jun 26, 2026
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -40,7 +40,7 @@ function(dissolve_add_test)
   target_link_libraries(
     ${TEST_NAME}
     PUBLIC ${WHOLE_ARCHIVE_FLAG} ${BASIC_LINK_LIBS} ${MODULENOGUI_LINK_LIBS} ${NO_WHOLE_ARCHIVE_FLAG}
-    PRIVATE ${CORE_LINK_LIBS} GTest::gtest_main
+    PRIVATE ${CORE_LINK_LIBS} testing GTest::gtest_main
   )
 
   if(DISSOLVE_UNIT_TEST_GUI)
@@ -62,6 +62,13 @@ function(dissolve_add_test)
 
 endfunction()
 
+add_library(testing testing.cpp testGraph.cpp testing.h testGraph.h)
+target_link_libraries(testing PRIVATE GTest::gtest_main)
+target_include_directories(
+  testing PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src ${PROJECT_SOURCE_DIR} ${CONAN_INCLUDE_DIRS_GTEST}
+                  ${CONAN_INCLUDE_DIRS_PUGIXML}
+)
+
 # Add unit test subdirectories
 add_subdirectory(algorithms)
 add_subdirectory(classes)

diff --git a/tests/algorithms/array3DIterator.cpp b/tests/algorithms/array3DIterator.cpp
@@ -6,8 +6,8 @@
 #include "templates/algorithms.h"
 #include "templates/array3D.h"
 #include <gtest/gtest.h>
+#include <iostream>
 
-#include "iostream"
 namespace UnitTest
 {
 

diff --git a/tests/algorithms/zip.cpp b/tests/algorithms/zip.cpp
@@ -4,7 +4,6 @@
 #include "templates/algorithms.h"
 #include <array>
 #include <gtest/gtest.h>
-#include <string_view>
 #include <vector>
 
 namespace UnitTest

diff --git a/tests/classes/cells.cpp b/tests/classes/cells.cpp
@@ -2,12 +2,13 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "classes/atomType.h"
+#include "classes/configuration.h"
 #include "classes/species.h"
 #include "kernels/energy.h"
 #include "main/dissolve.h"
 #include "math/mathFunc.h"
-#include "tests/graphData.h"
-#include <gtest/gtest.h>
+#include "nodes/species.h"
+#include "tests/testGraph.h"
 
 namespace UnitTest
 {

diff --git a/tests/classes/cells3.cpp b/tests/classes/cells3.cpp
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (c) 2026 Team Dissolve and contributors
 
+#include "classes/configuration.h"
 #include "kernels/energy.h"
+#include "nodes/species.h"
 #include "templates/algorithms.h"
-#include "tests/graphData.h"
-#include <gtest/gtest.h>
+#include "tests/testGraph.h"
 
 namespace UnitTest
 {

diff --git a/tests/classes/cells4.cpp b/tests/classes/cells4.cpp
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (c) 2026 Team Dissolve and contributors
 
-#include "tests/graphData.h"
-#include <gtest/gtest.h>
+#include "classes/configuration.h"
+#include "tests/testGraph.h"
 
 namespace UnitTest
 {

diff --git a/tests/classes/doubleKeyedMap.cpp b/tests/classes/doubleKeyedMap.cpp
@@ -2,8 +2,7 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "templates/doubleKeyedMap.h"
-#include <gtest/gtest.h>
-#include <tests/testData.h>
+#include "tests/testing.h"
 
 namespace UnitTest
 {

diff --git a/tests/classes/empiricalFormula.cpp b/tests/classes/empiricalFormula.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "classes/empiricalFormula.h"
-#include "tests/testData.h"
+#include "classes/species.h"
 #include <gtest/gtest.h>
 
 TEST(EmpiricalFormulaTest, Order)

diff --git a/tests/classes/history.cpp b/tests/classes/history.cpp
@@ -3,9 +3,8 @@
 
 #include "math/history.h"
 #include "nodes/number.h"
-#include "tests/graphData.h"
-#include "tests/testData.h"
-#include <gtest/gtest.h>
+#include "nodes/species.h"
+#include "tests/testGraph.h"
 
 namespace UnitTest
 {
@@ -80,11 +79,11 @@ TEST(History, CustomClass)
     for (auto n = 1; n <= 5; ++n)
     {
         sum += n;
-        EXPECT_TRUE(DissolveSystemTest::checkData1D(d * (sum / n), "Original", a.push(d * n, avgLength), "Averaged"));
+        EXPECT_TRUE(testData1D(d * (sum / n), "Original", a.push(d * n, avgLength), "Averaged"));
     }
 
     tomlRoundTrip(a, b);
-    EXPECT_TRUE(DissolveSystemTest::checkData1D(a.average(), "A", b.average(), "B"));
+    EXPECT_TRUE(testData1D(a.average(), "A", b.average(), "B"));
 }
 
 TEST(History, CustomClassWithInitialiser)
@@ -131,15 +130,13 @@ TEST(History, CustomClassWithInitialiser)
     for (auto n = 0; n < 3; ++n)
     {
         auto avg = a.push(p, avgLength);
+        EXPECT_TRUE(testData1D(p.partials().get("Ar//Ar"), "Partial", avg.partials().get("Ar//Ar"), "Averaged"));
+        EXPECT_TRUE(testData1D(p.boundPartials().get("Ar//Ar"), "BoundPartial", avg.boundPartials().get("Ar//Ar"), "Averaged"));
+        EXPECT_TRUE(testData1D(p.boundTotal(), "BoundTotal", avg.boundTotal(), "Averaged"));
         EXPECT_TRUE(
-            DissolveSystemTest::checkData1D(p.partials().get("Ar//Ar"), "Partial", avg.partials().get("Ar//Ar"), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D(p.boundPartials().get("Ar//Ar"), "BoundPartial",
-                                                    avg.boundPartials().get("Ar//Ar"), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D(p.boundTotal(), "BoundTotal", avg.boundTotal(), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D(p.unboundPartials().get("Ar//Ar"), "UnboundPartial",
-                                                    avg.unboundPartials().get("Ar//Ar"), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D(p.unboundTotal(), "UnboundTotal", avg.unboundTotal(), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D(p.total(), "Total", avg.total(), "Averaged"));
+            testData1D(p.unboundPartials().get("Ar//Ar"), "UnboundPartial", avg.unboundPartials().get("Ar//Ar"), "Averaged"));
+        EXPECT_TRUE(testData1D(p.unboundTotal(), "UnboundTotal", avg.unboundTotal(), "Averaged"));
+        EXPECT_TRUE(testData1D(p.total(), "Total", avg.total(), "Averaged"));
     }
 
     // Accumulate opposite trig values - just test partials as the totals are not automatically modified by PartialSet
@@ -149,21 +146,20 @@ TEST(History, CustomClassWithInitialiser)
     for (auto n = 1; n <= 3; ++n)
     {
         auto avg = a.push(p, avgLength);
-        EXPECT_TRUE(
-            DissolveSystemTest::checkData1D(p.partials().get("Ar//Ar"), "Partial", avg.partials().get("Ar//Ar"), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D((dcos * (avgLength - n) - dsin * n) / avgLength, "BoundPartial",
-                                                    avg.boundPartials().get("Ar//Ar"), "Averaged"));
-        EXPECT_TRUE(DissolveSystemTest::checkData1D((dsin * (avgLength - n) - dcos * n) / avgLength, "UnboundPartial",
-                                                    avg.unboundPartials().get("Ar//Ar"), "Averaged"));
+        EXPECT_TRUE(testData1D(p.partials().get("Ar//Ar"), "Partial", avg.partials().get("Ar//Ar"), "Averaged"));
+        EXPECT_TRUE(testData1D((dcos * (avgLength - n) - dsin * n) / avgLength, "BoundPartial",
+                               avg.boundPartials().get("Ar//Ar"), "Averaged"));
+        EXPECT_TRUE(testData1D((dsin * (avgLength - n) - dcos * n) / avgLength, "UnboundPartial",
+                               avg.unboundPartials().get("Ar//Ar"), "Averaged"));
     }
 
     tomlRoundTrip(a, b);
     auto avgA = a.average();
     auto avgB = b.average();
-    EXPECT_TRUE(DissolveSystemTest::checkData1D(avgA.boundPartials().get("Ar//Ar"), "BoundPartialA",
-                                                avgB.boundPartials().get("Ar//Ar"), "BoundPartialB"));
-    EXPECT_TRUE(DissolveSystemTest::checkData1D(avgA.unboundPartials().get("Ar//Ar"), "UnboundPartialA",
-                                                avgB.unboundPartials().get("Ar//Ar"), "UnboundPartialB"));
+    EXPECT_TRUE(
+        testData1D(avgA.boundPartials().get("Ar//Ar"), "BoundPartialA", avgB.boundPartials().get("Ar//Ar"), "BoundPartialB"));
+    EXPECT_TRUE(testData1D(avgA.unboundPartials().get("Ar//Ar"), "UnboundPartialA", avgB.unboundPartials().get("Ar//Ar"),
+                           "UnboundPartialB"));
 }
 
 } // namespace UnitTest
diff --git a/tests/classes/neta.cpp b/tests/classes/neta.cpp
@@ -6,7 +6,6 @@
 #include "data/elements.h"
 #include "data/ff/ff.h"
 #include "templates/algorithms.h"
-#include "tests/testData.h"
 #include <format>
 #include <gtest/gtest.h>
 

diff --git a/tests/classes/neutronWeights.cpp b/tests/classes/neutronWeights.cpp
@@ -3,10 +3,9 @@
 
 #include "classes/neutronWeights.h"
 #include "classes/isotopologueSet.h"
-#include "tests/graphData.h"
+#include "classes/species.h"
 #include "tests/tempFile.h"
-#include "tests/testData.h"
-#include <gtest/gtest.h>
+#include "tests/testing.h"
 
 namespace UnitTest
 {

diff --git a/tests/classes/potentialSet.cpp b/tests/classes/potentialSet.cpp
@@ -5,7 +5,6 @@
 #include "classes/atomType.h"
 #include "math/data1D.h"
 #include "math/history.h"
-#include "tests/testData.h"
 #include <gtest/gtest.h>
 
 namespace UnitTest

diff --git a/tests/classes/speciesSite.cpp b/tests/classes/speciesSite.cpp
@@ -3,7 +3,6 @@
 
 #include "classes/site.h"
 #include "classes/species.h"
-#include "tests/testData.h"
 #include <gtest/gtest.h>
 
 namespace UnitTest

diff --git a/tests/classes/structure.cpp b/tests/classes/structure.cpp
@@ -3,9 +3,8 @@
 
 #include "classes/structure.h"
 #include "nodes/calculateBonding.h"
-#include "tests/graphData.h"
+#include "tests/testGraph.h"
 #include <cmath>
-#include <gtest/gtest.h>
 
 namespace UnitTest
 {