From 5fcd1b0f79cd2c33bd1cbf75e511ea3d93fff4c7 Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Tue, 13 Apr 2021 15:07:48 +0200
Subject: [PATCH] adapt GUI tests to the now removed ParticleDistribution

the relevant GUI tests have not been deleted but instead set to DISABLED, so they are still present and can be reactivated in the future
---
 Tests/Functional/GUI/Std/CMakeLists.txt       |  1 +
 .../GUI/Translate/TranslationTests.cpp        |  2 +-
 Tests/Functional/Std/StandardTests.h          | 23 +++++++++++++------
 Tests/UnitTests/GUI/TestParticleCoreShell.cpp |  1 -
 Tests/UnitTests/GUI/TestParticleItem.cpp      |  1 -
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Tests/Functional/GUI/Std/CMakeLists.txt b/Tests/Functional/GUI/Std/CMakeLists.txt
index a6fbc299f3a..48cbd7bded9 100644
--- a/Tests/Functional/GUI/Std/CMakeLists.txt
+++ b/Tests/Functional/GUI/Std/CMakeLists.txt
@@ -26,6 +26,7 @@ set(source_files Check.cpp ../../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrap
 
 add_executable(${test} ${source_files})
 target_compile_options(${test} PUBLIC -DGUI_STD_TEST)
+target_compile_definitions(${test} PUBLIC DISABLE_DISTRIBUTION_TESTS)
 
 target_include_directories(${test} PUBLIC
     ${BornAgainGUI_INCLUDE_DIRS}
diff --git a/Tests/Functional/GUI/Translate/TranslationTests.cpp b/Tests/Functional/GUI/Translate/TranslationTests.cpp
index e2199be53ce..8d4e65bfcff 100644
--- a/Tests/Functional/GUI/Translate/TranslationTests.cpp
+++ b/Tests/Functional/GUI/Translate/TranslationTests.cpp
@@ -63,7 +63,7 @@ TEST_F(Translate, Rotation)
     EXPECT_TRUE(run("BasicGISAS", "RotatedPyramidsBuilder"));
 }
 
-TEST_F(Translate, SizeDistribution)
+TEST_F(Translate, DISABLED_SizeDistribution)
 {
     EXPECT_TRUE(run("BasicGISAS", "CylindersWithSizeDistributionBuilder"));
 }
diff --git a/Tests/Functional/Std/StandardTests.h b/Tests/Functional/Std/StandardTests.h
index 956f0274bb6..da5d488cfa3 100644
--- a/Tests/Functional/Std/StandardTests.h
+++ b/Tests/Functional/Std/StandardTests.h
@@ -21,6 +21,15 @@
 
 #include "Tests/GTestWrapper/google_test.h"
 
+// By defining DISABLE_DISTRIBUTION_TESTS in the project, tests which contain particle distributions
+// can be set do DISABLED. This is useful since the tests in here are the same for Core/Py/GUI, but
+// the particle distributions have been removed from GUI.
+#ifdef DISABLE_DISTRIBUTION_TESTS
+#define DISTRIBUTION_TEST_F(test_fixture, test_name) TEST_F(test_fixture, DISABLED_##test_name)
+#else
+#define DISTRIBUTION_TEST_F(test_fixture, test_name) TEST_F(test_fixture, test_name)
+#endif
+
 class Std : public ::testing::Test {
 };
 
@@ -152,37 +161,37 @@ TEST_F(Std, BoxStackComposition)
     EXPECT_TRUE(run("BoxStackComposition", "MiniGISAS", "BoxStackCompositionBuilder", 2e-10));
 }
 
-TEST_F(Std, CylindersWithSizeDistribution)
+DISTRIBUTION_TEST_F(Std, CylindersWithSizeDistribution)
 {
     EXPECT_TRUE(run("CylindersWithSizeDistribution", "MiniGISAS",
                     "CylindersWithSizeDistributionBuilder", 2e-10));
 }
 
-TEST_F(Std, TwoTypesCylindersDistribution)
+DISTRIBUTION_TEST_F(Std, TwoTypesCylindersDistribution)
 {
     EXPECT_TRUE(run("TwoTypesCylindersDistribution", "MiniGISAS",
                     "TwoTypesCylindersDistributionBuilder", 2e-10));
 }
 
-TEST_F(Std, RotatedPyramidsDistribution)
+DISTRIBUTION_TEST_F(Std, RotatedPyramidsDistribution)
 {
     EXPECT_TRUE(run("RotatedPyramidsDistribution", "MiniGISAS",
                     "RotatedPyramidsDistributionBuilder", 2e-10));
 }
 
-TEST_F(Std, SpheresWithLimitsDistribution)
+DISTRIBUTION_TEST_F(Std, SpheresWithLimitsDistribution)
 {
     EXPECT_TRUE(run("SpheresWithLimitsDistribution", "MiniGISAS",
                     "SpheresWithLimitsDistributionBuilder", 2e-10));
 }
 
-TEST_F(Std, ConesWithLimitsDistribution)
+DISTRIBUTION_TEST_F(Std, ConesWithLimitsDistribution)
 {
     EXPECT_TRUE(run("ConesWithLimitsDistribution", "MiniGISAS",
                     "ConesWithLimitsDistributionBuilder", 2e-10));
 }
 
-TEST_F(Std, LinkedBoxDistribution)
+DISTRIBUTION_TEST_F(Std, LinkedBoxDistribution)
 {
     EXPECT_TRUE(run("LinkedBoxDistribution", "MiniGISAS", "LinkedBoxDistributionBuilder", 2e-10));
 }
@@ -218,7 +227,7 @@ TEST_F(Std, ApproximationSSCA)
     EXPECT_TRUE(run("ApproximationSSCA", "MiniGISAS", "SizeDistributionSSCAModelBuilder", 2e-10));
 }
 
-TEST_F(Std, CylindersInSSCA)
+DISTRIBUTION_TEST_F(Std, CylindersInSSCA)
 {
     EXPECT_TRUE(run("CylindersInSSCA", "MiniGISAS", "CylindersInSSCABuilder", 2e-10));
 }
diff --git a/Tests/UnitTests/GUI/TestParticleCoreShell.cpp b/Tests/UnitTests/GUI/TestParticleCoreShell.cpp
index c9eb1e3cf01..6735e75de77 100644
--- a/Tests/UnitTests/GUI/TestParticleCoreShell.cpp
+++ b/Tests/UnitTests/GUI/TestParticleCoreShell.cpp
@@ -1,6 +1,5 @@
 #include "GUI/coregui/Models/ParticleCompositionItem.h"
 #include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "GUI/coregui/Models/ParticleDistributionItem.h"
 #include "GUI/coregui/Models/ParticleItem.h"
 #include "GUI/coregui/Models/SampleModel.h"
 #include "GUI/coregui/Models/SessionItemUtils.h"
diff --git a/Tests/UnitTests/GUI/TestParticleItem.cpp b/Tests/UnitTests/GUI/TestParticleItem.cpp
index b3a31e8dcb4..0449b284678 100644
--- a/Tests/UnitTests/GUI/TestParticleItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleItem.cpp
@@ -1,6 +1,5 @@
 #include "GUI/coregui/Models/GroupItem.h"
 #include "GUI/coregui/Models/ParticleCompositionItem.h"
-#include "GUI/coregui/Models/ParticleDistributionItem.h"
 #include "GUI/coregui/Models/ParticleItem.h"
 #include "GUI/coregui/Models/SampleModel.h"
 #include "GUI/coregui/Models/SessionItemUtils.h"
-- 
GitLab