mmo-ref/stendhal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated junit to 4.12 and hamcrest to 2.0.0.0

Browse source
This commit is contained in:
Hendrik Brummermann 2015-12-10 01:51:45 +01:00
parent 474338c137
commit bfdd110f88
10 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.classpath
View file

@ -10,11 +10,9 @@
<classpathentry kind="lib" path="libs/groovy.jar"/>
<classpathentry kind="lib" path="libs/guava.jar"/>
<classpathentry kind="lib" path="libs/h2.jar"/>
<classpathentry kind="lib" path="libs/hamcrest-all-1.1.jar"/>
<classpathentry kind="lib" path="libs/jardiff.jar"/>
<classpathentry kind="lib" path="libs/jcurses.jar"/>
<classpathentry kind="lib" path="libs/jorbis.jar"/>
<classpathentry kind="lib" path="libs/junit-4.4.jar"/>
<classpathentry kind="lib" path="libs/libtiled.jar"/>
<classpathentry kind="lib" path="libs/log4j.jar"/>
<classpathentry kind="lib" path="libs/marauroa.jar" sourcepath="/marauroa"/>
@ -38,5 +36,7 @@
<classpathentry kind="lib" path="libs/websocket-common-9.2.5.v20141112.jar"/>
<classpathentry kind="lib" path="libs/websocket-server-9.2.5.v20141112.jar"/>
<classpathentry kind="lib" path="libs/websocket-servlet-9.2.5.v20141112.jar"/>
<classpathentry kind="lib" path="libs/junit-4.12.jar"/>
<classpathentry kind="lib" path="libs/java-hamcrest-2.0.0.0.jar" sourcepath="/home/brummermann/.m2/repository/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

4
build.ant.properties
View file

@ -22,10 +22,10 @@ guava_jar = ${libdir}/guava.jar
log4j_jar = ${libdir}/log4j.jar
#hamcrest Matchers
hamcrest_jar =${libdir}/hamcrest-all-1.1.jar
hamcrest_jar =${libdir}/java-hamcrest-2.0.0.0.jar
# Junit 4.
junit_jar = ${libdir}/junit-4.4.jar
junit_jar = ${libdir}/junit-4.12.jar
# Groovy. You perhaps can save this one.
# It was used on the past but we agreed to remove support for groovy.

BIN
libs/hamcrest-all-1.1.jar
View file

Binary file not shown.

BIN
libs/java-hamcrest-2.0.0.0.jar Normal file
View file

Binary file not shown.

BIN
libs/junit-4.12.jar Normal file
View file

Binary file not shown.

BIN
libs/junit-4.4.jar
View file

Binary file not shown.

7
tests/games/stendhal/client/actions/SlashActionRepositoryTest.java
View file

@ -1,6 +1,5 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2015 - Stendhal *
***************************************************************************
***************************************************************************
* *
@ -12,8 +11,8 @@
***************************************************************************/
package games.stendhal.client.actions;
import static org.junit.Assert.*;
import static org.junit.matchers.StringContains.containsString;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertThat;
import org.junit.BeforeClass;
import org.junit.Test;

14
tests/games/stendhal/server/events/TextEventTest.java
View file

@ -12,16 +12,15 @@
***************************************************************************/
package games.stendhal.server.events;
import marauroa.common.game.RPClass;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import marauroa.common.game.RPClass;
public class TextEventTest {
/**
@ -30,7 +29,6 @@ public class TextEventTest {
@Test
public void testTextEvent() {
TextEvent event = new TextEvent("text");
assertThat(event, is(TextEvent.class));
assertThat(event.get("text"), is("text"));
}
@ -42,7 +40,7 @@ public class TextEventTest {
TextEvent.generateRPClass();
assertTrue(RPClass.hasRPClass("text"));
}
}

15
tests/games/stendhal/server/maps/quests/FindGhostsTest.java
View file

@ -13,14 +13,18 @@
package games.stendhal.server.maps.quests;
import static junit.framework.Assert.assertTrue;
import static utilities.SpeakerNPCTestHelper.getReply;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.matchers.StringContains.containsString;
import static utilities.SpeakerNPCTestHelper.getReply;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import games.stendhal.server.core.config.ZoneConfigurator;
import games.stendhal.server.core.engine.SingletonRepository;
import games.stendhal.server.core.engine.StendhalRPZone;
@ -29,11 +33,6 @@ import games.stendhal.server.entity.npc.fsm.Engine;
import games.stendhal.server.entity.player.Player;
import games.stendhal.server.maps.ados.city.KidGhostNPC;
import games.stendhal.server.maps.ados.hauntedhouse.WomanGhostNPC;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import utilities.PlayerTestHelper;
import utilities.QuestHelper;

12
tests/utilities/RPClass/ConsumableTestHelperTest.java
View file

@ -1,6 +1,5 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2015 - Stendhal *
***************************************************************************
***************************************************************************
* *
@ -12,21 +11,22 @@
***************************************************************************/
package utilities.RPClass;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
import games.stendhal.server.entity.item.ConsumableItem;
import org.junit.Test;
import games.stendhal.server.entity.item.ConsumableItem;
public class ConsumableTestHelperTest {
@Test
public void testCreate() throws Exception {
ConsumableItem eater = ConsumableTestHelper.createEater("consume");
assertThat(eater, is(ConsumableItem.class));
assertThat(eater, instanceOf(ConsumableItem.class));
ConsumableItem createImmunizer = ConsumableTestHelper.createImmunizer("consume");
assertThat(createImmunizer, is(ConsumableItem.class));
assertThat(createImmunizer, instanceOf(ConsumableItem.class));
}
}