From: Astrid S. <ast...@us...> - 2007-08-15 21:17:16
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/semos/bakery In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6301/tests/games/stendhal/server/maps/semos/bakery Modified Files: ChefNPCTest.java Log Message: code beautify Index: ChefNPCTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/semos/bakery/ChefNPCTest.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ChefNPCTest.java 14 Aug 2007 15:25:38 -0000 1.11 --- ChefNPCTest.java 15 Aug 2007 21:16:41 -0000 1.12 *************** *** 1,3 **** --- 1,4 ---- package games.stendhal.server.maps.semos.bakery; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; *************** *** 22,26 **** --- 23,29 ---- public class ChefNPCTest { private Engine en; + private Player player; + private SpeakerNPC npc; *************** *** 39,50 **** public void setUp() throws Exception { npc = new SpeakerNPC("chef"); ! ChefNPC cnpc = new ChefNPC(); en = npc.getEngine(); cnpc.createDialog(npc); ! player = new Player(new RPObject()); ! player.setName("bob"); ! PlayerHelper.addEmptySlots(player); } --- 42,53 ---- public void setUp() throws Exception { npc = new SpeakerNPC("chef"); ! ChefNPC cnpc = new ChefNPC(); en = npc.getEngine(); cnpc.createDialog(npc); ! player = new Player(new RPObject()); ! player.setName("bob"); ! PlayerHelper.addEmptySlots(player); } *************** *** 58,62 **** en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals("Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", npc.get("text")); en.step(player, "bye"); assertFalse(npc.isTalking()); --- 61,67 ---- en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals( ! "Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", ! npc.get("text")); en.step(player, "bye"); assertFalse(npc.isTalking()); *************** *** 64,171 **** } @Test public void testHiAndMakeNoStuff() { - en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals("Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", npc.get("text")); en.step(player, "make"); assertTrue(npc.isTalking()); ! assertEquals("I can only make 1 sandwich if you bring me 1 loaf of #bread, 2 pieces of #cheese, and 1 piece of #ham.", npc.get("text")); en.step(player, "bye"); assertFalse(npc.isTalking()); assertEquals("Bye.", npc.get("text")); } @Test public void testHiAndMakeWithStuffSingle() { - en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals("Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", npc.get("text")); ! StackableItem cheese = new StackableItem("cheese","","",null); cheese.setQuantity(2); ! cheese.setID(new ID(2,"testzone")); player.getSlot("bag").add(cheese); ! StackableItem bread = new StackableItem("bread","","",null); bread.setQuantity(1); ! bread.setID(new ID(1,"testzone")); ! player.getSlot("bag").add(bread ); ! StackableItem ham = new StackableItem("ham","","",null); ! ham.setID(new ID(3,"testzone")); ! player.getSlot("bag").add( ham); ! assertEquals(2,player.getNumberOfEquipped("cheese")); ! assertEquals(1,player.getNumberOfEquipped("bread")); ! assertEquals(1,player.getNumberOfEquipped("ham")); en.step(player, "make"); assertTrue(npc.isTalking()); ! assertEquals("I need you to fetch me 1 loaf of #bread, 2 pieces of #cheese, and 1 piece of #ham for this job. Do you have it?", npc.get("text")); en.step(player, "yes"); ! String[] questStatus = player.getQuest("leander_make_sandwiches").split(";"); ! String[] expected ={"1","sandwich",""}; ! assertEquals(expected[0],questStatus[0]); //amount ! assertEquals(expected[1],questStatus[1]); //item assertTrue(npc.isTalking()); ! assertEquals("OK, I will make 1 sandwich for you, but that will take some time. Please come back in 3 minutes.", npc.get("text")); ! assertEquals(0,player.getNumberOfEquipped("cheese")); ! assertEquals(0,player.getNumberOfEquipped("bread")); ! assertEquals(0,player.getNumberOfEquipped("ham")); en.step(player, "bye"); assertFalse(npc.isTalking()); ! player.setQuest("leander_make_sandwiches","1;;0"); en.step(player, "hi"); ! assertEquals("Welcome back! I'm done with your order. Here you have 1 sandwich.", npc.get("text")); ! assertEquals(1,player.getNumberOfEquipped("sandwich")); } @Test public void testHiAndMakeWithStuffMultiple() { - en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals("Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", npc.get("text")); ! StackableItem cheese = new StackableItem("cheese","","",null); cheese.setQuantity(4); ! cheese.setID(new ID(2,"testzone")); player.getSlot("bag").add(cheese); ! StackableItem bread = new StackableItem("bread","","",null); bread.setQuantity(2); ! bread.setID(new ID(1,"testzone")); ! player.getSlot("bag").add(bread ); ! StackableItem ham = new StackableItem("ham","","",null); ham.setQuantity(2); ! ham.setID(new ID(3,"testzone")); ! player.getSlot("bag").add( ham); ! assertEquals(4,player.getNumberOfEquipped("cheese")); ! assertEquals(2,player.getNumberOfEquipped("bread")); ! assertEquals(2,player.getNumberOfEquipped("ham")); en.step(player, "make 2 sandwiches"); assertTrue(npc.isTalking()); ! assertEquals("I need you to fetch me 2 pieces of #ham, 4 pieces of #cheese, and 2 loaves of #bread for this job. Do you have it?", npc.get("text")); en.step(player, "yes"); ! String[] questStatus = player.getQuest("leander_make_sandwiches").split(";"); ! String[] expected ={"2","sandwich",""}; ! assertEquals(expected[0],questStatus[0]); //amount ! assertEquals(expected[1],questStatus[1]); //item assertTrue(npc.isTalking()); ! assertEquals("OK, I will make 2 sandwich for you, but that will take some time. Please come back in 6 minutes.", npc.get("text")); ! assertEquals(0,player.getNumberOfEquipped("cheese")); ! assertEquals(0,player.getNumberOfEquipped("bread")); ! assertEquals(0,player.getNumberOfEquipped("ham")); en.step(player, "bye"); assertFalse(npc.isTalking()); ! player.setQuest("leander_make_sandwiches","2;;0"); en.step(player, "hi"); ! assertEquals("Welcome back! I'm done with your order. Here you have 2 sandwiches.", npc.get("text")); ! assertEquals(2,player.getNumberOfEquipped("sandwich")); } - } --- 69,197 ---- } + @Test public void testHiAndMakeNoStuff() { en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals( ! "Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", ! npc.get("text")); en.step(player, "make"); assertTrue(npc.isTalking()); ! assertEquals( ! "I can only make 1 sandwich if you bring me 1 loaf of #bread, 2 pieces of #cheese, and 1 piece of #ham.", ! npc.get("text")); en.step(player, "bye"); assertFalse(npc.isTalking()); assertEquals("Bye.", npc.get("text")); } + @Test public void testHiAndMakeWithStuffSingle() { en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals( ! "Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", ! npc.get("text")); ! StackableItem cheese = new StackableItem("cheese", "", "", null); cheese.setQuantity(2); ! cheese.setID(new ID(2, "testzone")); player.getSlot("bag").add(cheese); ! StackableItem bread = new StackableItem("bread", "", "", null); bread.setQuantity(1); ! bread.setID(new ID(1, "testzone")); ! player.getSlot("bag").add(bread); ! StackableItem ham = new StackableItem("ham", "", "", null); ! ham.setID(new ID(3, "testzone")); ! player.getSlot("bag").add(ham); ! assertEquals(2, player.getNumberOfEquipped("cheese")); ! assertEquals(1, player.getNumberOfEquipped("bread")); ! assertEquals(1, player.getNumberOfEquipped("ham")); en.step(player, "make"); assertTrue(npc.isTalking()); ! assertEquals( ! "I need you to fetch me 1 loaf of #bread, 2 pieces of #cheese, and 1 piece of #ham for this job. Do you have it?", ! npc.get("text")); en.step(player, "yes"); ! String[] questStatus = player.getQuest("leander_make_sandwiches") ! .split(";"); ! String[] expected = { "1", "sandwich", "" }; ! assertEquals(expected[0], questStatus[0]); // amount ! assertEquals(expected[1], questStatus[1]); // item assertTrue(npc.isTalking()); ! assertEquals( ! "OK, I will make 1 sandwich for you, but that will take some time. Please come back in 3 minutes.", ! npc.get("text")); ! assertEquals(0, player.getNumberOfEquipped("cheese")); ! assertEquals(0, player.getNumberOfEquipped("bread")); ! assertEquals(0, player.getNumberOfEquipped("ham")); en.step(player, "bye"); assertFalse(npc.isTalking()); ! player.setQuest("leander_make_sandwiches", "1;;0"); en.step(player, "hi"); ! assertEquals( ! "Welcome back! I'm done with your order. Here you have 1 sandwich.", ! npc.get("text")); ! assertEquals(1, player.getNumberOfEquipped("sandwich")); } + @Test public void testHiAndMakeWithStuffMultiple() { en.step(player, "hi"); assertTrue(npc.isTalking()); ! assertEquals( ! "Hallo! Glad to see you in my kitchen where I make #pizza and #sandwiches.", ! npc.get("text")); ! StackableItem cheese = new StackableItem("cheese", "", "", null); cheese.setQuantity(4); ! cheese.setID(new ID(2, "testzone")); player.getSlot("bag").add(cheese); ! StackableItem bread = new StackableItem("bread", "", "", null); bread.setQuantity(2); ! bread.setID(new ID(1, "testzone")); ! player.getSlot("bag").add(bread); ! StackableItem ham = new StackableItem("ham", "", "", null); ham.setQuantity(2); ! ham.setID(new ID(3, "testzone")); ! player.getSlot("bag").add(ham); ! assertEquals(4, player.getNumberOfEquipped("cheese")); ! assertEquals(2, player.getNumberOfEquipped("bread")); ! assertEquals(2, player.getNumberOfEquipped("ham")); en.step(player, "make 2 sandwiches"); assertTrue(npc.isTalking()); ! assertEquals( ! "I need you to fetch me 2 pieces of #ham, 4 pieces of #cheese, and 2 loaves of #bread for this job. Do you have it?", ! npc.get("text")); en.step(player, "yes"); ! String[] questStatus = player.getQuest("leander_make_sandwiches") ! .split(";"); ! String[] expected = { "2", "sandwich", "" }; ! assertEquals(expected[0], questStatus[0]); // amount ! assertEquals(expected[1], questStatus[1]); // item assertTrue(npc.isTalking()); ! assertEquals( ! "OK, I will make 2 sandwich for you, but that will take some time. Please come back in 6 minutes.", ! npc.get("text")); ! assertEquals(0, player.getNumberOfEquipped("cheese")); ! assertEquals(0, player.getNumberOfEquipped("bread")); ! assertEquals(0, player.getNumberOfEquipped("ham")); en.step(player, "bye"); assertFalse(npc.isTalking()); ! player.setQuest("leander_make_sandwiches", "2;;0"); en.step(player, "hi"); ! assertEquals( ! "Welcome back! I'm done with your order. Here you have 2 sandwiches.", ! npc.get("text")); ! assertEquals(2, player.getNumberOfEquipped("sandwich")); } } |