[Arianne-commits] stendhal/tests/games/stendhal/common DirectionTest.java, 1.1, 1.2 GrammarTest.java, 1.7, 1.8 TestClasspathEntry.java, 1.2, 1.3 TestVersion.java, 1.2, 1.3

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/common
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6301/tests/games/stendhal/common

Modified Files:
	DirectionTest.java GrammarTest.java TestClasspathEntry.java 
	TestVersion.java 
Log Message:
code beautify

Index: TestClasspathEntry.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/common/TestClasspathEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestClasspathEntry.java	24 Apr 2007 06:03:19 -0000	1.2
--- TestClasspathEntry.java	15 Aug 2007 21:16:43 -0000	1.3
***************
*** 12,16 ****
  		String test = "stendhal-0.54.jar";
  		ClasspathEntry ce = new ClasspathEntry(test);
! 		Assert.assertEquals(test + " filename", "stendhal-0.54.jar", ce.getFilename());
  		Assert.assertEquals(test + " type", "stendhal", ce.getType());
  		Assert.assertEquals(test + " version", "0.54", ce.getVersion());
--- 12,17 ----
  		String test = "stendhal-0.54.jar";
  		ClasspathEntry ce = new ClasspathEntry(test);
! 		Assert.assertEquals(test + " filename", "stendhal-0.54.jar", ce
! 				.getFilename());
  		Assert.assertEquals(test + " type", "stendhal", ce.getType());
  		Assert.assertEquals(test + " version", "0.54", ce.getVersion());
***************
*** 21,25 ****
  		String test = "/tmp/stendhal-0.54.jar";
  		ClasspathEntry ce = new ClasspathEntry(test);
! 		Assert.assertEquals(test + " filename", "/tmp/stendhal-0.54.jar", ce.getFilename());
  		Assert.assertEquals(test + " type", "stendhal", ce.getType());
  		Assert.assertEquals(test + " version", "0.54", ce.getVersion());
--- 22,27 ----
  		String test = "/tmp/stendhal-0.54.jar";
  		ClasspathEntry ce = new ClasspathEntry(test);
! 		Assert.assertEquals(test + " filename", "/tmp/stendhal-0.54.jar", ce
! 				.getFilename());
  		Assert.assertEquals(test + " type", "stendhal", ce.getType());
  		Assert.assertEquals(test + " version", "0.54", ce.getVersion());

Index: DirectionTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/common/DirectionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirectionTest.java	8 Apr 2007 21:11:16 -0000	1.1
--- DirectionTest.java	15 Aug 2007 21:16:43 -0000	1.2
***************
*** 53,57 ****
  		assertEquals(Direction.RIGHT, Direction.LEFT.oppositeDirection());
  		assertEquals(Direction.STOP, Direction.STOP.oppositeDirection());
! 		assertEquals(Direction.UP, Direction.UP.oppositeDirection().oppositeDirection());
  	}
  
--- 53,58 ----
  		assertEquals(Direction.RIGHT, Direction.LEFT.oppositeDirection());
  		assertEquals(Direction.STOP, Direction.STOP.oppositeDirection());
! 		assertEquals(Direction.UP, Direction.UP.oppositeDirection()
! 				.oppositeDirection());
  	}
  

Index: TestVersion.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/common/TestVersion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestVersion.java	24 Apr 2007 06:03:19 -0000	1.2
--- TestVersion.java	15 Aug 2007 21:16:43 -0000	1.3
***************
*** 13,46 ****
  		Assert.assertEquals("extratVersion 0: ", "", Version.cut("0.52.1", 0));
  		Assert.assertEquals("extratVersion 1: ", "0", Version.cut("0.52.1", 1));
! 		Assert.assertEquals("extratVersion 2: ", "0.52", Version.cut("0.52.1", 2));
! 		Assert.assertEquals("extratVersion 3: ", "0.52.1", Version.cut("0.52.1", 3));
! 		Assert.assertEquals("extratVersion 4: ", "0.52.1", Version.cut("0.52.1", 4));
  	}
  
  	@Test
  	public void testCheckVersionCompatibility() {
! 		Assert.assertTrue("VersionCompatible 0.52 ~ 0.52", Version.checkCompatibility("0.52", "0.52"));
! 		Assert.assertTrue("VersionCompatible 0.52 ~ 0.52.0", Version.checkCompatibility("0.52", "0.52.0"));
! 		Assert.assertTrue("VersionCompatible 0.52 ~ 0.52.1", Version.checkCompatibility("0.52", "0.52.1"));
! 		Assert.assertTrue("VersionCompatible ! 0.53 ~ 0.52", !Version.checkCompatibility("0.53", "0.52"));
! 		Assert.assertTrue("VersionCompatible ! 0.52 ~ 0.53", !Version.checkCompatibility("0.52", "0.53"));
  	}
  
  	@Test
  	public void testCompare() {
! 		Assert.assertTrue("VersionCompare 0.52 = 0.52", Version.compare("0.52", "0.52") == 0);
! 		Assert.assertTrue("VersionCompare 0.52 = 0.52.0", Version.compare("0.52", "0.52.0") == 0);
! 		Assert.assertTrue("VersionCompare 0.52 < 0.52.1", Version.compare("0.52", "0.52.1") < 0);
! 		Assert.assertTrue("VersionCompare 0.53 > 0.52", Version.compare("0.53", "0.52") > 0);
! 		Assert.assertTrue("VersionCompare 0.52 < 0.53", Version.compare("0.52", "0.53") < 0);
  	}
  
  	@Test
  	public void testCompareInt() {
! 		Assert.assertTrue("VersionCompare 0.2 < 0.10", Version.compare("0.2", "0.10") < 0);
! 		Assert.assertTrue("VersionCompare 0.10 > 0.2", Version.compare("0.10", "0.2") > 0);
! 		Assert.assertTrue("VersionCompare 0.02 = 0.2", Version.compare("0.02", "0.2") == 0);
  	}
  
