[Picross-commit] SF.net SVN: picross:[91] trunk
Status: Pre-Alpha
Brought to you by:
yvan_norsa
Menu
▾
▴
[Picross-commit] SF.net SVN: picross:[91] trunk
|
From: <yva...@us...> - 2011-06-16 12:11:10
|
Revision: 91
http://picross.svn.sourceforge.net/picross/?rev=91&view=rev
Author: yvan_norsa
Date: 2011-06-16 12:11:02 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
better test code
Modified Paths:
--------------
trunk/build.xml
trunk/test/picross/game/random/RandomPicrossModelTest.java
trunk/test/picross/game/simple/XBMModelTest.java
trunk/test/picross/grid/BoxTest.java
trunk/test/picross/grid/CompletedHintsTest.java
trunk/test/picross/grid/GridModelTest.java
trunk/test/picross/grid/PaintCommandTest.java
Removed Paths:
-------------
trunk/lib/testsHelper.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/build.xml 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
value="${lib.dir}/mmvcs.jar" />
<property name="simpleButton.jar"
value="${lib.dir}/simpleButton.jar" />
- <property name="testsHelper.jar"
- value="${lib.dir}/testsHelper.jar" />
<target name="-init"
depends="-setmode">
@@ -72,7 +70,6 @@
<pathelement location="${log4j.jar}" />
<pathelement location="${mmvcs.jar}" />
<pathelement location="${simpleButton.jar}" />
- <pathelement location="${testsHelper.jar}" />
</path>
<target name="compile"
Deleted: trunk/lib/testsHelper.jar
===================================================================
(Binary files differ)
Modified: trunk/test/picross/game/random/RandomPicrossModelTest.java
===================================================================
--- trunk/test/picross/game/random/RandomPicrossModelTest.java 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/test/picross/game/random/RandomPicrossModelTest.java 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
package picross.game.random;
-import fr.cle.tests.TestsHelper;
-
import org.apache.log4j.PropertyConfigurator;
import org.junit.Test;
@@ -58,8 +56,6 @@
/** {@inheritDoc} */
@Override
protected PicrossGrid getPicrossGrid() throws Throwable {
- //return new RandomPicrossModel();
-
- return (PicrossGrid) TestsHelper.getInstance("picross.game.random.RandomPicrossModel");
+ return new RandomPicrossModel();
}
}
Modified: trunk/test/picross/game/simple/XBMModelTest.java
===================================================================
--- trunk/test/picross/game/simple/XBMModelTest.java 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/test/picross/game/simple/XBMModelTest.java 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
package picross.game.simple;
-import fr.cle.tests.TestsHelper;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -66,8 +64,7 @@
try {
XBMModelTest.realModel =
- //new XBMModel(Picross.loadDataFile("asterix.xbm"));
- XBMModelTest.newXBMModel(Picross.loadDataFile("asterix.xbm"));
+ new XBMModel(Picross.loadDataFile("asterix.xbm"));
} catch (IOException ioEx) {
throw new ExceptionInInitializerError(ioEx);
} catch (PicrossException xbmEx) {
@@ -82,42 +79,12 @@
return XBMModelTest.realModel;
}
- /**
- * Tests the XBMModel constructor.
- *
- * @throws IOException if there is a problem with a stream loading
- * @throws XBMException if a file isn't valid
- */
- @Test
- public void testXBMModel() throws IOException, PicrossException {
- try {
- //new XBMModel(null);
- XBMModelTest.newXBMModel(null);
- Assert.fail("Tried to load a null model");
- } catch (IllegalArgumentException argEx) { }
+ @Test(expected = IllegalArgumentException.class)
+ public void loadNullModel() throws IOException, PicrossException {
+ new XBMModel(null);
+ }
- try {
- //new XBMModel(new ByteArrayInputStream("".getBytes()));
- XBMModelTest.newXBMModel(new ByteArrayInputStream("".getBytes()));
- Assert.fail("Empty file");
- } catch (PicrossException xbmEx) { }
+ public void loadEmptyModel() throws IOException, PicrossException {
+ new XBMModel(new ByteArrayInputStream("".getBytes()));
}
-
- private static PicrossGrid newXBMModel(InputStream in) throws IOException, PicrossException {
- try {
- return (PicrossGrid) TestsHelper.getInstance("picross.game.simple.XBMModel", in);
- } catch (Throwable throwable) {
- if (throwable instanceof IOException) {
- throw (IOException) throwable;
- }
-
- if (throwable instanceof PicrossException) {
- throw (PicrossException) throwable;
- }
-
- //if (throwable instanceof RuntimeException) {
- throw (RuntimeException) throwable;
- //}
- }
- }
}
Modified: trunk/test/picross/grid/BoxTest.java
===================================================================
--- trunk/test/picross/grid/BoxTest.java 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/test/picross/grid/BoxTest.java 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
package picross.grid;
-import fr.cle.tests.TestsHelper;
-
import javax.swing.ImageIcon;
import org.junit.Assert;
@@ -51,7 +49,7 @@
/*** Champ ***/
- private Object box = null;
+ private Box box = null;
/*** Constructeur ***/
@@ -66,7 +64,7 @@
@Before
public void setUp() throws Throwable {
- this.box = BoxTest.getBox();
+ this.box = new Box();
}
@Test
@@ -83,7 +81,7 @@
@Test
public void testEmpty() throws Throwable {
- TestsHelper.invoke(this.box, "empty");
+ this.box.empty();
Assert.assertTrue("box not empty", BoxTest.isBoxEmpty(this.box));
}
@@ -94,7 +92,7 @@
BoxTest.checkBox(this.box);
- Object box2 = BoxTest.getBox();
+ Box box2 = new Box();
Assert.assertFalse("box = box2", this.box.equals(box2));
BoxTest.checkBox(box2);
@@ -149,44 +147,37 @@
Assert.assertFalse("box crossed AND empty", BoxTest.isBoxCrossed(this.box));
}
- @Test
+ @Test(expected = IllegalArgumentException.class)
public void testSetRect() throws Throwable {
- try {
- TestsHelper.invoke(this.box, "setRect", null);
- Assert.fail("box.setRect(null)");
- } catch (IllegalArgumentException argEx) { }
+ this.box.setRect(null);
}
- private static Object getBox() throws Throwable {
- return TestsHelper.getInstance("picross.grid.Box");
+ private static void checkBox(Box box) throws Throwable {
+ box.check();
}
- private static void checkBox(Object box) throws Throwable {
- TestsHelper.invoke(box, "check");
+ private static void crossBox(Box box) throws Throwable {
+ box.cross();
}
- private static void crossBox(Object box) throws Throwable {
- TestsHelper.invoke(box, "cross");
+ private static ImageIcon getBoxIcon(Box box) throws Throwable {
+ return (ImageIcon) box.getIcon();
}
- private static ImageIcon getBoxIcon(Object box) throws Throwable {
- return (ImageIcon) TestsHelper.invoke(box, "getIcon");
+ private static ImageIcon getBoxRolloverIcon(Box box) throws Throwable {
+ return (ImageIcon) box.getRolloverIcon();
}
- private static ImageIcon getBoxRolloverIcon(Object box) throws Throwable {
- return (ImageIcon) TestsHelper.invoke(box, "getRolloverIcon");
+ private static boolean isBoxCrossed(Box box) throws Throwable {
+ return ((Boolean) box.isCrossed()).booleanValue();
}
- private static boolean isBoxCrossed(Object box) throws Throwable {
- return ((Boolean) TestsHelper.invoke(box, "isCrossed")).booleanValue();
+ private static boolean isBoxEmpty(Box box) throws Throwable {
+ return ((Boolean) box.isEmpty()).booleanValue();
}
- private static boolean isBoxEmpty(Object box) throws Throwable {
- return ((Boolean) TestsHelper.invoke(box, "isEmpty")).booleanValue();
+ private static boolean isBoxChecked(Box box) throws Throwable {
+ return ((Boolean) box.isChecked()).booleanValue();
}
-
- private static boolean isBoxChecked(Object box) throws Throwable {
- return ((Boolean) TestsHelper.invoke(box, "isChecked")).booleanValue();
- }
}
Modified: trunk/test/picross/grid/CompletedHintsTest.java
===================================================================
--- trunk/test/picross/grid/CompletedHintsTest.java 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/test/picross/grid/CompletedHintsTest.java 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
package picross.grid;
-import fr.cle.tests.TestsHelper;
-
import java.util.List;
import org.junit.Assert;
@@ -51,7 +49,7 @@
/*** Champ ***/
- Object hints = null;
+ CompletedHints hints = null;
/*** Constructeur ***/
@@ -115,14 +113,14 @@
@Test
public void testClearColHint() throws Throwable {
CompletedHintsTest.setCompleteColHint(this.hints, 3, 4);
- TestsHelper.invoke(this.hints, "clearColHint", 3, 4);
+ this.hints.clearColHint(3, 4);
Assert.assertFalse(CompletedHintsTest.isColHintComplete(this.hints, 3, 4));
}
@Test
public void testClearRowHint() throws Throwable {
CompletedHintsTest.setCompleteRowHint(this.hints, 8, 2);
- TestsHelper.invoke(this.hints, "clearRowHint", 8, 2);
+ this.hints.clearRowHint(8, 2);
Assert.assertFalse(CompletedHintsTest.isRowHintComplete(this.hints, 8, 2));
}
@@ -204,32 +202,32 @@
Assert.assertTrue(CompletedHintsTest.isRowHintComplete(this.hints, 5, 5));
}
- private static Object getCompletedHints(int colHintsWidth, int colHintsHeight, int rowHintsWidth, int rowHintsHeight) throws Throwable {
- return TestsHelper.getInstance("picross.grid.CompletedHints", colHintsWidth, colHintsHeight, rowHintsWidth, rowHintsHeight);
+ private static CompletedHints getCompletedHints(int colHintsWidth, int colHintsHeight, int rowHintsWidth, int rowHintsHeight) throws Throwable {
+ return new CompletedHints(colHintsWidth, colHintsHeight, rowHintsWidth, rowHintsHeight);
}
- private static void setCompleteColHint(Object hints, int col, int index) throws Throwable {
- TestsHelper.invoke(hints, "setCompleteColHint", col, index);
+ private static void setCompleteColHint(CompletedHints hints, int col, int index) throws Throwable {
+ hints.setCompleteColHint(col, index);
}
- private static boolean isColHintComplete(Object hints, int x, int y) throws Throwable {
- return ((Boolean) TestsHelper.invoke(hints, "isColHintComplete", x, y)).booleanValue();
+ private static boolean isColHintComplete(CompletedHints hints, int x, int y) throws Throwable {
+ return ((Boolean) hints.isColHintComplete(x, y)).booleanValue();
}
- private static void setCompleteRowHint(Object hints, int row, int index) throws Throwable {
- TestsHelper.invoke(hints, "setCompleteRowHint", row, index);
+ private static void setCompleteRowHint(CompletedHints hints, int row, int index) throws Throwable {
+ hints.setCompleteRowHint(row, index);
}
- private static boolean isRowHintComplete(Object hints, int x, int y) throws Throwable {
- return ((Boolean) TestsHelper.invoke(hints, "isRowHintComplete", x, y)).booleanValue();
+ private static boolean isRowHintComplete(CompletedHints hints, int x, int y) throws Throwable {
+ return ((Boolean) hints.isRowHintComplete(x, y)).booleanValue();
}
- private static List<Integer> getCompleteColHints(Object hints, int column) throws Throwable {
- return (List<Integer>) TestsHelper.invoke(hints, "getCompleteColHints", column);
+ private static List<Integer> getCompleteColHints(CompletedHints hints, int column) throws Throwable {
+ return (List<Integer>) hints.getCompleteColHints(column);
}
- private static List<Integer> getCompleteRowHints(Object hints, int row) throws Throwable {
- return (List<Integer>) TestsHelper.invoke(hints, "getCompleteRowHints", row);
+ private static List<Integer> getCompleteRowHints(CompletedHints hints, int row) throws Throwable {
+ return (List<Integer>) hints.getCompleteRowHints(row);
}
}
Modified: trunk/test/picross/grid/GridModelTest.java
===================================================================
--- trunk/test/picross/grid/GridModelTest.java 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/test/picross/grid/GridModelTest.java 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
package picross.grid;
-import fr.cle.tests.TestsHelper;
-
import org.easymock.EasyMock;
import org.junit.Assert;
@@ -51,7 +49,7 @@
/*** Champ ***/
- private Object model = null;
+ private GridModel model = null;
/*** Constructeur ***/
@@ -110,13 +108,22 @@
GridModelTest.actOnBox(this.model, 0, 0, GridAction.CHECK);
}
*/
- private static Object getGridModel(IGridMediator mediator, boolean[][] data) throws Throwable {
- return TestsHelper.getInstance("picross.grid.GridModel", mediator, data);
+ private static GridModel getGridModel(IGridMediator mediator, boolean[][] data) throws Throwable {
+ return new GridModel(mediator, data);
}
/*
private static void actOnBox(Object gridModel, int row, int column, Object action) {
TestsHelper.invoke(gridModel, "actOnBox", row, colum, action);
}
*/
+
+ @Test
+ public void incorrectHint() {
+ GridModel gridModel = new GridModel(EasyMock.createMock(IGridMediator.class),
+ new boolean[][] {
+ {false, true, false, true, true, false, true, true, true, false, false, true}
+ });
+
+ }
}
Modified: trunk/test/picross/grid/PaintCommandTest.java
===================================================================
--- trunk/test/picross/grid/PaintCommandTest.java 2011-06-16 11:11:11 UTC (rev 90)
+++ trunk/test/picross/grid/PaintCommandTest.java 2011-06-16 12:11:02 UTC (rev 91)
@@ -33,8 +33,6 @@
package picross.grid;
-import fr.cle.tests.TestsHelper;
-
import org.junit.Assert;
import org.junit.Test;
@@ -58,7 +56,7 @@
}
private static Object getPaintCommand(int row, int column) throws Throwable {
- return TestsHelper.getInstance("picross.grid.PaintCommand", row, column);
+ return new picross.grid.PaintCommand(row, column);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
