From 322bc603709d7778b808878c6df63d6cd1f4357b Mon Sep 17 00:00:00 2001 From: CptAlanSmith Date: Mon, 25 Sep 2023 22:18:19 +0100 Subject: Economy test finish --- src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/openvic-simulation') 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 aa0e59f..9f0ddbd 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 @@ -504,7 +504,10 @@ namespace OpenVic { } void check_base_price(std::string identifier, std::string value, std::string req_name) { - std::string base_price = get_game_manager()->get_good_manager().get_good_by_identifier(identifier)->get_base_price().to_string(); + 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(); + 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); -- cgit v1.2.3-56-ga3b1 From bc1a8c3e9a9209d0f2c2b843be4a11f317d0b479 Mon Sep 17 00:00:00 2001 From: CptAlanSmith Date: Tue, 26 Sep 2023 02:47:24 +0100 Subject: Refactoring/tidying --- src/openvic-simulation/testing/Testing.cpp | 66 +++++++++++------------------- src/openvic-simulation/testing/Testing.hpp | 1 + 2 files changed, 24 insertions(+), 43 deletions(-) (limited to 'src/openvic-simulation') diff --git a/src/openvic-simulation/testing/Testing.cpp b/src/openvic-simulation/testing/Testing.cpp index 4d3d9ea..42df80c 100644 --- a/src/openvic-simulation/testing/Testing.cpp +++ b/src/openvic-simulation/testing/Testing.cpp @@ -21,8 +21,8 @@ Testing::Testing(GameManager* game_manager) { A_006_politics_tests* a_006_politics_tests = new A_006_politics_tests(); test_scripts.push_back(a_006_politics_tests); - for (int i = 0; i < test_scripts.size(); i++) { - test_scripts[i]->set_game_manager(game_manager); + for (auto test_script : test_scripts) { + test_script->set_game_manager(game_manager); } } @@ -33,58 +33,38 @@ Testing::~Testing() { } void Testing::execute_all_scripts() { - for (int i = 0; i < test_scripts.size(); i++) { - test_scripts[i]->execute_script(); + for (auto test_script : test_scripts) { + test_script->execute_script(); } } void Testing::report_results() { std::ofstream test_results; - // _mkdir("..\\src\\openvic - simulation\\testing\\test_results"); - replace with compatible version (boost?) - test_results.open("..\\src\\openvic-simulation\\testing\\test_results\\results.txt"); + // _mkdir("../src/openvic - simulation/testing/test_results"); - replace with compatible version (boost?) + test_results.open("../src/openvic-simulation/testing/test_results/results.txt"); for (auto test_script : test_scripts) { - std::vector reqs = test_script->get_requirements(); - std::vector passed_reqs = test_script->get_passed_requirements(); - std::vector failed_reqs = test_script->get_failed_requirements(); - std::vector untested_reqs = test_script->get_untested_requirements(); + std::vector reqs = test_script->get_requirements(); + std::vector passed_reqs = test_script->get_passed_requirements(); + std::vector failed_reqs = test_script->get_failed_requirements(); + std::vector untested_reqs = test_script->get_untested_requirements(); test_results << test_script->get_script_name() << ":" << std::endl; - test_results << "\t" << "Requirements for Test" << std::endl; - test_results << "\t"; - for (auto req : reqs) { - test_results << req->get_id() << " "; - } - if (reqs.size() < 1) test_results << "None"; - test_results << std::endl << std::endl; - - test_results << "\t"<< "Passed Requirements" << std::endl; - test_results << "\t"; - for (auto req : passed_reqs) { - test_results << req->get_id() << " "; - } - if (passed_reqs.size() < 1) test_results << "None"; - test_results << std::endl << std::endl; - - test_results << "\t" << "Failed Requirements" << std::endl; - test_results << "\t"; - for (auto req : failed_reqs) { - test_results << req->get_id() << " "; - } - if (failed_reqs.size() < 1) test_results << "None"; - test_results << std::endl << std::endl; - - test_results << "\t" << "Untested Requirements" << std::endl; - test_results << "\t"; - for (auto req : untested_reqs) { - test_results << req->get_id() << " "; - } - if (untested_reqs.size() < 1) test_results << "None"; - test_results << std::endl << std::endl; + report_result("Requirements for Test", test_results, reqs); + report_result("Passed Requirements", test_results, passed_reqs); + report_result("Failed Requirements", test_results, failed_reqs); + report_result("Untested Requirements", test_results, untested_reqs); test_results << std::endl<< std::endl; } test_results.close(); +} - // Create Summary File - +void Testing::report_result(std::string req_title, std::ofstream& outfile, std::vector reqs) { + outfile << "\t" << req_title << std::endl; + outfile << "\t"; + for (auto req : reqs) { + outfile << req->get_id() << " "; + } + if (reqs.size() < 1) outfile << "None"; + outfile << std::endl << std::endl; } diff --git a/src/openvic-simulation/testing/Testing.hpp b/src/openvic-simulation/testing/Testing.hpp index 90c32db..670c95a 100644 --- a/src/openvic-simulation/testing/Testing.hpp +++ b/src/openvic-simulation/testing/Testing.hpp @@ -24,5 +24,6 @@ namespace OpenVic { void execute_all_scripts(); void report_results(); + void report_result(std::string req_title, std::ofstream& outfile, std::vector reqs); }; } -- cgit v1.2.3-56-ga3b1 From dbace1d971b604063455200b277fb2bc21cd5978 Mon Sep 17 00:00:00 2001 From: CptAlanSmith Date: Wed, 27 Sep 2023 00:34:31 +0100 Subject: Abstracted out a general test method to TestScript --- scripts | 2 +- src/openvic-simulation/testing/TestScript.cpp | 9 +++++++++ src/openvic-simulation/testing/TestScript.hpp | 3 +++ .../testing/test_scripts/A_002_economy_tests.cpp | 13 ++++++------- 4 files changed, 19 insertions(+), 8 deletions(-) (limited to 'src/openvic-simulation') diff --git a/scripts b/scripts index 3060e56..925a38d 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 3060e56388ac00d90deb6693ec19d47bad52deb2 +Subproject commit 925a38d4d8aef200823f50345dfa2570891454c4 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 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); } }; } -- cgit v1.2.3-56-ga3b1