[Freecol-commits] SF.net SVN: freecol:[9562] freecol/trunk

[<bur...@us...>]

Revision: 9562
          http://freecol.svn.sourceforge.net/freecol/?rev=9562&view=rev
Author:   burschik
Date:     2012-01-15 11:45:19 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Improve special unit labels.

Modified Paths:
--------------
    freecol/trunk/data/strings/FreeColMessages.properties
    freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java

Modified: freecol/trunk/data/strings/FreeColMessages.properties
===================================================================
--- freecol/trunk/data/strings/FreeColMessages.properties	2012-01-15 06:28:48 UTC (rev 9561)
+++ freecol/trunk/data/strings/FreeColMessages.properties	2012-01-15 11:45:19 UTC (rev 9562)
@@ -1744,14 +1744,22 @@
 model.unit.masterGunsmith.name={{plural:%number%|one=Master Gunsmith|other=Master Gunsmiths|default=Master Gunsmith}}
 model.unit.seasonedScout.name={{plural:%number%|one=Seasoned Scout|other=Seasoned Scouts|default=Seasoned Scout}}
 model.unit.hardyPioneer.name={{plural:%number%|one=Hardy Pioneer|other=Hardy Pioneers|default=Hardy Pioneer}}
+model.unit.hardyPioneer.pioneer=Hardy Pioneer
 model.unit.veteranSoldier.name={{plural:%number%|one=Veteran Soldier|other=Veteran Soldiers|default=Veteran Soldier}}
+model.unit.veteranSoldier.soldier=Veteran Soldier
+model.unit.veteranSoldier.dragoon=Veteran Dragoon
 model.unit.jesuitMissionary.name={{plural:%number%|one=Jesuit Missionary|other=Jesuit Missionaries|default=Jesuit Missionary}}
+model.unit.jesuitMissionary.missionary=Jesuit Missionary
 model.unit.indenturedServant.name={{plural:%number%|one=Indentured Servant|other=Indentured Servants|default=Indentured Servant}}
 model.unit.pettyCriminal.name={{plural:%number%|one=Petty Criminal|other=Petty Criminals|default=Petty Criminal}}
 model.unit.indianConvert.name={{plural:%number%|one=Indian Convert|other=Indian Converts|default=Indian Convert}}
 model.unit.brave.name={{plural:%number%|one=Brave|other=Braves|default=Brave}}
 model.unit.colonialRegular.name={{plural:%number%|one=Colonial Regular|other=Colonial Regulars|default=Colonial Regular}}
+model.unit.colonialRegular.soldier=Continental Army
+model.unit.colonialRegular.dragoon=Continental Cavalry
 model.unit.kingsRegular.name={{plural:%number%|one=King's Regular|other=King's Regulars|default=King's Regular}}
+model.unit.kingsRegular.soldier=Infantry
+model.unit.kingsRegular.dragoon=Cavalry
 model.unit.caravel.name={{plural:%number%|one=Caravel|other=Caravels|default=Caravel}}
 model.unit.frigate.name={{plural:%number%|one=Frigate|other=Frigates|default=Frigate}}
 model.unit.galleon.name={{plural:%number%|one=Galleon|other=Galleons|default=Galleon}}

Modified: freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java	2012-01-15 06:28:48 UTC (rev 9561)
+++ freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java	2012-01-15 11:45:19 UTC (rev 9562)
@@ -24,8 +24,12 @@
 
 import net.sf.freecol.util.test.FreeColTestCase;
 import net.sf.freecol.common.model.Colony;
+import net.sf.freecol.common.model.EquipmentType;
 import net.sf.freecol.common.model.Game;
+import net.sf.freecol.common.model.Player;
+import net.sf.freecol.common.model.Unit;
 import net.sf.freecol.common.model.StringTemplate;
+import net.sf.freecol.server.model.ServerUnit;
 
 public class MessagesTest extends FreeColTestCase {
 
@@ -252,4 +256,63 @@
     }
 
 
+    public void testLabels() {
+        Game game = getStandardGame();
+        Player dutch = game.getPlayer("model.nation.dutch");
+
+        EquipmentType muskets = spec().getEquipmentType("model.equipment.muskets");
+        EquipmentType horses = spec().getEquipmentType("model.equipment.horses");
+        EquipmentType tools = spec().getEquipmentType("model.equipment.tools");
+        EquipmentType bible = spec().getEquipmentType("model.equipment.missionary");
+
+        // King's regulars
+        Unit unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.kingsRegular"));
+        assertEquals("King's Regular", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(muskets, 1);
+        assertEquals("Infantry", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(horses, 1);
+        assertEquals("Cavalry", Messages.message(Messages.getLabel(unit)));
+
+        // Colonial regulars
+        unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.colonialRegular"));
+        assertEquals("Colonial Regular", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(muskets, 1);
+        assertEquals("Continental Army", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(horses, 1);
+        assertEquals("Continental Cavalry", Messages.message(Messages.getLabel(unit)));
+
+        // Veteran Soldiers
+        unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.veteranSoldier"));
+        assertEquals(1, unit.getEquipment().getCount(muskets));
+        assertEquals("Veteran Soldier", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(muskets, -1);
+        assertEquals("Veteran Soldier (no muskets)", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(horses, 1);
+        unit.changeEquipment(muskets, 1);
+        assertEquals("Veteran Dragoon", Messages.message(Messages.getLabel(unit)));
+
+        // Hardy Pioneers
+        unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.hardyPioneer"));
+        assertEquals(5, unit.getEquipment().getCount(tools));
+        assertEquals("Hardy Pioneer", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(tools, -5);
+        assertEquals("Hardy Pioneer (no tools)", Messages.message(Messages.getLabel(unit)));
+
+        unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.jesuitMissionary"));
+        assertEquals(1, unit.getEquipment().getCount(bible));
+        assertEquals("Jesuit Missionary", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(bible, -1);
+        assertEquals("Jesuit Missionary (not commissioned)", Messages.message(Messages.getLabel(unit)));
+
+    }
+
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.