Author: tchemit Date: 2010-04-04 12:18:46 +0200 (Sun, 04 Apr 2010) New Revision: 681 Log: improve tests Modified: trunk/src/test/java/org/nuiton/io/JavaFileUpdaterTest.java trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java Modified: trunk/src/test/java/org/nuiton/io/JavaFileUpdaterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/JavaFileUpdaterTest.java 2010-04-04 10:15:24 UTC (rev 680) +++ trunk/src/test/java/org/nuiton/io/JavaFileUpdaterTest.java 2010-04-04 10:18:46 UTC (rev 681) @@ -20,13 +20,17 @@ */ package org.nuiton.io; -import org.nuiton.io.FileUpdaterHelper.JavaFileUpdater; -import java.io.File; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.io.FileUpdaterHelper.JavaFileUpdater; +import org.nuiton.plugin.PluginHelper; import org.nuiton.plugin.TestHelper; -import static org.junit.Assert.*; +import java.io.File; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test of a {@link JavaFileUpdater} on the test sourcepath and test-classpath * @@ -35,7 +39,9 @@ public class JavaFileUpdaterTest { static MirroredFileUpdater fileUpdater; + static File sourceFile; + static File mirrorFile; @BeforeClass @@ -86,13 +92,13 @@ // now rename mirror Class, so source file is no more up to date File mirrorClassRenamed = new File(fileUpdater.getMirrorFile(sourceFile).getAbsolutePath() + "2"); - mirrorFile.renameTo(mirrorClassRenamed); + PluginHelper.renameFile(mirrorFile, mirrorClassRenamed); // java file is no more up to date assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); // renmae mirror Class to his original name - mirrorClassRenamed.renameTo(mirrorFile); + PluginHelper.renameFile(mirrorClassRenamed, mirrorFile); // java file is now up to date (rename method does not affect lasmodified property on a file) assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); @@ -111,13 +117,13 @@ long mirrorTime = mirrorFile.lastModified(); // make source file newer than mirror file - sourceFile.setLastModified(mirrorTime + 10); + PluginHelper.setLastModified(sourceFile, mirrorTime + 10); // java file is no more up to date assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); // put back old time to source file - sourceFile.setLastModified(sourceTime); + PluginHelper.setLastModified(sourceFile, sourceTime); // java file is now up to date (rename method does not affect lasmodified property on a file) assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); Modified: trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java 2010-04-04 10:15:24 UTC (rev 680) +++ trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java 2010-04-04 10:18:46 UTC (rev 681) @@ -20,13 +20,17 @@ */ package org.nuiton.io; -import java.io.File; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.io.FileUpdaterHelper.JaxxFileUpdater; +import org.nuiton.plugin.PluginHelper; import org.nuiton.plugin.TestHelper; -import static org.junit.Assert.*; +import java.io.File; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test of a {@link JaxxFileUpdater} on the test sourcepath * @@ -35,7 +39,9 @@ public class JaxxFileUpdaterTest { static MirroredFileUpdater fileUpdater; + static File sourceFile; + static File mirrorFile; @BeforeClass @@ -73,7 +79,7 @@ // we do not know if jaxx file is newer than the dummy java source ? - sourceFile.setLastModified(mirrorFile.lastModified() - 10); + PluginHelper.setLastModified(sourceFile, mirrorFile.lastModified() - 10); // java file is up to date since it was compiled to launch this test assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); @@ -92,13 +98,13 @@ // now rename mirror Class, so source file is no more up to date File mirrorClassRenamed = new File(fileUpdater.getMirrorFile(sourceFile).getAbsolutePath() + "2"); - mirrorFile.renameTo(mirrorClassRenamed); + PluginHelper.renameFile(mirrorFile, mirrorClassRenamed); // java file is no more up to date assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); // renmae mirror Class to his original name - mirrorClassRenamed.renameTo(mirrorFile); + PluginHelper.renameFile(mirrorClassRenamed, mirrorFile); // java file is now up to date (rename method does not affect lasmodified property on a file) assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); @@ -119,13 +125,13 @@ long mirrorTime = mirrorFile.lastModified(); // make source file newer than mirror file - sourceFile.setLastModified(mirrorTime + 10); + PluginHelper.setLastModified(sourceFile, mirrorTime + 10); // java file is no more up to date assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); // put back old time to source file - sourceFile.setLastModified(sourceTime); + PluginHelper.setLastModified(sourceFile, sourceTime); // java file is now up to date (rename method does not affect lasmodified property on a file) assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile));