mostly fix the test

calref · Sep 12, 2024 · 76abca7 · 76abca7
1 parent cc5778c
commit 76abca7
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 21 deletions.
diff --git a/src/fileio/fileio.hpp b/src/fileio/fileio.hpp
@@ -19,7 +19,7 @@ class cScenario;
 class cUniverse;
 
 fs::path locate_scenario(std::string scen_name);
-bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header = false);
+bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header = false, bool pop_paths = true);
 
 fs::path nav_get_or_decode_party();
 fs::path nav_put_or_temp_party(fs::path def = "");

diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp
@@ -100,20 +100,22 @@ fs::path locate_scenario(std::string scen_name) {
 	return scenPath;
 }
 
-bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header) {
+bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header, bool pop_paths) {
 	// Before loading a scenario, we may need to pop scenario resource paths.
-	fs::path graphics_path = ResMgr::graphics.popPath();
-	for(auto p : graphics_path) {
-		if(p.string() == "data") {
-			ResMgr::graphics.pushPath(graphics_path);
-			break;
+	if(pop_paths){
+		fs::path graphics_path = ResMgr::graphics.popPath();
+		for(auto p : graphics_path) {
+			if(p.string() == "data") {
+				ResMgr::graphics.pushPath(graphics_path);
+				break;
+			}
 		}
-	}
-	fs::path sounds_path = ResMgr::sounds.popPath();
-	for(auto p : sounds_path) {
-		if(p.string() == "data") {
-			ResMgr::sounds.pushPath(sounds_path);
-			break;
+		fs::path sounds_path = ResMgr::sounds.popPath();
+		for(auto p : sounds_path) {
+			if(p.string() == "data") {
+				ResMgr::sounds.pushPath(sounds_path);
+				break;
+			}
 		}
 	}
 	scenario = cScenario();

diff --git a/test/SConscript b/test/SConscript
@@ -31,6 +31,8 @@ env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/strings")))
 env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/dialogs")))
 env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/fonts")))
 env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/graphics")))
+# The town boundaries conversion test requires this:
+env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/sounds")))
 
 env.Command("#build/test/junk/", '', 'mkdir "' + Dir("#build/test/junk").path + '"')
 env.Command("#build/test/passed", test, run_tests, chdir=True)
diff --git a/test/town_legacy.cpp b/test/town_legacy.cpp
@@ -11,7 +11,10 @@
 #include "scenario/scenario.hpp"
 #include "oldstructs.hpp"
 #include "fileio/fileio.hpp"
-#include <boost/filesystem.hpp>
+#include <vector>
+#include "fileio/resmgr/res_image.hpp"
+#include "fileio/resmgr/res_sound.hpp"
+
 
 TEST_CASE("Converting legacy town data") {
 	cScenario scen;
@@ -247,16 +250,26 @@ TEST_CASE("Converting legacy town data") {
 		CHECK(town.creatures.size() == 30);
 	}
 	SECTION("Boundaries conversion") {
-		fs::path test_scenarios_dir = "files/town";
-		std::string test_scenarios[3] = {"townrectUniversal/header.exs", "townrectMac.exs", "townrectWindows.exs"};
+		std::string test_scenarios_dir = "files/town/";
+		std::vector<std::string> test_scenarios = {/*"townrectUniversal/header.exs",*/ "townrectMac.exs", "townrectWindows.exs"};
+
+		ResMgr::graphics.pushPath(fs::current_path()/".."/"rsrc"/"graphics");
+		ResMgr::graphics.pushPath(fs::current_path()/".."/"rsrc"/"sounds");
 
-		for(std::string test_scenario : test_scenarios){
-			cScenario scen;
+		try{
+			for(std::string test_scenario : test_scenarios){
+				cScenario scen;
 
-			load_scenario(test_scenarios_dir / test_scenario, scen);				
+				load_scenario(test_scenarios_dir + test_scenario, scen, false, false);
 
-			CHECK(scen.towns[0]->in_town_rect.width() == 5);
-			CHECK(scen.towns[0]->in_town_rect.height() == 3);
+				CHECK(scen.towns[0]->in_town_rect.width() == 5);
+				CHECK(scen.towns[0]->in_town_rect.height() == 3);
+			}
+		} catch(...) {
+			ResMgr::sounds.popPath();
+			ResMgr::graphics.popPath();
+			throw;
 		}
+
 	}
 }