Author: bleny Date: 2010-06-25 11:59:07 +0200 (Fri, 25 Jun 2010) New Revision: 88 Url: http://nuiton.org/repositories/revision/diswork/88 Log: m?\195?\160j tests Modified: trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonMultipleNodesTest.java trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonTest.java trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/AbstractDisworkMapTest.java trunk/diswork-fs/src/test/resources/log4j.properties Modified: trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonMultipleNodesTest.java =================================================================== --- trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonMultipleNodesTest.java 2010-06-25 09:38:13 UTC (rev 87) +++ trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonMultipleNodesTest.java 2010-06-25 09:59:07 UTC (rev 88) @@ -2,6 +2,7 @@ import java.io.InputStream; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.nuiton.diswork.fs.DisworkFileSystemConfig; @@ -36,5 +37,10 @@ config.setActivityStrategy("unlimited"); daemon2 = new DisworkDaemon(config2); } + + @After + public void tearDown() throws Exception { + daemon2.close(); + } } Modified: trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonTest.java =================================================================== --- trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonTest.java 2010-06-25 09:38:13 UTC (rev 87) +++ trunk/diswork-daemon/src/test/java/org/nuiton/diswork/daemon/DisworkDaemonTest.java 2010-06-25 09:59:07 UTC (rev 88) @@ -31,7 +31,6 @@ @After public void tearDown() throws Exception { - Thread.sleep(5000); daemon.close(); } Modified: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/AbstractDisworkMapTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/AbstractDisworkMapTest.java 2010-06-25 09:38:13 UTC (rev 87) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/AbstractDisworkMapTest.java 2010-06-25 09:59:07 UTC (rev 88) @@ -101,53 +101,21 @@ @Test public void testStoreLargeValue() { - - // 237499 - // 312499 - // 351561 - // 249999 - - int min = 0; - int max = 10 * 1000 * 1000; - - - int milieu = (min + max) / 2; - - while (max - min > 1) { + byte[] newBytes = new byte[11 * 1000 * 1000]; + Random random = new Random(); + random.nextBytes(newBytes); - byte[] newBytes = new byte[milieu]; - Random random = new Random(); - random.nextBytes(newBytes); - - map1.put("test", newBytes); + log.debug("putting large value"); + map1.put("test", newBytes); + log.debug("getting large value"); + + byte[] getResult = map2.get("test"); - byte[] getResult = map1.get("test"); - assertNotNull(getResult); - assertEquals(milieu, getResult.length); - - getResult = map2.get("test"); - if (getResult == null) { - System.out.println(max + " trop grand"); - max = milieu; - } else { - System.out.println(min + " trop petit"); - min = milieu; - } - - milieu = (min + max) / 2; - System.out.println(min + " < " + milieu + " < " + max); - } + assertNotNull(getResult); + assertEquals(newBytes.length, getResult.length); + assertArrayEquals(newBytes, getResult); - System.out.println(milieu); - /* - assertNotNull(getResult); - assertEquals(bytesSize, getResult.length); - - assertArrayEquals(newBytes, getResult); - */ - - } } Modified: trunk/diswork-fs/src/test/resources/log4j.properties =================================================================== --- trunk/diswork-fs/src/test/resources/log4j.properties 2010-06-25 09:38:13 UTC (rev 87) +++ trunk/diswork-fs/src/test/resources/log4j.properties 2010-06-25 09:59:07 UTC (rev 88) @@ -8,4 +8,5 @@ log4j.logger.org.nuiton.diswork.fs=WARN log4j.logger.org.nuiton.diswork.fs.storage.KademliaDisworkMap=INFO log4j.logger.org.nuiton.diswork.fs.Demo=INFO -log4j.logger.org.planx.xmlstore.routing=DEBUG \ No newline at end of file +log4j.logger.org.planx.xmlstore.routing=DEBUG +log4j.logger.org.nuiton.diswork.fs.storage.AbstractDisworkMapTest=DEBUG \ No newline at end of file