Skip to content
Snippets Groups Projects
Commit e7e2f4b7 authored by ribeaudc's avatar ribeaudc
Browse files

fix: - DataMover tests.

SVN: 6616
parent b13ff6cd
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,10 @@ ...@@ -16,7 +16,10 @@
package ch.systemsx.cisd.common.concurrent; package ch.systemsx.cisd.common.concurrent;
import static org.testng.AssertJUnit.*; import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertTrue;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -52,7 +55,7 @@ public class TerminableCallableTest ...@@ -52,7 +55,7 @@ public class TerminableCallableTest
final private Strategy strategy; final private Strategy strategy;
volatile FinishCause cause; volatile FinishCause cause;
volatile int cleanUpCount; volatile int cleanUpCount;
public TestRunnable(CountDownLatch launchLatch, CountDownLatch milestoneLatch, public TestRunnable(CountDownLatch launchLatch, CountDownLatch milestoneLatch,
...@@ -197,7 +200,7 @@ public class TerminableCallableTest ...@@ -197,7 +200,7 @@ public class TerminableCallableTest
assertEquals(1, sensor.cleanUpCount); assertEquals(1, sensor.cleanUpCount);
} }
@Test @Test(invocationCount = 10)
public void testThrowException() throws Exception public void testThrowException() throws Exception
{ {
final CountDownLatch launchLatch = new CountDownLatch(1); final CountDownLatch launchLatch = new CountDownLatch(1);
...@@ -209,7 +212,7 @@ public class TerminableCallableTest ...@@ -209,7 +212,7 @@ public class TerminableCallableTest
t.start(); t.start();
launchLatch.await(); launchLatch.await();
milestoneLatch.await(); milestoneLatch.await();
assertTrue(callableUnderTest.terminate(0L)); assertTrue(callableUnderTest.terminate());
assertTrue(milestoneLatch.await(0, TimeUnit.MILLISECONDS)); assertTrue(milestoneLatch.await(0, TimeUnit.MILLISECONDS));
assertTrue(describe(sensor.cause), FinishCause.EXCEPTION.equals(sensor.cause)); assertTrue(describe(sensor.cause), FinishCause.EXCEPTION.equals(sensor.cause));
assertEquals(1, sensor.cleanUpCount); assertEquals(1, sensor.cleanUpCount);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment