MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

adjusted termination timings

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-06-28 18:43:32 +03:00
parent c793578be6
commit 2c50c50465
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
+10 -10
View File
@@ -55,7 +55,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
future.get();
}
assertEquals(0, executor.shutdownNow().size());
assertTrue(executor.awaitTermination(N + N, TimeUnit.MILLISECONDS));
assertTrue(executor.awaitTermination(N + N + 100000, TimeUnit.MILLISECONDS));
assertEquals(maxTasks, max.get());
assertEquals(N, executed.get());
}
@@ -93,7 +93,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
future.get();
}
assertEquals(0, executor.shutdownNow().size());
assertTrue(executor.awaitTermination(N + N, TimeUnit.MILLISECONDS));
assertTrue(executor.awaitTermination(N + N+100000, TimeUnit.MILLISECONDS));
assertEquals(maxTasks, max.get());
assertEquals(N, executed.get());
}
@@ -106,7 +106,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
Integer result = f1.get();
assertEquals(42, result.intValue());
executor.shutdownNow();
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
}
public void testEarlyCancelPreventsRunning() throws ExecutionException, InterruptedException {
@@ -126,7 +126,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
assertFalse(run.get());
assertTrue(s1.isDone());
executor.shutdownNow();
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
}
public void testStressWhenSomeTasksCallOtherTasksGet() throws ExecutionException, InterruptedException {
@@ -175,7 +175,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
}
finally {
executor.shutdownNow();
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
}
assertTrue("Max threads was: "+maxThreads+" but bound was: "+maxSimultaneousTasks, maxThreads.get() <= maxSimultaneousTasks);
@@ -202,7 +202,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
String logs = log.toString();
assertEquals(expected.toString(), logs);
executor.shutdownNow();
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
}
@@ -238,7 +238,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
String logs = log.toString();
assertEquals("", logs);
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
}
public void testShutdownMustDisableSubmit() throws ExecutionException, InterruptedException {
@@ -272,7 +272,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
String logs = log.toString();
assertEquals("", logs);
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
}
public void testAwaitTerminationDoesWait() throws InterruptedException {
@@ -286,7 +286,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
futures[i] = executor.submit(() -> log.append(" "));
}
executor.shutdown();
assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
String logs = log.toString();
assertEquals(N, logs.length());
@@ -304,7 +304,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
assertFalse(executor2.awaitTermination(1, TimeUnit.SECONDS));
assertFalse(future.isDone());
assertFalse(future.isCancelled());
assertTrue(executor2.awaitTermination(1000, TimeUnit.SECONDS));
assertTrue(executor2.awaitTermination(100, TimeUnit.SECONDS));
assertTrue(future.isDone());
assertFalse(future.isCancelled());
}
platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
+1 -1
View File
@@ -479,7 +479,7 @@ public class BoundedTaskExecutorTest extends TestCase {
ExecutorService executor2 = new BoundedTaskExecutor(PooledThreadExecutor.INSTANCE, 1);
Future<?> future = executor2.submit(() -> TimeoutUtil.sleep(10000));
executor2.shutdown();
assertFalse(executor2.awaitTermination(100, TimeUnit.SECONDS));
assertFalse(executor2.awaitTermination(1, TimeUnit.SECONDS));
assertFalse(future.isDone());
assertFalse(future.isCancelled());
assertTrue(executor2.awaitTermination(100, TimeUnit.SECONDS));