- 
  }
--- 13,61 ----
  		Assert.assertEquals("extratVersion 0: ", "", Version.cut("0.52.1", 0));
  		Assert.assertEquals("extratVersion 1: ", "0", Version.cut("0.52.1", 1));
! 		Assert.assertEquals("extratVersion 2: ", "0.52", Version.cut("0.52.1",
! 				2));
! 		Assert.assertEquals("extratVersion 3: ", "0.52.1", Version.cut(
! 				"0.52.1", 3));
! 		Assert.assertEquals("extratVersion 4: ", "0.52.1", Version.cut(
! 				"0.52.1", 4));
  	}
  
  	@Test
  	public void testCheckVersionCompatibility() {
! 		Assert.assertTrue("VersionCompatible 0.52 ~ 0.52", Version
! 				.checkCompatibility("0.52", "0.52"));
! 		Assert.assertTrue("VersionCompatible 0.52 ~ 0.52.0", Version
! 				.checkCompatibility("0.52", "0.52.0"));
! 		Assert.assertTrue("VersionCompatible 0.52 ~ 0.52.1", Version
! 				.checkCompatibility("0.52", "0.52.1"));
! 		Assert.assertTrue("VersionCompatible ! 0.53 ~ 0.52", !Version
! 				.checkCompatibility("0.53", "0.52"));
! 		Assert.assertTrue("VersionCompatible ! 0.52 ~ 0.53", !Version
! 				.checkCompatibility("0.52", "0.53"));
  	}
  
  	@Test
  	public void testCompare() {
! 		Assert.assertTrue("VersionCompare 0.52 = 0.52", Version.compare("0.52",
! 				"0.52") == 0);
! 		Assert.assertTrue("VersionCompare 0.52 = 0.52.0", Version.compare(
! 				"0.52", "0.52.0") == 0);
! 		Assert.assertTrue("VersionCompare 0.52 < 0.52.1", Version.compare(
! 				"0.52", "0.52.1") < 0);
! 		Assert.assertTrue("VersionCompare 0.53 > 0.52", Version.compare("0.53",
! 				"0.52") > 0);
! 		Assert.assertTrue("VersionCompare 0.52 < 0.53", Version.compare("0.52",
! 				"0.53") < 0);
  	}
  
  	@Test
  	public void testCompareInt() {
! 		Assert.assertTrue("VersionCompare 0.2 < 0.10", Version.compare("0.2",
! 				"0.10") < 0);
! 		Assert.assertTrue("VersionCompare 0.10 > 0.2", Version.compare("0.10",
! 				"0.2") > 0);
! 		Assert.assertTrue("VersionCompare 0.02 = 0.2", Version.compare("0.02",
! 				"0.2") == 0);
  	}
  
  }

Index: GrammarTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/common/GrammarTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GrammarTest.java	28 Jul 2007 22:26:54 -0000	1.7
--- GrammarTest.java	15 Aug 2007 21:16:43 -0000	1.8
***************
*** 6,10 ****
  import org.junit.Test;
  
- 
  public class GrammarTest {
  
--- 6,9 ----
***************
*** 28,32 ****
  		assertEquals("they", Grammar.itthey(2));
  		assertEquals("they", Grammar.itthey(0));
! }
  
  	@Test
--- 27,31 ----
  		assertEquals("they", Grammar.itthey(2));
  		assertEquals("they", Grammar.itthey(0));
! 	}
  
  	@Test
***************
*** 55,59 ****
  		assertEquals("an eater", Grammar.a_noun("eater"));
  		assertEquals("a money", Grammar.a_noun("money"));
! 		assertEquals("a youngster",Grammar.a_noun("youngster"));
  	}
  
--- 54,58 ----
  		assertEquals("an eater", Grammar.a_noun("eater"));
  		assertEquals("a money", Grammar.a_noun("money"));
! 		assertEquals("a youngster", Grammar.a_noun("youngster"));
  	}
  
***************
*** 106,110 ****
  		Assert.assertEquals("swords", Grammar.plural("sword"));
  		Assert.assertEquals("scimitars", Grammar.plural("scimitar"));
! 		Assert.assertEquals("katanas", Grammar.plural("katana")); // wikipedia says katana/katanas ok
  		Assert.assertEquals("claymores", Grammar.plural("claymore"));
  		Assert.assertEquals("broadswords", Grammar.plural("broadsword"));
