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 di...@apache.org on 2007/06/26 21:22:00 UTC
svn commit: r550913 - in /webservices/axis2/trunk/java/modules/adb-codegen:
src/org/apache/axis2/schema/ test/org/apache/axis2/schema/innerChoice/
test/org/apache/axis2/schema/innerparticles/
test/org/apache/axis2/schema/restriction/ test/org/apache/ax...
Author: dims
Date: Tue Jun 26 12:21:59 2007
New Revision: 550913
URL: http://svn.apache.org/viewvc?view=rev&rev=550913
Log:
get adb-codegen module working in JDK1.6. we were using the same counter for all types, this check-in ensures that there is a separate counter for each type.
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=550913&r1=550912&r2=550913
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Tue Jun 26 12:21:59 2007
@@ -91,8 +91,6 @@
public static final String USE_REQUIRED = "required";
public static final String USE_NONE = "none";
- private static int typeCounter = 0;
-
/**
* @return the processes element map
* includes the Qname of the element as the key and a
@@ -745,37 +743,15 @@
*/
private QName generateTypeQName(QName referenceEltQName, XmlSchema parentSchema) {
QName generatedTypeName = new QName(referenceEltQName.getNamespaceURI(),
- referenceEltQName.getLocalPart() + getNextTypeSuffix());
+ referenceEltQName.getLocalPart() + getNextTypeSuffix(referenceEltQName.getLocalPart()));
while (parentSchema.getTypeByName(generatedTypeName) != null) {
generatedTypeName = new QName(referenceEltQName.getNamespaceURI(),
- referenceEltQName.getLocalPart() + getNextTypeSuffix());
+ referenceEltQName.getLocalPart() + getNextTypeSuffix(referenceEltQName.getLocalPart()));
}
return generatedTypeName;
}
/**
- * Generate a unique attribute Qname using the ref name
- *
- * @param attrRefName
- * @param parentSchema
- * @return Returns the generated attribute name
- */
- private QName generateAttributeQName(QName attrRefName, XmlSchema parentSchema) {
-
- if (typeCounter == Integer.MAX_VALUE) {
- typeCounter = 0;
- }
- QName generatedAttrName = new QName(attrRefName.getNamespaceURI(),
- attrRefName.getLocalPart() + typeCounter++);
-
- while (parentSchema.getTypeByName(generatedAttrName) != null) {
- generatedAttrName = new QName(attrRefName.getNamespaceURI(),
- attrRefName.getLocalPart() + typeCounter++);
- }
- return generatedAttrName;
- }
-
- /**
* Finds whether a given class is already made
*
* @param qName
@@ -1690,7 +1666,7 @@
schemaTypeQName = attributeSimpleType.getQName();
} else {
schemaTypeQName = new QName(parentSchema.getTargetNamespace(),
- attributeQName.getLocalPart() + getNextTypeSuffix());
+ attributeQName.getLocalPart() + getNextTypeSuffix(attributeQName.getLocalPart()));
}
}
@@ -1935,8 +1911,9 @@
BeanWriterMetaInfoHolder beanWriterMetaInfoHolder = new BeanWriterMetaInfoHolder();
process(parentElementQName, xmlSchemaSequence.getItems(), beanWriterMetaInfoHolder, true, parentSchema);
beanWriterMetaInfoHolder.setParticleClass(true);
+ String localName = parentElementQName.getLocalPart() + "Sequence";
QName sequenceQName = new QName(parentElementQName.getNamespaceURI(),
- parentElementQName.getLocalPart() + "Sequence" + getNextTypeSuffix());
+ localName + getNextTypeSuffix(localName));
String javaClassName = writeComplexParticle(sequenceQName, beanWriterMetaInfoHolder);
processedTypemap.put(sequenceQName, javaClassName);
@@ -1959,8 +1936,9 @@
beanWriterMetaInfoHolder.setChoice(true);
process(parentElementQName, xmlSchemaChoice.getItems(), beanWriterMetaInfoHolder, false, parentSchema);
beanWriterMetaInfoHolder.setParticleClass(true);
+ String localName = parentElementQName.getLocalPart() + "Choice";
QName choiceQName = new QName(parentElementQName.getNamespaceURI(),
- parentElementQName.getLocalPart() + "Choice" + getNextTypeSuffix());
+ localName + getNextTypeSuffix(localName));
String javaClassName = writeComplexParticle(choiceQName, beanWriterMetaInfoHolder);
processedTypemap.put(choiceQName, javaClassName);
@@ -2454,7 +2432,7 @@
QName fakeQname;
if (xsElt != null) {
- fakeQname = new QName(xsElt.getQName().getNamespaceURI(), xsElt.getQName().getLocalPart() + getNextTypeSuffix());
+ fakeQname = new QName(xsElt.getQName().getNamespaceURI(), xsElt.getQName().getLocalPart() + getNextTypeSuffix(xsElt.getQName().getLocalPart()));
// we have to set this otherwise the ours attribute would not set properly if refered to this simple
// type from any other element
xsElt.setSchemaTypeName(fakeQname);
@@ -2575,7 +2553,7 @@
childQname = unionSimpleType.getQName();
if (childQname == null) {
// we create a fake Qname for all these simple types since most propably they don't have one
- childQname = new QName(parentSimpleTypeQname.getNamespaceURI(), parentSimpleTypeQname.getLocalPart() + "_type" + i);
+ childQname = new QName(parentSimpleTypeQname.getNamespaceURI(), parentSimpleTypeQname.getLocalPart() + getNextTypeSuffix(parentSimpleTypeQname.getLocalPart()));
}
// this is an inner simple type of the union so it shold not have
// processed
@@ -2643,11 +2621,18 @@
}
- private String getNextTypeSuffix() {
- if (typeCounter == Integer.MAX_VALUE) {
- typeCounter = 0;
+ HashMap mapTypeCount = new HashMap();
+ private String getNextTypeSuffix(String localName) {
+ Integer typeCounter = (Integer) mapTypeCount.get(localName);
+ int count = 0;
+ if (typeCounter != null) {
+ if(typeCounter.intValue() == Integer.MAX_VALUE) {
+ count = 0;
+ } else {
+ count = typeCounter.intValue();
+ }
}
- return ("_type" + typeCounter++);
+ mapTypeCount.put(localName, new Integer(count+1));
+ return ("_type" + count);
}
-
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java?view=diff&rev=550913&r1=550912&r2=550913
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java Tue Jun 26 12:21:59 2007
@@ -34,10 +34,10 @@
testSequence.setSequence1("test sequence");
testSequence.setSequence2(3);
- TestInnerSequence1Choice_type2 testInnerSequence1Choice_type2 = new TestInnerSequence1Choice_type2();
- testInnerSequence1Choice_type2.setChoice1("test choice");
- testInnerSequence1Choice_type2.setChoice2(5);
- testSequence.setTestInnerSequence1Choice_type2(testInnerSequence1Choice_type2);
+ TestInnerSequence1Choice_type0 TestInnerSequence1Choice_type0 = new TestInnerSequence1Choice_type0();
+ TestInnerSequence1Choice_type0.setChoice1("test choice");
+ TestInnerSequence1Choice_type0.setChoice2(5);
+ testSequence.setTestInnerSequence1Choice_type0(TestInnerSequence1Choice_type0);
try {
OMElement omElement = testSequence.getOMElement(TestInnerSequence1.MY_QNAME,
@@ -48,7 +48,7 @@
TestInnerSequence1 result = TestInnerSequence1.Factory.parse(xmlReader);
assertEquals(result.getSequence1(), "test sequence");
assertEquals(result.getSequence2(), 3);
- assertEquals(result.getTestInnerSequence1Choice_type2().getChoice2(), 5);
+ assertEquals(result.getTestInnerSequence1Choice_type0().getChoice2(), 5);
// writtig result back
XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(System.out);
@@ -65,9 +65,9 @@
TestInnerSequence2 testSequence = new TestInnerSequence2();
testSequence.setSequence1("sequence");
testSequence.setSequence2(3);
- TestInnerSequence2Choice_type1 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type1();
+ TestInnerSequence2Choice_type0 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type0();
testInnerSequence2Choice_type1.setChoice1(new String[]{"choice1", "choice2"});
- testSequence.setTestInnerSequence2Choice_type1(testInnerSequence2Choice_type1);
+ testSequence.setTestInnerSequence2Choice_type0(testInnerSequence2Choice_type1);
try {
OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
@@ -78,7 +78,7 @@
TestInnerSequence2 result = TestInnerSequence2.Factory.parse(xmlReader);
assertEquals(result.getSequence1(), "sequence");
assertEquals(result.getSequence2(), 3);
- assertTrue(isEqual(result.getTestInnerSequence2Choice_type1().getChoice1(), new String[]{"choice1", "choice2"}));
+ assertTrue(isEqual(result.getTestInnerSequence2Choice_type0().getChoice1(), new String[]{"choice1", "choice2"}));
} catch (Exception e) {
fail();
}
@@ -88,9 +88,9 @@
TestInnerSequence2 testSequence = new TestInnerSequence2();
testSequence.setSequence1("sequence");
testSequence.setSequence2(3);
- TestInnerSequence2Choice_type1 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type1();
+ TestInnerSequence2Choice_type0 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type0();
testInnerSequence2Choice_type1.setChoice2(new int[]{2, 4});
- testSequence.setTestInnerSequence2Choice_type1(testInnerSequence2Choice_type1);
+ testSequence.setTestInnerSequence2Choice_type0(testInnerSequence2Choice_type1);
try {
OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
@@ -101,7 +101,7 @@
TestInnerSequence2 result = TestInnerSequence2.Factory.parse(xmlReader);
assertEquals(result.getSequence1(), "sequence");
assertEquals(result.getSequence2(), 3);
- assertTrue(isEqual(result.getTestInnerSequence2Choice_type1().getChoice2(), new int[]{2, 4}));
+ assertTrue(isEqual(result.getTestInnerSequence2Choice_type0().getChoice2(), new int[]{2, 4}));
} catch (Exception e) {
fail();
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java?view=diff&rev=550913&r1=550912&r2=550913
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java Tue Jun 26 12:21:59 2007
@@ -64,10 +64,10 @@
TestInnerParticle2 testInnerParticle2 = new TestInnerParticle2();
testInnerParticle2.setParam1("Param1");
- TestInnerParticle2Choice_type5 testInnerParticle2Choice_type1 = new TestInnerParticle2Choice_type5();
+ TestInnerParticle2Choice_type0 testInnerParticle2Choice_type1 = new TestInnerParticle2Choice_type0();
testInnerParticle2Choice_type1.setParam2("Param2");
testInnerParticle2Choice_type1.setParam3("Param3");
- testInnerParticle2.setTestInnerParticle2Choice_type5(testInnerParticle2Choice_type1);
+ testInnerParticle2.setTestInnerParticle2Choice_type0(testInnerParticle2Choice_type1);
testInnerParticle2.setParam4("Param4");
try {
@@ -78,7 +78,7 @@
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle2 result = TestInnerParticle2.Factory.parse(xmlReader);
assertEquals(result.getParam1(), "Param1");
- assertEquals(result.getTestInnerParticle2Choice_type5().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle2Choice_type0().getParam3(), "Param3");
assertEquals(result.getParam4(), "Param4");
} catch (XMLStreamException e) {
fail();
@@ -112,10 +112,10 @@
public void testInnerParticle32() {
TestInnerParticle3 testInnerParticle3 = new TestInnerParticle3();
- TestInnerParticle3Choice_type1 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type1();
+ TestInnerParticle3Choice_type0 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type0();
testInnerParticle3Choice_type1.setParam2("Param2");
testInnerParticle3Choice_type1.setParam3("Param3");
- testInnerParticle3.setTestInnerParticle3Choice_type1(testInnerParticle3Choice_type1);
+ testInnerParticle3.setTestInnerParticle3Choice_type0(testInnerParticle3Choice_type1);
try {
OMElement omElement =
@@ -124,7 +124,7 @@
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle3 result = TestInnerParticle3.Factory.parse(xmlReader);
- assertEquals(result.getTestInnerParticle3Choice_type1().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle3Choice_type0().getParam3(), "Param3");
} catch (XMLStreamException e) {
e.printStackTrace();
fail();
@@ -139,10 +139,10 @@
TestInnerParticle3 testInnerParticle3 = new TestInnerParticle3();
testInnerParticle3.setParam1("Param1");
- TestInnerParticle3Choice_type1 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type1();
+ TestInnerParticle3Choice_type0 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type0();
testInnerParticle3Choice_type1.setParam2("Param2");
testInnerParticle3Choice_type1.setParam3("Param3");
- testInnerParticle3.setTestInnerParticle3Choice_type1(testInnerParticle3Choice_type1);
+ testInnerParticle3.setTestInnerParticle3Choice_type0(testInnerParticle3Choice_type1);
testInnerParticle3.setParam4("Param4");
try {
@@ -187,10 +187,10 @@
public void testInnerParticle42() {
TestInnerParticle4 testInnerParticle4 = new TestInnerParticle4();
- TestInnerParticle4Sequence_type2 testInnerParticle4Sequence_type2 = new TestInnerParticle4Sequence_type2();
- testInnerParticle4Sequence_type2.setParam2("Param2");
- testInnerParticle4Sequence_type2.setParam3("Param3");
- testInnerParticle4.setTestInnerParticle4Sequence_type2(testInnerParticle4Sequence_type2);
+ TestInnerParticle4Sequence_type0 TestInnerParticle4Sequence_type0 = new TestInnerParticle4Sequence_type0();
+ TestInnerParticle4Sequence_type0.setParam2("Param2");
+ TestInnerParticle4Sequence_type0.setParam3("Param3");
+ testInnerParticle4.setTestInnerParticle4Sequence_type0(TestInnerParticle4Sequence_type0);
try {
OMElement omElement =
@@ -199,8 +199,8 @@
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle4 result = TestInnerParticle4.Factory.parse(xmlReader);
- assertEquals(result.getTestInnerParticle4Sequence_type2().getParam2(), "Param2");
- assertEquals(result.getTestInnerParticle4Sequence_type2().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle4Sequence_type0().getParam2(), "Param2");
+ assertEquals(result.getTestInnerParticle4Sequence_type0().getParam3(), "Param3");
} catch (XMLStreamException e) {
e.printStackTrace();
fail();
@@ -238,16 +238,16 @@
TestInnerParticle5 testInnerParticle5 = new TestInnerParticle5();
testInnerParticle5.setParam1("Param1");
- TestInnerParticle5Sequence_type4 testInnerParticle2Choice_type1 = new TestInnerParticle5Sequence_type4();
+ TestInnerParticle5Sequence_type1 testInnerParticle2Choice_type1 = new TestInnerParticle5Sequence_type1();
testInnerParticle2Choice_type1.setParam2("Param2");
testInnerParticle2Choice_type1.setParam3("Param3");
- TestInnerParticle5Sequence_type3 testInnerParticle5Sequence_type3 = new TestInnerParticle5Sequence_type3();
- testInnerParticle5Sequence_type3.setParam4("Param4");
- testInnerParticle5Sequence_type3.setParam5("Param5");
+ TestInnerParticle5Sequence_type0 innerParticle5Sequence_type0 = new TestInnerParticle5Sequence_type0();
+ innerParticle5Sequence_type0.setParam4("Param4");
+ innerParticle5Sequence_type0.setParam5("Param5");
- testInnerParticle2Choice_type1.setTestInnerParticle5Sequence_type3(testInnerParticle5Sequence_type3);
- testInnerParticle5.setTestInnerParticle5Sequence_type4(testInnerParticle2Choice_type1);
+ testInnerParticle2Choice_type1.setTestInnerParticle5Sequence_type0(innerParticle5Sequence_type0);
+ testInnerParticle5.setTestInnerParticle5Sequence_type1(testInnerParticle2Choice_type1);
testInnerParticle5.setParam6("Param6");
try {
@@ -258,10 +258,10 @@
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle5 result = TestInnerParticle5.Factory.parse(xmlReader);
assertEquals(result.getParam1(), "Param1");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getParam2(), "Param2");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getParam3(), "Param3");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getTestInnerParticle5Sequence_type3().getParam4(), "Param4");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getTestInnerParticle5Sequence_type3().getParam5(), "Param5");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getParam2(), "Param2");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getTestInnerParticle5Sequence_type0().getParam4(), "Param4");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getTestInnerParticle5Sequence_type0().getParam5(), "Param5");
assertEquals(result.getParam6(), "Param6");
} catch (XMLStreamException e) {
fail();
@@ -278,9 +278,9 @@
new TestInnterParticleExtensionChildComplexType();
testInnterParticleExtension.setTestInnterParticleExtension(testInnterParticleExtensionChildComplexType);
- TestInnterParticleExtensionParentComplexTypeChoice_type6 testInnterParticleExtensionParentComplexTypeChoice_type0 =
- new TestInnterParticleExtensionParentComplexTypeChoice_type6();
- testInnterParticleExtensionChildComplexType.setTestInnterParticleExtensionParentComplexTypeChoice_type6(testInnterParticleExtensionParentComplexTypeChoice_type0);
+ TestInnterParticleExtensionParentComplexTypeChoice_type0 testInnterParticleExtensionParentComplexTypeChoice_type0 =
+ new TestInnterParticleExtensionParentComplexTypeChoice_type0();
+ testInnterParticleExtensionChildComplexType.setTestInnterParticleExtensionParentComplexTypeChoice_type0(testInnterParticleExtensionParentComplexTypeChoice_type0);
testInnterParticleExtensionParentComplexTypeChoice_type0.setParam1("param1");
testInnterParticleExtensionParentComplexTypeChoice_type0.setParam2("param2");
@@ -295,7 +295,7 @@
assertTrue(result.getTestInnterParticleExtension() instanceof TestInnterParticleExtensionChildComplexType);
TestInnterParticleExtensionChildComplexType resultComplexType =
(TestInnterParticleExtensionChildComplexType) result.getTestInnterParticleExtension();
- assertEquals(resultComplexType.getTestInnterParticleExtensionParentComplexTypeChoice_type6().getParam2(),"param2");
+ assertEquals(resultComplexType.getTestInnterParticleExtensionParentComplexTypeChoice_type0().getParam2(),"param2");
} catch (ADBException e) {
fail();
} catch (XMLStreamException e) {
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?view=diff&rev=550913&r1=550912&r2=550913
==============================================================================
--- 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 Tue Jun 26 12:21:59 2007
@@ -142,9 +142,9 @@
address.setLine1("line1");
address.setLine2("line2");
address.setState("state");
- Zip_type3 ziptype = new Zip_type3();
+ Zip_type1 ziptype = new Zip_type1();
address.setZip(ziptype);
- ziptype.setZip_type2("C");
+ ziptype.setZip_type0("C");
try {
OMElement omElement = personElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
@@ -160,7 +160,7 @@
assertEquals(resultAddress.getLine1(),"line1");
assertEquals(resultAddress.getLine2(),"line2");
assertEquals(resultAddress.getState(),"state");
- assertEquals(resultAddress.getZip().getZip_type2(),"C");
+ assertEquals(resultAddress.getZip().getZip_type0(),"C");
} catch (Exception e) {
e.printStackTrace();
assertFalse(true);
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?view=diff&rev=550913&r1=550912&r2=550913
==============================================================================
--- 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 Tue Jun 26 12:21:59 2007
@@ -109,9 +109,9 @@
TestInnerUnionType testInnerUnionType = new TestInnerUnionType();
PackingType_T packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
- PackingType_T_type2 packingType_t_type2 = new PackingType_T_type2();
- packingType_t_type2.setPackingType_T_type2("MINOR_a");
- packingType_t.setObject(packingType_t_type2);
+ 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());
@@ -119,7 +119,7 @@
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(packingType_t_type2.toString(),result.getTestInnerUnionType().getObject().toString());
+ assertEquals(packingType_t_type0.toString(),result.getTestInnerUnionType().getObject().toString());
} catch (Exception e) {
assertTrue(false);
}
@@ -127,9 +127,9 @@
testInnerUnionType = new TestInnerUnionType();
packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
- PackingType_T_type3 packingType_t_type3 = new PackingType_T_type3();
- packingType_t_type3.setPackingType_T_type3("PROP_a");
- packingType_t.setObject(packingType_t_type3);
+ PackingType_T_type1 packingType_t_type1 = new PackingType_T_type1();
+ packingType_t_type1.setPackingType_T_type1("PROP_a");
+ packingType_t.setObject(packingType_t_type1);
try {
omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
@@ -137,7 +137,7 @@
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(packingType_t_type3.toString(),result.getTestInnerUnionType().getObject().toString());
+ assertEquals(packingType_t_type1.toString(),result.getTestInnerUnionType().getObject().toString());
} catch (Exception e) {
assertTrue(false);
}
@@ -145,7 +145,7 @@
testInnerUnionType = new TestInnerUnionType();
packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
- packingType_t.setObject(PackingType_T_type4.TAR);
+ packingType_t.setObject(PackingType_T_type2.TAR);
try {
omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
@@ -153,7 +153,7 @@
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(PackingType_T_type4.TAR,result.getTestInnerUnionType().getObject());
+ assertEquals(PackingType_T_type2.TAR,result.getTestInnerUnionType().getObject());
} catch (Exception e) {
assertTrue(false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org