Author: veithen
Date: Thu Mar 24 20:00:35 2011
New Revision: 1085104
URL: http://svn.apache.org/viewvc?rev=1085104&view=rev
Log:
Eliminated a couple of instances of the catch-and-fail JUnit anti-pattern.
Modified:
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/soapencoding/ArrayTest.java
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/xsd/ArrayTest.java
Modified:
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/soapencoding/ArrayTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/soapencoding/ArrayTest.java?rev=1085104&r1=1085103&r2=1085104&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/soapencoding/ArrayTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/soapencoding/ArrayTest.java
Thu Mar 24 20:00:35 2011
@@ -23,9 +23,7 @@ import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axis2.databinding.ADBException;
-import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
import java.util.List;
@@ -33,7 +31,7 @@ import java.util.List;
public class ArrayTest extends TestCase {
- public void testArray1() {
+ public void testArray1() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -48,29 +46,21 @@ public class ArrayTest extends TestCase
array.setArrayTypeQName(new
javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/","int";));
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i-1)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i-1)).get_int(),i);
}
}
- public void testArray2() {
+ public void testArray2() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -85,26 +75,18 @@ public class ArrayTest extends TestCase
array.setArrayTypeQName(new
javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/","date";));
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- assertEquals(resultList.size(),5);
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ assertEquals(resultList.size(),5);
}
- public void testArray3() {
+ public void testArray3() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -118,29 +100,21 @@ public class ArrayTest extends TestCase
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i-1)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i-1)).get_int(),i);
}
}
- public void testArray4() {
+ public void testArray4() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -154,58 +128,41 @@ public class ArrayTest extends TestCase
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- assertEquals(resultList.size(),5);
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
- }
-
- public void testArray5() {
-
-
- try {
- java.lang.String omElementString = "<ns1:Array
xmlns:ns1=\"http://schemas.xmlsoap.org/soap/encoding/\"; \n" +
- "
xmlns:s1=\"http://www.w3.org/2001/XMLSchema\"\n"; +
- " ns1:arrayType=\"s1:ur-type[5]\">\n" +
- " <ns1:int>1</ns1:int>\n" +
- " <ns1:int>2</ns1:int>\n" +
- " <ns1:int>3</ns1:int>\n" +
- " <ns1:int>4</ns1:int>\n" +
- " <ns1:int>5</ns1:int>\n" +
- "</ns1:Array>";
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i-1)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- e.printStackTrace();
- fail();
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ assertEquals(resultList.size(),5);
+ }
+
+ public void testArray5() throws Exception {
+
+
+ java.lang.String omElementString = "<ns1:Array
xmlns:ns1=\"http://schemas.xmlsoap.org/soap/encoding/\"; \n" +
+ " xmlns:s1=\"http://www.w3.org/2001/XMLSchema\"\n"; +
+ " ns1:arrayType=\"s1:ur-type[5]\">\n" +
+ " <ns1:int>1</ns1:int>\n" +
+ " <ns1:int>2</ns1:int>\n" +
+ " <ns1:int>3</ns1:int>\n" +
+ " <ns1:int>4</ns1:int>\n" +
+ " <ns1:int>5</ns1:int>\n" +
+ "</ns1:Array>";
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i-1)).get_int(),i);
}
}
- public void testArray6() {
+ public void testArray6() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -221,24 +178,16 @@ public class ArrayTest extends TestCase
array.setArrayTypeQName(new
javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/","int";));
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i)).get_int(),i);
}
}
Modified:
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/xsd/ArrayTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/xsd/ArrayTest.java?rev=1085104&r1=1085103&r2=1085104&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/xsd/ArrayTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/xsd/ArrayTest.java
Thu Mar 24 20:00:35 2011
@@ -24,18 +24,16 @@ import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axis2.databinding.ADBException;
import org.apache.axis2.databinding.types.soapencoding.Array;
import org.apache.axis2.databinding.types.soapencoding.ArrayE;
-import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
import java.util.List;
public class ArrayTest extends TestCase {
- public void testArray1() {
+ public void testArray1() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -50,30 +48,21 @@ public class ArrayTest extends TestCase
array.setArrayTypeQName(new
javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema","int";));
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i-1)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- e.printStackTrace();
- fail();
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i-1)).get_int(),i);
}
}
- public void testArray2() {
+ public void testArray2() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -88,26 +77,18 @@ public class ArrayTest extends TestCase
array.setArrayTypeQName(new
javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema","date";));
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- assertEquals(resultList.size(),5);
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ assertEquals(resultList.size(),5);
}
- public void testArray3() {
+ public void testArray3() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -121,29 +102,21 @@ public class ArrayTest extends TestCase
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i-1)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i-1)).get_int(),i);
}
}
- public void testArray4() {
+ public void testArray4() throws Exception {
ArrayE arrayElement = new ArrayE();
Array array = new Array();
@@ -157,52 +130,35 @@ public class ArrayTest extends TestCase
arrayElement.setArray(array);
- try {
- OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- java.lang.String omElementString = omElement.toStringWithConsume();
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- assertEquals(resultList.size(),5);
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
+ OMElement omElement = arrayElement.getOMElement(ArrayE.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
+ java.lang.String omElementString = omElement.toStringWithConsume();
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ assertEquals(resultList.size(),5);
}
- public void testArray5() {
+ public void testArray5() throws Exception {
- try {
- java.lang.String omElementString = "<ns1:Array
xmlns:ns1=\"http://schemas.xmlsoap.org/soap/encoding/\";
xmlns:s1=\"http://www.w3.org/2001/XMLSchema\"\n"; +
- " ns1:arrayType=\"s1:ur-type[5]\">\n" +
- " <s1:int>1</s1:int>\n" +
- " <s1:int>2</s1:int>\n" +
- " <s1:int>3</s1:int>\n" +
- " <s1:int>4</s1:int>\n" +
- " <s1:int>5</s1:int>\n" +
- "</ns1:Array>";
- System.out.println("OMElement ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- ArrayE result = ArrayE.Factory.parse(xmlReader);
- List resultList = result.getArray().getObjectList();
- for (int i = 1; i < 6; i++) {
- assertEquals(((_int)resultList.get(i-1)).get_int(),i);
- }
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
+ java.lang.String omElementString = "<ns1:Array
xmlns:ns1=\"http://schemas.xmlsoap.org/soap/encoding/\";
xmlns:s1=\"http://www.w3.org/2001/XMLSchema\"\n"; +
+ " ns1:arrayType=\"s1:ur-type[5]\">\n" +
+ " <s1:int>1</s1:int>\n" +
+ " <s1:int>2</s1:int>\n" +
+ " <s1:int>3</s1:int>\n" +
+ " <s1:int>4</s1:int>\n" +
+ " <s1:int>5</s1:int>\n" +
+ "</ns1:Array>";
+ System.out.println("OMElement ==> " + omElementString);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
+ new ByteArrayInputStream(omElementString.getBytes()));
+ ArrayE result = ArrayE.Factory.parse(xmlReader);
+ List resultList = result.getArray().getObjectList();
+ for (int i = 1; i < 6; i++) {
+ assertEquals(((_int)resultList.get(i-1)).get_int(),i);
}
-
}
}
\ No newline at end of file
