From: Astrid S. <ast...@us...> - 2008-07-09 15:01:40
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5872/tests/games/stendhal/server/maps/quests Modified Files: CampfireTest.java Log Message: removed heritage Index: CampfireTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/maps/quests/CampfireTest.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** CampfireTest.java 9 Jul 2008 12:19:27 -0000 1.21 --- CampfireTest.java 9 Jul 2008 15:01:44 -0000 1.22 *************** *** 5,11 **** --- 5,14 ---- import static org.junit.Assert.assertTrue; import games.stendhal.common.MathHelper; + import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.entity.item.StackableItem; + import games.stendhal.server.entity.npc.NPCList; import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.npc.fsm.Engine; + import games.stendhal.server.entity.player.Player; import games.stendhal.server.maps.MockStendhalRPRuleProcessor; import games.stendhal.server.maps.MockStendlRPWorld; *************** *** 14,24 **** import marauroa.common.game.RPObject.ID; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; ! import utilities.ZonePlayerAndNPCTestImpl; ! public class CampfireTest extends ZonePlayerAndNPCTestImpl { private static final String ZONE_NAME = "testzone"; --- 17,29 ---- import marauroa.common.game.RPObject.ID; + import org.junit.After; import org.junit.AfterClass; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; ! import utilities.PlayerTestHelper; ! public class CampfireTest { private static final String ZONE_NAME = "testzone"; *************** *** 26,41 **** private static final String CAMPFIRE = "campfire"; @BeforeClass public static void setUpBeforeClass() throws Exception { Log4J.init(); - MockStendhalRPRuleProcessor.get(); - MockStendlRPWorld.get(); - - setupZone(ZONE_NAME, new CampingGirlNPC()); - - Campfire cf = new Campfire(); - cf.addToWorld(); } --- 31,45 ---- private static final String CAMPFIRE = "campfire"; + private Player player; + + private SpeakerNPC npc; + + private StendhalRPZone zone; + @BeforeClass public static void setUpBeforeClass() throws Exception { Log4J.init(); MockStendhalRPRuleProcessor.get(); MockStendlRPWorld.get(); } *************** *** 44,54 **** } ! public CampfireTest() { ! super(ZONE_NAME, "Sally"); } @Test public void testCanStartQuestNow() throws Exception { ! SpeakerNPC npc = getNPC("Sally"); Engine en = npc.getEngine(); --- 48,72 ---- } ! ! @Before ! public void setUp() throws Exception { ! player = PlayerTestHelper.createPlayer("player"); ! zone = new StendhalRPZone("zone"); ! new CampingGirlNPC().configureZone(zone, null); ! npc = NPCList.get().get("Sally"); ! Campfire cf = new Campfire(); ! cf.addToWorld(); ! } ! ! ! @After ! public void tearDown() throws Exception { ! player=null; ! NPCList.get().clear(); } @Test public void testCanStartQuestNow() throws Exception { ! Engine en = npc.getEngine(); *************** *** 80,84 **** @Test public void testHiAndbye() { ! SpeakerNPC npc = getNPC("Sally"); Engine en = npc.getEngine(); --- 98,102 ---- @Test public void testHiAndbye() { ! Engine en = npc.getEngine(); *************** *** 93,97 **** @Test public void testDoQuest() { ! SpeakerNPC npc = getNPC("Sally"); Engine en = npc.getEngine(); --- 111,115 ---- @Test public void testDoQuest() { ! Engine en = npc.getEngine(); *************** *** 152,156 **** @Test public void testJobAndOffer() { - SpeakerNPC npc = getNPC("Sally"); Engine en = npc.getEngine(); --- 170,173 ---- |