Author: heiko.braun(a)jboss.com Date: 2006-11-06 09:02:29 -0500 (Mon, 06 Nov 2006) New Revision: 1400 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml Log: Fix JBWS-1333 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2006-11-06 13:38:27 UTC (rev 1399) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2006-11-06 14:02:29 UTC (rev 1400) @@ -303,8 +303,8 @@ { Call call = service.createCall(); call.setOperationName(new QName(TARGET_NAMESPACE, "base64BinaryTest")); - call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_BASE64BINARY, primParams.getClass(), ParameterMode.IN); - call.setReturnType(Constants.TYPE_LITERAL_BASE64BINARY, primParams.getClass()); + call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_BASE64BINARY, byte[].class, ParameterMode.IN); + call.setReturnType(Constants.TYPE_LITERAL_BASE64BINARY, byte[].class); call.setTargetEndpointAddress(TARGET_ADDRESS); primParams = (byte[])call.invoke(new Object[] { primParams }); return primParams; @@ -314,8 +314,8 @@ { Call call = service.createCall(); call.setOperationName(new QName(TARGET_NAMESPACE, "hexBinaryTest")); - call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_HEXBINARY, primParams.getClass(), ParameterMode.IN); - call.setReturnType(Constants.TYPE_LITERAL_HEXBINARY, primParams.getClass()); + call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_HEXBINARY, byte[].class, ParameterMode.IN); + call.setReturnType(Constants.TYPE_LITERAL_HEXBINARY, byte[].class); call.setTargetEndpointAddress(TARGET_ADDRESS); primParams = (byte[])call.invoke(new Object[] { primParams }); return primParams; Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-06 13:38:27 UTC (rev 1399) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-06 14:02:29 UTC (rev 1400) @@ -209,9 +209,8 @@ Object out = base64BinaryTest(in); assertEquals(new String(in), new String((byte[])out)); - System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary"); - //out = base64BinaryTest(null); - //assertNull(out); + out = base64BinaryTest(null); + assertNull(out); } public void testHexBinary() throws Exception @@ -220,9 +219,8 @@ byte[] out = hexBinaryTest(in); assertEquals(new String(in), new String((byte[])out)); - System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary"); - //out = hexBinaryTest(null); - //assertNull(out); + out = hexBinaryTest(null); + assertNull(out); } public void testCalendar() throws Exception Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-06 13:38:27 UTC (rev 1399) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-06 14:02:29 UTC (rev 1400) @@ -9,6 +9,7 @@ <service-ref> <service-ref-name>service/StandardTypes</service-ref-name> + <config-name>Standard MTOM disabled client</config-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-06 13:38:27 UTC (rev 1399) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-06 14:02:29 UTC (rev 1400) @@ -5,7 +5,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <servlet> + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Standard MTOM disabled endpoint</param-value> + </context-param> + + <servlet> <servlet-name>StandardTypes</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class> </servlet>