From 7b15b526ac75f91fca23f83de6f95539e1f5a553 Mon Sep 17 00:00:00 2001
From: historic_bruno <ben@wildfiregames.com>
Date: Sun, 13 Jul 2014 19:45:44 +0000
Subject: [PATCH] Fixes tests.

Changes direct access of EndGameManager.gameType to getter function, by
convention

This was SVN commit r15525.
---
 .../mods/public/simulation/components/EndGameManager.js    | 5 +++++
 .../data/mods/public/simulation/components/GuiInterface.js | 2 +-
 .../simulation/components/tests/test_GuiInterface.js       | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/binaries/data/mods/public/simulation/components/EndGameManager.js b/binaries/data/mods/public/simulation/components/EndGameManager.js
index a5efe3da7a..1b75b48b78 100644
--- a/binaries/data/mods/public/simulation/components/EndGameManager.js
+++ b/binaries/data/mods/public/simulation/components/EndGameManager.js
@@ -21,6 +21,11 @@ EndGameManager.prototype.Init = function()
 	this.alliedVictory = true;
 };
 
+EndGameManager.prototype.GetGameType = function()
+{
+	return this.gameType;
+};
+
 EndGameManager.prototype.SetGameType = function(newGameType)
 {
 	this.gameType = newGameType;
diff --git a/binaries/data/mods/public/simulation/components/GuiInterface.js b/binaries/data/mods/public/simulation/components/GuiInterface.js
index fb23cd2c3a..cfca3af02a 100644
--- a/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ b/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -119,7 +119,7 @@ GuiInterface.prototype.GetSimulationState = function(player)
 
 	// and the game type
 	var cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
-	ret.gameType = cmpEndGameManager.gameType;
+	ret.gameType = cmpEndGameManager.GetGameType();
 
 	return ret;
 };
diff --git a/binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js b/binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
index b6415cb507..0ae49bcb0c 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
@@ -4,6 +4,7 @@ Engine.LoadComponentScript("interfaces/Auras.js");
 Engine.LoadComponentScript("interfaces/Barter.js");
 Engine.LoadComponentScript("interfaces/Builder.js");
 Engine.LoadComponentScript("interfaces/DamageReceiver.js");
+Engine.LoadComponentScript("interfaces/EndGameManager.js");
 Engine.LoadComponentScript("interfaces/EntityLimits.js");
 Engine.LoadComponentScript("interfaces/Foundation.js");
 Engine.LoadComponentScript("interfaces/GarrisonHolder.js");
@@ -36,6 +37,10 @@ AddMock(SYSTEM_ENTITY, IID_Barter, {
 	}},
 });
 
+AddMock(SYSTEM_ENTITY, IID_EndGameManager, {
+	GetGameType: function() { return "conquest"; }
+});
+
 AddMock(SYSTEM_ENTITY, IID_PlayerManager, {
 	GetNumPlayers: function() { return 2; },
 	GetPlayerByID: function(id) { TS_ASSERT(id === 0 || id === 1); return 100+id; },
@@ -244,6 +249,7 @@ TS_ASSERT_UNEVAL_EQUALS(cmp.GetSimulationState(), {
 	],
 	circularMap: false,
 	timeElapsed: 0,
+	gameType: "conquest",
 });
 
 TS_ASSERT_UNEVAL_EQUALS(cmp.GetExtendedSimulationState(), {
@@ -339,6 +345,7 @@ TS_ASSERT_UNEVAL_EQUALS(cmp.GetExtendedSimulationState(), {
 	],
 	circularMap: false,
 	timeElapsed: 0,
+	gameType: "conquest",
 	barterPrices: {buy: {food: 150}, sell: {food: 25}}
 });