--- 105,112 ----
  		Assert.assertEquals("swords", Grammar.plural("sword"));
  		Assert.assertEquals("scimitars", Grammar.plural("scimitar"));
! 		Assert.assertEquals("katanas", Grammar.plural("katana")); // wikipedia
! 		// says
! 		// katana/katanas
! 		// ok
  		Assert.assertEquals("claymores", Grammar.plural("claymore"));
  		Assert.assertEquals("broadswords", Grammar.plural("broadsword"));
***************
*** 123,127 ****
  		Assert.assertEquals("twoside axes", Grammar.plural("twoside axe"));
  		Assert.assertEquals("halberds", Grammar.plural("halberd"));
! 		Assert.assertEquals("twoside axes +3", Grammar.plural("twoside axe +3")); // i will make a set of names for these +s
  		Assert.assertEquals("clubs", Grammar.plural("club"));
  		Assert.assertEquals("staffs", Grammar.plural("staff"));
--- 125,132 ----
  		Assert.assertEquals("twoside axes", Grammar.plural("twoside axe"));
  		Assert.assertEquals("halberds", Grammar.plural("halberd"));
! 		Assert
! 				.assertEquals("twoside axes +3", Grammar
! 						.plural("twoside axe +3")); // i will make a set of
! 		// names for these +s
  		Assert.assertEquals("clubs", Grammar.plural("club"));
  		Assert.assertEquals("staffs", Grammar.plural("staff"));
***************
*** 144,199 ****
  		Assert.assertEquals("bucklers", Grammar.plural("buckler"));
  		Assert.assertEquals("wooden shields", Grammar.plural("wooden shield"));
! 		Assert.assertEquals("studded shields", Grammar.plural("studded shield"));
  		Assert.assertEquals("plate shields", Grammar.plural("plate shield"));
  		Assert.assertEquals("lion shields", Grammar.plural("lion shield"));
! 		Assert.assertEquals("unicorn shields", Grammar.plural("unicorn shield"));
! 		Assert.assertEquals("lion shields +1", Grammar.plural("lion shield +1"));
  		Assert.assertEquals("skull shields", Grammar.plural("skull shield"));
  		Assert.assertEquals("crown shields", Grammar.plural("crown shield"));
  		Assert.assertEquals("golden shields", Grammar.plural("golden shield"));
  		Assert.assertEquals("dresses", Grammar.plural("dress"));
! 		Assert.assertEquals("suits of leather armor", Grammar.plural("suit of leather armor")); //
! 		Assert.assertEquals("leather cuirasses", Grammar.plural("leather cuirass"));
! 		Assert.assertEquals("suits of leather armor +1", Grammar.plural("suit of leather armor +1")); //
! 		Assert.assertEquals("leather cuirasses +1", Grammar.plural("leather cuirass +1"));
! 		Assert.assertEquals("suits of studded armor", Grammar.plural("suit of studded armor")); //
! 		Assert.assertEquals("suits of chain armor", Grammar.plural("suit of chain armor")); //
! 		Assert.assertEquals("suits of chain armor +1", Grammar.plural("suit of chain armor +1")); //
! 		Assert.assertEquals("suits of scale armor", Grammar.plural("suit of scale armor")); //
! 		Assert.assertEquals("suits of scale armor +1", Grammar.plural("suit of scale armor +1")); //
! 		Assert.assertEquals("suits of scale armor +112", Grammar.plural("suit of scale armor +112")); //
! 		Assert.assertEquals("suits of chain armor +3", Grammar.plural("suit of chain armor +3")); //
! 		Assert.assertEquals("suits of scale armor +2", Grammar.plural("suit of scale armor +2")); //
! 		Assert.assertEquals("suits of plate armor", Grammar.plural("suit of plate armor")); //
! 		Assert.assertEquals("suits of golden armor", Grammar.plural("suit of golden armor")); //
! 		Assert.assertEquals("leather helmets", Grammar.plural("leather helmet"));
  		Assert.assertEquals("robins hats", Grammar.plural("robins hat"));
! 		Assert.assertEquals("studded helmets", Grammar.plural("studded helmet"));
  		Assert.assertEquals("chain helmets", Grammar.plural("chain helmet"));
  		Assert.assertEquals("viking helmets", Grammar.plural("viking helmet"));
! 		Assert.assertEquals("chain helmets +2", Grammar.plural("chain helmet +2"));
  		Assert.assertEquals("golden helmets", Grammar.plural("golden helmet"));
! 		Assert.assertEquals("golden helmets +3", Grammar.plural("golden helmet +3"));
  		Assert.assertEquals("trophy helmets", Grammar.plural("trophy helmet"));
