[Arianne-commits] stendhal/tests/games/stendhal/server/maps/quests KillSpidersTest.java, 1.3, 1.4 WeaponsCollectorTest.java, 1.13, 1.14 HatForMonogenesTest.java, 1.10, 1.11 ElfPrincessTest.java, 1.7, 1.8 CloakCollectorTest.java, 1.22, 1.23 AdosDeathmatchTest.java, 1.4, 1.5 ArmorForDagobertTest.java, 1.9, 1.10

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

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8450/tests/games/stendhal/server/maps/quests

Modified Files:
	KillSpidersTest.java WeaponsCollectorTest.java 
	HatForMonogenesTest.java ElfPrincessTest.java 
	CloakCollectorTest.java AdosDeathmatchTest.java 
	ArmorForDagobertTest.java 
Log Message:
made tests pass after all those changes :)

Index: HatForMonogenesTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/HatForMonogenesTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** HatForMonogenesTest.java	12 Jul 2008 14:43:47 -0000	1.10
--- HatForMonogenesTest.java	22 Feb 2009 21:56:06 -0000	1.11
***************
*** 162,166 ****
  		oldXP = player.getXP();
  		en.step(player, "yes");
! 		assertEquals(oldXP + 10, player.getXP());
  
  		assertEquals("Bless you, my good friend! Now my head will stay nice and warm.", npc.get("text"));
--- 162,166 ----
  		oldXP = player.getXP();
  		en.step(player, "yes");
! 		assertEquals(oldXP + 50, player.getXP());
  
  		assertEquals("Bless you, my good friend! Now my head will stay nice and warm.", npc.get("text"));

Index: WeaponsCollectorTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/WeaponsCollectorTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WeaponsCollectorTest.java	12 Jul 2008 14:43:47 -0000	1.13
--- WeaponsCollectorTest.java	22 Feb 2009 21:56:06 -0000	1.14
***************
*** 133,137 ****
  		
  		assertTrue(player.isEquipped("ice sword"));
! 		assertEquals(oldXP + 1000, player.getXP());
  	}
  }
--- 133,137 ----
  		
  		assertTrue(player.isEquipped("ice sword"));
! 		assertEquals(oldXP + 5000, player.getXP());
  	}
  }

Index: KillSpidersTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/KillSpidersTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** KillSpidersTest.java	2 Dec 2008 17:29:04 -0000	1.3
--- KillSpidersTest.java	22 Feb 2009 21:56:06 -0000	1.4
***************
*** 109,113 ****
  		en.step(player, "no");
  		assertThat(player.getKarma(), lessThan(newKarma));
! 		assertEquals("Ok, i have to find someone else to do this 'little' job!", npc.get("text"));
  		assertThat(player.getQuest(questSlot), is("rejected"));
  		en.step(player, "bye");
--- 109,113 ----
  		en.step(player, "no");
  		assertThat(player.getKarma(), lessThan(newKarma));
! 		assertEquals("Ok, I have to find someone else to do this 'little' job!", npc.get("text"));
  		assertThat(player.getQuest(questSlot), is("rejected"));
  		en.step(player, "bye");

Index: AdosDeathmatchTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/AdosDeathmatchTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AdosDeathmatchTest.java	12 Jul 2008 14:43:47 -0000	1.4
--- AdosDeathmatchTest.java	22 Feb 2009 21:56:06 -0000	1.5
***************
*** 58,76 ****
  		en.step(dmPlayer, "deathmatch");
  		assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
! 		assertEquals("The deathmatch is the ultimate challenge for true #heroes.", recruiter.get("text"));
  		
- 		en.step(dmPlayer, "heroes");
- 		assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
- 		assertEquals("Are you such a hero? I can take you to the #challenge.", recruiter.get("text"));
  		
  		dmPlayer.setLevel(19);
  		en.step(dmPlayer, "challenge");
  		assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
! 		assertEquals("Sorry, you are too weak!", recruiter.get("text"));
  		recruiter.remove("text");
  		
  		en.step(dmPlayer, "bye");
  		assertEquals(ConversationStates.IDLE, en.getCurrentState());
! 		assertEquals("I hope you will enjoy the Ados #Deathmatch!", recruiter.get("text"));
  		
  
--- 58,73 ----
  		en.step(dmPlayer, "deathmatch");
  		assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
! 		assertEquals("Many dangerous creatures will attack you in the deathmatch arena. It is only for strong #heroes.", recruiter.get("text"));
  		
  		
  		dmPlayer.setLevel(19);
  		en.step(dmPlayer, "challenge");
  		assertEquals(ConversationStates.ATTENDING, en.getCurrentState());
! 		assertEquals("Sorry, you are too weak for the #deathmatch now, come back when you have at least level 20.", recruiter.get("text"));
  		recruiter.remove("text");
  		
  		en.step(dmPlayer, "bye");
  		assertEquals(ConversationStates.IDLE, en.getCurrentState());
! 		assertEquals("I hope you will enjoy the Ados Deathmatch!", recruiter.get("text"));
  		
  

