Restructure test source folders

test/src/CatchMain.cpp

@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include <catch.hpp>

test/src/Graphics/Rect.cpp

@@ -1,8 +1,6 @@
-#define CATCH_CONFIG_MAIN
-
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/System/Vector2.hpp>
-#include "TestUtilities/Graphics.hpp"
+#include "GraphicsUtil.hpp"
 
 TEST_CASE("sf::Rect class template", "[graphics]")
 {

test/src/System/Vector2.cpp

@@ -1,7 +1,5 @@
-#define CATCH_CONFIG_MAIN
-
 #include <SFML/System/Vector2.hpp>
-#include "TestUtilities/System.hpp"
+#include "SystemUtil.hpp"
 
 // Use sf::Vector2i for tests. Test coverage is given, as there are no template specializations.
 

test/src/System/Vector3.cpp

@@ -1,5 +1,5 @@
 #include <SFML/System/Vector3.hpp>
-#include "TestUtilities/System.hpp"
+#include "SystemUtil.hpp"
 
 // Use sf::Vector3i for tests. Test coverage is given, as there are no template specializations.
 

test/src/TestUtilities/GraphicsUtil.hpp

@@ -6,7 +6,7 @@
 #ifndef SFML_TESTUTILITIES_GRAPHICS_HPP
 #define SFML_TESTUTILITIES_GRAPHICS_HPP
 
-#include "Window.hpp"
+#include "WindowUtil.hpp"
 
 // Forward declarations for non-template types
 namespace sf

test/src/TestUtilities/WindowUtil.hpp

@@ -6,7 +6,7 @@
 #ifndef SFML_TESTUTILITIES_WINDOW_HPP
 #define SFML_TESTUTILITIES_WINDOW_HPP
 
-#include "System.hpp"
+#include "SystemUtil.hpp"
 
 #include <SFML/Graphics/Rect.hpp>
 

test/src/Window.cpp

@@ -1,10 +0,0 @@
-#define CATCH_CONFIG_MAIN
-
-#include <SFML/Graphics/Rect.hpp>
-#include <SFML/System/Vector2.hpp>
-#include "TestUtilities/Window.hpp"
-
-TEST_CASE("Window unit test exists", "[window]")
-{
-    CHECK(TRUE);
-}