Move test environment sources to a separate folder.

kovacsv · kovacsv · commit 69fb048ecdf5 · 2021-01-03T08:37:54.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,8 +99,10 @@ install (FILES ${LocalizationFiles} DESTINATION localization)
 # NodeEngineTest
 
 set (TestFrameworkSourcesFolder Sources/TestFramework)
+set (TestEnvironmentSourcesFolder Sources/NodeEngineTest/TestEnvironment)
 set (NodeEngineTestSourcesFolder Sources/NodeEngineTest)
 file (GLOB TestFrameworkFiles ${TestFrameworkSourcesFolder}/*.hpp ${TestFrameworkSourcesFolder}/*.cpp)
+file (GLOB TestEnvironmentFiles ${TestEnvironmentSourcesFolder}/*.hpp ${TestEnvironmentSourcesFolder}/*.cpp)
 file (GLOB NodeEngineTestHeaderFiles ${NodeEngineTestSourcesFolder}/*.hpp)
 file (GLOB NodeEngineTestSourceFiles ${NodeEngineTestSourcesFolder}/*.cpp)
 set (
@@ -111,13 +113,22 @@ set (
 set (
 	NodeEngineTestFiles
 	${TestFrameworkFiles}
+	${TestEnvironmentFiles}
 	${NodeEngineTestTestFiles}
 )
 source_group ("Framework" FILES ${TestFrameworkFiles})
+source_group ("Environment" FILES ${TestEnvironmentFiles})
 source_group ("Sources" FILES ${NodeEngineTestTestFiles})
 add_executable (NodeEngineTest ${NodeEngineTestFiles})
 set_target_properties (NodeEngineTest PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/$<CONFIG>")
-target_include_directories (NodeEngineTest PUBLIC ${NodeEngineSourcesFolder} ${NodeUIEngineSourcesFolder} ${BuiltInNodesSourcesFolder} ${TestFrameworkSourcesFolder})
+target_include_directories (
+	NodeEngineTest PUBLIC
+	${NodeEngineSourcesFolder}
+	${NodeUIEngineSourcesFolder}
+	${BuiltInNodesSourcesFolder}
+	${TestFrameworkSourcesFolder}
+	${TestEnvironmentSourcesFolder}
+)
 target_link_libraries (NodeEngineTest NodeEngine NodeUIEngine BuiltInNodes)
 get_filename_component (NodeEngineTestSourcesFolderAbsolute "${CMAKE_CURRENT_LIST_DIR}/${NodeEngineTestSourcesFolder}" ABSOLUTE)
 add_custom_command (TARGET NodeEngineTest POST_BUILD
diff --git a/Sources/NodeEngineTest/CompatibitilityTest.cpp b/Sources/NodeEngineTest/CompatibitilityTest.cpp
@@ -4,7 +4,7 @@
 #include "BI_InputUINodes.hpp"
 #include "BI_BinaryOperationNodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 #include "TestReference.hpp"
 
 #include <fstream>
diff --git a/Sources/NodeEngineTest/NodeEditorTest.cpp b/Sources/NodeEngineTest/NodeEditorTest.cpp
@@ -2,7 +2,7 @@
 #include "NE_MemoryStream.hpp"
 #include "NUIE_NodeEditor.hpp"
 #include "BI_BuiltInNodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTest.cpp b/Sources/NodeEngineTest/NodeEditorVisualTest.cpp
@@ -4,7 +4,7 @@
 #include "NUIE_FeatureToggle.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTestConnection.cpp b/Sources/NodeEngineTest/NodeEditorVisualTestConnection.cpp
@@ -2,7 +2,7 @@
 #include "NUIE_NodeEditor.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTestGrouping.cpp b/Sources/NodeEngineTest/NodeEditorVisualTestGrouping.cpp
@@ -2,7 +2,7 @@
 #include "NUIE_NodeEditor.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTestNavigation.cpp b/Sources/NodeEngineTest/NodeEditorVisualTestNavigation.cpp
@@ -2,7 +2,7 @@
 #include "NUIE_NodeEditor.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTestRecalculation.cpp b/Sources/NodeEngineTest/NodeEditorVisualTestRecalculation.cpp
@@ -2,7 +2,7 @@
 #include "NUIE_NodeEditor.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTestSlotMarkers.cpp b/Sources/NodeEngineTest/NodeEditorVisualTestSlotMarkers.cpp
@@ -4,7 +4,7 @@
 #include "NUIE_FeatureToggle.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTestWorkflow.cpp b/Sources/NodeEngineTest/NodeEditorVisualTestWorkflow.cpp
@@ -2,7 +2,7 @@
 #include "NUIE_NodeEditor.hpp"
 #include "BI_BuiltInNodes.hpp"
 #include "BI_ViewerUINodes.hpp"
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestEnvironment.cpp b/Sources/NodeEngineTest/TestEnvironment/TestEnvironment.cpp
@@ -1,4 +1,4 @@
-#include "VisualTestFramework.hpp"
+#include "TestEnvironment.hpp"
 #include "NUIE_FileIO.hpp"
 #include "NUIE_InputEventHandler.hpp"
 #include "BI_BuiltInNodes.hpp"
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestEnvironment.hpp b/Sources/NodeEngineTest/TestEnvironment/TestEnvironment.hpp
@@ -1,5 +1,5 @@
-#ifndef VISUALTESTFRAMEWORK_HPP
-#define VISUALTESTFRAMEWORK_HPP
+#ifndef TESTENVIRONMENT_HPP
+#define TESTENVIRONMENT_HPP
 
 #include "NE_StringConverter.hpp"
 #include "NE_EvaluationEnv.hpp"
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestNodes.cpp b/Sources/NodeEngineTest/TestEnvironment/TestNodes.cpp
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestNodes.hpp b/Sources/NodeEngineTest/TestEnvironment/TestNodes.hpp
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestReference.cpp b/Sources/NodeEngineTest/TestEnvironment/TestReference.cpp
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestReference.hpp b/Sources/NodeEngineTest/TestEnvironment/TestReference.hpp
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestUtils.cpp b/Sources/NodeEngineTest/TestEnvironment/TestUtils.cpp
diff --git a/Sources/NodeEngineTest/TestEnvironment/TestUtils.hpp b/Sources/NodeEngineTest/TestEnvironment/TestUtils.hpp
diff --git a/Sources/TestFramework/SimpleTest.hpp b/Sources/TestFramework/SimpleTest.hpp
@@ -9,26 +9,6 @@
 #define WIN_PATH_SEPARATOR	L'\\'
 #define PATH_SEPARATOR		L'/'
 
-#define TEST(TESTNAME)											\
-class TESTNAME##_Test : public SimpleTest::Test {				\
-public:															\
-	TESTNAME##_Test () :										\
-		SimpleTest::Test (#TESTNAME)							\
-	{															\
-	}															\
-	virtual void RunTest () override;							\
-};																\
-static class TESTNAME##_Registrator {							\
-	public:														\
-		TESTNAME##_Registrator ()								\
-		{														\
-			SimpleTest::RegisterTest (new TESTNAME##_Test ());	\
-		}														\
-} TESTNAME##_RegistratorInstance;								\
-void TESTNAME##_Test::RunTest ()
-
-#define ASSERT(condition) TestAssert (condition, __FILE__, __LINE__)
-
 namespace SimpleTest
 {
 
@@ -72,4 +52,24 @@ void			RegisterTest (Test* test);
 
 }
 
+#define TEST(TESTNAME)											\
+class TESTNAME##_Test : public SimpleTest::Test {				\
+public:															\
+	TESTNAME##_Test () :										\
+		SimpleTest::Test (#TESTNAME)							\
+	{															\
+	}															\
+	virtual void RunTest () override;							\
+};																\
+static class TESTNAME##_Registrator {							\
+	public:														\
+		TESTNAME##_Registrator ()								\
+		{														\
+			SimpleTest::RegisterTest (new TESTNAME##_Test ());	\
+		}														\
+} TESTNAME##_RegistratorInstance;								\
+void TESTNAME##_Test::RunTest ()
+
+#define ASSERT(condition) TestAssert (condition, __FILE__, __LINE__)
+
 #endif
