Move test files into same tree as source

It was getting easy to forget about tests or forget to keep the tree structure in sync with the source tree. We adopt a new structure here to put the tests closer to the sources so that it is more likely they will be considered when working on the source. To avoid any possible file name clashes we change the suffix to .test.cpp rather than _test.cpp.
MHeasell · Oct 4, 2020 · 44dbb09 · 44dbb09
1 parent faf2061
commit 44dbb09
Show file tree

Hide file tree

Showing 42 changed files with 41 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -720,49 +720,49 @@ if(WIN32)
 endif()
 
 set(TEST_FILES
-    test/rwe/BoxTreeSplit_test.cpp
-    test/rwe/DiscreteRect_test.cpp
-    test/rwe/EightWayDirection_test.cpp
-    test/rwe/FeatureDefinition_test.cpp
-    test/rwe/GameHash_util_test.cpp
-    test/rwe/Grid_test.cpp
-    test/rwe/ListTdfAdapter_test.cpp
-    test/rwe/MinHeap_test.cpp
-    test/rwe/Point_test.cpp
-    test/rwe/Result_test.cpp
-    test/rwe/SideData_test.cpp
-    test/rwe/SimAngle_test.cpp
-    test/rwe/SimVector_test.cpp
-    test/rwe/SimpleTdfAdapter_test.cpp
-    test/rwe/TdfBlock_test.cpp
-    test/rwe/VectorMap_test.cpp
-    test/rwe/ViewportService_test.cpp
-    test/rwe/camera/CabinetCamera_test.cpp
-    test/rwe/cob/cob_util_test.cpp
-    test/rwe/dump_util_test.cpp
-    test/rwe/geometry/BoundingBox3f_test.cpp
-    test/rwe/geometry/Circle2f_test.cpp
-    test/rwe/geometry/CollisionMesh_test.cpp
-    test/rwe/geometry/Plane3f_test.cpp
-    test/rwe/geometry/Ray3f_test.cpp
-    test/rwe/geometry/Rectangle2f_test.cpp
-    test/rwe/geometry/Triangle3f_test.cpp
-    test/rwe/gui_test.cpp
-    test/rwe/ip_util_test.cpp
-    test/rwe/math/Matrix4f_test.cpp
-    test/rwe/math/Vector2f_test.cpp
-    test/rwe/math/Vector3f_test.cpp
-    test/rwe/math/rwe_math_test.cpp
-    test/rwe/network_util_test.cpp
-    test/rwe/ota_test.cpp
-    test/rwe/pathfinding/pathfinding_utils_test.cpp
-    test/rwe/rc_gen_optional.h
-    test/rwe/rwe_string_test.cpp
-    test/rwe/unit_util_test.cpp
-    test/rwe/util_test.cpp
+    src/rwe/BoxTreeSplit.test.cpp
+    src/rwe/GameHash_util.test.cpp
+    src/rwe/MinHeap.test.cpp
+    src/rwe/Result.test.cpp
+    src/rwe/SideData.test.cpp
+    src/rwe/VectorMap.test.cpp
+    src/rwe/ViewportService.test.cpp
+    src/rwe/camera/CabinetCamera.test.cpp
+    src/rwe/cob/cob_util.test.cpp
+    src/rwe/dump_util.test.cpp
+    src/rwe/geometry/BoundingBox3f.test.cpp
+    src/rwe/geometry/Circle2f.test.cpp
+    src/rwe/geometry/CollisionMesh.test.cpp
+    src/rwe/geometry/Plane3f.test.cpp
+    src/rwe/geometry/Ray3f.test.cpp
+    src/rwe/geometry/Rectangle2f.test.cpp
+    src/rwe/geometry/Triangle3f.test.cpp
+    src/rwe/grid/DiscreteRect.test.cpp
+    src/rwe/grid/EightWayDirection.test.cpp
+    src/rwe/grid/Grid.test.cpp
+    src/rwe/grid/Point.test.cpp
+    src/rwe/io/featuretdf/FeatureDefinition.test.cpp
+    src/rwe/io/gui/gui.test.cpp
+    src/rwe/io/ota/ota.test.cpp
+    src/rwe/io/tdf/ListTdfAdapter.test.cpp
+    src/rwe/io/tdf/SimpleTdfAdapter.test.cpp
+    src/rwe/io/tdf/TdfBlock.test.cpp
+    src/rwe/ip_util.test.cpp
+    src/rwe/math/Matrix4f.test.cpp
+    src/rwe/math/Vector2f.test.cpp
+    src/rwe/math/Vector3f.test.cpp
+    src/rwe/math/rwe_math.test.cpp
+    src/rwe/network_util.test.cpp
+    src/rwe/pathfinding/pathfinding_utils.test.cpp
+    src/rwe/rc_gen_optional.h
+    src/rwe/rwe_string.test.cpp
+    src/rwe/sim/SimAngle.test.cpp
+    src/rwe/sim/SimVector.test.cpp
+    src/rwe/sim/unit_util.test.cpp
+    src/rwe/util.test.cpp
     )
 
