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 19:19:46 UTC
svn commit: r543224 - in
/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba:
AbstractTypeTestClient1.java CorbaTypeTest.java
Author: bravi
Date: Thu May 31 12:19:45 2007
New Revision: 543224
URL: http://svn.apache.org/viewvc?view=rev&rev=543224
Log:
[YOKO-373] - Adding Choice With Enum type test.
Modified:
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
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=543224&r1=543223&r2=543224
==============================================================================
--- 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 12:19:45 2007
@@ -30,6 +30,7 @@
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.ChoiceWithEnum;
import org.apache.type_test.types1.ChoiceWithStruct;
import org.apache.type_test.types1.CompoundArray;
import org.apache.type_test.types1.EmptyAll;
@@ -676,6 +677,39 @@
assertTrue("testStructWithEnum(): Incorrect value for out param",
equals(yOrig, z.value));
assertTrue("testStructWithEnum(): Incorrect return value", equals(x, ret));
+ }
+ }
+
+ protected boolean equals(ChoiceWithEnum x, ChoiceWithEnum 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.getVarEnum() != null && y.getVarEnum() != null) {
+ return x.getVarEnum().equals(y.getVarEnum());
+ } else {
+ return false;
+ }
+ }
+
+ public void testChoiceWithEnum() throws Exception {
+ ChoiceWithEnum x = new ChoiceWithEnum();
+ SimpleEnum enumx = SimpleEnum.fromValue("abc");
+ x.setVarEnum(enumx);
+
+ ChoiceWithEnum yOrig = new ChoiceWithEnum();
+ yOrig.setVarInt(13);
+
+ Holder<ChoiceWithEnum> y = new Holder<ChoiceWithEnum>(yOrig);
+ Holder<ChoiceWithEnum> z = new Holder<ChoiceWithEnum>();
+ ChoiceWithEnum ret = client.testChoiceWithEnum(x, y, z);
+
+ if (!perfTestOnly) {
+ assertTrue("testChoiceWithEnum(): Incorrect value for inout param",
+ equals(x, y.value));
+ assertTrue("testChoiceWithEnum(): Incorrect value for out param",
+ equals(yOrig, z.value));
+ assertTrue("testChoiceWithEnum(): 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=543224&r1=543223&r2=543224
==============================================================================
--- 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 12:19:45 2007
@@ -68,14 +68,14 @@
public void testChoiceWithStruct() throws Exception {
}
+ public void testChoiceWithEnum() 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 {