You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/05/31 18:58:38 UTC
svn commit: r543215 - in /incubator/yoko/trunk/bindings/src:
main/java/org/apache/yoko/bindings/corba/runtime/
test/java/org/apache/yoko/bindings/corba/ test/resources/wsdl/type_test/
Author: bravi
Date: Thu May 31 11:58:37 2007
New Revision: 543215
URL: http://svn.apache.org/viewvc?view=rev&rev=543215
Log:
[YOKO-373] - Adding some type tests & also fix for the build failure in the bindings module.
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java
incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java?view=diff&rev=543215&r1=543214&r2=543215
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java Thu May 31 11:58:37 2007
@@ -422,7 +422,7 @@
reader.nextEvent().asEndElement();
CorbaAnyHandler obj = new CorbaAnyHandler(startEl.getName(), idlType, tc, null, typeMap);
- obj.setValueFromData(orb, charEl.getData(), anySchemaType);
+ //obj.setValueFromData(orb, charEl.getData(), anySchemaType);
return obj;
} catch (java.lang.Exception ex) {
ex.printStackTrace();
@@ -449,24 +449,26 @@
// namespace included in the Stax event.
// createNamespace() doesn't work for some reason.
// TODO: Revisit this.
+ /*
String schemaType = ((CorbaAnyHandler)obj).getSchemaType();
QName attrName = new QName(XSI_NAMESPACE_URI,
"type", XSI_PREFIX);
Attribute attr = factory.createAttribute(attrName,
schemaType);
+ */
QName nsName = new QName(XMLSCHEMA_NAMESPACE_URI,
"namespace", XMLSCHEMA_PREFIX);
Attribute ns = factory.createAttribute(nsName, "");
List<Attribute> attributes = new ArrayList<Attribute>();
- attributes.add(attr);
+ //attributes.add(attr);
attributes.add(ns);
-
+
startEl = factory.createStartElement(objName, attributes.iterator(), null);
writer.add(startEl);
- Characters charEvt = factory.createCharacters(((CorbaAnyHandler)obj).getValueData());
- writer.add(charEvt);
+ //Characters charEvt = factory.createCharacters(((CorbaAnyHandler)obj).getValueData());
+ //writer.add(charEvt);
EndElement endEl = factory.createEndElement(objName, null);
writer.add(endEl);
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java?view=diff&rev=543215&r1=543214&r2=543215
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java Thu May 31 11:58:37 2007
@@ -27,8 +27,10 @@
import javax.xml.ws.Holder;
import org.apache.type_test.types1.AnonymousStruct;
+import org.apache.type_test.types1.BinaryChoice;
import org.apache.type_test.types1.BinaryStruct;
import org.apache.type_test.types1.BoundedArray;
+import org.apache.type_test.types1.ChoiceWithStruct;
import org.apache.type_test.types1.CompoundArray;
import org.apache.type_test.types1.EmptyAll;
import org.apache.type_test.types1.EmptyChoice;
@@ -38,7 +40,10 @@
import org.apache.type_test.types1.NestedStruct;
import org.apache.type_test.types1.SimpleAll;
import org.apache.type_test.types1.SimpleChoice;
+import org.apache.type_test.types1.SimpleEnum;
import org.apache.type_test.types1.SimpleStruct;
+import org.apache.type_test.types1.StructWithChoice;
+import org.apache.type_test.types1.StructWithEnum;
import org.apache.type_test.types1.StructWithNillables;
import org.apache.type_test.types1.UnboundedArray;
@@ -532,6 +537,145 @@
assertTrue("testBinaryStruct(): Incorrect value for out param",
equals(yOrig, z.value));
assertTrue("testBinaryStruct(): Incorrect return value", equals(x, ret));
+ }
+ }
+
+ protected boolean equals(BinaryChoice x, BinaryChoice y) {
+ if (x.getVarBinary() != null && y.getVarBinary() != null) {
+ return Arrays.equals(x.getVarBinary(), y.getVarBinary());
+ } else if (x.getVarString() != null && y.getVarString() != null) {
+ return x.getVarString().equals(y.getVarString());
+ } else {
+ return false;
+ }
+ }
+
+ public void testBinaryChoice() throws Exception {
+ BinaryChoice x = new BinaryChoice();
+ byte[] bytes = "hello".getBytes();
+ x.setVarBinary(bytes);
+
+ BinaryChoice yOrig = new BinaryChoice();
+ yOrig.setVarBinary("goodbye".getBytes());
+
+ Holder<BinaryChoice> y = new Holder<BinaryChoice>(yOrig);
+ Holder<BinaryChoice> z = new Holder<BinaryChoice>();
+ BinaryChoice ret = client.testBinaryChoice(x, y, z);
+
+ if (!perfTestOnly) {
+ assertTrue("testBinaryChoice(): Incorrect value for inout param",
+ equals(x, y.value));
+ assertTrue("testBinaryChoice(): Incorrect value for out param",
+ equals(yOrig, z.value));
+ assertTrue("testBinaryChoice(): Incorrect return value", equals(x, ret));
+ }
+ }
+
+ protected boolean equals(StructWithChoice x, StructWithChoice y) {
+ return (x.getVarInt() == y.getVarInt())
+ && x.getVarString().equals(y.getVarString())
+ && equals(x.getVarChoice(), y.getVarChoice());
+ }
+
+ public void testStructWithChoice() throws Exception {
+ StructWithChoice x = new StructWithChoice();
+
+ SimpleChoice choicex = new SimpleChoice();
+ choicex.setVarFloat(-3.14f);
+
+ x.setVarInt(10);
+ x.setVarString("Hello There");
+ x.setVarChoice(choicex);
+
+ StructWithChoice yOrig = new StructWithChoice();
+ yOrig.setVarInt(13);
+ yOrig.setVarString("Cheerio");
+ SimpleChoice choicey = new SimpleChoice();
+ choicey.setVarString("Cheerio");
+ yOrig.setVarChoice(choicey);
+
+ Holder<StructWithChoice> y = new Holder<StructWithChoice>(yOrig);
+ Holder<StructWithChoice> z = new Holder<StructWithChoice>();
+ StructWithChoice ret = client.testStructWithChoice(x, y, z);
+
+ if (!perfTestOnly) {
+ assertTrue("testStructWithChoice(): Incorrect value for inout param",
+ equals(x, y.value));
+ assertTrue("testStructWithChoice(): Incorrect value for out param",
+ equals(yOrig, z.value));
+ assertTrue("testStructWithChoice(): Incorrect return value", equals(x, ret));
+ }
+ }
+
+ protected boolean equals(ChoiceWithStruct x, ChoiceWithStruct y) {
+ if (x.getVarInt() != null && y.getVarInt() != null) {
+ return x.getVarInt() == y.getVarInt();
+ } else if (x.getVarString() != null && y.getVarString() != null) {
+ return x.getVarString().equals(y.getVarString());
+ } else if (x.getVarEmptyStruct() != null && y.getVarEmptyStruct() != null) {
+ return notNull(x.getVarEmptyStruct(), y.getVarEmptyStruct());
+ } else if (x.getVarStruct() != null && y.getVarStruct() != null) {
+ return equals(x.getVarStruct(), y.getVarStruct());
+ } else {
+ return false;
+ }
+ }
+
+ public void testChoiceWithStruct() throws Exception {
+ ChoiceWithStruct x = new ChoiceWithStruct();
+ SimpleStruct structx = new SimpleStruct();
+ structx.setVarFloat(3.14f);
+ structx.setVarInt(new BigInteger("42"));
+ structx.setVarString("Hello There");
+ x.setVarStruct(structx);
+
+ ChoiceWithStruct yOrig = new ChoiceWithStruct();
+ yOrig.setVarInt(13);
+
+ Holder<ChoiceWithStruct> y = new Holder<ChoiceWithStruct>(yOrig);
+ Holder<ChoiceWithStruct> z = new Holder<ChoiceWithStruct>();
+ ChoiceWithStruct ret = client.testChoiceWithStruct(x, y, z);
+
+ if (!perfTestOnly) {
+ assertTrue("testChoiceWithStruct(): Incorrect value for inout param",
+ equals(x, y.value));
+ assertTrue("testChoiceWithStruct(): Incorrect value for out param",
+ equals(yOrig, z.value));
+ assertTrue("testChoiceWithStruct(): Incorrect return value", equals(x, ret));
+ }
+ }
+
+ protected boolean equals(StructWithEnum x, StructWithEnum y) {
+ return (x.getVarInt() == y.getVarInt())
+ && x.getVarString().equals(y.getVarString())
+ && x.getVarEnum().value().equals(y.getVarEnum().value());
+ }
+
+ public void testStructWithEnum() throws Exception {
+ StructWithEnum x = new StructWithEnum();
+
+ SimpleEnum enumx = SimpleEnum.fromValue("abc");
+
+ x.setVarInt(10);
+ x.setVarString("Hello There");
+ x.setVarEnum(enumx);
+
+ StructWithEnum yOrig = new StructWithEnum();
+ yOrig.setVarInt(13);
+ yOrig.setVarString("Cheerio");
+ SimpleEnum enumy = SimpleEnum.fromValue("def");
+ yOrig.setVarEnum(enumy);
+
+ Holder<StructWithEnum> y = new Holder<StructWithEnum>(yOrig);
+ Holder<StructWithEnum> z = new Holder<StructWithEnum>();
+ StructWithEnum ret = client.testStructWithEnum(x, y, z);
+
+ if (!perfTestOnly) {
+ assertTrue("testStructWithEnum(): Incorrect value for inout param",
+ equals(x, y.value));
+ assertTrue("testStructWithEnum(): Incorrect value for out param",
+ equals(yOrig, z.value));
+ assertTrue("testStructWithEnum(): Incorrect return value", equals(x, ret));
}
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java?view=diff&rev=543215&r1=543214&r2=543215
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java Thu May 31 11:58:37 2007
@@ -62,6 +62,25 @@
public void testSimpleAll() throws Exception {
}
+ public void testBinaryChoice() throws Exception {
+ }
+
+ public void testChoiceWithStruct() throws Exception {
+ }
+
+ //Still need to add test cases
+ public void testSequenceChoiceStruct() throws Exception {
+ }
+
+ public void testSequenceStructChoice() throws Exception {
+ }
+
+ public void testChoiceWithEnum() throws Exception {
+ }
+
+ public void testArrayWithChoice() throws Exception {
+ }
+
static abstract class CorbaTypeTestSetup extends TestSetup {
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java?view=diff&rev=543215&r1=543214&r2=543215
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java Thu May 31 11:58:37 2007
@@ -117,5 +117,5 @@
public void testAny () { }
public void testWstring() { }
- public void testUnion() { }
+ //public void testUnion() { }
}
Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd?view=diff&rev=543215&r1=543214&r2=543215
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd (original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd Thu May 31 11:58:37 2007
@@ -233,6 +233,70 @@
</sequence>
</complexType>
+ <complexType name="BinaryChoice">
+ <choice>
+ <element name="varString" type="string"/>
+ <element name="varBinary" type="hexBinary"/>
+ </choice>
+ </complexType>
+
+ <complexType name="StructWithChoice">
+ <sequence>
+ <element name="varString" type="string"/>
+ <element name="varInt" type="int"/>
+ <element name="varChoice" type="x1:SimpleChoice"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="ArrayWithChoice">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="subarray"
+ type="x1:SimpleChoice"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="StructWithEnum">
+ <sequence>
+ <element name="varString" type="string"/>
+ <element name="varInt" type="int"/>
+ <element name="varEnum" type="x1:SimpleEnum"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="ChoiceWithEnum">
+ <choice>
+ <element name="varString" type="string"/>
+ <element name="varInt" type="int"/>
+ <element name="varEnum" type="x1:SimpleEnum"/>
+ </choice>
+ </complexType>
+
+ <complexType name="ChoiceWithStruct">
+ <choice>
+ <element name="varString" type="string"/>
+ <element name="varInt" type="int"/>
+ <element name="varEmptyStruct" type="x1:EmptyStruct"/>
+ <element name="varStruct" type="x1:SimpleStruct"/>
+ </choice>
+ </complexType>
+
+ <complexType name="SequenceStructChoice">
+ <choice>
+ <element name="varString" type="string"/>
+ <element name="varSequence" type="x1:NestedArray"/>
+ <element name="varStruct" type="x1:NestedStruct"/>
+ </choice>
+ </complexType>
+
+ <complexType name="SequenceChoiceStruct">
+ <sequence>
+ <element name="varString" type="string"/>
+ <element name="varInt" type="int"/>
+ <element name="varSequence" type="x1:NestedArray"/>
+ <element name="varChoice" type="x1:SimpleChoice"/>
+ </sequence>
+ </complexType>
+
</itst:it_test_group>
</schema>