Skip to content

Commit 689112e

Browse files
author
lukas
committed
fixed gameframe condition timeouts on emergency protocol tests
1 parent 0fe2d3c commit 689112e

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

tests/s25Main/integration/testEmergencyProtocol.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@ struct EmergencyFixture : public WorldFixture<CreateEmptyWorld, 1>
3030
world.SetBuildingSite(BuildingType::Farm, pos, 0);
3131
world.BuildRoad(0, false, world.GetNeighbour(pos, Direction::SouthEast),
3232
std::vector<Direction>(3, Direction::West));
33-
34-
33+
3534
pos = world.GetPlayer(0).GetHQPos() + MapPoint(-3, 0);
3635
world.SetBuildingSite(BuildingType::Farm, pos, 0);
3736
world.BuildRoad(0, false, world.GetNeighbour(pos, Direction::SouthEast),
3837
std::vector<Direction>(3, Direction::East));
3938

40-
4139
//wait until emergency protocol should be activated
4240
RTTR_EXEC_TILL(500,HQ->GetInventory()[GoodType::Boards] == 10);
4341

@@ -66,11 +64,11 @@ BOOST_FIXTURE_TEST_CASE(EmergencyProtoclActiveWoodcutterAndSawmillCanBuild, Emer
6664
std::vector<Direction>(2, Direction::NorthEast));
6765

6866
//check if inventory boards are given out
69-
RTTR_EXEC_TILL(500,HQ->GetInventory()[GoodType::Boards] < 10);
67+
RTTR_EXEC_TILL(200,HQ->GetInventory()[GoodType::Boards] < 10);
7068

7169
//check if building where found
72-
RTTR_EXEC_TILL(10000,world.GetNO(posWoodcutter)->GetType() == NodalObjectType::Building);
73-
RTTR_EXEC_TILL(10000,world.GetNO(posSawmill)->GetType() == NodalObjectType::Building);
70+
RTTR_EXEC_TILL(2000,world.GetNO(posWoodcutter)->GetType() == NodalObjectType::Building);
71+
RTTR_EXEC_TILL(2000,world.GetNO(posSawmill)->GetType() == NodalObjectType::Building);
7472
}
7573

7674
BOOST_FIXTURE_TEST_CASE(EmergencyProtoclActiveOtherBuldingsnotBuild, EmergencyFixture)
@@ -83,7 +81,7 @@ BOOST_FIXTURE_TEST_CASE(EmergencyProtoclActiveOtherBuldingsnotBuild, EmergencyFi
8381
std::vector<Direction>(2, Direction::NorthEast));
8482

8583
//wait for some more ticks to give time if not working to deliver more boards
86-
RTTR_SKIP_GFS(200);
84+
RTTR_SKIP_GFS(500);
8785
//check boards are still fine and protocol working
8886
BOOST_TEST_CHECK(world.GetPlayer(0).GetHQ()->GetInventory()[GoodType::Boards] == 10);
8987
}

0 commit comments

Comments
 (0)