grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid catching AssertionError in tests 

Found via ErrorProne
This commit is contained in:
Eric Anderson 2017-09-18 09:54:14 -07:00
parent 6bb1755357
commit bd28b92850
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
context/src/test/java/io/grpc/ContextTest.java
View File

@ -455,7 +455,7 @@ public class ContextTest {
assertSame(current, observed); assertSame(current, observed);
assertSame(current, Context.current()); assertSame(current, Context.current());
final Error err = new Error(); final TestError err = new TestError();
try { try {
base.wrap(new Runnable() { base.wrap(new Runnable() {
@Override @Override
@ -464,7 +464,7 @@ public class ContextTest {
} }
}).run(); }).run();
fail("Expected exception"); fail("Expected exception");
} catch (Error ex) { } catch (TestError ex) {
assertSame(err, ex); assertSame(err, ex);
} }
assertSame(current, Context.current()); assertSame(current, Context.current());
@ -495,7 +495,7 @@ public class ContextTest {
assertSame(current, observed); assertSame(current, observed);
assertSame(current, Context.current()); assertSame(current, Context.current());
final Error err = new Error(); final TestError err = new TestError();
try { try {
base.wrap(new Callable<Object>() { base.wrap(new Callable<Object>() {
@Override @Override
@ -504,7 +504,7 @@ public class ContextTest {
} }
}).call(); }).call();
fail("Excepted exception"); fail("Excepted exception");
} catch (Error ex) { } catch (TestError ex) {
assertSame(err, ex); assertSame(err, ex);
} }
assertSame(current, Context.current()); assertSame(current, Context.current());
@ -987,4 +987,7 @@ public class ContextTest {
} }
} }
} }
/** Allows more precise catch blocks than plain Error to avoid catching AssertionError. */
private static final class TestError extends Error {}
} }

27
core/src/test/java/io/grpc/internal/ServerImplTest.java
View File

@ -1027,7 +1027,7 @@ public class ServerImplTest {
ServerStreamListener mockListener = mock(ServerStreamListener.class); ServerStreamListener mockListener = mock(ServerStreamListener.class);
listener.setListener(mockListener); listener.setListener(mockListener);
Throwable expectedT = new AssertionError(); TestError expectedT = new TestError();
doThrow(expectedT).when(mockListener) doThrow(expectedT).when(mockListener)
.messagesAvailable(any(StreamListener.MessageProducer.class)); .messagesAvailable(any(StreamListener.MessageProducer.class));
// Closing the InputStream is done by the delegated listener (generally ServerCallImpl) // Closing the InputStream is done by the delegated listener (generally ServerCallImpl)
@ -1035,7 +1035,7 @@ public class ServerImplTest {
try { try {
executor.runDueTasks(); executor.runDueTasks();
fail("Expected exception"); fail("Expected exception");
} catch (Throwable t) { } catch (TestError t) {
assertSame(expectedT, t); assertSame(expectedT, t);
ensureServerStateNotLeaked(); ensureServerStateNotLeaked();
} }
@ -1052,7 +1052,7 @@ public class ServerImplTest {
ServerStreamListener mockListener = mock(ServerStreamListener.class); ServerStreamListener mockListener = mock(ServerStreamListener.class);
listener.setListener(mockListener); listener.setListener(mockListener);
Throwable expectedT = new RuntimeException(); RuntimeException expectedT = new RuntimeException();
doThrow(expectedT).when(mockListener) doThrow(expectedT).when(mockListener)
.messagesAvailable(any(StreamListener.MessageProducer.class)); .messagesAvailable(any(StreamListener.MessageProducer.class));
// Closing the InputStream is done by the delegated listener (generally ServerCallImpl) // Closing the InputStream is done by the delegated listener (generally ServerCallImpl)
@ -1060,7 +1060,7 @@ public class ServerImplTest {
try { try {
executor.runDueTasks(); executor.runDueTasks();
fail("Expected exception"); fail("Expected exception");
} catch (Throwable t) { } catch (RuntimeException t) {
assertSame(expectedT, t); assertSame(expectedT, t);
ensureServerStateNotLeaked(); ensureServerStateNotLeaked();
} }
@ -1077,13 +1077,13 @@ public class ServerImplTest {
ServerStreamListener mockListener = mock(ServerStreamListener.class); ServerStreamListener mockListener = mock(ServerStreamListener.class);
listener.setListener(mockListener); listener.setListener(mockListener);
Throwable expectedT = new AssertionError(); TestError expectedT = new TestError();
doThrow(expectedT).when(mockListener).halfClosed(); doThrow(expectedT).when(mockListener).halfClosed();
listener.halfClosed(); listener.halfClosed();
try { try {
executor.runDueTasks(); executor.runDueTasks();
fail("Expected exception"); fail("Expected exception");
} catch (Throwable t) { } catch (TestError t) {
assertSame(expectedT, t); assertSame(expectedT, t);
ensureServerStateNotLeaked(); ensureServerStateNotLeaked();
} }
@ -1100,13 +1100,13 @@ public class ServerImplTest {
ServerStreamListener mockListener = mock(ServerStreamListener.class); ServerStreamListener mockListener = mock(ServerStreamListener.class);
listener.setListener(mockListener); listener.setListener(mockListener);
Throwable expectedT = new RuntimeException(); RuntimeException expectedT = new RuntimeException();
doThrow(expectedT).when(mockListener).halfClosed(); doThrow(expectedT).when(mockListener).halfClosed();
listener.halfClosed(); listener.halfClosed();
try { try {
executor.runDueTasks(); executor.runDueTasks();
fail("Expected exception"); fail("Expected exception");
} catch (Throwable t) { } catch (RuntimeException t) {
assertSame(expectedT, t); assertSame(expectedT, t);
ensureServerStateNotLeaked(); ensureServerStateNotLeaked();
} }
@ -1123,13 +1123,13 @@ public class ServerImplTest {
ServerStreamListener mockListener = mock(ServerStreamListener.class); ServerStreamListener mockListener = mock(ServerStreamListener.class);
listener.setListener(mockListener); listener.setListener(mockListener);
Throwable expectedT = new AssertionError(); TestError expectedT = new TestError();
doThrow(expectedT).when(mockListener).onReady(); doThrow(expectedT).when(mockListener).onReady();
listener.onReady(); listener.onReady();
try { try {
executor.runDueTasks(); executor.runDueTasks();
fail("Expected exception"); fail("Expected exception");
} catch (Throwable t) { } catch (TestError t) {
assertSame(expectedT, t); assertSame(expectedT, t);
ensureServerStateNotLeaked(); ensureServerStateNotLeaked();
} }
@ -1146,13 +1146,13 @@ public class ServerImplTest {
ServerStreamListener mockListener = mock(ServerStreamListener.class); ServerStreamListener mockListener = mock(ServerStreamListener.class);
listener.setListener(mockListener); listener.setListener(mockListener);
Throwable expectedT = new RuntimeException(); RuntimeException expectedT = new RuntimeException();
doThrow(expectedT).when(mockListener).onReady(); doThrow(expectedT).when(mockListener).onReady();
listener.onReady(); listener.onReady();
try { try {
executor.runDueTasks(); executor.runDueTasks();
fail("Expected exception"); fail("Expected exception");
} catch (Throwable t) { } catch (RuntimeException t) {
assertSame(expectedT, t); assertSame(expectedT, t);
ensureServerStateNotLeaked(); ensureServerStateNotLeaked();
} }
@ -1249,4 +1249,7 @@ public class ServerImplTest {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }
/** Allows more precise catch blocks than plain Error to avoid catching AssertionError. */
private static final class TestError extends Error {}
} }