LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Reveal the call trace of failed test cases which run in executors"

Browse Source
This commit is contained in:
Junyu Lai
2019-03-26 06:38:39 +00:00
committed by Gerrit Code Review
parent 539821c978 c3106feee7
commit 67cfb00800
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -212,7 +212,6 @@ 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;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
/** /**
@@ -4022,8 +4021,13 @@ public class ConnectivityServiceTest {
callback3.expectStopped(); callback3.expectStopped();
} }
@FunctionalInterface
private interface ThrowingConsumer<T> {
void accept(T t) throws Exception;
}
// Helper method to prepare the executor and run test // Helper method to prepare the executor and run test
private void runTestWithSerialExecutors(Consumer<Executor> functor) { private void runTestWithSerialExecutors(ThrowingConsumer<Executor> functor) throws Exception {
final ExecutorService executorSingleThread = Executors.newSingleThreadExecutor(); final ExecutorService executorSingleThread = Executors.newSingleThreadExecutor();
final Executor executorInline = (Runnable r) -> r.run(); final Executor executorInline = (Runnable r) -> r.run();
functor.accept(executorSingleThread); functor.accept(executorSingleThread);
@@ -4032,15 +4036,9 @@ public class ConnectivityServiceTest {
} }
@Test @Test
public void testNattSocketKeepalives() { public void testNattSocketKeepalives() throws Exception {
runTestWithSerialExecutors(executor -> { runTestWithSerialExecutors(executor -> doTestNattSocketKeepalivesWithExecutor(executor));
try { runTestWithSerialExecutors(executor -> doTestNattSocketKeepalivesFdWithExecutor(executor));
doTestNattSocketKeepalivesWithExecutor(executor);
doTestNattSocketKeepalivesFdWithExecutor(executor);
} catch (Exception e) {
fail(e.getMessage());
}
});
} }
private void doTestNattSocketKeepalivesWithExecutor(Executor executor) throws Exception { private void doTestNattSocketKeepalivesWithExecutor(Executor executor) throws Exception {
@@ -4210,14 +4208,8 @@ public class ConnectivityServiceTest {
} }
@Test @Test
public void testTcpSocketKeepalives() { public void testTcpSocketKeepalives() throws Exception {
runTestWithSerialExecutors(executor -> { runTestWithSerialExecutors(executor -> doTestTcpSocketKeepalivesWithExecutor(executor));
try {
doTestTcpSocketKeepalivesWithExecutor(executor);
} catch (Exception e) {
fail(e.getMessage());
}
});
} }
private void doTestTcpSocketKeepalivesWithExecutor(Executor executor) throws Exception { private void doTestTcpSocketKeepalivesWithExecutor(Executor executor) throws Exception {