! 		Assert.assertEquals("pairs of leather legs", Grammar.plural("pair of leather legs")); //
! 		Assert.assertEquals("pairs of studded legs", Grammar.plural("pair of studded legs")); //
! 		Assert.assertEquals("pairs of chain legs", Grammar.plural("pair of chain legs")); //
! 		Assert.assertEquals("pairs of golden legs", Grammar.plural("pair of golden legs")); //
! 		Assert.assertEquals("pairs of leather boots", Grammar.plural("pair of leather boots")); //
! 		Assert.assertEquals("pairs of studded boots", Grammar.plural("pair of studded boots")); //
! 		Assert.assertEquals("pairs of chain boots", Grammar.plural("pair of chain boots")); //
! 		Assert.assertEquals("pairs of steel boots", Grammar.plural("pair of steel boots")); //
! 		Assert.assertEquals("pairs of golden boots", Grammar.plural("pair of golden boots")); //
  		Assert.assertEquals("cloaks", Grammar.plural("cloak"));
  		Assert.assertEquals("elf cloaks", Grammar.plural("elf cloak"));
  		Assert.assertEquals("dwarf cloaks", Grammar.plural("dwarf cloak"));
  		Assert.assertEquals("elf cloaks +2", Grammar.plural("elf cloak +2"));
! 		Assert.assertEquals("green dragon cloaks", Grammar.plural("green dragon cloak"));
  		Assert.assertEquals("lich cloaks", Grammar.plural("lich cloak"));
! 		Assert.assertEquals("blue dragon cloaks", Grammar.plural("blue dragon cloak"));
! 		Assert.assertEquals("black dragon cloaks", Grammar.plural("black dragon cloak"));
  		Assert.assertEquals("golden cloaks", Grammar.plural("golden cloak"));
  		Assert.assertEquals("cherries", Grammar.plural("cherry"));
! 		Assert.assertEquals("pieces of cheese", Grammar.plural("piece of cheese")); //
  		Assert.assertEquals("carrots", Grammar.plural("carrot"));
  		Assert.assertEquals("salads", Grammar.plural("salad"));
--- 149,243 ----
  		Assert.assertEquals("bucklers", Grammar.plural("buckler"));
  		Assert.assertEquals("wooden shields", Grammar.plural("wooden shield"));
! 		Assert
! 				.assertEquals("studded shields", Grammar
! 						.plural("studded shield"));
  		Assert.assertEquals("plate shields", Grammar.plural("plate shield"));
  		Assert.assertEquals("lion shields", Grammar.plural("lion shield"));
! 		Assert
! 				.assertEquals("unicorn shields", Grammar
! 						.plural("unicorn shield"));
! 		Assert
! 				.assertEquals("lion shields +1", Grammar
! 						.plural("lion shield +1"));
  		Assert.assertEquals("skull shields", Grammar.plural("skull shield"));
  		Assert.assertEquals("crown shields", Grammar.plural("crown shield"));
  		Assert.assertEquals("golden shields", Grammar.plural("golden shield"));
  		Assert.assertEquals("dresses", Grammar.plural("dress"));
! 		Assert.assertEquals("suits of leather armor", Grammar
! 				.plural("suit of leather armor")); //
! 		Assert.assertEquals("leather cuirasses", Grammar
! 				.plural("leather cuirass"));
! 		Assert.assertEquals("suits of leather armor +1", Grammar
! 				.plural("suit of leather armor +1")); //
! 		Assert.assertEquals("leather cuirasses +1", Grammar
! 				.plural("leather cuirass +1"));
! 		Assert.assertEquals("suits of studded armor", Grammar
! 				.plural("suit of studded armor")); //
! 		Assert.assertEquals("suits of chain armor", Grammar
! 				.plural("suit of chain armor")); //
! 		Assert.assertEquals("suits of chain armor +1", Grammar
! 				.plural("suit of chain armor +1")); //
! 		Assert.assertEquals("suits of scale armor", Grammar
! 				.plural("suit of scale armor")); //
! 		Assert.assertEquals("suits of scale armor +1", Grammar
! 				.plural("suit of scale armor +1")); //
! 		Assert.assertEquals("suits of scale armor +112", Grammar
! 				.plural("suit of scale armor +112")); //
! 		Assert.assertEquals("suits of chain armor +3", Grammar
! 				.plural("suit of chain armor +3")); //
! 		Assert.assertEquals("suits of scale armor +2", Grammar
! 				.plural("suit of scale armor +2")); //
! 		Assert.assertEquals("suits of plate armor", Grammar
! 				.plural("suit of plate armor")); //
! 		Assert.assertEquals("suits of golden armor", Grammar
! 				.plural("suit of golden armor")); //
! 		Assert
! 				.assertEquals("leather helmets", Grammar
! 						.plural("leather helmet"));
  		Assert.assertEquals("robins hats", Grammar.plural("robins hat"));
! 		Assert
! 				.assertEquals("studded helmets", Grammar
! 						.plural("studded helmet"));
  		Assert.assertEquals("chain helmets", Grammar.plural("chain helmet"));
  		Assert.assertEquals("viking helmets", Grammar.plural("viking helmet"));
! 		Assert.assertEquals("chain helmets +2", Grammar
! 				.plural("chain helmet +2"));
  		Assert.assertEquals("golden helmets", Grammar.plural("golden helmet"));
! 		Assert.assertEquals("golden helmets +3", Grammar
! 				.plural("golden helmet +3"));
  		Assert.assertEquals("trophy helmets", Grammar.plural("trophy helmet"));
