openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix Windows build and tests

Browse Source
This commit is contained in:
Celtic Minstrel
2020-02-02 22:32:33 -05:00
parent c4c201db6e
commit 511b1858a3
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/scen_read.cpp
View File

@@ -210,7 +210,7 @@ TEST_CASE("Loading a new-format scenario record") {
REQUIRE(scen.scenario_timers.size() >= 1);
CHECK(scen.scenario_timers[0].time == 100);
CHECK(scen.scenario_timers[0].node == 15);
CHECK(scen.scenario_timers[0].node_type == 0);
CHECK(scen.scenario_timers[0].node_type == eSpecCtxType::SCEN);
REQUIRE(scen.snd_names.size() >= 1);
CHECK(scen.snd_names[0] == "The name of my custom sound");
}

4
test/scen_write.cpp
View File

@@ -100,7 +100,7 @@ TEST_CASE("Saving a scenario record") {
scen.store_item_towns[0] = 5;
REQUIRE(scen.scenario_timers.size() >= 1); // A safety valve for if I ever make this array dynamic
scen.scenario_timers[0].node = 3;
scen.scenario_timers[0].node_type = 1;
scen.scenario_timers[0].node_type = eSpecCtxType::OUTDOOR;
scen.scenario_timers[0].time = 30000;
scen.spec_strs.push_back("This is a sample special string!");
scen.journal_strs.push_back("This is a sample journal string!");
@@ -110,7 +110,7 @@ TEST_CASE("Saving a scenario record") {
CHECK(scen.store_item_rects[0] == rect(1,2,3,4));
CHECK(scen.store_item_towns[0] == 5);
CHECK(scen.scenario_timers[0].node == 3);
CHECK(scen.scenario_timers[0].node_type == 0); // This is inferred by the fact that it's in the scenario file
CHECK(scen.scenario_timers[0].node_type == eSpecCtxType::SCEN); // This is inferred by the fact that it's in the scenario file
CHECK(scen.scenario_timers[0].time == 30000);
REQUIRE(scen.spec_strs.size() == 1);
CHECK(scen.spec_strs[0] == "This is a sample special string!");

2
test/town_read.cpp
View File

@@ -155,7 +155,7 @@ TEST_CASE("Loading a town definition") {
CHECK(town->defy_mapping);
CHECK(town->defy_scrying);
REQUIRE(town->timers.size() >= 1);
CHECK(town->timers[0].node_type == 2);
CHECK(town->timers[0].node_type == eSpecCtxType::TOWN);
CHECK(town->timers[0].node == 15);
CHECK(town->timers[0].time == 100);
REQUIRE(town->wandering.size() >= 1);

2
test/town_write.cpp
View File

@@ -90,7 +90,7 @@ TEST_CASE("Saving a town") {
CHECK(town->defy_mapping);
CHECK(town->defy_scrying);
REQUIRE(town->timers.size() >= 1);
CHECK(town->timers[0].node_type == 2);
CHECK(town->timers[0].node_type == eSpecCtxType::TOWN);
CHECK(town->timers[0].node == 12);
CHECK(town->timers[0].time == 2500);
REQUIRE(town->wandering.size() >= 1);