Rebase against master

- Fix merge conflicts in state_test.cpp, logger_test.cpp

Author: hrishikeshshekhar

test/state/soldier_test.cpp

@@ -163,19 +163,18 @@ TEST_F(SoldierTest, PursuitAndKill) {
 }
 
 TEST_F(SoldierTest, SimultaneousKill) {
-	auto *target_soldier =
-	    new Soldier(2, PlayerId::PLAYER2, ActorType::SOLDIER, 100, 100,
-	                DoubleVec2D(15, 15), gold_manager.get(), path_planner.get(),
-	                10, 10, 10);
+	auto *target_soldier = new Soldier(
+	    2, PlayerId::PLAYER2, ActorType::SOLDIER, 100, 100, DoubleVec2D(15, 15),
+	    gold_manager.get(), path_planner.get(), 10, 10, 10);
 
 	// Both soldiers attacking each other
 	soldier->Attack(target_soldier);
 	target_soldier->Attack(soldier.get());
 
-
-	// Expecting call to gold manager to reward gold to each soldier for killing the other
+	// Expecting call to gold manager to reward gold to each soldier for killing
+	// the other
 	EXPECT_CALL(*gold_manager, RewardKill(target_soldier));
-	EXPECT_CALL(*gold_manager, RewardKill(soldier.get())); 
+	EXPECT_CALL(*gold_manager, RewardKill(soldier.get()));
 
 	while (target_soldier->GetHp() != 0) {
 		this->soldier->Update();

test/state/state_test.cpp

@@ -100,10 +100,10 @@ class StateTest : public Test {
 		                          path_planner.get(), 10, 10, 10, 10, 10, 10));
 
 		// Player 2 has 1 villager
-		villagers[1].push_back(make_unique<Villager>(
-		    4, PlayerId::PLAYER1, ActorType::VILLAGER, 100, 100,
-		    DoubleVec2D(10, 10), gold_manager.get(), path_planner.get(), 10, 10,
-		    10, 10, 10, 10));
+		villagers[1].push_back(
+		    make_unique<Villager>(4, PlayerId::PLAYER1, ActorType::VILLAGER,
+		                          100, 100, DoubleVec2D(10, 10), gold_manager,
+		                          path_planner.get(), 10, 10, 10, 10, 10, 10));
 
 		// Player2 has 1 soldier, say..
 		soldiers[1].push_back(make_unique<Soldier>(
@@ -120,9 +120,6 @@ class StateTest : public Test {
 };
 
 TEST_F(StateTest, MoveUnitTest) {
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
 	state->MoveUnit(PlayerId::PLAYER1, 1, Vec2D(5, 5));
 	auto curr_villagers = state->GetVillagers();
 	auto curr_villager = curr_villagers[0].front();
@@ -135,9 +132,6 @@ TEST_F(StateTest, MoveUnitTest) {
 }
 
 TEST_F(StateTest, MineLocationTest) {
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
 	state->MineLocation(PlayerId::PLAYER1, 1, Vec2D(25, 25));
 	auto curr_villagers = state->GetVillagers();
 	auto curr_villager = curr_villagers[0].front();
@@ -151,9 +145,6 @@ TEST_F(StateTest, MineLocationTest) {
 }
 
 TEST_F(StateTest, VillagerAttackEnemyTest) {
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
 	state->AttackActor(PlayerId::PLAYER1, 1, 2);
 	auto curr_villagers = state->GetVillagers();
 	auto curr_villager = curr_villagers[0].front();
@@ -170,9 +161,6 @@ TEST_F(StateTest, VillagerAttackEnemyTest) {
 }
 
 TEST_F(StateTest, SoldierAttackEnemyTest) {
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
 	state->AttackActor(PlayerId::PLAYER2, 2, 1);
 	auto curr_soldiers = state->GetSoldiers();
 	auto curr_soldier = curr_soldiers[1].front();
@@ -195,17 +183,10 @@ TEST_F(StateTest, CreateFactoryTest) {
 	auto curr_factories = state->GetFactories();
 	auto villager = curr_villagers[0].front();
 
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
 	// Updating the state and soldier
 	while (villager->GetState() != VillagerStateName::BUILD) {
 		state->Update();
 	}
-=======
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
-	state->Update();
->>>>>>> Add expectations for GoldManager mock
 
 	// Checking if the villager has transitioned into the BUILD state
 	ASSERT_EQ(villager->GetState(), VillagerStateName::BUILD);
@@ -215,20 +196,8 @@ TEST_F(StateTest, CreateFactoryTest) {
 	curr_factories = state->GetFactories();
 	auto factory = curr_factories[0].front();
 	ASSERT_EQ(curr_factories[0].size(), 1);
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
 	ASSERT_EQ(factory->GetState(), FactoryStateName::UNBUILT);
-
-<<<<<<< e22e3eaa527dea449d4e47edfe57c4f9204a9c48
-	auto gold_manager = villager->GetGoldManager();
-	ASSERT_EQ(gold_manager->GetBalance(PlayerId::PLAYER1), 5000 - FACTORY_COST);
-=======
-	//This is a gold manager test
-	// auto gold_manager = curr_villagers[0].front()->GetGoldManager();
-	// ASSERT_EQ(gold_manager->GetBalance(PlayerId::PLAYER1), 5000 - FACTORY_COST);
->>>>>>> Replace GoldManager with mock in all tests
-=======
 	ASSERT_EQ(curr_factories[0].front()->GetState(), FactoryStateName::UNBUILT);
->>>>>>> Add expectations for GoldManager mock
 }
 
 TEST_F(StateTest, BuildFactoryTest) {
@@ -239,43 +208,30 @@ TEST_F(StateTest, BuildFactoryTest) {
 	auto curr_factories = state->GetFactories();
 	auto villager = curr_villagers[0].front();
 
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
 	// Updating the villager's state
 	while (villager->GetState() != VillagerStateName::BUILD) {
 		state->Update();
 	}
 
-<<<<<<< 8d7402a77dd4b1910544206ee76d36a175b1ae5d
 	ASSERT_EQ(villager->GetState(), VillagerStateName::BUILD);
 
 	// Getting the updated factories from state
 	curr_factories = state->GetFactories();
 	auto factory = curr_factories[0].front();
-=======
-	EXPECT_CALL(*gold_manager, AssignGold());
-=======
-	EXPECT_CALL(*gold_manager, Update());
->>>>>>> Add tests for GoldManager
 
+	// Updating state
 	state->Update();
 
 	// Adding expectation for gold manager as state is updated
 
 	ASSERT_EQ(curr_villagers[0].front()->GetState(), VillagerStateName::BUILD);
->>>>>>> Add expectations for GoldManager mock
 	ASSERT_EQ(curr_factories[0].size(), 1);
 	ASSERT_EQ(factory->GetState(), FactoryStateName::UNBUILT);
 
 	// Test BuildFactory for the same villager..
 	state->BuildFactory(PlayerId::PLAYER1, 1, factory->GetActorId());
 
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
-	// Updating state again
-=======
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
->>>>>>> Add expectations for GoldManager mock
+	// Updating state
 	state->Update();
 
 	ASSERT_EQ(curr_villagers[0].front()->GetState(), VillagerStateName::BUILD);
@@ -284,9 +240,7 @@ TEST_F(StateTest, BuildFactoryTest) {
 	// Test BuildFactory for the other villager..
 	state->BuildFactory(PlayerId::PLAYER1, 3, factory->GetActorId());
 
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
+	// Updating state
 	state->Update();
 
 	ASSERT_EQ(curr_villagers[0][1]->GetState(), VillagerStateName::BUILD);
@@ -301,17 +255,13 @@ TEST_F(StateTest, FactoryProductionTest) {
 	auto curr_factories = state->GetFactories();
 	auto villager = curr_villagers[0].front();
 
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
 	// Updating the villager's state
 	while (villager->GetState() != VillagerStateName::BUILD) {
 		state->Update();
 	}
-=======
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
 
+	// Updating state
 	state->Update();
->>>>>>> Add expectations for GoldManager mock
 
 	ASSERT_EQ(villager->GetState(), VillagerStateName::BUILD);
 
@@ -327,9 +277,7 @@ TEST_F(StateTest, FactoryProductionTest) {
 	state->SetFactoryProduction(PlayerId::PLAYER1, factory->GetActorId(),
 	                            ActorType::SOLDIER);
 
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
+	// Updating state
 	state->Update();
 
 	ASSERT_EQ(factory->GetProductionState(), ActorType::SOLDIER);
@@ -344,17 +292,13 @@ TEST_F(StateTest, FactoryDeathTest) {
 	ASSERT_EQ(curr_factories[0].size(), 0);
 	auto villager = curr_villagers[0].front();
 
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
 	// Updating the villager's state
 	while (villager->GetState() != VillagerStateName::BUILD) {
 		state->Update();
 	}
-=======
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
 
+	// Updating state
 	state->Update();
->>>>>>> Add expectations for GoldManager mock
 
 	ASSERT_EQ(villager->GetState(), VillagerStateName::BUILD);
 
@@ -364,7 +308,6 @@ TEST_F(StateTest, FactoryDeathTest) {
 	ASSERT_EQ(curr_factories[0].size(), 1);
 	ASSERT_EQ(factory->GetState(), FactoryStateName::UNBUILT);
 
-<<<<<<< 72cb5844d7321e03c15e8a78f1b3e553a1a92ca5
 	// Killing the factory
 	factory->SetHp(0);
 	factory->Update();
@@ -374,24 +317,16 @@ TEST_F(StateTest, FactoryDeathTest) {
 	ASSERT_EQ(factory->GetState(), FactoryStateName::DEAD);
 	ASSERT_EQ(factory->GetHp(), 0);
 
-	// Updating the state
-=======
 	// Kill factory
-	EXPECT_CALL(*gold_manager, Update());
-
 	auto curr_factory = curr_factories[0].front();
 	curr_factory->SetHp(0);
->>>>>>> Add expectations for GoldManager mock
 	state->Update();
 
 	auto new_facs = state->GetFactories();
 	ASSERT_EQ(new_facs[0].size(), 0);
 }
 
 TEST_F(StateTest, VillagerDeathTest) {
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
 	auto curr_villagers = state->GetVillagers();
 	ASSERT_EQ(curr_villagers[0].size(), 2);
 
@@ -404,9 +339,6 @@ TEST_F(StateTest, VillagerDeathTest) {
 }
 
 TEST_F(StateTest, SoldierDeathTest) {
-	// Adding expectation for gold manager as state is updated
-	EXPECT_CALL(*gold_manager, Update());
-
 	auto curr_soldiers = state->GetSoldiers();
 	ASSERT_EQ(curr_soldiers[1].size(), 1);