Compare commits

..
Author SHA1 Message Date
admin b9ebaf516f Use direct vector declarations in action tests 2026-06-23 12:54:28 -07:00
8 changed files with 32 additions and 32 deletions
@@ -34,7 +34,7 @@ TEST_F(FallIntoWaterActionTests, takesDamage) {
Coords c{2, 2};
auto fallerOffset = AddGenericUnit(1, 0, c);
auto unitsVec = std::vector<Unit>{fallerOffset};
std::vector<Unit> unitsVec{fallerOffset};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
net::eagle0::shardok::storage::fb::Weather weather;
@@ -77,7 +77,7 @@ TEST_F(FallIntoWaterActionTests, highRoll_sweptAway) {
Coords c{2, 2};
auto fallerOffset = AddGenericUnit(1, 0, c);
auto unitsVec = std::vector<Unit>{fallerOffset};
std::vector<Unit> unitsVec{fallerOffset};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
net::eagle0::shardok::storage::fb::Weather weather;
@@ -121,7 +121,7 @@ TEST_F(FallIntoWaterActionTests, lowRoll_escapes) {
Coords c{2, 2};
auto fallerOffset = AddGenericUnit(1, 0, c);
auto unitsVec = std::vector<Unit>{fallerOffset};
std::vector<Unit> unitsVec{fallerOffset};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
net::eagle0::shardok::storage::fb::Weather weather;
@@ -170,7 +170,7 @@ TEST_F(FallIntoWaterActionTests, noHero_alwaysSweptAway) {
unit.mutable_location() = c;
unit.mutable_battalion().mutate_size(500);
auto unitsVec = std::vector<Unit>{unit};
std::vector<Unit> unitsVec{unit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
net::eagle0::shardok::storage::fb::Weather weather;
@@ -53,7 +53,7 @@ class MeteorCastActionTests : public ::testing::Test {
auto otherOffset = AddGenericUnit(1, 1, Coords(1, 1));
auto unitsVec = std::vector<Unit>{casterOffset, otherOffset};
std::vector<Unit> unitsVec{casterOffset, otherOffset};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto hexMap = AddHexMap(fbb, BASIC_MAP_FB);
@@ -104,7 +104,7 @@ auto MakeGameState() -> GameStateW {
ub.mutable_location() = coords;
ub.mutate_status(net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT);
auto unitsVec = std::vector<Unit>{ub};
std::vector<Unit> unitsVec{ub};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto weather = net::eagle0::shardok::storage::fb::Weather(
@@ -45,7 +45,7 @@ class PerformUndeadCommandsActionTest : public ::testing::Test {
auto undeadOff = AddGenericUndead(UNCONTROLLED_PLAYER_ID, 1, undeadPosition);
auto targetedOff = AddGenericUnit(4, 2, Coords(5, 5));
auto unitsVec = std::vector<Unit>{adjOff, undeadOff, targetedOff};
std::vector<Unit> unitsVec{adjOff, undeadOff, targetedOff};
auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto mapOff = AddBasicMap(fbb);
@@ -22,7 +22,7 @@ class PlaceHiddenUnitCommandTest : public ::testing::Test {
auto actorOff = AddGenericUnit(0, 0, Coords(-1, -1));
auto unitsVec = std::vector<Unit>{actorOff};
std::vector<Unit> unitsVec{actorOff};
auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto hexMapOffset = AddHexMap(fbb, BASIC_MAP_FB);
@@ -21,7 +21,7 @@ class UndeadChangeAction_test : public ::testing::Test {
auto firstUndeadOff = AddGenericUndead(1, 1, Coords(4, 4));
auto secondUndeadOff = AddGenericUndead(2, 2, Coords(1, 1));
auto unitsVec = vector<Unit>{otherUnit, firstUndeadOff, secondUndeadOff};
vector<Unit> unitsVec{otherUnit, firstUndeadOff, secondUndeadOff};
auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
GameStateBuilder gsb(fbb);
@@ -51,7 +51,7 @@ TEST_F(UpdateGameStatusActionTests, onePlayerLeft_addsGameOverResult) {
auto coords = net::eagle0::shardok::storage::fb::Coords(3, 3);
auto onlyUnit = AddGenericUnit(0, 0, coords);
vector<Unit> unitsVec{onlyUnit};
auto unitsVec = vector<Unit>{onlyUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -96,7 +96,7 @@ TEST_F(UpdateGameStatusActionTests, twoPlayersLeft_noGameOverResult) {
auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -137,7 +137,7 @@ TEST_F(UpdateGameStatusActionTests, onePlayerAllUnitsHidden_gameOverResult) {
auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -183,7 +183,7 @@ TEST_F(UpdateGameStatusActionTests, remainingPlayerDoesNotHaveLastPlayerStanding
auto coords1 = net::eagle0::shardok::storage::fb::Coords(3, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
vector<Unit> unitsVec{attackerUnit};
auto unitsVec = vector<Unit>{attackerUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -232,7 +232,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_gameOverResult) {
auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -287,7 +287,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_hiddenDefenderFlees)
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
auto hiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
vector<Unit> unitsVec{attackerUnit, defenderUnit, hiddenDefender};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, hiddenDefender};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -349,7 +349,7 @@ TEST_F(UpdateGameStatusActionTests,
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
auto hiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
vector<Unit> unitsVec{attackerUnit, defenderUnit, hiddenDefender};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, hiddenDefender};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -406,7 +406,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_hiddenDefenderTooTir
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
auto hiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
vector<Unit> unitsVec{attackerUnit, defenderUnit, hiddenDefender};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, hiddenDefender};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -467,7 +467,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_notHiddenDefender_do
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
auto notHiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
vector<Unit> unitsVec{attackerUnit, defenderUnit, notHiddenDefender};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, notHiddenDefender};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -522,7 +522,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_notEndOfRound_noGame
auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -575,7 +575,7 @@ TEST_F(UpdateGameStatusActionTests,
auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -633,7 +633,7 @@ TEST_F(UpdateGameStatusActionTests, allianceVictory_alliesHaveConditionSet_retur
auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -695,7 +695,7 @@ TEST_F(UpdateGameStatusActionTests, allianceVictory_notAllAlliesHaveConditionSet
auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -758,7 +758,7 @@ TEST_F(UpdateGameStatusActionTests,
auto unit1 = AddGenericUnit(0, 0, castle1Coords);
auto unit2 = AddGenericUnit(1, 1, castle2Coords);
auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
vector<Unit> unitsVec{unit1, unit2, defenderUnit};
auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -827,7 +827,7 @@ TEST_F(UpdateGameStatusActionTests, alliedCastleVictory_notMutuallyAllied_return
auto unit1 = AddGenericUnit(0, 0, castle1Coords);
auto unit2 = AddGenericUnit(1, 1, castle2Coords);
auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
vector<Unit> unitsVec{unit1, unit2, defenderUnit};
auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -891,7 +891,7 @@ TEST_F(UpdateGameStatusActionTests, alliedCastleVictory_missingVictoryCondition_
auto unit1 = AddGenericUnit(0, 0, castle1Coords);
auto unit2 = AddGenericUnit(1, 1, castle2Coords);
auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
vector<Unit> unitsVec{unit1, unit2, defenderUnit};
auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -953,7 +953,7 @@ TEST_F(UpdateGameStatusActionTests, alliedCastleVictory_emptyTile_returnsNoActio
auto defenderCoords = net::eagle0::shardok::storage::fb::Coords(2, 1);
auto unit1 = AddGenericUnit(0, 0, castle1Coords);
auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
vector<Unit> unitsVec{unit1, defenderUnit};
auto unitsVec = vector<Unit>{unit1, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1012,7 +1012,7 @@ TEST_F(UpdateGameStatusActionTests, allianceVictory_notAllAllied_returnsNoAction
auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1054,7 +1054,7 @@ TEST_F(UpdateGameStatusActionTests,
auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1109,7 +1109,7 @@ TEST_F(UpdateGameStatusActionTests, maxRoundsExceeded_noWinAfterMaxRounds_throws
auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
auto attackerUnit = AddGenericUnit(0, 0, coords1);
auto defenderUnit = AddGenericUnit(1, 1, coords2);
vector<Unit> unitsVec{attackerUnit, defenderUnit};
auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1172,7 +1172,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_mutuallyAlliedCoAtta
auto unit1 = AddGenericUnit(0, 0, castleCoords);
auto unit2 = AddGenericUnit(1, 1, allyCoords);
auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
vector<Unit> unitsVec{unit1, unit2, defenderUnit};
auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1241,7 +1241,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_nonAlliedCoAttacker_
auto unit1 = AddGenericUnit(0, 0, castleCoords);
auto unit2 = AddGenericUnit(1, 1, allyCoords);
auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
vector<Unit> unitsVec{unit1, unit2, defenderUnit};
auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -39,7 +39,7 @@ class UpdateOpponentKnowledgeActionTests : public ::testing::Test {
auto attackerOff = AddGenericUnit(0, 0, attackerPosition);
auto defenderOff = AddGenericUnit(1, 1, notAdjacentPosition);
auto unitsVec = vector<Unit>{attackerOff, defenderOff};
vector<Unit> unitsVec{attackerOff, defenderOff};
auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);