Author: echatellier Date: 2012-08-10 15:15:37 +0200 (Fri, 10 Aug 2012) New Revision: 3718 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3718 Log: Update nuiton-matrix and fix tests. Modified: trunk/pom.xml trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 09:24:11 UTC (rev 3717) +++ trunk/pom.xml 2012-08-10 13:15:37 UTC (rev 3718) @@ -62,21 +62,15 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.3</version> + <version>2.3-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.3</version> + <version>2.3-SNAPSHOT</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> </dependency> <dependency> Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 09:24:11 UTC (rev 3717) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 13:15:37 UTC (rev 3718) @@ -44,9 +44,6 @@ import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; @@ -63,7 +60,7 @@ public void setUp() throws IOException, TopiaException { MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); URL zipURL = this.getClass().getResource("/simulations/test-nonregression-20090203.zip"); - SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-nonregression"); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-" + System.currentTimeMillis()); SimulationContext.get().setSimulationStorage(simRef); } @@ -75,9 +72,9 @@ @Test public void testImportEntityImportString() throws IOException, TopiaException { String data = "[1, 1, 1]\n" + - "String:testpopulation\n" + - "String:Testengin\n" + - "String:Zone test1\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + "0;0;0;42.0"; TopiaContext tx = SimulationContext.get().getDB(); @@ -129,7 +126,7 @@ String data = "[1, 1, 2]\n" + "Population:test population\n" + "Gear:Testengin\n" + - "TimeStep:0,1\n" + + "TimeStep:1,0\n" + "0;0;0;1.0\n" + "0;0;1;2.0"; @@ -143,7 +140,7 @@ MatrixND m = MatrixFactory.getInstance().create(sems); m.importCSV(new StringReader(data), null); - Assert.assertEquals(1.0, m.getValue(0, 0, 0), 0.001); - Assert.assertEquals(2.0, m.getValue(0, 0, 1), 0.001); + Assert.assertEquals(2.0, m.getValue(0, 0, 0), 0.001); + Assert.assertEquals(1.0, m.getValue(0, 0, 1), 0.001); } }