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 ri...@apache.org on 2006/11/07 13:01:57 UTC
svn commit: r472095 [2/4] - in /incubator/yoko/trunk:
bindings/src/main/java/org/apache/yoko/bindings/corba/
bindings/src/test/java/org/apache/yoko/bindings/corba/
bindings/src/test/java/org/apache/yoko/bindings/corba/types/
core/src/main/java/org/apac...
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba;
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -31,26 +32,27 @@
public class CorbaMessageTest extends TestCase {
- private ORB orb;
-
+ private ORB orb;
+
public CorbaMessageTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaMessageTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -60,31 +62,31 @@
}
}
}
-
+
public void testCreateCorbaMessage() {
CorbaMessage msg = new CorbaMessage();
assertNotNull(msg);
}
-
+
public void testGetCorbaMessageAttributes() {
CorbaMessage msg = new CorbaMessage();
-
+
msg.setOperationName("TestOperationName");
String opName = msg.getOperationName();
assertTrue(opName.equals("TestOperationName"));
-
+
QName param1Name = new QName("param1");
QName param1IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
TypeCode param1TypeCode = orb.get_primitive_tc(TCKind.tk_long);
CorbaPrimitiveHandler param1 = new CorbaPrimitiveHandler(param1Name, param1IdlType, param1TypeCode, null);
CorbaStreamable p1 = new CorbaStreamable(param1, param1Name);
-
+
QName param2Name = new QName("param2");
QName param2IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
TypeCode param2TypeCode = orb.get_primitive_tc(TCKind.tk_string);
CorbaPrimitiveHandler param2 = new CorbaPrimitiveHandler(param2Name, param2IdlType, param2TypeCode, null);
CorbaStreamable p2 = new CorbaStreamable(param2, param2Name);
-
+
msg.addStreamableArgument(p1);
msg.addStreamableArgument(p2);
@@ -92,17 +94,17 @@
assertTrue(arguments.length == 2);
assertNotNull(arguments[0]);
assertNotNull(arguments[1]);
-
+
QName returnName = new QName("param2");
QName returnIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
TypeCode returnTypeCode = orb.get_primitive_tc(TCKind.tk_boolean);
CorbaPrimitiveHandler returnValue = new CorbaPrimitiveHandler(returnName, returnIdlType, returnTypeCode, null);
CorbaStreamable ret = new CorbaStreamable(returnValue, returnName);
-
+
msg.setStreamableReturn(ret);
CorbaStreamable retVal = msg.getStreamableReturn();
assertNotNull(retVal);
-
+
Exception ex = new CorbaBindingException("TestException");
msg.setException(ex);
Exception msgEx = msg.getException();
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedTypeTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedTypeTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedTypeTest.java Tue Nov 7 05:01:55 2006
@@ -21,6 +21,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
+import java.util.Properties;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventFactory;
@@ -57,42 +58,43 @@
private final String nestedNamespaceURI = "http://yoko.apache.org/nested/idl_types";
private final String nestedPrefix = "corbatm";
-
+
private TestUtils testUtils;
private ORB orb;
private Bus bus;
private EndpointReferenceType endpoint;
private CorbaBindingImpl bindingImpl;
-
+
public CorbaNestedTypeTest(String arg0) {
super(arg0);
}
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaBindingImplMarshalTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
+
testUtils = new TestUtils();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Test");
orb = ORB.init(new String[0], props);
bus = Bus.init(new String[0]);
-
+
// programmatically add the corba binding factory
BindingManager manager = bus.getBindingManager();
CorbaBindingFactory corbaBF = new CorbaBindingFactory();
corbaBF.init(bus);
manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
-
+
endpoint = testUtils.getNestedEndpointReference();
bindingImpl = new CorbaBindingImpl(bus, endpoint, orb, false);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -102,10 +104,10 @@
}
}
}
-
- // Since the nested type aspect of this Binding really just involves the CorbaObjectHandlers and the
+
+ // Since the nested type aspect of this Binding really just involves the CorbaObjectHandlers and the
// reading an writing to and from Stax, we'll test just these components.
-
+
public void testNestedType() {
QName objName = new QName("object");
QName objIdlType = new QName(nestedNamespaceURI, "NestedStruct", nestedPrefix);
@@ -115,7 +117,7 @@
TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
CorbaStructHandler obj = new CorbaStructHandler(objName, objIdlType, objTypeCode, structType);
assertNotNull(obj);
-
+
// Create member 1, a BasicStruct
objName = new QName("member1");
objIdlType = new QName(nestedNamespaceURI, "BasicStruct", nestedPrefix);
@@ -125,13 +127,13 @@
objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
CorbaStructHandler member1Obj = new CorbaStructHandler(objName, objIdlType, objTypeCode, structType);
assertNotNull(member1Obj);
-
+
// Create the basic struct members
String nestedMember1Value = "Basic Member 1";
objName = new QName("member1");
objIdlType = CorbaConstants.NT_CORBA_STRING;
objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
- CorbaPrimitiveHandler nestedMember1Obj =
+ CorbaPrimitiveHandler nestedMember1Obj =
new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
assertNotNull(nestedMember1Obj);
member1Obj.addMember(nestedMember1Obj);
@@ -140,13 +142,13 @@
objName = new QName("member2");
objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
- CorbaPrimitiveHandler nestedMember2Obj =
+ CorbaPrimitiveHandler nestedMember2Obj =
new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
assertNotNull(nestedMember2Obj);
member1Obj.addMember(nestedMember2Obj);
-
+
obj.addMember(member1Obj);
-
+
// Create member 2, a Basic Fixed
BigDecimal fixedValue = new BigDecimal("123.67");
objName = new QName("member2");
@@ -158,7 +160,7 @@
CorbaFixedHandler member2Obj = new CorbaFixedHandler(objName, objIdlType, objTypeCode, fixedType);
assertNotNull(member2Obj);
obj.addMember(member2Obj);
-
+
// Create member 3, a Basic Enum
int enumIndex = 0;
objName = new QName("member3");
@@ -170,7 +172,7 @@
CorbaEnumHandler member3Obj = new CorbaEnumHandler(objName, objIdlType, objTypeCode, enumType);
assertNotNull(member3Obj);
obj.addMember(member3Obj);
-
+
// Create member 4, a Basic Enum
Float floatValue = 123456.678f;
objName = new QName("member4");
@@ -184,22 +186,22 @@
// struct.
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
oStream.write_string(nestedMember1Value);
oStream.write_boolean(nestedMember2Value.booleanValue());
oStream.write_fixed(fixedValue.movePointRight(2));
oStream.write_long(enumIndex);
oStream.write_float(floatValue.floatValue());
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
- reader.read(obj);
-
+ reader.read(obj);
+
// Now that the Object has its values, try and write it to Stax
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-
+
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
XMLEventWriter evtWriter = null;
try {
@@ -208,7 +210,7 @@
assertTrue(false);
}
assertNotNull(evtWriter);
-
+
XMLEventFactory factory = XMLEventFactory.newInstance();
try {
bindingImpl.writeObjectToStax(obj, evtWriter, factory, false);
@@ -216,32 +218,32 @@
} catch (XMLStreamException ex) {
assertTrue(false);
}
-
+
byte[] b = outStream.toByteArray();
for (int i = 0; i < b.length; ++i) {
System.out.print((char)b[i]);
}
System.out.println();
-
- ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray());
+
+ ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray());
XMLEventReader evtReader = null;
- try {
+ try {
evtReader = inputFactory.createXMLEventReader(inStream);
} catch (XMLStreamException ex) {
assertTrue(false);
}
assertNotNull(evtReader);
-
+
// Now use the Stax data to re-create a new object
- CorbaObjectHandler result =
- bindingImpl.readObjectFromStax(evtReader,
- new QName(nestedNamespaceURI, "NestedStruct", nestedPrefix),
+ CorbaObjectHandler result =
+ bindingImpl.readObjectFromStax(evtReader,
+ new QName(nestedNamespaceURI, "NestedStruct", nestedPrefix),
false);
-
+
// Verify that the object has the correct values
- assertTrue(result instanceof CorbaStructHandler);
+ assertTrue(result instanceof CorbaStructHandler);
CorbaStructHandler nestedStructResult = (CorbaStructHandler)result;
-
+
result = nestedStructResult.getMember(0);
assertTrue(result instanceof CorbaStructHandler);
CorbaStructHandler structResult = (CorbaStructHandler)result;
@@ -255,7 +257,7 @@
assertTrue(result instanceof CorbaPrimitiveHandler);
structPrimitiveMemberResult = (CorbaPrimitiveHandler)result;
assertTrue(structPrimitiveMemberResult.getValueData().equals(nestedMember2Value.toString()));
-
+
// This is the fixed nested inside our struct
result = nestedStructResult.getMember(1);
assertTrue(result instanceof CorbaFixedHandler);
@@ -267,12 +269,12 @@
assertTrue(result instanceof CorbaEnumHandler);
CorbaEnumHandler enumResult = (CorbaEnumHandler)result;
assertTrue(enumResult.getValue().equals(enumType.getEnumerator().get(enumIndex).getValue()));
-
+
// This is the primitive nested inside our struct
result = nestedStructResult.getMember(3);
assertTrue(result instanceof CorbaPrimitiveHandler);
CorbaPrimitiveHandler primitiveResult = (CorbaPrimitiveHandler)result;
assertTrue(primitiveResult.getValueData().equals(floatValue.toString()));
}
-
+
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java Tue Nov 7 05:01:55 2006
@@ -20,6 +20,7 @@
import java.math.BigInteger;
import java.util.List;
+import java.util.Properties;
import javax.xml.namespace.QName;
@@ -54,25 +55,26 @@
public class CorbaObjectReaderTest extends TestCase {
private ORB orb;
-
+
public CorbaObjectReaderTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaObjectReaderTest.class);
}
-
+
protected void setUp() throws java.lang.Exception {
super.setUp();
- java.util.Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws java.lang.Exception {
if (orb != null) {
try {
@@ -87,175 +89,175 @@
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_boolean(true);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Boolean boolValue = reader.readBoolean();
assertTrue(boolValue.booleanValue() == true);
}
-
+
public void testReadChar() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_char('c');
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Character charValue = reader.readChar();
assertTrue(charValue.charValue() == 'c');
}
-
+
public void testReadWChar() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_wchar('w');
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Character wcharValue = reader.readWChar();
assertTrue(wcharValue.charValue() == 'w');
}
-
+
public void testReadOctet() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_octet((byte)27);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Byte octetValue = reader.readOctet();
assertTrue(octetValue.byteValue() == (byte)27);
}
-
+
public void testReadShort() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_short((short)-100);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Short shortValue = reader.readShort();
assertTrue(shortValue.shortValue() == (short)-100);
}
-
+
public void testReadUShort() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_ushort((short)100);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Short ushortValue = reader.readUShort();
assertTrue(ushortValue.shortValue() == (short)100);
}
-
+
public void testReadLong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_long(-100000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Long longValue = reader.readLong();
assertTrue(longValue.longValue() == -100000);
}
-
+
public void testReadULong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_ulong(100000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
BigInteger ulongValue = reader.readULong();
assertTrue(ulongValue.longValue() == 100000);
}
-
+
public void testReadLongLong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_longlong(1000000000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
BigInteger longlongValue = reader.readLongLong();
assertTrue(longlongValue.longValue() == 1000000000);
}
-
+
public void testReadULongLong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_ulonglong(-1000000000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
BigInteger ulonglongValue = reader.readULongLong();
assertTrue(ulonglongValue.longValue() == -1000000000);
}
-
+
public void testReadFloat() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_float((float)1234.56);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Float floatValue = reader.readFloat();
assertTrue(floatValue.floatValue() == (float)1234.56);
}
-
+
public void testReadDouble() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_double(6543.21);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Double doubleValue = reader.readDouble();
assertTrue(doubleValue.doubleValue() == 6543.21);
}
-
+
public void testReadString() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_string("String");
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
String stringValue = reader.readString();
assertTrue(stringValue.equals("String"));
}
-
+
public void testReadWString() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_wstring("WString");
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
String wstringValue = reader.readWString();
assertTrue(wstringValue.equals("WString"));
}
-
+
// need to add tests for arrays, sequences, struct, exceptions
public void testReadArray() {
-
+
int data[] = { 1, 1, 2, 3, 5, 8, 13, 21 };
-
+
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_long_array(data, 0, data.length);
@@ -276,22 +278,22 @@
CorbaArrayHandler obj = new CorbaArrayHandler(new QName("Array"), arrayIdlType, arrayTC, arrayType);
for (int i = 0; i < data.length; ++i) {
CorbaObjectHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), longIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), longIdlType,
orb.get_primitive_tc(TCKind.tk_long), null);
obj.addElement(nestedObj);
}
-
+
reader.readArray(obj);
int length = obj.getElements().size();
for (int i = 0; i < length; ++i) {
- assertTrue(new Long(((CorbaPrimitiveHandler)obj.getElement(i)).getValueData()).intValue()
- == data[i]);
+ assertTrue(new Long(((CorbaPrimitiveHandler)obj.getElement(i)).getValueData()).intValue()
+ == data[i]);
}
}
-
+
public void testReadSequence() {
String data[] = { "one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one" };
-
+
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_long(data.length);
@@ -308,7 +310,7 @@
Sequence seqType = new Sequence();
seqType.setBound(data.length);
- seqType.setElemtype(stringIdlType);
+ seqType.setElemtype(stringIdlType);
// name and respoitory ID of the sequence are not needed for this test
// build the object holder for a sequence.
@@ -316,19 +318,19 @@
CorbaSequenceHandler obj = new CorbaSequenceHandler(new QName("Seq"), seqIdlType, seqTC, seqType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
orb.get_primitive_tc(TCKind.tk_string), null);
obj.addElement(nestedObj);
}
-
+
reader.readSequence(obj);
int length = obj.getElements().size();
for (int i = 0; i < length; ++i) {
assertTrue(((CorbaPrimitiveHandler)obj.getElement(i)).getValueData().equals(data[i]));
}
}
-
- public void testReadStruct() {
+
+ public void testReadStruct() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
@@ -341,19 +343,19 @@
int member1 = 12345;
String member2 = "54321";
boolean member3 = true;
-
+
oStream.write_long(member1);
oStream.write_string(member2);
oStream.write_boolean(member3);
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
QName structIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "struct", CorbaConstants.NP_WSDL_CORBA);
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName boolIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
-
+
Struct structType = new Struct();
structType.setName("TestStruct");
MemberType m1 = new MemberType();
@@ -374,9 +376,9 @@
structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null);
structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null);
structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null);
- TypeCode structTC = orb.create_struct_tc("IDL:org.apache.yoko.TestStruct/1.0", "TestStruct",
+ TypeCode structTC = orb.create_struct_tc("IDL:org.apache.yoko.TestStruct/1.0", "TestStruct",
structMembers);
- CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
+ CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
structTC, structType);
obj.addMember(
new CorbaPrimitiveHandler(new QName("member1"), longIdlType, structMembers[0].type, null));
@@ -384,17 +386,17 @@
new CorbaPrimitiveHandler(new QName("member2"), stringIdlType, structMembers[1].type, null));
obj.addMember(
new CorbaPrimitiveHandler(new QName("member3"), boolIdlType, structMembers[2].type, null));
-
+
reader.readStruct(obj);
-
+
List<CorbaObjectHandler> nestedObjs = obj.getMembers();
- assertTrue(new Integer(((CorbaPrimitiveHandler)nestedObjs.get(0)).getValueData()).intValue()
+ assertTrue(new Integer(((CorbaPrimitiveHandler)nestedObjs.get(0)).getValueData()).intValue()
== member1);
assertTrue(((CorbaPrimitiveHandler)nestedObjs.get(1)).getValueData().equals(member2));
assertTrue(new Boolean(((CorbaPrimitiveHandler)nestedObjs.get(2)).getValueData()).booleanValue()
== member3);
}
-
+
public void testReadException() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
@@ -406,18 +408,18 @@
// }
short code = 12345;
String message = "54321";
-
+
oStream.write_string("IDL:org.apache.yoko.TestException/1.0");
oStream.write_short(code);
oStream.write_string(message);
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
QName exceptIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "exception", CorbaConstants.NP_WSDL_CORBA);
QName shortIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
-
+
Exception exceptType = new Exception();
exceptType.setName("TestException");
MemberType m1 = new MemberType();
@@ -433,32 +435,32 @@
StructMember[] exceptMembers = new StructMember[2];
exceptMembers[0] = new StructMember("code", orb.get_primitive_tc(TCKind.tk_short), null);
exceptMembers[1] = new StructMember("message", orb.get_primitive_tc(TCKind.tk_string), null);
- TypeCode exceptTC = orb.create_exception_tc("IDL:org.apache.yoko.TestException/1.0", "TestException",
+ TypeCode exceptTC = orb.create_exception_tc("IDL:org.apache.yoko.TestException/1.0", "TestException",
exceptMembers);
- CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
+ CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
exceptTC, exceptType);
obj.addMember(
new CorbaPrimitiveHandler(new QName("code"), shortIdlType, exceptMembers[0].type, null));
obj.addMember(
new CorbaPrimitiveHandler(new QName("message"), stringIdlType, exceptMembers[1].type, null));
-
+
reader.readException(obj);
-
+
List<CorbaObjectHandler> nestedObjs = obj.getMembers();
assertTrue(new Short(((CorbaPrimitiveHandler)nestedObjs.get(0)).getValueData()).shortValue() == code);
assertTrue(((CorbaPrimitiveHandler)nestedObjs.get(1)).getValueData().equals(message));
- }
-
+ }
+
public void testReadEnum() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
// create the following enum
// enum { RED, GREEN, BLUE };
oStream.write_long(1);
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
String[] enums = {"RED", "GREEN", "BLUE" };
Enum enumType = new Enum();
Enumerator enumRed = new Enumerator();
@@ -470,39 +472,39 @@
enumType.getEnumerator().add(enumRed);
enumType.getEnumerator().add(enumGreen);
enumType.getEnumerator().add(enumBlue);
-
+
// These values don't matter to the outcome of the test but are needed during construction
QName enumName = new QName("TestEnum");
QName enumIdlType = new QName("corbatm:TestEnum");
TypeCode enumTC = orb.create_enum_tc("IDL:TestEnum:1.0", enumName.getLocalPart(), enums);
CorbaEnumHandler obj = new CorbaEnumHandler(enumName, enumIdlType, enumTC, enumType);
-
+
reader.readEnum(obj);
assertTrue(obj.getValue().equals(enums[1]));
}
-
+
public void testReadFixed() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
// create the following fixed
// fixed<5,2>
oStream.write_fixed(new java.math.BigDecimal("12345.67").movePointRight((int)2));
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Fixed fixedType = new Fixed();
fixedType.setDigits(5);
fixedType.setScale(2);
-
+
// These values don't matter to the outcome of the test but are needed during construction
QName fixedName = new QName("TestFixed");
QName fixedIdlType = new QName("corbatm:TestFixed");
TypeCode fixedTC = orb.create_fixed_tc((short)fixedType.getDigits(), (short)fixedType.getScale());
CorbaFixedHandler obj = new CorbaFixedHandler(fixedName, fixedIdlType, fixedTC, fixedType);
-
+
reader.readFixed(obj);
-
+
assertTrue(obj.getValue().equals(new java.math.BigDecimal("12345.67")));
}
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java Tue Nov 7 05:01:55 2006
@@ -19,6 +19,7 @@
package org.apache.yoko.bindings.corba;
import java.math.BigInteger;
+import java.util.Properties;
import javax.xml.namespace.QName;
@@ -47,25 +48,26 @@
public class CorbaObjectWriterTest extends TestCase {
private ORB orb;
-
+
public CorbaObjectWriterTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaObjectWriterTest.class);
}
-
+
protected void setUp() throws java.lang.Exception {
super.setUp();
- java.util.Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws java.lang.Exception {
if (orb != null) {
try {
@@ -79,24 +81,24 @@
public void testWriteBoolean() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Boolean boolValue = new Boolean(true);
writer.writeBoolean(boolValue);
-
+
InputStream iStream = oStream.create_input_stream();
boolean b = iStream.read_boolean();
assertTrue(b == boolValue.booleanValue());
}
-
+
public void testWriteChar() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Character charValue = new Character('c');
writer.writeChar(charValue);
-
+
InputStream iStream = oStream.create_input_stream();
char c = iStream.read_char();
assertTrue(c == charValue.charValue());
@@ -105,128 +107,128 @@
public void testWriteWChar() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Character wcharValue = new Character('w');
writer.writeChar(wcharValue);
-
+
InputStream iStream = oStream.create_input_stream();
char wc = iStream.read_char();
assertTrue(wc == wcharValue.charValue());
}
-
+
public void testWriteShort() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Short shortValue = new Short((short)-123);
writer.writeShort(shortValue);
-
+
InputStream iStream = oStream.create_input_stream();
short s = iStream.read_short();
assertTrue(s == shortValue.shortValue());
}
-
+
public void testWriteUShort() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Short ushortValue = new Short((short)123);
writer.writeUShort(ushortValue);
-
+
InputStream iStream = oStream.create_input_stream();
short us = iStream.read_ushort();
assertTrue(us == ushortValue.shortValue());
}
-
+
public void testWriteLong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Long longValue = new Long(-1234567);
writer.writeLong(longValue);
-
+
InputStream iStream = oStream.create_input_stream();
long l = iStream.read_long();
assertTrue(l == longValue.longValue());
}
-
+
public void testWriteULong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
BigInteger ulongValue = new BigInteger("1234567");
writer.writeULong(ulongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ul = iStream.read_ulong();
assertTrue(ul == ulongValue.longValue());
}
-
+
public void testWriteLongLong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
BigInteger longlongValue = new BigInteger("-12345678900");
writer.writeLongLong(longlongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ll = iStream.read_longlong();
assertTrue(ll == longlongValue.longValue());
}
-
+
public void testWriteULongLong() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
BigInteger ulonglongValue = new BigInteger("12345678900");
writer.writeULongLong(ulonglongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ul = iStream.read_ulonglong();
assertTrue(ul == ulonglongValue.longValue());
}
-
+
public void testWriteFloat() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Float floatValue = new Float((float)123456.78);
writer.writeFloat(floatValue);
-
+
InputStream iStream = oStream.create_input_stream();
float f = iStream.read_float();
assertTrue(f == floatValue.floatValue());
}
-
+
public void testWriteDouble() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Double doubleValue = new Double(987654.321);
writer.writeDouble(doubleValue);
-
+
InputStream iStream = oStream.create_input_stream();
double d = iStream.read_double();
assertTrue(d == doubleValue.doubleValue());
}
-
+
public void testWriteString() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
String stringValue = new String("String");
writer.writeString(stringValue);
-
+
InputStream iStream = oStream.create_input_stream();
String s = iStream.read_string();
assertTrue(s.equals(stringValue));
@@ -235,19 +237,19 @@
public void testWriteWString() {
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
String wstringValue = new String("String");
writer.writeWString(wstringValue);
-
+
InputStream iStream = oStream.create_input_stream();
String s = iStream.read_wstring();
assertTrue(s.equals(wstringValue));
}
-
+
public void testWriteArray() {
int data[] = { 1, 1, 2, 3, 5, 8, 13, 21 };
-
+
// create an array of longs
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName arrayIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "array", CorbaConstants.NP_WSDL_CORBA);
@@ -261,7 +263,7 @@
CorbaArrayHandler obj = new CorbaArrayHandler(new QName("Array"), arrayIdlType, arrayTC, arrayType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), longIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), longIdlType,
orb.get_primitive_tc(TCKind.tk_long), null);
nestedObj.setValueFromData(Integer.toString(data[i]));
obj.addElement(nestedObj);
@@ -271,24 +273,24 @@
OutputStream oStream = new OutputStream(buf);
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeArray(obj);
-
+
InputStream iStream = oStream.create_input_stream();
for (int i = 0; i < data.length; ++i) {
int val = iStream.read_long();
assertTrue(val == data[i]);
}
}
-
+
public void testWriteSequence() {
String data[] = { "one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one" };
-
+
// create an sequence of strings
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName seqIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "sequence", CorbaConstants.NP_WSDL_CORBA);
Sequence seqType = new Sequence();
seqType.setBound(data.length);
- seqType.setElemtype(stringIdlType);
+ seqType.setElemtype(stringIdlType);
// name and respoitory ID of the sequence are not needed for this test
// build the object holder for a sequence.
@@ -296,17 +298,17 @@
CorbaSequenceHandler obj = new CorbaSequenceHandler(new QName("Seq"), seqIdlType, seqTC, seqType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
orb.get_primitive_tc(TCKind.tk_string), null);
nestedObj.setValueFromData(data[i]);
obj.addElement(nestedObj);
}
-
+
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeSequence(obj);
-
+
InputStream iStream = oStream.create_input_stream();
int length = iStream.read_long();
for (int i = 0; i < length; ++i) {
@@ -314,7 +316,7 @@
assertTrue(val.equals(data[i]));
}
}
-
+
public void testWriteStruct() {
// create the following struct
// struct TestStruct {
@@ -325,12 +327,12 @@
int member1 = 12345;
String member2 = "54321";
boolean member3 = true;
-
+
QName structIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "struct", CorbaConstants.NP_WSDL_CORBA);
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName boolIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
-
+
Struct structType = new Struct();
structType.setName("TestStruct");
MemberType m1 = new MemberType();
@@ -351,30 +353,30 @@
structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null);
structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null);
structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null);
- TypeCode structTC = orb.create_struct_tc("IDL:org.apache.yoko.TestStruct/1.0", "TestStruct",
+ TypeCode structTC = orb.create_struct_tc("IDL:org.apache.yoko.TestStruct/1.0", "TestStruct",
structMembers);
- CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
+ CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
structTC, structType);
- CorbaPrimitiveHandler memberObj1 =
+ CorbaPrimitiveHandler memberObj1 =
new CorbaPrimitiveHandler(new QName("member1"), longIdlType, structMembers[0].type, null);
- CorbaPrimitiveHandler memberObj2 =
+ CorbaPrimitiveHandler memberObj2 =
new CorbaPrimitiveHandler(new QName("member2"), stringIdlType, structMembers[1].type, null);
- CorbaPrimitiveHandler memberObj3 =
+ CorbaPrimitiveHandler memberObj3 =
new CorbaPrimitiveHandler(new QName("member3"), boolIdlType, structMembers[2].type, null);
-
+
memberObj1.setValueFromData(Integer.toString(member1));
memberObj2.setValueFromData(member2);
memberObj3.setValueFromData(Boolean.toString(member3));
-
+
obj.addMember(memberObj1);
obj.addMember(memberObj2);
obj.addMember(memberObj3);
-
+
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeStruct(obj);
-
+
InputStream iStream = oStream.create_input_stream();
int readMember1 = iStream.read_long();
assertTrue(readMember1 == member1);
@@ -383,7 +385,7 @@
boolean readMember3 = iStream.read_boolean();
assertTrue(readMember3 == member3);
}
-
+
public void testWriteException() {
// create the following exception
// exception TestExcept {
@@ -393,11 +395,11 @@
short code = 12345;
String message = "54321";
String reposID = "IDL:org.apache.yoko.TestException/1.0";
-
+
QName exceptIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "exception", CorbaConstants.NP_WSDL_CORBA);
QName shortIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
-
+
Exception exceptType = new Exception();
exceptType.setName("TestException");
exceptType.setRepositoryID(reposID);
@@ -415,13 +417,13 @@
exceptMembers[0] = new StructMember("code", orb.get_primitive_tc(TCKind.tk_short), null);
exceptMembers[1] = new StructMember("message", orb.get_primitive_tc(TCKind.tk_string), null);
TypeCode exceptTC = orb.create_exception_tc(reposID, "TestException", exceptMembers);
- CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
+ CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
exceptTC, exceptType);
-
- CorbaPrimitiveHandler member1 =
+
+ CorbaPrimitiveHandler member1 =
new CorbaPrimitiveHandler(new QName("code"), shortIdlType, exceptMembers[0].type, null);
member1.setValueFromData(Short.toString(code));
- CorbaPrimitiveHandler member2 =
+ CorbaPrimitiveHandler member2 =
new CorbaPrimitiveHandler(new QName("message"), stringIdlType, exceptMembers[1].type, null);
member2.setValueFromData(message);
obj.addMember(member1);
@@ -433,7 +435,7 @@
writer.writeException(obj);
InputStream iStream = oStream.create_input_stream();
-
+
String readId = iStream.read_string();
assertTrue(readId.equals(reposID));
short readCode = iStream.read_short();
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba;
+import java.util.Properties;
import javax.xml.namespace.QName;
import org.omg.CORBA.portable.InputStream;
@@ -35,25 +36,26 @@
public class CorbaStreamableTest extends TestCase {
private ORB orb;
-
+
public CorbaStreamableTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaStreamableTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -63,70 +65,70 @@
}
}
}
-
+
public void testCreateStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamable(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamable(obj, objName);
assertNotNull(streamable);
}
-
+
public void testGetStreamableAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_float);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamable(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamable(obj, objName);
TypeCode type = streamable._type();
assertTrue(type.kind().value() == objTypeCode.kind().value());
-
+
CorbaPrimitiveHandler storedObj = (CorbaPrimitiveHandler)streamable.getObject();
assertNotNull(storedObj);
-
+
int mode = streamable.getMode();
assertTrue(mode == org.omg.CORBA.ARG_OUT.value);
-
+
String name = streamable.getName();
assertTrue(name.equals(objName.getLocalPart()));
}
-
+
public void testSetStreamableAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_boolean);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamable(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamable(obj, objName);
streamable.setMode(org.omg.CORBA.ARG_IN.value);
int mode = streamable.getMode();
assertTrue(mode == org.omg.CORBA.ARG_IN.value);
}
-
+
public void testReadStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "char", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_char);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamable(obj, objName);
-
+ CorbaStreamable streamable = new CorbaStreamable(obj, objName);
+
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
oStream.write_char('c');
-
+
InputStream iStream = oStream.create_input_stream();
streamable._read(iStream);
CorbaPrimitiveHandler streamableObj = (CorbaPrimitiveHandler)streamable.getObject();
Object o = streamableObj.getValue();
-
+
assertTrue(o instanceof Character);
Character charValue = (Character)o;
assertTrue(charValue.charValue() == 'c');
}
-
+
public void testWriteStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "wstring", CorbaConstants.NP_WSDL_CORBA);
@@ -134,11 +136,11 @@
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
obj.setValueFromData("TestWString");
CorbaStreamable streamable = new CorbaStreamable(obj, objName);
-
+
Buffer buf = new Buffer();
OutputStream oStream = new OutputStream(buf);
streamable._write(oStream);
-
+
InputStream iStream = oStream.create_input_stream();
String value = iStream.read_wstring();
assertTrue(value.equals("TestWString"));
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba;
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -40,26 +41,27 @@
private ORB orb;
private TestUtils testUtils;
-
+
public CorbaUtilsTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaUtilsTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
- java.util.Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
testUtils = new TestUtils();
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -69,7 +71,7 @@
}
}
}
-
+
public void testBooleanTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -77,7 +79,7 @@
assertTrue(tc.kind().value() == TCKind._tk_boolean);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testCharTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "char", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -85,7 +87,7 @@
assertTrue(tc.kind().value() == TCKind._tk_char);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testWCharTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wchar", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -93,7 +95,7 @@
assertTrue(tc.kind().value() == TCKind._tk_wchar);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testOctetTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "octet", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -101,7 +103,7 @@
assertTrue(tc.kind().value() == TCKind._tk_octet);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testShortTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "short", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -109,7 +111,7 @@
assertTrue(tc.kind().value() == TCKind._tk_short);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testUShortTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ushort", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -117,7 +119,7 @@
assertTrue(tc.kind().value() == TCKind._tk_ushort);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "long", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -125,7 +127,7 @@
assertTrue(tc.kind().value() == TCKind._tk_long);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testULongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulong", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -133,7 +135,7 @@
assertTrue(tc.kind().value() == TCKind._tk_ulong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testLongLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "longlong", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -141,7 +143,7 @@
assertTrue(tc.kind().value() == TCKind._tk_longlong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testULongLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulonglong", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -149,7 +151,7 @@
assertTrue(tc.kind().value() == TCKind._tk_ulonglong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testFloatTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "float", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -157,7 +159,7 @@
assertTrue(tc.kind().value() == TCKind._tk_float);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testDoubleTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "double", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -165,7 +167,7 @@
assertTrue(tc.kind().value() == TCKind._tk_double);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testStringTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "string", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -173,7 +175,7 @@
assertTrue(tc.kind().value() == TCKind._tk_string);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testWStringTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wstring", "corba");
TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -181,44 +183,44 @@
assertTrue(tc.kind().value() == TCKind._tk_wstring);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
public void testGetCorbaAddressType() throws Exception {
Bus bus = Bus.init();
-
+
// programmatically add the corba binding factory
BindingManager manager = bus.getBindingManager();
CorbaBindingFactory corbaBF = new CorbaBindingFactory();
corbaBF.init(bus);
manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
-
+
EndpointReferenceType endpoint = testUtils.getSimpleTestEndpointReference();
AddressType address = CorbaUtils.getCorbaAddressType(bus, endpoint);
- assertNotNull(address);
+ assertNotNull(address);
}
-
+
public void testGetCorbaBindingType() throws Exception {
Bus bus = Bus.init();
-
+
// programmatically add the corba binding factory
BindingManager manager = bus.getBindingManager();
CorbaBindingFactory corbaBF = new CorbaBindingFactory();
corbaBF.init(bus);
manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
-
+
EndpointReferenceType endpoint = testUtils.getSimpleTestEndpointReference();
BindingType binding = CorbaUtils.getCorbaBindingType(bus, endpoint);
assertNotNull(binding);
}
-
+
public void testGetCorbaOperationType() throws Exception {
Bus bus = Bus.init();
-
+
// programmatically add the corba binding factory
BindingManager manager = bus.getBindingManager();
CorbaBindingFactory corbaBF = new CorbaBindingFactory();
corbaBF.init(bus);
manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
-
+
EndpointReferenceType endpoint = testUtils.getSimpleTestEndpointReference();
String opName = "testSimpleMethod";
OperationType operation = CorbaUtils.getCorbaOperationType(opName, bus, endpoint);
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java Tue Nov 7 05:01:55 2006
@@ -19,6 +19,7 @@
package org.apache.yoko.bindings.corba.types;
+import java.util.Properties;
import javax.xml.namespace.QName;
import org.apache.yoko.wsdl.CorbaConstants;
@@ -33,7 +34,7 @@
public class CorbaAnyHandlerTest extends TestCase {
private ORB orb;
-
+
public CorbaAnyHandlerTest(String arg0) {
super(arg0);
}
@@ -41,17 +42,18 @@
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaAnyHandlerTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
- java.util.Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -59,26 +61,26 @@
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
public void testGetSetSchemaType() {
String testSchemaType = "xs:string";
QName anyName = new QName("TestAny");
QName anyIdlType = CorbaConstants.NT_CORBA_ANY;
TypeCode anyTC = orb.get_primitive_tc(TCKind.tk_any);
-
+
CorbaAnyHandler anyHandler = new CorbaAnyHandler(anyName, anyIdlType, anyTC, null);
anyHandler.setSchemaType(testSchemaType);
String result = anyHandler.getSchemaType();
assert(result.equals(testSchemaType));
}
-
+
public void testGetSetValue() {
QName anyName = new QName("TestAny");
QName anyIdlType = CorbaConstants.NT_CORBA_ANY;
TypeCode anyTC = orb.get_primitive_tc(TCKind.tk_any);
-
+
CorbaAnyHandler anyHandler = new CorbaAnyHandler(anyName, anyIdlType, anyTC, null);
Any any = orb.create_any();
String expectedSchemaType = null;
@@ -216,7 +218,7 @@
assertTrue(floatResult == floatValue);
resultSchemaType = anyHandler.getSchemaType();
assertTrue(resultSchemaType.equals(expectedSchemaType));
-
+
String stringValue = "test string";
any.insert_string(stringValue);
anyHandler.setValue(any);
@@ -239,7 +241,7 @@
resultSchemaType = anyHandler.getSchemaType();
assertTrue(resultSchemaType.equals(expectedSchemaType));
}
-
+
public void testGetSetValueData() {
QName anyName = new QName("TestAny");
QName anyIdlType = CorbaConstants.NT_CORBA_ANY;
@@ -251,13 +253,13 @@
String schemaType = null;
String resultSchemaType = null;
Any resultAny = null;
-
+
value = "false";
schemaType = "xs:boolean";
anyHandler.setValueFromData(orb, value, schemaType);
resultValue = anyHandler.getValueData();
resultSchemaType = anyHandler.getSchemaType();
- assertTrue(resultValue.equals(value));
+ assertTrue(resultValue.equals(value));
assertTrue(resultSchemaType.equals(schemaType));
resultAny = anyHandler.getValue();
assertTrue(resultAny.type().kind().value() == TCKind._tk_boolean);
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba.types;
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -35,7 +36,7 @@
private QName objName;
private QName objIdlType;
private TypeCode objTypeCode;
-
+
public CorbaArrayHandlerTest(String arg0) {
super(arg0);
}
@@ -43,11 +44,12 @@
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaArrayHandlerTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
@@ -57,7 +59,7 @@
objIdlType = null;
objTypeCode = null;
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba.types;
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -32,25 +33,26 @@
public class CorbaEnumHandlerTest extends TestCase {
private ORB orb;
-
+
public CorbaEnumHandlerTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -60,12 +62,12 @@
}
}
}
-
+
public void testCorbaEnumHandler() {
Enum enumType = new Enum();
enumType.setName("EnumType");
enumType.setRepositoryID("IDL:EnumType:1.0");
-
+
Enumerator enumerator0 = new Enumerator();
enumerator0.setValue("ENUM0");
Enumerator enumerator1 = new Enumerator();
@@ -75,22 +77,22 @@
enumType.getEnumerator().add(enumerator0);
enumType.getEnumerator().add(enumerator1);
enumType.getEnumerator().add(enumerator2);
-
+
QName enumName = new QName("EnumType");
- QName enumIdlType =
+ QName enumIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "EnumType", CorbaConstants.NP_WSDL_CORBA);
String members[] = new String[3];
members[0] = enumerator0.getValue();
members[1] = enumerator1.getValue();
members[2] = enumerator2.getValue();
TypeCode enumTC = orb.create_enum_tc(enumType.getRepositoryID(), enumType.getName(), members);
-
+
CorbaEnumHandler obj = new CorbaEnumHandler(enumName, enumIdlType, enumTC, enumType);
assertNotNull(obj);
-
+
obj.setValue(members[1]);
assertTrue(obj.getValue().equals(enumerator1.getValue()));
-
+
assertTrue(obj.getIndex() == (long)1);
}
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba.types;
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -31,25 +32,26 @@
public class CorbaFixedHandlerTest extends TestCase {
private ORB orb;
-
+
public CorbaFixedHandlerTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -59,28 +61,28 @@
}
}
}
-
+
public void testCorbaFixedHandler() {
Fixed fixedType = new Fixed();
fixedType.setName("FixedType");
fixedType.setDigits((long)3);
fixedType.setScale((long)2);
-
+
QName fixedName = new QName(fixedType.getName());
- QName fixedIdlType =
+ QName fixedIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "FixedType", CorbaConstants.NP_WSDL_CORBA);
TypeCode fixedTC = orb.create_fixed_tc((short)fixedType.getDigits(), (short)fixedType.getScale());
CorbaFixedHandler obj = new CorbaFixedHandler(fixedName, fixedIdlType, fixedTC, fixedType);
assertNotNull(obj);
-
+
java.math.BigDecimal value = new java.math.BigDecimal(123.45);
obj.setValue(value);
-
+
assertTrue(value.equals(obj.getValue()));
-
+
String valueData = obj.getValueData();
assertTrue(valueData.equals(value.toString()));
-
+
assertTrue(fixedType.getDigits() == obj.getDigits());
assertTrue(fixedType.getScale() == obj.getScale());
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java Tue Nov 7 05:01:55 2006
@@ -19,6 +19,7 @@
package org.apache.yoko.bindings.corba.types;
import java.util.List;
+import java.util.Properties;
import javax.xml.namespace.QName;
@@ -42,7 +43,7 @@
private TestUtils testUtils;
private ORB orb;
private Bus bus;
-
+
public CorbaHandlerUtilsTest(String arg0) {
super(arg0);
}
@@ -50,20 +51,21 @@
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaHandlerUtilsTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
testUtils = new TestUtils();
- java.util.Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
bus = Bus.init(new String[0]);
-
+
// programmatically add the corba binding factory
BindingManager manager = bus.getBindingManager();
CorbaBindingFactory corbaBF = new CorbaBindingFactory();
@@ -71,7 +73,7 @@
manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -79,19 +81,19 @@
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
public void testCreateTypeHandler() {
- CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus,
+ CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus,
testUtils.getComplexTypesEndpointReference(),
- orb,
+ orb,
false);
QName objName = null;
QName objIdlType = null;
CorbaObjectHandler result = null;
List<CorbaTypeMap> typeMaps = bindingImpl.getCorbaTypeMaps();
-
+
// Test for an array handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
@@ -112,7 +114,7 @@
// Test for a primitive handler
objName = new QName("object");
- objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
+ objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps);
assertTrue(result instanceof CorbaPrimitiveHandler);
@@ -134,11 +136,11 @@
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps);
assertTrue(result instanceof CorbaUnionHandler);
}
-
+
public void testInitializeObjectHandler() {
- CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus,
+ CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus,
testUtils.getComplexTypesEndpointReference(),
- orb,
+ orb,
false);
QName objName = null;
QName objIdlType = null;
@@ -153,7 +155,7 @@
CorbaArrayHandler arrayHandler = (CorbaArrayHandler)result;
// WSDL defines the array to have 5 elements
assertTrue(arrayHandler.getElements().size() == 5);
-
+
// Test for a sequence handler
objName = new QName("object");
@@ -165,7 +167,7 @@
// element has been set.
assertTrue(seqHandler.getElements().size() == 0);
assertNotNull(seqHandler.getTemplateElement());
-
+
// Test for a bounded sequence handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestBoundedSequence", complexTypesPrefix);
@@ -174,7 +176,7 @@
CorbaSequenceHandler boundedSeqHandler = (CorbaSequenceHandler)result;
// This is a bounded sequence with WSDL defining 5 elements.
assertTrue(boundedSeqHandler.getElements().size() == 5);
-
+
// Test for a struct handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestStruct", complexTypesPrefix);
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java Tue Nov 7 05:01:55 2006
@@ -18,6 +18,7 @@
*/
package org.apache.yoko.bindings.corba.types;
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -31,25 +32,26 @@
public class CorbaObjectHandlerTest extends TestCase {
private ORB orb;
-
+
public CorbaObjectHandlerTest(String arg0) {
super(arg0);
}
-
+
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
}
-
+
protected void setUp() throws Exception {
super.setUp();
-
- java.util.Properties props = System.getProperties();
+
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", "Yoko-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
protected void tearDown() throws Exception {
if (orb != null) {
try {
@@ -59,7 +61,7 @@
}
}
}
-
+
public void testCreateCorbaObjectHandler() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
@@ -67,7 +69,7 @@
CorbaObjectHandler obj = new CorbaObjectHandler(objName, objIdlType, objTypeCode, null);
assertNotNull(obj);
}
-
+
public void testGetObjectAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
@@ -77,15 +79,15 @@
QName name = obj.getName();
assertNotNull(name);
assertTrue(name.equals(objName));
-
+
QName idlType = obj.getIdlType();
assertNotNull(idlType);
assertTrue(idlType.equals(objIdlType));
-
+
TypeCode tc = obj.getTypeCode();
assertNotNull(tc);
assertTrue(tc.kind().value() == objTypeCode.kind().value());
-
+
Object objDef = obj.getType();
assertNull(objDef);
}