! 		Assert.assertEquals("pairs of leather legs", Grammar
! 				.plural("pair of leather legs")); //
! 		Assert.assertEquals("pairs of studded legs", Grammar
! 				.plural("pair of studded legs")); //
! 		Assert.assertEquals("pairs of chain legs", Grammar
! 				.plural("pair of chain legs")); //
! 		Assert.assertEquals("pairs of golden legs", Grammar
! 				.plural("pair of golden legs")); //
! 		Assert.assertEquals("pairs of leather boots", Grammar
! 				.plural("pair of leather boots")); //
! 		Assert.assertEquals("pairs of studded boots", Grammar
! 				.plural("pair of studded boots")); //
! 		Assert.assertEquals("pairs of chain boots", Grammar
! 				.plural("pair of chain boots")); //
! 		Assert.assertEquals("pairs of steel boots", Grammar
! 				.plural("pair of steel boots")); //
! 		Assert.assertEquals("pairs of golden boots", Grammar
! 				.plural("pair of golden boots")); //
  		Assert.assertEquals("cloaks", Grammar.plural("cloak"));
  		Assert.assertEquals("elf cloaks", Grammar.plural("elf cloak"));
  		Assert.assertEquals("dwarf cloaks", Grammar.plural("dwarf cloak"));
  		Assert.assertEquals("elf cloaks +2", Grammar.plural("elf cloak +2"));
! 		Assert.assertEquals("green dragon cloaks", Grammar
! 				.plural("green dragon cloak"));
  		Assert.assertEquals("lich cloaks", Grammar.plural("lich cloak"));
! 		Assert.assertEquals("blue dragon cloaks", Grammar
! 				.plural("blue dragon cloak"));
! 		Assert.assertEquals("black dragon cloaks", Grammar
! 				.plural("black dragon cloak"));
  		Assert.assertEquals("golden cloaks", Grammar.plural("golden cloak"));
  		Assert.assertEquals("cherries", Grammar.plural("cherry"));
! 		Assert.assertEquals("pieces of cheese", Grammar
! 				.plural("piece of cheese")); //
  		Assert.assertEquals("carrots", Grammar.plural("carrot"));
  		Assert.assertEquals("salads", Grammar.plural("salad"));
***************
*** 201,233 ****
  		Assert.assertEquals("loaves of bread", Grammar.plural("loaf of bread")); //
  		Assert.assertEquals("chunks of meat", Grammar.plural("chunk of meat")); //
! 		// 		Assert.assertEquals("hams", Grammar.plural("ham"));
  		Assert.assertEquals("sandwiches", Grammar.plural("sandwich"));
  		Assert.assertEquals("pies", Grammar.plural("pie"));
! 		Assert.assertEquals("button mushrooms", Grammar.plural("button mushroom"));
  		Assert.assertEquals("porcini", Grammar.plural("porcini"));
  		Assert.assertEquals("toadstools", Grammar.plural("toadstool"));
! 		//		Assert.assertEquals("beers", Grammar.plural("beer"));
  		Assert.assertEquals("flasks of wine", Grammar.plural("flask of wine")); //
  		Assert.assertEquals("minor potions", Grammar.plural("minor potion"));
! 		//		Assert.assertEquals("antidotes", Grammar.plural("antidote"));
! 		//		Assert.assertEquals("potions", Grammar.plural("potion"));
! 		Assert.assertEquals("greater potions", Grammar.plural("greater potion"));
! 		//		Assert.assertEquals("poisons", Grammar.plural("poison"));
! 		//		Assert.assertEquals("greater poisons", Grammar.plural("greater poison"));
! 		//		Assert.assertEquals("deadly poisons", Grammar.plural("deadly poison"));
  		Assert.assertEquals("flasks", Grammar.plural("flask"));
  		Assert.assertEquals("bottles", Grammar.plural("bottle"));
  		Assert.assertEquals("big bottles", Grammar.plural("big bottle"));
! 		Assert.assertEquals("money", Grammar.plural("money")); // See my bug report! don't like this!
  		Assert.assertEquals("black books", Grammar.plural("black book")); //
! 		// TODO:		Assert.assertEquals("arandula", Grammar.plural("arandula"));
  		Assert.assertEquals("logs of wood", Grammar.plural("log of wood")); //
! 		Assert.assertEquals("sheaves of grain", Grammar.plural("sheaf of grain"));
  		Assert.assertEquals("bags of flour", Grammar.plural("bag of flour")); //
! 		Assert.assertEquals("nuggets of iron ore", Grammar.plural("nugget of iron ore")); //
  		Assert.assertEquals("bars of iron", Grammar.plural("bar of iron")); //
! 		Assert.assertEquals("golden gm tokens", Grammar.plural("golden gm token")); // Token spelt wrong
! 		Assert.assertEquals("silvery gm tokens", Grammar.plural("silvery gm token")); // Token spelt wrong
! 		Assert.assertEquals("bronze gm tokens", Grammar.plural("bronze gm token")); // Token spelt wrong
  		Assert.assertEquals("tokens", Grammar.plural("token"));
  		Assert.assertEquals("notes", Grammar.plural("note"));
