Author: tfischer Date: Mon Oct 12 00:10:54 2015 New Revision: 1708029 URL: http://svn.apache.org/viewvc?rev=1708029&view=rev Log: Try and fix Test on Jenkins
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java?rev=1708029&r1=1708028&r2=1708029&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java Mon Oct 12 00:10:54 2015 @@ -28,6 +28,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.torque.generator.BaseTest; import org.apache.torque.generator.configuration.UnitDescriptor; import org.apache.torque.generator.configuration.paths.CustomProjectPaths; @@ -41,6 +43,9 @@ import org.junit.Test; */ public class RunOnlyOnSourceChangeTest extends BaseTest { + /** The logger. */ + private static Log log = LogFactory.getLog(Controller.class); + @Test public void testRunOnlyOnSourceChange() throws Exception { @@ -91,13 +96,16 @@ public class RunOnlyOnSourceChangeTest e long unchangedTargetFile2LastModified = assertFile(targetDir2, "unchangedOutput.txt", "unchangedValue"); long changedTargetFile21LastModified = assertFile(targetDir2, "changedOutput1.txt", "valueToBeChanged"); long changedTargetFile22LastModified = assertFile(targetDir2, "changedOutput2.txt", "valueToBeChanged"); + Thread.sleep(50); // allow time for Date checks // second run + log.debug("Start time of generation " + System.currentTimeMillis()); FileUtils.deleteDirectory(srcDir1); FileUtils.deleteDirectory(srcDir2); FileUtils.copyDirectory(new File("src/test/runOnlyOnSourceChange/src/main/torque-gen/secondSource"), srcDir1); FileUtils.copyDirectory(new File("src/test/runOnlyOnSourceChange/src/main/torque-gen/secondSource"), srcDir2); controller.run(unitDescriptors); + log.debug("End time of generation " + System.currentTimeMillis()); // check outcome of second generation assertTrue(unchangedTargetFile1LastModified == assertFile(targetDir1, "unchangedOutput.txt", "unchangedValue")); @@ -113,6 +121,7 @@ public class RunOnlyOnSourceChangeTest e File targetFile = new File(targetDir, filename); assertTrue(targetFile.exists()); assertEquals(expectedContent, FileUtils.readFileToString(targetFile, "ISO-8859-1")); + return targetFile.lastModified(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org