owenb 2002/10/24 11:05:47 Modified: java/test/soap OutputPartsTest.java Log: Changed so that it does not expect an exception when using Axis and the service returns null Revision Changes Path 1.4 +10 -2 xml-axis-wsif/java/test/soap/OutputPartsTest.java Index: OutputPartsTest.java =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/soap/OutputPartsTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- OutputPartsTest.java 16 Sep 2002 08:18:55 -0000 1.3 +++ OutputPartsTest.java 24 Oct 2002 18:05:47 -0000 1.4 @@ -166,7 +166,7 @@ doitStockquote( "SOAPJMSPort", "soap", FAKE_SOAP_MSG_FILENAME2, "return value not found in response message" ); } public void testAxis2() { - doitStockquote( "SOAPJMSPort", "axis", FAKE_SOAP_MSG_FILENAME2, "return value not found in response message" ); + doitStockquote( "SOAPJMSPort", "axis", FAKE_SOAP_MSG_FILENAME2, "<null>" ); } public void testSOAP3() { doitStockquote( "SOAPJMSPort", "soap", FAKE_SOAP_MSG_FILENAME3, "java.lang.String" ); @@ -249,8 +249,10 @@ value = ((Float)o).floatValue(); assertTrue( "doAsyncOpNoHandler stockquote value incorrect!", value == -1.0F ); + } else if (error.equals("<null>")) { + assertNull("return value not null!!", o); } else { - assertTrue( "return value null!!", + assertTrue( "return value null!!", error.equals( "return=null" ) || error.equals( "all=null" ) ); } @@ -267,6 +269,8 @@ o = output.getObjectPart( "p1" ); if ( o != null ) { assertTrue( "error on part p1!!", o instanceof String ); + } else if (error.equals("<null>")) { + assertNull("return value not null!!", o); } else { assertTrue( "p1 is null!!", error.equals( "p1=null" ) @@ -276,6 +280,8 @@ o = output.getObjectPart( "p2" ); if ( o != null ) { assertTrue( "error on part p2!!", o instanceof Float ); + } else if (error.equals("<null>")) { + assertNull("return value not null!!", o); } else { assertTrue( "p2 is null!!", error.equals( "p2=null" ) @@ -285,6 +291,8 @@ o = output.getObjectPart( "p3" ); if ( o != null ) { assertTrue( "error on part p3!!", o instanceof String ); + } else if (error.equals("<null>")) { + assertNull("return value not null!!", o); } else { assertTrue( "p3 is null!!", error.equals( "p3=null" )