Clang-format formatting (with manual cleanup)

1 files changed, 89 insertions, 61 deletions

diff --git a/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp
index c79e602..e24d44c 100644
--- a/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_001_file_tests : public TestScript {
@@ -11,92 +11,121 @@ namespace OpenVic {
 		}
 
 		void add_requirements() {
-			Requirement* FS_44 = new Requirement("FS_44",
-				"The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename Canned Food.png",
-				"The icon for the Canned Food good has been loaded into the program");
+			Requirement* FS_44 = new Requirement(
+				"FS_44",
+				"The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename "
+				"Canned Food.png",
+				"The icon for the Canned Food good has been loaded into the program"
+			);
 			add_requirement(FS_44);
-			Requirement* FS_48 = new Requirement("FS_48",
+			Requirement* FS_48 = new Requirement(
+				"FS_48",
 				"The icon for the Coal good shall be loaded from the R/art/economy/goods folder with the filename Coal.png",
-				"The icon for the Coal good has been loaded into the program");
+				"The icon for the Coal good has been loaded into the program"
+			);
 			add_requirement(FS_48);
-			Requirement* FS_61 = new Requirement("FS_61",
+			Requirement* FS_61 = new Requirement(
+				"FS_61",
 				"The icon for the Grain good shall be loaded from the R/art/economy/goods folder with the filename Grain.png",
-				"The icon for the Grain good has been loaded into the program");
+				"The icon for the Grain good has been loaded into the program"
+			);
 			add_requirement(FS_61);
-			Requirement* FS_62 = new Requirement("FS_62",
+			Requirement* FS_62 = new Requirement(
+				"FS_62",
 				"The icon for the Iron good shall be loaded from the R/art/economy/goods folder with the filename Iron.png",
-				"The icon for the Iron good has been loaded into the program");
+				"The icon for the Iron good has been loaded into the program"
+			);
 			add_requirement(FS_62);
-			Requirement* FS_63 = new Requirement("FS_63",
+			Requirement* FS_63 = new Requirement(
+				"FS_63",
 				"The icon for the Liquor good shall be loaded from the R/art/economy/goods folder with the filename Liquor.png",
-				"The icon for the Liquor good has been loaded into the program");
+				"The icon for the Liquor good has been loaded into the program"
+			);
 			add_requirement(FS_63);
-			Requirement* FS_67 = new Requirement("FS_67",
-				"The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename Machine Parts.png",
-				"The icon for the Machine Parts good has been loaded into the program");
+			Requirement* FS_67 = new Requirement(
+				"FS_67",
+				"The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename "
+				"Machine Parts.png",
+				"The icon for the Machine Parts good has been loaded into the program"
+			);
 			add_requirement(FS_67);
-			Requirement* FS_86 = new Requirement("FS_86",
+			Requirement* FS_86 = new Requirement(
+				"FS_86",
 				"The icon for the Wool good shall be loaded from the R/art/economy/goods folder with the filename Wool.png",
-				"The icon for the Wool good has been loaded into the program");
+				"The icon for the Wool good has been loaded into the program"
+			);
 			add_requirement(FS_86);
-			Requirement* FS_2 = new Requirement("FS_2",
-				"User provided data shall be saved to an 'OpenVic' folder, located following platform convention",
-				"User data is saved to the correct place");
+			Requirement* FS_2 = new Requirement(
+				"FS_2", "User provided data shall be saved to an 'OpenVic' folder, located following platform convention",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_2);
-			Requirement* FS_20 = new Requirement("FS_20",
-				"On Windows, user provided data shall be saved by default to '%APPDATA%/OpenVic/'",
-				"User data is saved to the correct place");
+			Requirement* FS_20 = new Requirement(
+				"FS_20", "On Windows, user provided data shall be saved by default to '%APPDATA%/OpenVic/'",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_20);
-			Requirement* FS_21 = new Requirement("FS_21",
-				"On Linux, user provided data shall be saved by default to '~/.local/share/OpenVic/'",
-				"User data is saved to the correct place");
+			Requirement* FS_21 = new Requirement(
+				"FS_21", "On Linux, user provided data shall be saved by default to '~/.local/share/OpenVic/'",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_21);
-			Requirement* FS_22 = new Requirement("FS_22",
-				"On macOS, user provided data shall be saved by default to '~/Library/Application Support/OpenVic/'",
-				"User data is saved to the correct place");
+			Requirement* FS_22 = new Requirement(
+				"FS_22", "On macOS, user provided data shall be saved by default to '~/Library/Application Support/OpenVic/'",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_22);
-			Requirement* FS_24 = new Requirement("FS_24",
-				"All .csv files in the locale folder shall contain translation keys and translations",
-				"No errant files in locale directory");
+			Requirement* FS_24 = new Requirement(
+				"FS_24", "All .csv files in the locale folder shall contain translation keys and translations",
+				"No errant files in locale directory"
+			);
 			add_requirement(FS_24);
-			Requirement* FS_17 = new Requirement("FS_17",
-				"List of available locales are loaded from R/localisation/ directory",
-				"Locales loaded correctly");
+			Requirement* FS_17 = new Requirement(
+				"FS_17", "List of available locales are loaded from R/localisation/ directory", "Locales loaded correctly"
+			);
 			add_requirement(FS_17);
-			Requirement* FS_333 = new Requirement("FS_333",
-				"The map's provinces shall be defined by unique colours in 'R/map/provinces.bmp'",
-				"The unique colours of 'R/map/provinces.bmp' define provinces");
+			Requirement* FS_333 = new Requirement(
+				"FS_333", "The map's provinces shall be defined by unique colours in 'R/map/provinces.bmp'",
+				"The unique colours of 'R/map/provinces.bmp' define provinces"
+			);
 			add_requirement(FS_333);
-			Requirement* FS_335 = new Requirement("FS_335",
-				"Unique province IDs shall be associated with their unique colours in 'R/map/definition.csv'",
-				"'R/map/definition.csv' associates every unique colour used to define a province with a unique ID");
+			Requirement* FS_335 = new Requirement(
+				"FS_335", "Unique province IDs shall be associated with their unique colours in 'R/map/definition.csv'",
+				"'R/map/definition.csv' associates every unique colour used to define a province with a unique ID"
+			);
 			add_requirement(FS_335);
-			Requirement* FS_334 = new Requirement("FS_334",
-				"Water provinces shall be defined by a list of their IDs in 'R/map/default.map'",
-				"'R/map/default.map' contains a list of province IDs which are used to define water provinces");
+			Requirement* FS_334 = new Requirement(
+				"FS_334", "Water provinces shall be defined by a list of their IDs in 'R/map/default.map'",
+				"'R/map/default.map' contains a list of province IDs which are used to define water provinces"
+			);
 			add_requirement(FS_334);
-			Requirement* FS_338 = new Requirement("FS_338",
+			Requirement* FS_338 = new Requirement(
+				"FS_338",
 				"The image for the minimap background shall be loaded from the R/art/ui folder with the filename minimap.png",
-				"The image for the minimap background has been loaded into the program");
+				"The image for the minimap background has been loaded into the program"
+			);
 			add_requirement(FS_338);
-			Requirement* FS_343 = new Requirement("FS_343",
-				"The textures making up the cosmetic terrain map shall be loaded from the R/art/terrain folder",
-				"The textures making up the cosmetic terrain map have been loaded into the program");
+			Requirement* FS_343 = new Requirement(
+				"FS_343", "The textures making up the cosmetic terrain map shall be loaded from the R/art/terrain folder",
+				"The textures making up the cosmetic terrain map have been loaded into the program"
+			);
 			add_requirement(FS_343);
-			Requirement* FS_341 = new Requirement("FS_341",
-				"State areas shall be defined by lists of province IDs in 'R/map/region.txt'",
-				"'R/map/region.txt' defines state areas with lists of province IDs");
+			Requirement* FS_341 = new Requirement(
+				"FS_341", "State areas shall be defined by lists of province IDs in 'R/map/region.txt'",
+				"'R/map/region.txt' defines state areas with lists of province IDs"
+			);
 			add_requirement(FS_341);
-			Requirement* SND_10 = new Requirement("SND_10",
-				"SFX shall be refered to by their filename, without the extension",
-				"Sound effects are identified by their filename without extension");
+			Requirement* SND_10 = new Requirement(
+				"SND_10", "SFX shall be refered to by their filename, without the extension",
+				"Sound effects are identified by their filename without extension"
+			);
 			add_requirement(SND_10);
 		}
 
 		void execute_script() {
 			// FS_44
-			// The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename Canned Food.png
-			// The icon for the Canned Food good has been loaded into the program
+			// The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename Canned
+			// Food.png The icon for the Canned Food good has been loaded into the program
 
 			// TODO: Write test steps for FS_44...
 
@@ -125,8 +154,8 @@ namespace OpenVic {
 			// TODO: Write test steps for FS_63...
 
 			// FS_67
-			// The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename Machine Parts.png
-			// The icon for the Machine Parts good has been loaded into the program
+			// The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename
+			// Machine Parts.png The icon for the Machine Parts good has been loaded into the program
 
 			// TODO: Write test steps for FS_67...
 
@@ -213,7 +242,6 @@ namespace OpenVic {
 			// Sound effects are identified by their filename without extension
 
 			// TODO: Write test steps for SND_10...
-
 		}
 	};
 }