andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compiler errors for 9b22097f7e7c878bd18c95d548ad36b5c9ae9e5c

Browse Source 
Motivation:

Branch 4.0 is broken as 9b22097f7e7c878bd18c95d548ad36b5c9ae9e5c uses 4.1 APIs in tests.

Modifications:

Fix the tests by using 4.0 APIs.

Result:

Branch 4.0 is back to green.
This commit is contained in:
Xiaoyan Lin 2016-05-27 23:20:24 -07:00
parent 48ed70c1aa
commit d0ae71f62c
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
View File

@ -25,7 +25,6 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -79,17 +78,12 @@ public class DefaultPromiseTest {
@Test @Test
public void testNoStackOverflowErrorWithDefaultEventExecutorA() throws Exception { public void testNoStackOverflowErrorWithDefaultEventExecutorA() throws Exception {
ExecutorService executorService = Executors.newSingleThreadExecutor(); EventExecutor executor = new DefaultEventExecutor(null, new DefaultThreadFactory("test"));
try {
EventExecutor executor = new DefaultEventExecutor(executorService);
try { try {
testStackOverFlowErrorChainedFuturesA(Math.min(stackOverflowDepth << 1, Integer.MAX_VALUE), executor); testStackOverFlowErrorChainedFuturesA(Math.min(stackOverflowDepth << 1, Integer.MAX_VALUE), executor);
} finally { } finally {
executor.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS); executor.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
} }
} finally {
executorService.shutdown();
}
} }
@Test @Test
@ -100,17 +94,12 @@ public class DefaultPromiseTest {
@Test @Test
public void testNoStackOverflowErrorWithDefaultEventExecutorB() throws Exception { public void testNoStackOverflowErrorWithDefaultEventExecutorB() throws Exception {
ExecutorService executorService = Executors.newSingleThreadExecutor(); EventExecutor executor = new DefaultEventExecutor(null, new DefaultThreadFactory("test"));
try {
EventExecutor executor = new DefaultEventExecutor(executorService);
try { try {
testStackOverFlowErrorChainedFuturesB(Math.min(stackOverflowDepth << 1, Integer.MAX_VALUE), executor); testStackOverFlowErrorChainedFuturesB(Math.min(stackOverflowDepth << 1, Integer.MAX_VALUE), executor);
} finally { } finally {
executor.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS); executor.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
} }
} finally {
executorService.shutdown();
}
} }
@Test @Test