Gen: Moved tests to a separate folder, unified shared sources.

d12fk · May 4, 2017 · 96fdd72 · 96fdd72
1 parent 187abe3
commit 96fdd72
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 337 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -9,10 +9,9 @@ add_subdirectory(ByteBuffer)
 add_subdirectory(ChunkData)
 add_subdirectory(CompositeChat)
 add_subdirectory(FastRandom)
+add_subdirectory(Generating)
 add_subdirectory(HTTP)
-add_subdirectory(LoadablePieces)
 add_subdirectory(LuaThreadStress)
 add_subdirectory(Network)
 add_subdirectory(OSSupport)
-add_subdirectory(PieceRotation)
 add_subdirectory(SchematicFileSerializer)
diff --git a/tests/LoadablePieces/Bindings.h → tests/Generating/Bindings.h b/tests/LoadablePieces/Bindings.h → tests/Generating/Bindings.h
diff --git a/tests/PieceRotation/CMakeLists.txt → tests/Generating/CMakeLists.txt b/tests/PieceRotation/CMakeLists.txt → tests/Generating/CMakeLists.txt
@@ -65,8 +65,7 @@ set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h
 )
 
-set (SRCS
-	PieceRotationTest.cpp
+set (STUBS
 	Stubs.cpp
 	LuaState_Typedefs.inc
 	LuaState_Declaration.inc
@@ -86,17 +85,37 @@ if (MSVC)
 	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
 endif()
 
-source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
-source_group("Sources" FILES ${SRCS})
-add_executable(PieceRotation ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
-target_link_libraries(PieceRotation tolualib zlib)
+add_library(GeneratorTestingSupport STATIC ${SHARED_SRCS} ${SHARED_HDRS} ${STUBS})
+target_link_libraries(GeneratorTestingSupport tolualib zlib)
+source_group("Stubs" FILES ${STUBS})
+
+
+
+
+
+# LoadablePieces test:
+source_group("Data files" FILES Test.cubeset Test1.schematic)
+add_executable(LoadablePieces LoadablePieces.cpp Test.cubeset Test1.schematic)
+target_link_libraries(LoadablePieces GeneratorTestingSupport)
+add_test(NAME LoadablePieces-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND LoadablePieces)
+
+
+
+
+
+# PieceRotation test:
+add_executable(PieceRotation PieceRotationTest.cpp)
+target_link_libraries(PieceRotation GeneratorTestingSupport)
 add_test(NAME PieceRotation-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND PieceRotation)
 
 
 
 
+
 # Put the projects into solution folders (MSVC):
 set_target_properties(
+	GeneratorTestingSupport
+	LoadablePieces
 	PieceRotation
-	PROPERTIES FOLDER Tests
+	PROPERTIES FOLDER Tests/Generating
 )
diff --git a/tests/LoadablePieces/LoadablePieces.cpp → tests/Generating/LoadablePieces.cpp b/tests/LoadablePieces/LoadablePieces.cpp → tests/Generating/LoadablePieces.cpp
diff --git a/...s/LoadablePieces/LuaState_Declaration.inc → tests/Generating/LuaState_Declaration.inc b/...s/LoadablePieces/LuaState_Declaration.inc → tests/Generating/LuaState_Declaration.inc
diff --git a/tests/LoadablePieces/LuaState_Typedefs.inc → tests/Generating/LuaState_Typedefs.inc b/tests/LoadablePieces/LuaState_Typedefs.inc → tests/Generating/LuaState_Typedefs.inc
diff --git a/tests/PieceRotation/PieceRotationTest.cpp → tests/Generating/PieceRotationTest.cpp b/tests/PieceRotation/PieceRotationTest.cpp → tests/Generating/PieceRotationTest.cpp
diff --git a/tests/LoadablePieces/Stubs.cpp → tests/Generating/Stubs.cpp b/tests/LoadablePieces/Stubs.cpp → tests/Generating/Stubs.cpp
diff --git a/tests/LoadablePieces/Test.cubeset → tests/Generating/Test.cubeset b/tests/LoadablePieces/Test.cubeset → tests/Generating/Test.cubeset
diff --git a/tests/LoadablePieces/Test1.schematic → tests/Generating/Test1.schematic b/tests/LoadablePieces/Test1.schematic → tests/Generating/Test1.schematic
diff --git a/tests/PieceRotation/Bindings.h b/tests/PieceRotation/Bindings.h
diff --git a/tests/PieceRotation/LuaState_Declaration.inc b/tests/PieceRotation/LuaState_Declaration.inc
diff --git a/tests/PieceRotation/LuaState_Typedefs.inc b/tests/PieceRotation/LuaState_Typedefs.inc
diff --git a/tests/PieceRotation/Stubs.cpp b/tests/PieceRotation/Stubs.cpp