-add_executable(rwe_test test/main.cpp ${TEST_FILES})
+add_executable(rwe_test src/test.cpp ${TEST_FILES})
 target_link_libraries(rwe_test Catch2::Catch2)
 target_link_libraries(rwe_test rapidcheck_catch)
 target_link_libraries(rwe_test rapidcheck_boost)

diff --git a/test/rwe/BoxTreeSplit_test.cpp → src/rwe/BoxTreeSplit.test.cpp b/test/rwe/BoxTreeSplit_test.cpp → src/rwe/BoxTreeSplit.test.cpp
diff --git a/test/rwe/GameHash_util_test.cpp → src/rwe/GameHash_util.test.cpp b/test/rwe/GameHash_util_test.cpp → src/rwe/GameHash_util.test.cpp
diff --git a/test/rwe/MinHeap_test.cpp → src/rwe/MinHeap.test.cpp b/test/rwe/MinHeap_test.cpp → src/rwe/MinHeap.test.cpp
diff --git a/test/rwe/Result_test.cpp → src/rwe/Result.test.cpp b/test/rwe/Result_test.cpp → src/rwe/Result.test.cpp
diff --git a/test/rwe/SideData_test.cpp → src/rwe/SideData.test.cpp b/test/rwe/SideData_test.cpp → src/rwe/SideData.test.cpp
diff --git a/test/rwe/VectorMap_test.cpp → src/rwe/VectorMap.test.cpp b/test/rwe/VectorMap_test.cpp → src/rwe/VectorMap.test.cpp
diff --git a/test/rwe/ViewportService_test.cpp → src/rwe/ViewportService.test.cpp b/test/rwe/ViewportService_test.cpp → src/rwe/ViewportService.test.cpp
diff --git a/test/rwe/camera/CabinetCamera_test.cpp → src/rwe/camera/CabinetCamera.test.cpp b/test/rwe/camera/CabinetCamera_test.cpp → src/rwe/camera/CabinetCamera.test.cpp
diff --git a/test/rwe/cob/cob_util_test.cpp → src/rwe/cob/cob_util.test.cpp b/test/rwe/cob/cob_util_test.cpp → src/rwe/cob/cob_util.test.cpp
diff --git a/test/rwe/dump_util_test.cpp → src/rwe/dump_util.test.cpp b/test/rwe/dump_util_test.cpp → src/rwe/dump_util.test.cpp
diff --git a/test/rwe/geometry/BoundingBox3f_test.cpp → src/rwe/geometry/BoundingBox3f.test.cpp b/test/rwe/geometry/BoundingBox3f_test.cpp → src/rwe/geometry/BoundingBox3f.test.cpp
diff --git a/test/rwe/geometry/Circle2f_test.cpp → src/rwe/geometry/Circle2f.test.cpp b/test/rwe/geometry/Circle2f_test.cpp → src/rwe/geometry/Circle2f.test.cpp
diff --git a/test/rwe/geometry/CollisionMesh_test.cpp → src/rwe/geometry/CollisionMesh.test.cpp b/test/rwe/geometry/CollisionMesh_test.cpp → src/rwe/geometry/CollisionMesh.test.cpp
diff --git a/test/rwe/geometry/Plane3f_test.cpp → src/rwe/geometry/Plane3f.test.cpp b/test/rwe/geometry/Plane3f_test.cpp → src/rwe/geometry/Plane3f.test.cpp
diff --git a/test/rwe/geometry/Ray3f_test.cpp → src/rwe/geometry/Ray3f.test.cpp b/test/rwe/geometry/Ray3f_test.cpp → src/rwe/geometry/Ray3f.test.cpp
diff --git a/test/rwe/geometry/Rectangle2f_test.cpp → src/rwe/geometry/Rectangle2f.test.cpp b/test/rwe/geometry/Rectangle2f_test.cpp → src/rwe/geometry/Rectangle2f.test.cpp
diff --git a/test/rwe/geometry/Triangle3f_test.cpp → src/rwe/geometry/Triangle3f.test.cpp b/test/rwe/geometry/Triangle3f_test.cpp → src/rwe/geometry/Triangle3f.test.cpp
diff --git a/test/rwe/DiscreteRect_test.cpp → src/rwe/grid/DiscreteRect.test.cpp b/test/rwe/DiscreteRect_test.cpp → src/rwe/grid/DiscreteRect.test.cpp
diff --git a/test/rwe/EightWayDirection_test.cpp → src/rwe/grid/EightWayDirection.test.cpp b/test/rwe/EightWayDirection_test.cpp → src/rwe/grid/EightWayDirection.test.cpp
diff --git a/test/rwe/Grid_test.cpp → src/rwe/grid/Grid.test.cpp b/test/rwe/Grid_test.cpp → src/rwe/grid/Grid.test.cpp
diff --git a/test/rwe/Point_test.cpp → src/rwe/grid/Point.test.cpp b/test/rwe/Point_test.cpp → src/rwe/grid/Point.test.cpp
diff --git a/test/rwe/FeatureDefinition_test.cpp → .../io/featuretdf/FeatureDefinition.test.cpp b/test/rwe/FeatureDefinition_test.cpp → .../io/featuretdf/FeatureDefinition.test.cpp
diff --git a/test/rwe/gui_test.cpp → src/rwe/io/gui/gui.test.cpp b/test/rwe/gui_test.cpp → src/rwe/io/gui/gui.test.cpp
diff --git a/test/rwe/ota_test.cpp → src/rwe/io/ota/ota.test.cpp b/test/rwe/ota_test.cpp → src/rwe/io/ota/ota.test.cpp
diff --git a/test/rwe/ListTdfAdapter_test.cpp → src/rwe/io/tdf/ListTdfAdapter.test.cpp b/test/rwe/ListTdfAdapter_test.cpp → src/rwe/io/tdf/ListTdfAdapter.test.cpp
diff --git a/test/rwe/SimpleTdfAdapter_test.cpp → src/rwe/io/tdf/SimpleTdfAdapter.test.cpp b/test/rwe/SimpleTdfAdapter_test.cpp → src/rwe/io/tdf/SimpleTdfAdapter.test.cpp
diff --git a/test/rwe/TdfBlock_test.cpp → src/rwe/io/tdf/TdfBlock.test.cpp b/test/rwe/TdfBlock_test.cpp → src/rwe/io/tdf/TdfBlock.test.cpp
diff --git a/test/rwe/ip_util_test.cpp → src/rwe/ip_util.test.cpp b/test/rwe/ip_util_test.cpp → src/rwe/ip_util.test.cpp
diff --git a/test/rwe/math/Matrix4f_test.cpp → src/rwe/math/Matrix4f.test.cpp b/test/rwe/math/Matrix4f_test.cpp → src/rwe/math/Matrix4f.test.cpp
diff --git a/test/rwe/math/Vector2f_test.cpp → src/rwe/math/Vector2f.test.cpp b/test/rwe/math/Vector2f_test.cpp → src/rwe/math/Vector2f.test.cpp
diff --git a/test/rwe/math/Vector3f_test.cpp → src/rwe/math/Vector3f.test.cpp b/test/rwe/math/Vector3f_test.cpp → src/rwe/math/Vector3f.test.cpp
diff --git a/test/rwe/math/rwe_math_test.cpp → src/rwe/math/rwe_math.test.cpp b/test/rwe/math/rwe_math_test.cpp → src/rwe/math/rwe_math.test.cpp
diff --git a/test/rwe/network_util_test.cpp → src/rwe/network_util.test.cpp b/test/rwe/network_util_test.cpp → src/rwe/network_util.test.cpp
diff --git a/...we/pathfinding/pathfinding_utils_test.cpp → ...we/pathfinding/pathfinding_utils.test.cpp b/...we/pathfinding/pathfinding_utils_test.cpp → ...we/pathfinding/pathfinding_utils.test.cpp
diff --git a/test/rwe/rc_gen_optional.h → src/rwe/rc_gen_optional.h b/test/rwe/rc_gen_optional.h → src/rwe/rc_gen_optional.h
diff --git a/test/rwe/rwe_string_test.cpp → src/rwe/rwe_string.test.cpp b/test/rwe/rwe_string_test.cpp → src/rwe/rwe_string.test.cpp
diff --git a/test/rwe/SimAngle_test.cpp → src/rwe/sim/SimAngle.test.cpp b/test/rwe/SimAngle_test.cpp → src/rwe/sim/SimAngle.test.cpp
diff --git a/test/rwe/SimVector_test.cpp → src/rwe/sim/SimVector.test.cpp b/test/rwe/SimVector_test.cpp → src/rwe/sim/SimVector.test.cpp
diff --git a/test/rwe/unit_util_test.cpp → src/rwe/sim/unit_util.test.cpp b/test/rwe/unit_util_test.cpp → src/rwe/sim/unit_util.test.cpp
diff --git a/test/rwe/util_test.cpp → src/rwe/util.test.cpp b/test/rwe/util_test.cpp → src/rwe/util.test.cpp
diff --git a/test/main.cpp → src/test.cpp b/test/main.cpp → src/test.cpp