--- 245,289 ----
  		Assert.assertEquals("loaves of bread", Grammar.plural("loaf of bread")); //
  		Assert.assertEquals("chunks of meat", Grammar.plural("chunk of meat")); //
! 		// Assert.assertEquals("hams", Grammar.plural("ham"));
  		Assert.assertEquals("sandwiches", Grammar.plural("sandwich"));
  		Assert.assertEquals("pies", Grammar.plural("pie"));
! 		Assert.assertEquals("button mushrooms", Grammar
! 				.plural("button mushroom"));
  		Assert.assertEquals("porcini", Grammar.plural("porcini"));
  		Assert.assertEquals("toadstools", Grammar.plural("toadstool"));
! 		// Assert.assertEquals("beers", Grammar.plural("beer"));
  		Assert.assertEquals("flasks of wine", Grammar.plural("flask of wine")); //
  		Assert.assertEquals("minor potions", Grammar.plural("minor potion"));
! 		// Assert.assertEquals("antidotes", Grammar.plural("antidote"));
! 		// Assert.assertEquals("potions", Grammar.plural("potion"));
! 		Assert
! 				.assertEquals("greater potions", Grammar
! 						.plural("greater potion"));
! 		// Assert.assertEquals("poisons", Grammar.plural("poison"));
! 		// Assert.assertEquals("greater poisons", Grammar.plural("greater
! 		// poison"));
! 		// Assert.assertEquals("deadly poisons", Grammar.plural("deadly
! 		// poison"));
  		Assert.assertEquals("flasks", Grammar.plural("flask"));
  		Assert.assertEquals("bottles", Grammar.plural("bottle"));
  		Assert.assertEquals("big bottles", Grammar.plural("big bottle"));
! 		Assert.assertEquals("money", Grammar.plural("money")); // See my bug
! 		// report! don't
! 		// like this!
  		Assert.assertEquals("black books", Grammar.plural("black book")); //
! 		// TODO: Assert.assertEquals("arandula", Grammar.plural("arandula"));
  		Assert.assertEquals("logs of wood", Grammar.plural("log of wood")); //
! 		Assert.assertEquals("sheaves of grain", Grammar
! 				.plural("sheaf of grain"));
  		Assert.assertEquals("bags of flour", Grammar.plural("bag of flour")); //
! 		Assert.assertEquals("nuggets of iron ore", Grammar
! 				.plural("nugget of iron ore")); //
  		Assert.assertEquals("bars of iron", Grammar.plural("bar of iron")); //
! 		Assert.assertEquals("golden gm tokens", Grammar
! 				.plural("golden gm token")); // Token spelt wrong
! 		Assert.assertEquals("silvery gm tokens", Grammar
! 				.plural("silvery gm token")); // Token spelt wrong
! 		Assert.assertEquals("bronze gm tokens", Grammar
! 				.plural("bronze gm token")); // Token spelt wrong
  		Assert.assertEquals("tokens", Grammar.plural("token"));
  		Assert.assertEquals("notes", Grammar.plural("note"));
***************
*** 271,287 ****
  		Assert.assertEquals("skeletons", Grammar.plural("skeleton"));
  		Assert.assertEquals("gargoyles", Grammar.plural("gargoyle"));
! 		Assert.assertEquals("young beholders", Grammar.plural("young beholder"));
  		Assert.assertEquals("zombie rats", Grammar.plural("zombie rat"));
! 		Assert.assertEquals("veteran goblins", Grammar.plural("veteran goblin"));
! 		Assert.assertEquals("soldier kobolds", Grammar.plural("soldier kobold"));
! 		Assert.assertEquals("green slimes", Grammar.plural("green slime")); //plural of slime is slime but this is a creature....
  		Assert.assertEquals("archer kobolds", Grammar.plural("archer kobold"));
  		Assert.assertEquals("black bears", Grammar.plural("black bear"));
! 		Assert.assertEquals("elder gargoyles", Grammar.plural("elder gargoyle"));
  		Assert.assertEquals("razorrats", Grammar.plural("razorrat"));
  		Assert.assertEquals("cyclopses", Grammar.plural("cyclops"));
  		Assert.assertEquals("beholders", Grammar.plural("beholder"));
! 		Assert.assertEquals("soldier goblins", Grammar.plural("soldier goblin"));
! 		Assert.assertEquals("veteran kobolds", Grammar.plural("veteran kobold"));
  		Assert.assertEquals("trolls", Grammar.plural("troll"));
  		Assert.assertEquals("orcs", Grammar.plural("orc"));
--- 327,363 ----
  		Assert.assertEquals("skeletons", Grammar.plural("skeleton"));
  		Assert.assertEquals("gargoyles", Grammar.plural("gargoyle"));
! 		Assert
! 				.assertEquals("young beholders", Grammar
! 						.plural("young beholder"));
  		Assert.assertEquals("zombie rats", Grammar.plural("zombie rat"));
