提交 afecfba0 authored 作者: Thomas Mueller's avatar Thomas Mueller

assertThrows

上级 a1ace544
...@@ -32,9 +32,7 @@ public abstract class AssertThrows { ...@@ -32,9 +32,7 @@ public abstract class AssertThrows {
if (t == null) { if (t == null) {
throw new AssertionError("Expected an exception of type " + throw new AssertionError("Expected an exception of type " +
expectedExceptionClass.getSimpleName() + expectedExceptionClass.getSimpleName() +
" to be thrown, but the method returned " + " to be thrown, but the method returned successfully");
returnValue +
" for " + ProxyCodeGenerator.formatMethodCall(m, args));
} }
if (!expectedExceptionClass.isAssignableFrom(t.getClass())) { if (!expectedExceptionClass.isAssignableFrom(t.getClass())) {
AssertionError ae = new AssertionError( AssertionError ae = new AssertionError(
...@@ -42,8 +40,7 @@ public abstract class AssertThrows { ...@@ -42,8 +40,7 @@ public abstract class AssertThrows {
expectedExceptionClass.getSimpleName() + expectedExceptionClass.getSimpleName() +
" to be thrown, but the method under test threw an exception of type\n" + " to be thrown, but the method under test threw an exception of type\n" +
t.getClass().getSimpleName() + t.getClass().getSimpleName() +
" (see in the 'Caused by' for the exception that was thrown) " + " (see in the 'Caused by' for the exception that was thrown)");
" for " + ProxyCodeGenerator.formatMethodCall(m, args));
ae.initCause(t); ae.initCause(t);
throw ae; throw ae;
} }
...@@ -61,9 +58,7 @@ public abstract class AssertThrows { ...@@ -61,9 +58,7 @@ public abstract class AssertThrows {
public boolean verify(Object returnValue, Throwable t, Method m, Object... args) { public boolean verify(Object returnValue, Throwable t, Method m, Object... args) {
if (t != null) { if (t != null) {
throw new AssertionError( throw new AssertionError(
"Expected an exception to be thrown, but the method returned " + "Expected an exception to be thrown, but the method returned successfully");
returnValue +
" for " + ProxyCodeGenerator.formatMethodCall(m, args));
} }
// all exceptions are fine // all exceptions are fine
return false; return false;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论