cvs commit: ws-axis/java/test/wsdl/types VerifyTestCase.java

[ia...@apache.org]

ias         2003/12/19 01:06:42

  Modified:    java/test/wsdl/types VerifyTestCase.java
  Log:
  Fix for Bug 25558 - Several types that were previously generated are now mapped to String directly
  
  Revision  Changes    Path
  1.42      +8 -8      ws-axis/java/test/wsdl/types/VerifyTestCase.java
  
  Index: VerifyTestCase.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/types/VerifyTestCase.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- VerifyTestCase.java	15 Dec 2003 19:25:20 -0000	1.41
  +++ VerifyTestCase.java	19 Dec 2003 09:06:42 -0000	1.42
  @@ -36,6 +36,8 @@
   import org.apache.axis.types.UnsignedShort;
   import org.apache.axis.types.Year;
   import org.apache.axis.types.YearMonth;
  +import org.apache.axis.types.URI.MalformedURIException;
  +
   import test.wsdl.types.comprehensive_service.TypeTest;
   import test.wsdl.types.comprehensive_service.TypeTestServiceLocator;
   import test.wsdl.types.comprehensive_types.Animal;
  @@ -53,8 +55,6 @@
   import test.wsdl.types.comprehensive_types.EnumShort;
   import test.wsdl.types.comprehensive_types.EnumString;
   import test.wsdl.types.comprehensive_types.PersionCat;
  -import test.wsdl.types.comprehensive_types.Simple;
  -import test.wsdl.types.comprehensive_types.SimpleFwd;
   import test.wsdl.types.comprehensive_types._complexWComplex_stock_quote;
   import test.wsdl.types.comprehensive_types.StringParameter;
   import test.wsdl.types.comprehensive_types.Time;
  @@ -70,8 +70,6 @@
   import test.wsdl.types.comprehensive_types.holders.EnumHolder;
   import test.wsdl.types.comprehensive_types2.A;
   import test.wsdl.types.comprehensive_types2.B;
  -import test.wsdl.types.comprehensive_types2.SimpleAnyURIType;
  -import test.wsdl.types.comprehensive_types2.holders.SimpleAnyURITypeHolder;
   
   import javax.xml.namespace.QName;
   import javax.xml.rpc.ServiceException;
  @@ -414,7 +412,7 @@
           Time time = new Time();
           time.setDST(false);
           stockQuote.setTime(time);
  -        stockQuote.setChange(new SimpleFwd("5"));
  +        stockQuote.setChange("5");
           stockQuote.setPctchange("100%");
           stockQuote.setBid("9");
           stockQuote.setAsk("11");
  @@ -742,11 +740,13 @@
           }
           
           try {
  -            SimpleAnyURIType sendValue = new SimpleAnyURIType("urn:this-is-a-simple-test");
  -            SimpleAnyURITypeHolder ch = new SimpleAnyURITypeHolder(sendValue);
  -            SimpleAnyURIType actual = binding.methodSimpleAnyURI(sendValue, ch);
  +            org.apache.axis.types.URI sendValue = new org.apache.axis.types.URI("urn:this-is-a-simple-test");
  +            org.apache.axis.holders.URIHolder ch = new org.apache.axis.holders.URIHolder(sendValue);
  +            org.apache.axis.types.URI actual = binding.methodSimpleAnyURI(sendValue, ch);
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("methodAnyURI Exception caught: " + re );
  +        } catch (MalformedURIException mue) {
  +            throw new junit.framework.AssertionFailedError("methodAnyURI Exception caught: " + mue );
           }
           
           try {