You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ve...@apache.org on 2009/06/20 19:42:33 UTC
svn commit: r786866 [3/3] - in
/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema:
./ all/ anytype/ attribute/ base64binary/ booleantest/ choice/ decimal/
enumeration/ extension/ group/ innerChoice/ innerparticleextension/ i...
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java?rev=786866&r1=786865&r2=786866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java Sat Jun 20 17:42:32 2009
@@ -19,10 +19,7 @@
package org.apache.axis2.schema.restriction;
-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.schema.AbstractTestCase;
import org.tempuri.Address;
import org.tempuri.ComplexRestrictionTypeTestElement;
import org.tempuri.EnumerationSimpleTypeElement;
@@ -39,14 +36,12 @@
import org.tempuri.Zip_type1;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
-import java.util.Date;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+public class SimpleRestrictionTest extends AbstractTestCase {
-public class SimpleRestrictionTest extends TestCase {
-
- public void testSimpleAttribute() {
+ public void testSimpleAttribute() throws Exception {
TestSimpleAttributeElement testSimpleAttributeElement = new TestSimpleAttributeElement();
@@ -65,94 +60,54 @@
testSimpleAttribute.setAttrib1(parentSimpleType1);
testSimpleAttribute.setAttrib2(parentSimpleType2);
- try {
- OMElement omElement = testSimpleAttributeElement.getOMElement(TestSimpleAttributeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM String ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- TestSimpleAttributeElement result = TestSimpleAttributeElement.Factory.parse(xmlReader);
- assertEquals(result.getTestSimpleAttributeElement().getTestElement1(), testSimpleAttribute.getTestElement1());
- assertEquals(result.getTestSimpleAttributeElement().getTestElement2(), testSimpleAttribute.getTestElement2());
- assertEquals(result.getTestSimpleAttributeElement().getTestElement3(), testSimpleAttribute.getTestElement3());
- assertEquals(result.getTestSimpleAttributeElement().getAttrib1().getChildSimpleType(), parentSimpleType1.getChildSimpleType());
- assertEquals(result.getTestSimpleAttributeElement().getAttrib2().getChildSimpleType(), parentSimpleType2.getChildSimpleType());
- } catch (Exception e) {
- assertFalse(true);
- }
-
+ testSerializeDeserialize(testSimpleAttributeElement);
}
- public void testNormalSimpleTypeElement() {
+ public void testNormalSimpleTypeElement() throws Exception {
NormalSimpleTypeElement normalSimpleTypeElement = new NormalSimpleTypeElement();
ParentNormalSimpleType parentNormalSimpleType = new ParentNormalSimpleType();
normalSimpleTypeElement.setNormalSimpleTypeElement(parentNormalSimpleType);
parentNormalSimpleType.setNormalSimpleType(new QName("http://wso2.com", "test"));
-
- try {
- OMElement omElement = normalSimpleTypeElement.getOMElement(NormalSimpleTypeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- NormalSimpleTypeElement result = NormalSimpleTypeElement.Factory.parse(xmlReader);
- assertEquals(result.getNormalSimpleTypeElement().getNormalSimpleType(), parentNormalSimpleType.getNormalSimpleType());
- } catch (Exception e) {
- assertFalse(true);
- }
-
+ testSerializeDeserialize(normalSimpleTypeElement);
}
- public void testEnumerationSimpleTypeElement() {
+ public void testEnumerationSimpleTypeElement() throws Exception {
EnumerationSimpleTypeElement enumerationSimpleTypeElement = new EnumerationSimpleTypeElement();
enumerationSimpleTypeElement.setEnumerationSimpleTypeElement(ParentEnumerationSimpleType.value1);
-
- try {
- OMElement omElement = enumerationSimpleTypeElement.getOMElement(EnumerationSimpleTypeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- EnumerationSimpleTypeElement result = EnumerationSimpleTypeElement.Factory.parse(xmlReader);
- assertEquals(result.getEnumerationSimpleTypeElement().getValue(), ParentEnumerationSimpleType.value1.getValue());
- } catch (Exception e) {
- assertFalse(true);
- }
+ testSerializeDeserialize(enumerationSimpleTypeElement);
}
- public void testComplexRestrictionType() {
+ public void testComplexRestrictionType() throws Exception {
ComplexRestrictionTypeTestElement complexRestrictionTypeTestElement = new ComplexRestrictionTypeTestElement();
ParentRestrictionType parentRestrictionType = new ParentRestrictionType();
complexRestrictionTypeTestElement.setComplexRestrictionTypeTestElement(parentRestrictionType);
parentRestrictionType.setBaseTypeElement1("test 1");
parentRestrictionType.setBaseTypeElement2(5);
-
- try {
- OMElement omElement = complexRestrictionTypeTestElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- ComplexRestrictionTypeTestElement result = ComplexRestrictionTypeTestElement.Factory.parse(xmlReader);
- assertEquals(result.getComplexRestrictionTypeTestElement().getBaseTypeElement1(), parentRestrictionType.getBaseTypeElement1());
- assertEquals(result.getComplexRestrictionTypeTestElement().getBaseTypeElement2(), parentRestrictionType.getBaseTypeElement2());
- } catch (Exception e) {
- e.printStackTrace();
- assertFalse(true);
- }
+ testSerializeDeserialize(complexRestrictionTypeTestElement);
}
- public void testPersonElement() {
+ public void testPersonElement() throws Exception {
PersonElement personElement = new PersonElement();
Person person = new Person();
personElement.setPersonElement(person);
person.setName("amila");
person.setAge(23);
person.setHairColor(HairColor_type1.black);
- Date date = new Date();
- person.setBirthDate(date);
+ Calendar cal = new GregorianCalendar();
+ cal.set(Calendar.DAY_OF_MONTH, 7);
+ cal.set(Calendar.MONTH, Calendar.FEBRUARY);
+ cal.set(Calendar.YEAR, 1977);
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ person.setBirthDate(cal.getTime());
Address address = new Address();
person.setAddress(address);
address.setCity("Galle");
@@ -163,28 +118,6 @@
address.setZip(ziptype);
ziptype.setZip_type0("C");
- try {
- OMElement omElement = personElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- PersonElement result = PersonElement.Factory.parse(xmlReader);
- assertEquals(result.getPersonElement().getName(),"amila");
- assertEquals(result.getPersonElement().getAge(),23);
- assertEquals(result.getPersonElement().getHairColor(),HairColor_type1.black);
- Address resultAddress = result.getPersonElement().getAddress();
- assertEquals(resultAddress.getCity(),"Galle");
- assertEquals(resultAddress.getLine1(),"line1");
- assertEquals(resultAddress.getLine2(),"line2");
- assertEquals(resultAddress.getState(),"state");
- assertEquals(resultAddress.getZip().getZip_type0(),"C");
- } catch (Exception e) {
- e.printStackTrace();
- assertFalse(true);
- }
-
-
+ testSerializeDeserialize(personElement);
}
-
-
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java?rev=786866&r1=786865&r2=786866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java Sat Jun 20 17:42:32 2009
@@ -19,113 +19,60 @@
package org.apache.axis2.schema.union;
-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.types.URI;
+import org.apache.axis2.schema.AbstractTestCase;
import org.tempuri.union.*;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
-public class UnionTest extends TestCase {
+public class UnionTest extends AbstractTestCase {
- public void testRecord2(){
- Object result;
- result = testRecord2(new Integer(10));
- assertEquals(result,new Integer(10));
- result = testRecord2(new Boolean(true));
- assertEquals(result,new Boolean(true));
+ public void testRecord2() throws Exception {
+ testRecord2(new Integer(10));
+ testRecord2(new Boolean(true));
}
- private Object testRecord2(Object testObject) {
+ private void testRecord2(Object testObject) throws Exception {
Record2 record2 = new Record2();
DateOrDateTimeType dateOrDateTimeType = new DateOrDateTimeType();
record2.setElem1(dateOrDateTimeType);
dateOrDateTimeType.setObject(testObject);
- try {
- OMElement omElement = record2.getOMElement(Record2.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM String ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- Record2 newRecord2 = Record2.Factory.parse(xmlReader);
- return newRecord2.getElem1().getObject();
- } catch (Exception e) {
- assertFalse(true);
- }
- return null;
- }
-
- public void testRecord1() {
- Object result;
- try {
- result = testRecord1(new URI("http://www.google.com"));
- assertEquals(result,new URI("http://www.google.com"));
- result = testRecord1(FooEnum._value1);
- assertEquals(result,FooEnum._value1);
- } catch (URI.MalformedURIException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ testSerializeDeserialize(record2);
}
- private Object testRecord1(Object testObject) {
+ public void testRecord1() throws Exception {
+ testRecord1(new URI("http://www.google.com"));
+ testRecord1(FooEnum._value1);
+ }
+
+ private void testRecord1(Object testObject) throws Exception {
Record1 record1 = new Record1();
FooOpenEnum fooOpenEnum = new FooOpenEnum();
record1.setElem1(fooOpenEnum);
- try {
- fooOpenEnum.setObject(testObject);
- OMElement omElement = record1.getOMElement(Record1.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM String ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- Record1 newRecord1 = Record1.Factory.parse(xmlReader);
- return newRecord1.getElem1().getObject();
- } catch (Exception e) {
- assertFalse(true);
- }
- return null;
+ fooOpenEnum.setObject(testObject);
+
+ testSerializeDeserialize(record1);
}
- public void testUnionQName(){
+ public void testUnionQName() throws Exception {
UnionQNameTestElement unionQNameTestElement = new UnionQNameTestElement();
UnionQNameTest unionQNameTest = new UnionQNameTest();
unionQNameTestElement.setUnionQNameTestElement(unionQNameTest);
unionQNameTest.setObject(new QName("http://www.google.com","test"));
- try {
- OMElement omElement = unionQNameTestElement.getOMElement(UnionQNameTestElement.MY_QNAME,OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- UnionQNameTestElement result = UnionQNameTestElement.Factory.parse(xmlReader);
- assertEquals(unionQNameTest.getObject(),result.getUnionQNameTestElement().getObject());
- } catch (Exception e) {
- assertTrue(false);
- }
+ testSerializeDeserialize(unionQNameTestElement);
}
- public void testInnerSimpleTypes(){
+ public void testInnerSimpleTypes() throws Exception {
TestInnerUnionType testInnerUnionType = new TestInnerUnionType();
PackingType_T packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
PackingType_T_type0 packingType_t_type0 = new PackingType_T_type0();
packingType_t_type0.setPackingType_T_type0("MINOR_a");
packingType_t.setObject(packingType_t_type0);
- OMElement omElement;
- try {
- omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(packingType_t_type0.toString(),result.getTestInnerUnionType().getObject().toString());
- } catch (Exception e) {
- assertTrue(false);
- }
+
+ testSerializeDeserialize(testInnerUnionType);
testInnerUnionType = new TestInnerUnionType();
packingType_t = new PackingType_T();
@@ -134,33 +81,13 @@
packingType_t_type1.setPackingType_T_type1("PROP_a");
packingType_t.setObject(packingType_t_type1);
- try {
- omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(packingType_t_type1.toString(),result.getTestInnerUnionType().getObject().toString());
- } catch (Exception e) {
- assertTrue(false);
- }
+ testSerializeDeserialize(testInnerUnionType);
testInnerUnionType = new TestInnerUnionType();
packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
packingType_t.setObject(PackingType_T_type2.TAR);
- try {
- omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(PackingType_T_type2.TAR,result.getTestInnerUnionType().getObject());
- } catch (Exception e) {
- assertTrue(false);
- }
-
-
+ testSerializeDeserialize(testInnerUnionType);
}
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java?rev=786866&r1=786865&r2=786866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java Sat Jun 20 17:42:32 2009
@@ -19,22 +19,14 @@
package org.apache.axis2.schema.union2;
-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.schema.AbstractTestCase;
import org.tempuri.union2.*;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
import java.util.Date;
+public class Union2Test extends AbstractTestCase {
-public class Union2Test extends TestCase {
-
- public void testUnionElement2() {
+ public void testUnionElement2() throws Exception {
TestUnionElement2 testUnionElement2 = new TestUnionElement2();
TestUnion1 param1 = new TestUnion1();
@@ -46,28 +38,10 @@
testUnionElement2.setAttribute1(attribute1);
- try {
- OMElement omElement = testUnionElement2.getOMElement(
- TestUnionElement2.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element String ==> " + omElementString);
- XMLStreamReader xmlReader =
- StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- TestUnionElement2 result = TestUnionElement2.Factory.parse(xmlReader);
- assertEquals(result.getParam1().getObject(), Boolean.TRUE);
- assertEquals(result.getAttribute1().getObject(), "test attribute");
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
+ testSerializeDeserialize(testUnionElement2);
}
- public void testListElement2() {
+ public void testListElement2() throws Exception {
TestListElement1 testListElement1 = new TestListElement1();
TestList1 param1 = new TestList1();
@@ -78,32 +52,10 @@
attribute1.setString(new String[]{"attribute1","attribute2"});
testListElement1.setAttribute1(attribute1);
- try {
- OMElement omElement = testListElement1.getOMElement(
- TestListElement1.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element String ==> " + omElementString);
- XMLStreamReader xmlReader =
- StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(omElementString.getBytes()));
- TestListElement1 result = TestListElement1.Factory.parse(xmlReader);
- assertEquals(result.getParam1().getString()[0], "param1");
- assertEquals(result.getParam1().getString()[1], "param2");
- assertEquals(result.getAttribute1().getString()[0], "attribute1");
- assertEquals(result.getAttribute1().getString()[1], "attribute2");
- } catch (ADBException e) {
- e.printStackTrace();
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
-
+ testSerializeDeserialize(testListElement1);
}
- public void testFuzzDateType(){
+ public void testFuzzDateType() throws Exception {
TestFuzzyDateType testFuzzyDateType = new TestFuzzyDateType();
FuzzyDateType fuzzyDateType = new FuzzyDateType();
@@ -111,20 +63,6 @@
testFuzzyDateType.setTestFuzzyDateType(fuzzyDateType);
- try {
- OMElement omElement = testFuzzyDateType.getOMElement(
- TestFuzzyDateType.MY_QNAME,OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toStringWithConsume();
- System.out.println("OM Element ==> " + omElementString);
- XMLStreamReader xmlReader =
- StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- TestFuzzyDateType result = TestFuzzyDateType.Factory.parse(xmlReader);
- } catch (ADBException e) {
- fail();
- } catch (XMLStreamException e) {
- fail();
- } catch (Exception e) {
- fail();
- }
+ TestFuzzyDateType result = (TestFuzzyDateType)serializeDeserialize(testFuzzyDateType);
}
}