Index: ArmorForDagobertTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/ArmorForDagobertTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ArmorForDagobertTest.java	12 Jul 2008 14:43:47 -0000	1.9
--- ArmorForDagobertTest.java	22 Feb 2009 21:56:06 -0000	1.10
***************
*** 51,55 ****
  	public void testQuest() {
  		en.step(player, "hi");
! 		assertEquals("Welcome to the bank of Semos! Do you need #help on your personal chest?", npc.get("text"));
  		assertTrue(quest.getHistory(player).isEmpty());
  
--- 51,55 ----
  	public void testQuest() {
  		en.step(player, "hi");
! 		assertEquals("Welcome to the bank of Semos! I am here to #help you manage your personal chest.", npc.get("text"));
  		assertTrue(quest.getHistory(player).isEmpty());
  
***************
*** 75,79 ****
  
  		en.step(player, "hi");
! 		assertEquals("Welcome to the bank of Semos! Do you need #help on your personal chest?", npc.get("text"));
  		assertEquals(questHistory, quest.getHistory(player));
  		en.step(player, "task");
--- 75,79 ----
  
  		en.step(player, "hi");
! 		assertEquals("Welcome to the bank of Semos! I am here to #help you manage your personal chest.", npc.get("text"));
  		assertEquals(questHistory, quest.getHistory(player));
  		en.step(player, "task");
***************
*** 148,152 ****
  		questHistory.add("DONE");
  		assertEquals(questHistory, quest.getHistory(player));
! 		assertEquals("Oh, I am so thankful! Here is some gold I found ... ehm ... somewhere.", npc.get("text"));
  		assertEquals(xpBeforeReward + 50, player.getXP());
  		en.step(player, "task");
--- 148,152 ----
  		questHistory.add("DONE");
  		assertEquals(questHistory, quest.getHistory(player));
! 		assertEquals("Oh, I am so thankful! Here is some gold I found ... ehm ... somewhere. Now that you have proven yourself a trusted customer, you may have access to your own private banking #vault any time you like.", npc.get("text"));
  		assertEquals(xpBeforeReward + 50, player.getXP());
  		en.step(player, "task");

Index: CloakCollectorTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/CloakCollectorTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CloakCollectorTest.java	12 Jul 2008 14:43:46 -0000	1.22
--- CloakCollectorTest.java	22 Feb 2009 21:56:06 -0000	1.23
***************
*** 137,141 ****
  		assertTrue(player.isEquipped("black cloak"));
  		assertEquals(oldKarma + 5.0, player.getKarma(), 0.01);
! 		assertEquals(2500, player.getXP());
  	}
  
--- 137,141 ----
  		assertTrue(player.isEquipped("black cloak"));
  		assertEquals(oldKarma + 5.0, player.getKarma(), 0.01);
! 		assertEquals(10000, player.getXP());
  	}
  

Index: ElfPrincessTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/ElfPrincessTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ElfPrincessTest.java	2 Dec 2008 17:29:04 -0000	1.7
--- ElfPrincessTest.java	22 Feb 2009 21:56:06 -0000	1.8
***************
*** 6,9 ****
--- 6,10 ----
  import games.stendhal.server.core.engine.SingletonRepository;
  import games.stendhal.server.core.engine.StendhalRPZone;
+ import games.stendhal.server.entity.npc.ConversationStates;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  import games.stendhal.server.entity.npc.fsm.Engine;
***************
*** 85,91 ****
  		assertTrue("Flowers! Get your fresh flowers here!".equals(npcRose.get("text")) || (npcRose.get("text") == null));
  		enRose.step(player, "hi");
! 		assertEquals("Hello dearie. My far sight tells me you need a pretty flower for some fair maiden. Here ye arr.", npcRose.get("text"));
! 		enRose.step(player, "bye");
! 		assertEquals("Everything's coming up roses ... bye ...", npcRose.get("text"));
  
  		// -----------------------------------------------
--- 86,92 ----
  		assertTrue("Flowers! Get your fresh flowers here!".equals(npcRose.get("text")) || (npcRose.get("text") == null));
  		enRose.step(player, "hi");
! 		assertEquals("Hello dearie. My far sight tells me you need a pretty flower for some fair maiden. Here ye arr, bye now.", npcRose.get("text"));
! 		assertEquals(ConversationStates.IDLE, enRose.getCurrentState());
! 		
  
  		// -----------------------------------------------
***************
*** 126,133 ****
  
  		enRose.step(player, "hi");
! 		assertEquals("Hello dearie. My far sight tells me you need a pretty flower for some fair maiden. Here ye arr.", npcRose.get("text"));
! 		enRose.step(player, "bye");
! 		assertEquals("Everything's coming up roses ... bye ...", npcRose.get("text"));
! 
  		// -----------------------------------------------
  
--- 127,133 ----
  
  		enRose.step(player, "hi");
! 		assertEquals("Hello dearie. My far sight tells me you need a pretty flower for some fair maiden. Here ye arr, bye now.", npcRose.get("text"));
! 		assertEquals(ConversationStates.IDLE, enRose.getCurrentState());
! 	
  		// -----------------------------------------------