aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author CptAlanSmith <CptAlanSmith@gmail.com>2023-09-27 01:34:31 +0200
committer CptAlanSmith <CptAlanSmith@gmail.com>2023-09-28 21:06:12 +0200
commitdbace1d971b604063455200b277fb2bc21cd5978 (patch)
treef1773cb4eef1ef21c5fe8aade732d250c0dd701d
parentbc1a8c3e9a9209d0f2c2b843be4a11f317d0b479 (diff)
Abstracted out a general test method to TestScript
m---------scripts0
-rw-r--r--src/openvic-simulation/testing/TestScript.cpp9
-rw-r--r--src/openvic-simulation/testing/TestScript.hpp3
-rw-r--r--src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp13
4 files changed, 18 insertions, 7 deletions
diff --git a/scripts b/scripts
-Subproject 3060e56388ac00d90deb6693ec19d47bad52deb
+Subproject 925a38d4d8aef200823f50345dfa2570891454c
diff --git a/src/openvic-simulation/testing/TestScript.cpp b/src/openvic-simulation/testing/TestScript.cpp
index d9affae..0a9ce6f 100644
--- a/src/openvic-simulation/testing/TestScript.cpp
+++ b/src/openvic-simulation/testing/TestScript.cpp
@@ -40,3 +40,12 @@ void TestScript::set_requirements(std::vector<Requirement*> in_requirements) { r
void TestScript::add_requirement(Requirement* req) { requirements.push_back(req); }
void TestScript::set_game_manager(GameManager* in_game_manager) { game_manager = in_game_manager; }
void TestScript::set_script_name(std::string in_script_name) { script_name = in_script_name; }
+
+// Methods
+void TestScript::pass_or_fail_req_with_actual_and_target_values(std::string req_name, std::string target_value, std::string actual_value) {
+ Requirement* req = get_requirement_by_id(req_name);
+ req->set_target_value(target_value);
+ req->set_actual_value(actual_value);
+ if (target_value == actual_value) req->set_pass(true);
+ else req->set_pass(false);
+}
diff --git a/src/openvic-simulation/testing/TestScript.hpp b/src/openvic-simulation/testing/TestScript.hpp
index 874e083..c278323 100644
--- a/src/openvic-simulation/testing/TestScript.hpp
+++ b/src/openvic-simulation/testing/TestScript.hpp
@@ -34,5 +34,8 @@ namespace OpenVic {
void add_requirement(Requirement* req);
void set_game_manager(GameManager* in_game_manager);
void set_script_name(std::string in_script_name);
+
+ // Methods
+ void pass_or_fail_req_with_actual_and_target_values(std::string req_name, std::string target_value, std::string actual_value);
};
}
diff --git a/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp
index 9f0ddbd..c74c5e9 100644
--- a/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp
@@ -503,16 +503,15 @@ namespace OpenVic {
check_base_price("wool", "0.7", "ECON_261");
}
- void check_base_price(std::string identifier, std::string value, std::string req_name) {
+ void check_base_price(std::string identifier, std::string target_value, std::string req_name) {
+ // Get string of base_price from goods manager
fixed_point_t base_price_fp = get_game_manager()->get_good_manager().get_good_by_identifier(identifier)->get_base_price();
std::stringstream ss;
- ss << std::fixed << std::setprecision(1) << base_price_fp.to_double();
+ ss << std::fixed << std::setprecision(1) << base_price_fp.to_double(); // Use a single digit floating point of the value
std::string base_price = ss.str();
- Requirement* req = get_requirement_by_id(req_name);
- req->set_target_value(value);
- req->set_actual_value(base_price);
- if (base_price == value) req->set_pass(true);
- else req->set_pass(false);
+
+ // Perform req checks
+ pass_or_fail_req_with_actual_and_target_values(req_name, target_value, base_price);
}
};
}