! 		Assert
! 				.assertEquals("veteran goblins", Grammar
! 						.plural("veteran goblin"));
! 		Assert
! 				.assertEquals("soldier kobolds", Grammar
! 						.plural("soldier kobold"));
! 		Assert.assertEquals("green slimes", Grammar.plural("green slime")); // plural
! 		// of
! 		// slime
! 		// is
! 		// slime
! 		// but
! 		// this
! 		// is a
! 		// creature....
  		Assert.assertEquals("archer kobolds", Grammar.plural("archer kobold"));
  		Assert.assertEquals("black bears", Grammar.plural("black bear"));
! 		Assert
! 				.assertEquals("elder gargoyles", Grammar
! 						.plural("elder gargoyle"));
  		Assert.assertEquals("razorrats", Grammar.plural("razorrat"));
  		Assert.assertEquals("cyclopses", Grammar.plural("cyclops"));
  		Assert.assertEquals("beholders", Grammar.plural("beholder"));
! 		Assert
! 				.assertEquals("soldier goblins", Grammar
! 						.plural("soldier goblin"));
! 		Assert
! 				.assertEquals("veteran kobolds", Grammar
! 						.plural("veteran kobold"));
  		Assert.assertEquals("trolls", Grammar.plural("troll"));
  		Assert.assertEquals("orcs", Grammar.plural("orc"));
***************
*** 298,307 ****
  		Assert.assertEquals("ratmen", Grammar.plural("ratman"));
  		Assert.assertEquals("ratwomen", Grammar.plural("ratwoman"));
! 		Assert.assertEquals("elder beholders", Grammar.plural("elder beholder"));
! 		Assert.assertEquals("brown slimes", Grammar.plural("brown slime")); //plural of slime is slime but this is a creature....
! 		Assert.assertEquals("venom gargoyles", Grammar.plural("venom gargoyle"));
  		Assert.assertEquals("elder ogres", Grammar.plural("elder ogre"));
! 		Assert.assertEquals("dwarf guardians", Grammar.plural("dwarf guardian"));
! 		Assert.assertEquals("orc chiefs", Grammar.plural("orc chief")); //chief is an exception to the v rule
  		Assert.assertEquals("militia elves", Grammar.plural("militia elf"));
  		Assert.assertEquals("archer elves", Grammar.plural("archer elf"));
--- 374,402 ----
  		Assert.assertEquals("ratmen", Grammar.plural("ratman"));
  		Assert.assertEquals("ratwomen", Grammar.plural("ratwoman"));
! 		Assert
! 				.assertEquals("elder beholders", Grammar
! 						.plural("elder beholder"));
! 		Assert.assertEquals("brown slimes", Grammar.plural("brown slime")); // plural
! 		// of
! 		// slime
! 		// is
! 		// slime
! 		// but
! 		// this
! 		// is a
! 		// creature....
! 		Assert
! 				.assertEquals("venom gargoyles", Grammar
! 						.plural("venom gargoyle"));
  		Assert.assertEquals("elder ogres", Grammar.plural("elder ogre"));
! 		Assert
! 				.assertEquals("dwarf guardians", Grammar
! 						.plural("dwarf guardian"));
! 		Assert.assertEquals("orc chiefs", Grammar.plural("orc chief")); // chief
! 		// is an
! 		// exception
! 		// to
! 		// the v
! 		// rule
  		Assert.assertEquals("militia elves", Grammar.plural("militia elf"));
  		Assert.assertEquals("archer elves", Grammar.plural("archer elf"));
***************
*** 309,314 ****
  		Assert.assertEquals("elder dwarves", Grammar.plural("elder dwarf"));
  		Assert.assertEquals("soldier elves", Grammar.plural("soldier elf"));
! 		Assert.assertEquals("warrior skeletons", Grammar.plural("warrior skeleton"));
! 		Assert.assertEquals("black slimes", Grammar.plural("black slime")); //plural of slime is slime but this is a creature....
  		Assert.assertEquals("wooden golems", Grammar.plural("wooden golem"));
  		Assert.assertEquals("royal mummies", Grammar.plural("royal mummy"));
--- 404,418 ----
  		Assert.assertEquals("elder dwarves", Grammar.plural("elder dwarf"));
  		Assert.assertEquals("soldier elves", Grammar.plural("soldier elf"));
! 		Assert.assertEquals("warrior skeletons", Grammar
! 				.plural("warrior skeleton"));
! 		Assert.assertEquals("black slimes", Grammar.plural("black slime")); // plural
! 		// of
! 		// slime
! 		// is
! 		// slime
! 		// but
! 		// this
! 		// is a
! 		// creature....
  		Assert.assertEquals("wooden golems", Grammar.plural("wooden golem"));
  		Assert.assertEquals("royal mummies", Grammar.plural("royal mummy"));
***************
*** 321,329 ****
  		Assert.assertEquals("archmage elves", Grammar.plural("archmage elf"));
  		Assert.assertEquals("leader dwarves", Grammar.plural("leader dwarf"));
! 		Assert.assertEquals("demon skeletons", Grammar.plural("demon skeleton"));
! 		Assert.assertEquals("elf sacerdotists", Grammar.plural("elf sacerdotist"));
! 		Assert.assertEquals("earth elementals", Grammar.plural("earth elemental"));
! 		Assert.assertEquals("fire elementals", Grammar.plural("fire elemental"));
! 		Assert.assertEquals("water elementals", Grammar.plural("water elemental"));
  		Assert.assertEquals("green dragons", Grammar.plural("green dragon"));
  		Assert.assertEquals("death knights", Grammar.plural("death knight"));
