TUSCANY-3778: Fix WSDL generation and enable commented out tests
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1036533 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java b/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java
index 8d1694d..f18ded0 100644
--- a/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java
+++ b/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java
@@ -108,9 +108,9 @@
abean.setField3(bbean);
assertEquals("Hello 3 4 1 2", wsProxy.getGreetingsDBean(abean));
-/* TUSCANY-3778
+
String byteArrayString = "Hello World";
- assertEquals(byteArrayString, String.valueOf(wsProxy.getGreetingsByteArray(byteArrayString.getBytes())));
+ assertEquals(byteArrayString, new String(wsProxy.getGreetingsByteArray(byteArrayString.getBytes())));
try {
wsProxy.getGreetingsException("Fred");
@@ -118,7 +118,6 @@
} catch(Exception ex) {
}
-*/
}
@Test
diff --git a/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
index 4eb8a47..c5dc4a8 100644
--- a/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ b/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
@@ -979,7 +979,7 @@
Message faultMsg = definition.getMessage(faultName);
if (faultMsg == null) {
faultMsg = definition.createMessage();
- faultMsg.setQName(faultName);
+ faultMsg.setQName(new QName(namespaceURI, faultName.getLocalPart()));
faultMsg.setUndefined(false);
definition.addMessage(faultMsg);
faultMsg.addPart(generatePart(definition, faultType.getLogical(), faultName.getLocalPart()));
@@ -1107,7 +1107,7 @@
}
helpers.put(db, helper);
}
- TypeInfo typeInfo = helper.getTypeInfo(javaType.isArray() ? javaType.getComponentType() : javaType,
+ TypeInfo typeInfo = helper.getTypeInfo(byte[].class != javaType && javaType.isArray() ? javaType.getComponentType() : javaType,
dataType.getLogical());
ElementInfo element = new ElementInfo(name, typeInfo);
element.setMany(byte[].class != javaType && javaType.isArray());
