You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/05/02 19:40:21 UTC
svn commit: r1793582 -
/axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
Author: veithen
Date: Tue May 2 19:40:21 2017
New Revision: 1793582
URL: http://svn.apache.org/viewvc?rev=1793582&view=rev
Log:
Improve error reporting in unit tests.
Modified:
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
Modified: axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java?rev=1793582&r1=1793581&r2=1793582&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java Tue May 2 19:40:21 2017
@@ -25,7 +25,6 @@ import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringReader;
@@ -103,7 +102,7 @@ public abstract class AbstractTestCase e
* @param expected
* @param actual
*/
- public static void assertBeanEquals(Object expected, Object actual) {
+ public static void assertBeanEquals(Object expected, Object actual) throws Exception {
if (expected == null) {
assertNull(actual);
return;
@@ -127,7 +126,7 @@ public abstract class AbstractTestCase e
}
}
- private static void assertPropertyValueEquals(String message, Object expected, Object actual) {
+ private static void assertPropertyValueEquals(String message, Object expected, Object actual) throws Exception {
if (expected == null) {
assertNull(message, actual);
} else {
@@ -195,18 +194,14 @@ public abstract class AbstractTestCase e
return count;
}
- private static void assertDataHandlerEquals(DataHandler expected, DataHandler actual) {
- try {
- InputStream in1 = expected.getInputStream();
- InputStream in2 = actual.getInputStream();
- int b;
- do {
- b = in1.read();
- assertEquals(b, in2.read());
- } while (b != -1);
- } catch (IOException ex) {
- fail("Failed to read data handler");
- }
+ private static void assertDataHandlerEquals(DataHandler expected, DataHandler actual) throws Exception {
+ InputStream in1 = expected.getInputStream();
+ InputStream in2 = actual.getInputStream();
+ int b;
+ do {
+ b = in1.read();
+ assertEquals(b, in2.read());
+ } while (b != -1);
}
public static Object toHelperModeBean(ADBBean bean) throws Exception {