--- 425,440 ----
  		Assert.assertEquals("archmage elves", Grammar.plural("archmage elf"));
  		Assert.assertEquals("leader dwarves", Grammar.plural("leader dwarf"));
! 		Assert
! 				.assertEquals("demon skeletons", Grammar
! 						.plural("demon skeleton"));
! 		Assert.assertEquals("elf sacerdotists", Grammar
! 				.plural("elf sacerdotist"));
! 		Assert.assertEquals("earth elementals", Grammar
! 				.plural("earth elemental"));
! 		Assert
! 				.assertEquals("fire elementals", Grammar
! 						.plural("fire elemental"));
! 		Assert.assertEquals("water elementals", Grammar
! 				.plural("water elemental"));
  		Assert.assertEquals("green dragons", Grammar.plural("green dragon"));
  		Assert.assertEquals("death knights", Grammar.plural("death knight"));
***************
*** 333,336 ****
--- 444,448 ----
  
  	}
+ 
  	/**
  	 * Tests pluralisation of creatures
***************
*** 338,361 ****
  	@Test
  	public void testFullForm() {
! 		Assert.assertEquals("1 sandwich", Grammar.quantityplnoun(1,"sandwich"));
! 		Assert.assertEquals("2 sandwiches", Grammar.quantityplnoun(2,"sandwich"));
! 		Assert.assertEquals("1 piece of ham", Grammar.quantityplnoun(1,"ham"));
! 		Assert.assertEquals("2 pieces of ham", Grammar.quantityplnoun(2,"ham"));
! 		Assert.assertEquals("1 piece of cheese", Grammar.quantityplnoun(1,"cheese"));
! 		Assert.assertEquals("2 pieces of cheese", Grammar.quantityplnoun(2,"cheese"));
! 		Assert.assertEquals("1 loaf of bread", Grammar.quantityplnoun(1,"bread"));
! 		Assert.assertEquals("2 loaves of bread", Grammar.quantityplnoun(2,"bread"));
! 		Assert.assertEquals("1 #sandwich", Grammar.quantityplnoun(1,"#sandwich"));
! 		Assert.assertEquals("2 #sandwiches", Grammar.quantityplnoun(2,"#sandwich"));
! 		Assert.assertEquals("1 piece of #ham", Grammar.quantityplnoun(1,"#ham"));
! 		Assert.assertEquals("2 pieces of #ham", Grammar.quantityplnoun(2,"#ham"));
! 		Assert.assertEquals("1 piece of #cheese", Grammar.quantityplnoun(1,"#cheese"));
! 		Assert.assertEquals("2 pieces of #cheese", Grammar.quantityplnoun(2,"#cheese"));
! 		Assert.assertEquals("1 loaf of #bread", Grammar.quantityplnoun(1,"#bread"));
! 		Assert.assertEquals("2 loaves of #bread", Grammar.quantityplnoun(2,"#bread"));
! 
  
  	}
  
- 
  }
--- 450,488 ----
  	@Test
  	public void testFullForm() {
! 		Assert
! 				.assertEquals("1 sandwich", Grammar.quantityplnoun(1,
! 						"sandwich"));
! 		Assert.assertEquals("2 sandwiches", Grammar.quantityplnoun(2,
! 				"sandwich"));
! 		Assert.assertEquals("1 piece of ham", Grammar.quantityplnoun(1, "ham"));
! 		Assert
! 				.assertEquals("2 pieces of ham", Grammar.quantityplnoun(2,
! 						"ham"));
! 		Assert.assertEquals("1 piece of cheese", Grammar.quantityplnoun(1,
! 				"cheese"));
! 		Assert.assertEquals("2 pieces of cheese", Grammar.quantityplnoun(2,
! 				"cheese"));
! 		Assert.assertEquals("1 loaf of bread", Grammar.quantityplnoun(1,
! 				"bread"));
! 		Assert.assertEquals("2 loaves of bread", Grammar.quantityplnoun(2,
! 				"bread"));
! 		Assert.assertEquals("1 #sandwich", Grammar.quantityplnoun(1,
! 				"#sandwich"));
! 		Assert.assertEquals("2 #sandwiches", Grammar.quantityplnoun(2,
! 				"#sandwich"));
! 		Assert.assertEquals("1 piece of #ham", Grammar
! 				.quantityplnoun(1, "#ham"));
! 		Assert.assertEquals("2 pieces of #ham", Grammar.quantityplnoun(2,
! 				"#ham"));
! 		Assert.assertEquals("1 piece of #cheese", Grammar.quantityplnoun(1,
! 				"#cheese"));
! 		Assert.assertEquals("2 pieces of #cheese", Grammar.quantityplnoun(2,
! 				"#cheese"));
! 		Assert.assertEquals("1 loaf of #bread", Grammar.quantityplnoun(1,
! 				"#bread"));
! 		Assert.assertEquals("2 loaves of #bread", Grammar.quantityplnoun(2,
! 				"#bread"));
  
  	}
  
  }