mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add and use FreeColTestCase.getServerPlayer.

This commit is contained in:
Mike Pope 2019-03-17 14:15:12 +10:30
parent 0f59ec252b
commit 9a1977eba5
18 changed files with 153 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/src/net/sf/freecol/common/i18n/MessagesTest.java
View File

@ -393,12 +393,10 @@ public class MessagesTest extends FreeColTestCase {
// Unit.getDescription/getFullDescription are just wrappers around
// Messages.getTemplate/getFullTemplate.
Game game = getStandardGame();
ServerPlayer dutch = (ServerPlayer)game
.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Nation refNation = dutch.getNation().getREFNation();
ServerPlayer dutchREF = new ServerPlayer(game, false, refNation);
ServerPlayer sioux = (ServerPlayer)game
.getPlayerByNationId("model.nation.sioux");
ServerPlayer sioux = getServerPlayer(game, "model.nation.sioux");
Unit unit;
// King's regulars

12
test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
View File

@ -69,7 +69,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
final CostDecider decider = CostDeciders.avoidSettlements();
Tile start = game.getMap().getTile(5, 5);
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Unit unit = new ServerUnit(game, start, french, pioneerType);
for (Direction dir : Direction.values()) {
Tile end = start.getNeighbourOrNull(dir);
@ -90,7 +90,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
game.setMap(map);
final CostDecider decider = CostDeciders.avoidSettlements();
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Unit unit = new ServerUnit(game, game.getMap().getTile(1, 1),
french, pioneerType);
int cost = decider.getCost(unit, game.getMap().getTile(1, 1),
@ -111,7 +111,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
Tile unitTile = map.getTile(9, 9);
assertTrue("Unit tile should be land",unitTile.isLand());
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Unit unit = new ServerUnit(game, unitTile, french, pioneerType);
Tile seaTile = map.getTile(10, 9);
@ -135,7 +135,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
Tile unitTile = map.getTile(10, 9);
assertFalse("Unit tile should be ocean", unitTile.isLand());
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Unit unit = new ServerUnit(game, unitTile, french, galleonType);
Tile landTile = map.getTile(9, 9);
@ -163,7 +163,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
settlementTile.changeOwningSettlement(settlement);
Tile unitTile = map.getTile(1, 1);
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Unit unit = new ServerUnit(game, unitTile, french, pioneerType);
// unit is going somewhere else
Tile unitDestination = map.getTile(3, 1);
@ -187,7 +187,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
Tile unitTile = map.getTile(10, 9);
assertFalse("Unit tile should be ocean",unitTile.isLand());
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Unit galleon = new ServerUnit(game, unitTile, french, galleonType);
Tile settlementTile = map.getTile(9, 9);

6
test/src/net/sf/freecol/common/model/CombatTest.java
View File

@ -475,7 +475,7 @@ public class CombatTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap(plains, true));
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
french.addAbility(new Ability(Ability.INDEPENDENCE_DECLARED));
ServerPlayer refPlayer = igc.createREFPlayer(french);
@ -551,8 +551,8 @@ public class CombatTest extends FreeColTestCase {
CombatModel combatModel = game.getCombatModel();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
dutch.setStance(inca, Stance.WAR);
inca.setStance(dutch, Stance.WAR);

16
test/src/net/sf/freecol/common/model/PlayerTest.java
View File

@ -239,12 +239,10 @@ public class PlayerTest extends FreeColTestCase {
assertEquals(russianREF, russian.getREFPlayer());
}
public void testTension(){
String errMsg = "";
public void testTension() {
Game game = getStandardGame();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
int initialTension = 500;
int change = 250;
@ -257,10 +255,10 @@ public class PlayerTest extends FreeColTestCase {
int expectedDutchTension = initialTension + change;
int expectedFrenchTension = initialTension;
errMsg = "Dutch tension value should have changed";
assertEquals(errMsg, expectedDutchTension, dutch.getTension(french).getValue());
errMsg = "French tension value should have remained the same";
assertEquals(errMsg, expectedFrenchTension ,french.getTension(dutch).getValue());
assertEquals("Dutch tension value should have changed",
expectedDutchTension, dutch.getTension(french).getValue());
assertEquals("French tension value should have remained the same",
expectedFrenchTension, french.getTension(dutch).getValue());
}
public void testAddAnotherPlayersUnit(){

36
test/src/net/sf/freecol/server/ai/ContactTest.java
View File

@ -64,8 +64,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile1 = map.getTile(6, 8);
tile1.setExplored(dutch, true);
tile1.setExplored(french, true);
@ -95,8 +95,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer iroquois = getServerPlayer(game, "model.nation.iroquois");
Tile tile1 = map.getTile(6, 8);
tile1.setExplored(dutch, true);
Tile tile2 = map.getTile(5, 8);
@ -130,8 +130,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer) game.getPlayer("model.nation.dutch");
ServerPlayer french = (ServerPlayer) game.getPlayer("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile1 = map.getTile(5, 8);
tile1.setExplored(dutch, true);
tile1.setExplored(french, true);
@ -160,8 +160,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer iroquois = getServerPlayer(game, "model.nation.iroquois");
Tile tile1 = map.getTile(5, 8);
tile1.setExplored(dutch, true);
Tile tile2 = map.getTile(4, 8);
@ -194,8 +194,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer apache = getServerPlayer(game, "model.nation.apache");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile1 = map.getTile(5, 8);
tile1.setExplored(french, true);
Tile tile2 = map.getTile(4, 8);
@ -224,8 +224,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
ServerPlayer apache = getServerPlayer(game, "model.nation.apache");
ServerPlayer iroquois = getServerPlayer(game, "model.nation.iroquois");
Tile tile1 = map.getTile(5, 8);
Tile tile2 = map.getTile(4, 8);
Tile tile3 = map.getTile(3, 8);
@ -251,8 +251,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer apache = getServerPlayer(game, "model.nation.apache");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile tile1 = map.getTile(5, 8);
tile1.setExplored(dutch, true);
Tile tile2 = map.getTile(4, 8);
@ -279,8 +279,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer apache = (ServerPlayer) game.getPlayerByNationId("model.nation.apache");
ServerPlayer iroquois = (ServerPlayer) game.getPlayerByNationId("model.nation.iroquois");
ServerPlayer apache = getServerPlayer(game, "model.nation.apache");
ServerPlayer iroquois = getServerPlayer(game, "model.nation.iroquois");
Tile tile1 = map.getTile(5, 8);
Tile tile2 = map.getTile(4, 8);
Tile tile3 = map.getTile(3, 8);
@ -307,8 +307,8 @@ public class ContactTest extends FreeColTestCase {
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile1 = map.getTile(5, 8);
tile1.setExplored(dutch, true);
tile1.setExplored(french, true);

18
test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java
View File

@ -81,7 +81,7 @@ public class MissionAssignmentTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
// Create attacking player and units
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile tile1 = map.getTile(2, 2);
Tile tile2 = map.getTile(2, 1);
@ -92,7 +92,7 @@ public class MissionAssignmentTest extends FreeColTestCase {
assertNotNull(aiUnit);
// Create defending player and unit
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile3 = map.getTile(1, 2);
Unit enemyColonist = new ServerUnit(game, tile3, french, colonistType);
@ -123,9 +123,9 @@ public class MissionAssignmentTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
// Create player and unit
ServerPlayer incaPlayer = (ServerPlayer) game.getPlayerByNationId("model.nation.inca");
ServerPlayer incaPlayer = getServerPlayer(game, "model.nation.inca");
NativeAIPlayer aiInca = (NativeAIPlayer)aiMain.getAIPlayer(incaPlayer);
ServerPlayer dutchPlayer = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutchPlayer = getServerPlayer(game, "model.nation.dutch");
Tile dutchUnitTile = map.getTile(9, 9);
Tile braveUnitTile = map.getTile(9, 8);;
@ -151,7 +151,7 @@ public class MissionAssignmentTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
// Create player and unit
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile tile1 = map.getTile(2, 2);
Unit soldier = new ServerUnit(game, tile1, dutch, veteranType);
@ -181,9 +181,9 @@ public class MissionAssignmentTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
// Create player and unit
ServerPlayer inca = (ServerPlayer) game.getPlayerByNationId("model.nation.inca");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
NativeAIPlayer aiInca = (NativeAIPlayer)aiMain.getAIPlayer(inca);
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile settlementTile = map.getTile(9, 9);
Tile adjacentTile = settlementTile.getNeighbourOrNull(Direction.N);
@ -256,9 +256,9 @@ public class MissionAssignmentTest extends FreeColTestCase {
InGameController igc = ServerTestHelper.getInGameController();
// Create player and unit
ServerPlayer inca = (ServerPlayer) game.getPlayerByNationId("model.nation.inca");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
NativeAIPlayer aiInca = (NativeAIPlayer)aiMain.getAIPlayer(inca);
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile settlementTile = map.getTile(9, 9);
Tile seaTile = map.getTile(10, 9);

6
test/src/net/sf/freecol/server/ai/REFTest.java
View File

@ -58,8 +58,7 @@ public class REFTest extends FreeColTestCase {
InGameController igc = ServerTestHelper.getInGameController();
// Create player
final ServerPlayer player1 = (ServerPlayer)game
.getPlayerByNationId("model.nation.dutch");
final ServerPlayer player1 = getServerPlayer(game, "model.nation.dutch");
final Force exf = player1.getMonarch().getExpeditionaryForce();
// Update to have full naval capacity
exf.prepareToBoard();
@ -88,8 +87,7 @@ public class REFTest extends FreeColTestCase {
Random random = ServerTestHelper.getServer().getServerRandom();
// Create player
final ServerPlayer player1 = (ServerPlayer)game
.getPlayerByNationId("model.nation.dutch");
final ServerPlayer player1 = getServerPlayer(game, "model.nation.dutch");
final Monarch monarch = player1.getMonarch();
game.setTurn(new Turn(200));
assertTrue("REF addition",

4
test/src/net/sf/freecol/server/ai/TensionTest.java
View File

@ -57,8 +57,8 @@ public class TensionTest extends FreeColTestCase {
InGameController igc = ServerTestHelper.getInGameController();
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
ServerPlayer european = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer indian = (ServerPlayer) game.getPlayerByNationId("model.nation.tupi");
ServerPlayer european = getServerPlayer(game, "model.nation.dutch");
ServerPlayer indian = getServerPlayer(game, "model.nation.tupi");
NativeAIPlayer indianAI = (NativeAIPlayer)aiMain.getAIPlayer(indian);
// initially, the players are unknown to each other

2
test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java
View File

@ -69,7 +69,7 @@ public class PioneeringMissionTest extends FreeColTestCase {
// Get player, colony and unit
final ServerPlayer player
= (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
= getServerPlayer(game, "model.nation.dutch");
final EuropeanAIPlayer aiPlayer
= (EuropeanAIPlayer)aiMain.getAIPlayer(player);
final Colony colony = getStandardColony();

4
test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java
View File

@ -60,8 +60,8 @@ public class PrivateerMissionTest extends FreeColTestCase {
Map map = game.getMap();
// Create player and unit
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile colonyTile = map.getTile(9, 9);
Tile privateerTile = map.getTile(10, 9);

4
test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java
View File

@ -62,8 +62,8 @@ public class ScoutingMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
// Create players, settlement and unit
ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.exploreMap(true);
Tile settlementTile = map.getTile(2, 1);

12
test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java
View File

@ -84,7 +84,7 @@ public class TransportMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
assertNotNull(aiMain);
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
AIPlayer aiPlayer = aiMain.getAIPlayer(dutch);
// Create a ship at sea carrying a colonist
@ -100,7 +100,7 @@ public class TransportMissionTest extends FreeColTestCase {
assertTrue(colonist.getLocation()==galleon);
// Create the attacker, also at sea
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile2 = map.getTile(11, 9);
Unit privateer = new ServerUnit(game, tile2, french, privateerType);
@ -130,7 +130,7 @@ public class TransportMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
assertNotNull(aiMain);
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.exploreMap(true);
// create a ship carrying a colonist
@ -163,7 +163,7 @@ public class TransportMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
assertNotNull(aiMain);
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.exploreMap(true);
Europe europe = dutch.getEurope();
assertNotNull("Setup error, europe is null", europe);
@ -201,7 +201,7 @@ public class TransportMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
assertNotNull(aiMain);
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Europe europe = dutch.getEurope();
assertNotNull("Setup error, europe is null", europe);
@ -240,7 +240,7 @@ public class TransportMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
assertNotNull(aiMain);
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.exploreMap(true);
Europe europe = dutch.getEurope();
assertNotNull("Setup error, europe is null", europe);

8
test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java
View File

@ -57,7 +57,7 @@ public class UnitSeekAndDestroyMissionTest extends FreeColTestCase {
// Create attacking player and unit
ServerPlayer player1
= (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
= getServerPlayer(game, "model.nation.dutch");
Tile tile1 = map.getTile(2, 2);
Unit attacker = new ServerUnit(game, tile1, player1, veteranType);
AIUnit aiUnit = aiMain.getAIUnit(attacker);
@ -65,7 +65,7 @@ public class UnitSeekAndDestroyMissionTest extends FreeColTestCase {
// Create defending player and unit
ServerPlayer player2
= (ServerPlayer)game.getPlayerByNationId("model.nation.french");
= getServerPlayer(game, "model.nation.french");
Tile tile2 = map.getTile(2, 1);
Role soldierRole = spec().getRole("model.role.soldier");
Unit defender = new ServerUnit(game, tile2, player2,
@ -96,14 +96,14 @@ public class UnitSeekAndDestroyMissionTest extends FreeColTestCase {
AIMain aiMain = ServerTestHelper.getServer().getAIMain();
// Create attacking player and unit
ServerPlayer player1 = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer player1 = getServerPlayer(game, "model.nation.dutch");
Tile tile1 = map.getTile(2, 2);
Unit attacker = new ServerUnit(game, tile1, player1, veteranType);
AIUnit aiUnit = aiMain.getAIUnit(attacker);
assertNotNull(aiUnit);
// Create defending player and unit
ServerPlayer player2 = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer player2 = getServerPlayer(game, "model.nation.french");
Tile defenderTile = map.getTile(2, 1);
Role soldierRole = spec().getRole("model.role.soldier");
Unit defender = new ServerUnit(game, defenderTile, player2, veteranType, soldierRole);

110
test/src/net/sf/freecol/server/control/InGameControllerTest.java
View File

@ -224,8 +224,8 @@ public class InGameControllerTest extends FreeColTestCase {
final InGameController igc = ServerTestHelper.getInGameController();
// Setup
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
int initialTensionValue = 500;
dutch.setStance(french, Stance.PEACE);
french.setStance(dutch, Stance.PEACE);
@ -270,8 +270,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap());
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
FreeColTestCase.IndianSettlementBuilder builder
= new FreeColTestCase.IndianSettlementBuilder(game);
ServerIndianSettlement camp = (ServerIndianSettlement)builder.build();
@ -308,7 +308,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile tile = map.getTile(1, 1);
Unit privateer = new ServerUnit(game, tile, dutch, privateerType);
assertEquals("Privateer should not carry anything",
@ -342,7 +342,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile tile = map.getTile(10, 4);
Unit ship = new ServerUnit(game, tile, dutch, galleonType);
Unit treasure = new ServerUnit(game, tile, dutch, treasureTrainType);
@ -409,7 +409,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile landTile = map.getTile(9, 9);
Tile seaTile = map.getTile(10, 9);
ServerUnit colonist = new ServerUnit(game, landTile, dutch, colonistType);
@ -450,7 +450,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Unit unit = new ServerUnit(game, map.getTile(5, 8), dutch,
hardyPioneerType);
assertTrue("Unit should be a hardy pioneer",
@ -487,8 +487,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(french, Stance.WAR, dutch, true);
assertEquals("Dutch should be at war with french",
dutch.getStance(french), Stance.WAR);
@ -542,8 +542,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(french, Stance.WAR, dutch, true);
dutch.addAbility(new Ability(Ability.INDEPENDENCE_DECLARED));
@ -611,8 +611,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(french, Stance.WAR, dutch, true);
Colony colony = getStandardColony();
@ -728,8 +728,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
igc.changeStance(dutch, Stance.WAR, inca, true);
Colony colony = getStandardColony(1, 5, 8);
@ -944,8 +944,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
igc.changeStance(dutch, Stance.WAR, inca, true);
Colony colony = getStandardColony();
@ -991,8 +991,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tile tile1 = map.getTile(5, 8);
tile1.setExplored(dutch, true);
tile1.setExplored(french, true);
@ -1019,8 +1019,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1052,8 +1052,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
// UnitType promotion
@ -1173,8 +1173,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1214,8 +1214,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1264,8 +1264,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1341,8 +1341,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
igc.changeStance(dutch, Stance.WAR, inca, true);
Tile tile1 = map.getTile(5, 8);
@ -1423,8 +1423,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1455,8 +1455,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1509,8 +1509,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
igc.changeStance(dutch, Stance.WAR, french, true);
Tile tile1 = map.getTile(5, 8);
@ -1553,8 +1553,8 @@ public class InGameControllerTest extends FreeColTestCase {
private void setPlayersAt(Stance stance,Tension tension) {
final Game game = getGame();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
// Setup
dutch.setStance(french, stance);
@ -1600,8 +1600,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap());
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tension hateful = new Tension(Tension.Level.HATEFUL.getLimit());
Stance initialStance = Stance.WAR;
Stance newStance = Stance.PEACE;
@ -1633,8 +1633,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap());
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tension hateful = new Tension(Tension.Level.HATEFUL.getLimit());
Stance initialStance = Stance.CEASE_FIRE;
Stance newStance = Stance.PEACE;
@ -1669,8 +1669,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap());
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
Tension hateful = new Tension(Tension.Level.HATEFUL.getLimit());
Stance initialStance = Stance.WAR;
Stance newStance = Stance.CEASE_FIRE;
@ -1698,8 +1698,8 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap());
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer inca = (ServerPlayer)game.getPlayerByNationId("model.nation.inca");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer inca = getServerPlayer(game, "model.nation.inca");
Player.makeContact(inca, dutch);
FreeColTestCase.IndianSettlementBuilder builder
@ -1827,7 +1827,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap());
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
assertEquals(0, dutch.getUnitCount());
List<AbstractUnit> units = new ArrayList<>();
units.add(new AbstractUnit(colonistType, Specification.DEFAULT_ROLE_ID, 1));
@ -1934,7 +1934,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap(true));
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
FoundingFather father = new FoundingFather("father", spec());
father.setType(FoundingFatherType.TRADE);
Modifier priceBonus = new Modifier(Modifier.BUILDING_PRICE_BONUS,
@ -1957,7 +1957,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Map map = game.getMap();
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Colony colony = getStandardColony(1);
Unit colonist = new ServerUnit(game, map.getTile(6, 8), dutch,
colonistType);
@ -1974,13 +1974,13 @@ public class InGameControllerTest extends FreeColTestCase {
colonist.getExperience() == 0);
}
private static int workLeftFor(UnitType unitType, TileType tileType,
TileImprovementType whichWork) {
private int workLeftFor(UnitType unitType, TileType tileType,
TileImprovementType whichWork) {
Game game = getStandardGame();
game = ServerTestHelper.startServerGame(getTestMap(tileType));
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile tile = game.getMap().getTile(3, 3);
assertEquals(tile.getType(), tileType);
@ -2085,7 +2085,7 @@ public class InGameControllerTest extends FreeColTestCase {
final Game game = ServerTestHelper.startServerGame(getTestMap(true));
final InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Colony colony = getStandardColony();
UnitType gardenerType = new UnitType("gardener", spec());

2
test/src/net/sf/freecol/server/model/ServerColonyTest.java
View File

@ -90,7 +90,7 @@ public class ServerColonyTest extends FreeColTestCase {
public void testFoodConsumption() {
Game game = ServerTestHelper.startServerGame(getTestMap(plains));
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
// Setting test colony and colonist
Colony colony = FreeColTestUtils.getColonyBuilder()
.colonyTile(game.getMap().getTile(5, 8)).build();

36
test/src/net/sf/freecol/server/model/ServerPlayerTest.java
View File

@ -85,8 +85,8 @@ public class ServerPlayerTest extends FreeColTestCase {
ServerGame game = ServerTestHelper.startServerGame(getTestMap());
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer english = (ServerPlayer) game.getPlayerByNationId("model.nation.english");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
ServerPlayer english = getServerPlayer(game, "model.nation.english");
Market frenchMarket = french.getMarket();
Market englishMarket = english.getMarket();
int frenchGold = french.getGold();
@ -151,8 +151,8 @@ public class ServerPlayerTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap());
Map map = game.getMap();
ServerPlayer dutch = (ServerPlayer) game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer) game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
InGameController igc = ServerTestHelper.getInGameController();
Tile tile0 = map.getTile(0, 0);
Tile tile1 = map.getTile(6, 8);
@ -182,7 +182,7 @@ public class ServerPlayerTest extends FreeColTestCase {
Colony colony = getStandardColony();
colony.addGoods(cottonType, 200);
ServerPlayer dutch
= (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
= getServerPlayer(game, "model.nation.dutch");
Unit wagonInColony
= new ServerUnit(game, colony.getTile(), dutch, wagonTrainType);
Unit wagonNotInColony
@ -227,7 +227,7 @@ public class ServerPlayerTest extends FreeColTestCase {
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch
= (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
= getServerPlayer(game, "model.nation.dutch");
Europe europe = dutch.getEurope();
Unit privateer1
= new ServerUnit(game, europe, dutch, privateerType);
@ -259,7 +259,7 @@ public class ServerPlayerTest extends FreeColTestCase {
public void testCheckGameOverNoUnits() {
Game game = ServerTestHelper.startServerGame(getTestMap());
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.setGold(0);
assertEquals("Should not have units", 0, dutch.getUnitCount());
@ -270,7 +270,7 @@ public class ServerPlayerTest extends FreeColTestCase {
public void testCheckNoGameOverEnoughMoney() {
Game game = ServerTestHelper.startServerGame(getTestMap());
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.setGold(10000);
assertEquals("Should be alive, has enough money",
@ -281,7 +281,7 @@ public class ServerPlayerTest extends FreeColTestCase {
public void testCheckNoGameOverHasColonistInNewWorld() {
Game game = ServerTestHelper.startServerGame(getTestMap());
Map map = game.getMap();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.setGold(0);
new ServerUnit(game, map.getTile(4, 7), dutch, colonistType);
@ -292,7 +292,7 @@ public class ServerPlayerTest extends FreeColTestCase {
public void testCheckGameOver1600Threshold() {
Game game = ServerTestHelper.startServerGame(getTestMap());
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.setGold(0);
new ServerUnit(game, dutch.getEurope(), dutch, galleonType);
@ -317,7 +317,7 @@ public class ServerPlayerTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap(spec().getTileType("model.tile.highSeas")));
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.setGold(0);
Unit galleon = new ServerUnit(game, map.getTile(6, 8), dutch,
@ -343,7 +343,7 @@ public class ServerPlayerTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap());
Map map = game.getMap();
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
dutch.setGold(0);
Unit galleon = new ServerUnit(game, dutch.getEurope(), dutch,
@ -366,8 +366,8 @@ public class ServerPlayerTest extends FreeColTestCase {
}
public void testSellingMakesPricesFall() {
Game g = ServerTestHelper.startServerGame(getTestMap());
ServerPlayer dutch = (ServerPlayer)g.getPlayerByNationId("model.nation.dutch");
Game game = ServerTestHelper.startServerGame(getTestMap());
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Market dm = dutch.getMarket();
int previousGold = dutch.getGold();
@ -380,7 +380,7 @@ public class ServerPlayerTest extends FreeColTestCase {
public void testBuyingMakesPricesRaise() {
Game game = ServerTestHelper.startServerGame(getTestMap());
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Market dm = dutch.getMarket();
dutch.modifyGold(1000000);
@ -445,8 +445,8 @@ public class ServerPlayerTest extends FreeColTestCase {
public void testDutchMarket() {
Game game = getStandardGame();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer french = (ServerPlayer)game.getPlayerByNationId("model.nation.french");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
ServerPlayer french = getServerPlayer(game, "model.nation.french");
assertEquals("model.nationType.trade", dutch.getNationType().getId());
assertTrue(dutch.getNationType().hasModifier(Modifier.TRADE_BONUS));
assertTrue(dutch.hasModifier(Modifier.TRADE_BONUS));
@ -455,7 +455,7 @@ public class ServerPlayerTest extends FreeColTestCase {
int dutchSellAmount = sellUntilPriceDrop(game, dutch, silverType);
Game g2 = getStandardGame();
ServerPlayer french2 = (ServerPlayer)g2.getPlayerByNationId("model.nation.french");
ServerPlayer french2 = getServerPlayer(game, "model.nation.french");
int frenchSellAmount = sellUntilPriceDrop(g2, french2, silverType);
assertTrue(dutchSellAmount > frenchSellAmount);

8
test/src/net/sf/freecol/server/model/ServerUnitTest.java
View File

@ -143,7 +143,7 @@ public class ServerUnitTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap(plains));
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Tile plain = game.getMap().getTile(5, 8);
plain.setExplored(dutch, true);
plain.setOwner(dutch);
@ -187,7 +187,7 @@ public class ServerUnitTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap(plains));
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Map map = game.getMap();
map.getTile(5, 8).setExplored(dutch, true);
map.getTile(6, 8).setExplored(dutch, true);
@ -271,7 +271,7 @@ public class ServerUnitTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap(savannahForest));
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Map map = game.getMap();
Tile tile = map.getTile(5, 8);
map.getTile(5, 8).setExplored(dutch, true);
@ -429,7 +429,7 @@ public class ServerUnitTest extends FreeColTestCase {
Game game = ServerTestHelper.startServerGame(getTestMap(savannahForest));
InGameController igc = ServerTestHelper.getInGameController();
ServerPlayer dutch = (ServerPlayer)game.getPlayerByNationId("model.nation.dutch");
ServerPlayer dutch = getServerPlayer(game, "model.nation.dutch");
Map map = game.getMap();
Tile tile = map.getTile(5, 8);
tile.setOwner(dutch);

11
test/src/net/sf/freecol/util/test/FreeColTestCase.java
View File

@ -738,4 +738,15 @@ public class FreeColTestCase extends TestCase {
}
uct.addUnitTypeChange(utc);
}
/**
* Helper function to get a server player by id.
*
* @param game The {@code Game} to look in.
* @param id The player identifier.
* @return The {@code ServerPlayer} found.
*/
public ServerPlayer getServerPlayer(Game game, String id) {
return (ServerPlayer)game.getPlayerByNationId(id);
}
}