From be32bd62f54176ff60fc620acf77ca2afe4e74ff Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Mon, 20 Aug 2007 07:25:20 +0000 Subject: [PATCH] testWithTimer() and testOnChangeCalled() merged. Hopefully it solves the random failure of testOnChangeCalled() SVN: 1419 --- .../systemsx/cisd/common/utilities/FileWatcherTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileWatcherTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileWatcherTest.java index 7995a71d05b..4dc14b15888 100644 --- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileWatcherTest.java +++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileWatcherTest.java @@ -104,19 +104,14 @@ public class FileWatcherTest assertEquals(true, onChangeCalled); } - @Test - public final void testWithTimer() throws IOException + @Test(timeOut = 5000, groups = "slow") + public final void testOnChangeCalled() throws IOException { onChangeCalled = false; FileWatcher fileWatcher = new TestFileWatcher(tmpFile2); FileUtils.touch(tmpFile2); Timer timer = new Timer(true); timer.schedule(fileWatcher, 0); - } - - @Test(dependsOnMethods = "testWithTimer", timeOut = 5000, groups = "slow") - public final void testOnChangeCalled() - { while (onChangeCalled == false) { try -- GitLab