axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: xml-axis/java/test/inout InoutSOAPBindingImpl.java inout.wsdl DetailedInoutTestCase.java
Date Wed, 05 Dec 2001 21:45:10 GMT
tomj        01/12/05 13:45:10

  Modified:    java/src/org/apache/axis/wsdl Utils.java SymbolTable.java
                        JavaWriterFactory.java JavaTestCaseWriter.java
                        JavaStubWriter.java JavaSkelWriter.java
                        JavaServiceImplWriter.java
                        JavaComplexTypeWriter.java
               java/test/inout InoutSOAPBindingImpl.java inout.wsdl
                        DetailedInoutTestCase.java
  Log:
  Work to verify that all XML names are run through xmlNameToJava() so
  that any illegal XML characters are removed.
  
  Updated xmlNameToJava to come closer to the JAX-RPC spec.
  IT would be real nice if Sun or someone would just drop some Java code from the sky
  to do the regular expression/word/funky stuff they spec.  But until then, this is pretty good.
  
  Update the WSDL in/out test not to use userscores in it operation names,
  since these are now stripped out.
  
  Revision  Changes    Path
  1.20      +44 -8     xml-axis/java/src/org/apache/axis/wsdl/Utils.java
  
  Index: Utils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Utils.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Utils.java	2001/12/04 19:34:56	1.19
  +++ Utils.java	2001/12/05 21:45:09	1.20
  @@ -406,7 +406,7 @@
       static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
   
       /** Use this character as suffix */
  -    static final char keywordSuffix = '_';
  +    static final char keywordPrefix = '_';
   
       /**
        * checks if the input string is a valid java keyword.
  @@ -421,7 +421,7 @@
        * this simply means appending an underscore.)
        */
       public static String makeNonJavaKeyword(String keyword){
  -        return  keyword + keywordSuffix;
  +        return  keywordPrefix + keyword;
        }
   
       /**
  @@ -430,12 +430,48 @@
       public static String xmlNameToJava(String name)
       {
           char[] nameArray = name.toCharArray();
  -        for(int j = 0, len = name.length(); j < len; ++j) {
  +        int len = name.length();
  +        StringBuffer result = new StringBuffer(len);
  +        
  +        // First character, lower case
  +        int i = 0;
  +        while (i < name.length() 
  +                && !Character.isLetter(nameArray[i])) {
  +            i++;
  +        }
  +        result.append( Character.toLowerCase(nameArray[i]) );
  +        
  +        // The rest of the string
  +        boolean wordStart = false;
  +        for(int j = i + 1; j < len; ++j) {
               char c = nameArray[j];
  -            if( !Character.isLetterOrDigit(c) && c != '_' )
  -                nameArray[j] = '_';
  +
  +            // if this is a bad char, skip it a remember to capitolize next
  +            // good character we encounter
  +            if( !Character.isLetterOrDigit(c)) {
  +                wordStart = true;
  +                continue;
  +            }
  +            result.append( wordStart ? Character.toUpperCase(c) : c );
  +            wordStart = false;
           }
  -        return capitalizeFirstChar(new String(nameArray));
  +        
  +        // covert back to a String
  +        String newName = result.toString();
  +        
  +        // check for Java keywords
  +        if (isJavaKeyword(newName))
  +            newName = makeNonJavaKeyword(newName);
  +        
  +        return newName;
  +    }
  +
  +    /**
  +     * Map an XML name to a valid Java identifier w/ capitolized first letter 
  +     */ 
  +    public static String xmlNameToJavaClass(String name)
  +    {
  +        return capitalizeFirstChar(xmlNameToJava(name));
       }
   
       public static String makePackageName(String namespace)
  @@ -535,9 +571,9 @@
           String exceptionName;
           if (faultMessage != null) {
               String faultMessageName = faultMessage.getQName().getLocalPart();
  -            exceptionName = Utils.capitalizeFirstChar(Utils.xmlNameToJava(faultMessageName));
  +            exceptionName = Utils.xmlNameToJavaClass(faultMessageName);
           } else {
  -            exceptionName = Utils.capitalizeFirstChar(Utils.xmlNameToJava(fault.getName()));
  +            exceptionName = Utils.xmlNameToJavaClass(fault.getName());
           }
           return exceptionName;
       }
  
  
  
  1.17      +2 -2      xml-axis/java/src/org/apache/axis/wsdl/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/SymbolTable.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SymbolTable.java	2001/12/05 18:52:26	1.16
  +++ SymbolTable.java	2001/12/05 21:45:09	1.17
  @@ -415,9 +415,9 @@
           // Use the namespace uri to get the appropriate package
           String pkg = getPackage(qName.getNamespaceURI());
           if (pkg != null) {
  -            fullJavaName = pkg + "." + Utils.xmlNameToJava(qName.getLocalPart());
  +            fullJavaName = pkg + "." + Utils.xmlNameToJavaClass(qName.getLocalPart());
           } else {
  -            fullJavaName = Utils.xmlNameToJava(qName.getLocalPart());
  +            fullJavaName = Utils.xmlNameToJavaClass(qName.getLocalPart());
           }
           return fullJavaName;
       } // getJavaName
  
  
  
  1.13      +2 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaWriterFactory.java
  
  Index: JavaWriterFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaWriterFactory.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JavaWriterFactory.java	2001/12/05 18:52:26	1.12
  +++ JavaWriterFactory.java	2001/12/05 21:45:09	1.13
  @@ -281,7 +281,8 @@
        * Construct the signatures.  signature is used by both the interface and the stub.
        * skelSig is used by the skeleton.
        */
  -    private void constructSignatures(Parameters parms, String name) {
  +    private void constructSignatures(Parameters parms, String opName) {
  +        String name  = Utils.xmlNameToJava(opName);
           int allOuts = parms.outputs + parms.inouts;
           String ret = parms.returnType == null ? "void" : parms.returnType.getName();
           String signature = "    public " + ret + " " + name + "(";
  
  
  
  1.10      +2 -2      xml-axis/java/src/org/apache/axis/wsdl/JavaTestCaseWriter.java
  
  Index: JavaTestCaseWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaTestCaseWriter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JavaTestCaseWriter.java	2001/12/04 19:34:56	1.9
  +++ JavaTestCaseWriter.java	2001/12/05 21:45:09	1.10
  @@ -125,7 +125,7 @@
                   continue;
               }
   
  -            String portName = Utils.xmlNameToJava(p.getName());
  +            String portName = Utils.xmlNameToJavaClass(p.getName());
   
               writeComment(pw, p.getDocumentationElement());
               writeServiceTestCode(portName, binding);
  @@ -198,7 +198,7 @@
               }
   
               pw.print("binding.");
  -            pw.print(op.getName());
  +            pw.print(Utils.xmlNameToJava(op.getName()));
               pw.print("(");
   
               Iterator iparam = params.list.iterator();
  
  
  
  1.21      +1 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaStubWriter.java
  
  Index: JavaStubWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaStubWriter.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- JavaStubWriter.java	2001/12/04 22:11:47	1.20
  +++ JavaStubWriter.java	2001/12/05 21:45:09	1.21
  @@ -111,7 +111,7 @@
           PortType portType = binding.getPortType();
           PortTypeEntry ptEntry =
                   symbolTable.getPortTypeEntry(portType.getQName());
  -        String name = Utils.xmlNameToJava(qname.getLocalPart());
  +        String name = Utils.xmlNameToJavaClass(qname.getLocalPart());
           String portTypeName = ptEntry.getName();
           boolean isRPC = true;
           if (bEntry.getBindingStyle() == BindingEntry.STYLE_DOCUMENT) {
  
  
  
  1.11      +1 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaSkelWriter.java
  
  Index: JavaSkelWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaSkelWriter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JavaSkelWriter.java	2001/12/04 19:34:56	1.10
  +++ JavaSkelWriter.java	2001/12/05 21:45:09	1.11
  @@ -190,7 +190,7 @@
               pw.print("        ");
           else
               pw.print("        Object ret = ");
  -        String call = "impl." + operation.getName() + "(";
  +        String call = "impl." + Utils.xmlNameToJava(operation.getName()) + "(";
           if (emitter.bMessageContext) {
               call = call + "ctx";
               if (parms.list.size() > 0)
  
  
  
  1.8       +1 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaServiceImplWriter.java
  
  Index: JavaServiceImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaServiceImplWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JavaServiceImplWriter.java	2001/11/30 14:12:52	1.7
  +++ JavaServiceImplWriter.java	2001/12/05 21:45:09	1.8
  @@ -134,7 +134,7 @@
                   continue;
               }
   
  -            String portName = Utils.xmlNameToJava(p.getName());
  +            String portName = Utils.xmlNameToJavaClass(p.getName());
               String stubClass = bEntry.getName() + "Stub";
               String bindingType = ptEntry.getName();
   
  
  
  
  1.4       +3 -13     xml-axis/java/src/org/apache/axis/wsdl/JavaComplexTypeWriter.java
  
  Index: JavaComplexTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaComplexTypeWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaComplexTypeWriter.java	2001/11/09 19:57:45	1.3
  +++ JavaComplexTypeWriter.java	2001/12/05 21:45:09	1.4
  @@ -92,18 +92,17 @@
           Node node = type.getNode();
   
           // We are only interested in the java names of the types, so replace the
  -        // Types in the list with their java names.
  +        // Types in the list with their java names.  
  +        // Also filter element names for Java 
           for (int i=0; i < elements.size(); i+=2) {
               elements.setElementAt(((Type) elements.get(i)).getJavaName(), i);
  +            elements.setElementAt( Utils.xmlNameToJava((String) elements.get(i + 1)), i + 1);
           }
   
           pw.println("public class " + className + " implements java.io.Serializable {");
   
           for (int i = 0; i < elements.size(); i += 2) {
               String variable = (String) elements.get(i + 1);
  -            if (Utils.isJavaKeyword(variable)) {
  -                variable = Utils.makeNonJavaKeyword(variable);
  -            }
               pw.println("    private " + elements.get(i) + " " + variable + ";");
           }
   
  @@ -116,17 +115,11 @@
               for (int i = 0; i < elements.size(); i += 2) {
                   if (i != 0) pw.print(", ");
                   String variable = (String) elements.get(i + 1);
  -                if (Utils.isJavaKeyword(variable)) {
  -                    variable = Utils.makeNonJavaKeyword(variable);
  -                }
                   pw.print((String) elements.get(i) + " " + variable);
               }
               pw.println(") {");
               for (int i = 1; i < elements.size(); i += 2) {
                   String variable = (String) elements.get(i);
  -                if (Utils.isJavaKeyword(variable)) {
  -                    variable = Utils.makeNonJavaKeyword(variable);
  -                }
                   pw.println("        this." + variable + " = " + variable + ";");
               }
               pw.println("    }");
  @@ -137,9 +130,6 @@
               String name = (String) elements.get(i + 1);
               String capName = Utils.capitalizeFirstChar(name);
   
  -            if (Utils.isJavaKeyword(name)) {
  -                name = Utils.makeNonJavaKeyword(name);
  -            }
               pw.println("    public " + typeName + " get" + capName + "() {");
               pw.println("        return " + name + ";");
               pw.println("    }");
  
  
  
  1.7       +102 -102  xml-axis/java/test/inout/InoutSOAPBindingImpl.java
  
  Index: InoutSOAPBindingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/inout/InoutSOAPBindingImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- InoutSOAPBindingImpl.java	2001/10/20 09:02:04	1.6
  +++ InoutSOAPBindingImpl.java	2001/12/05 21:45:09	1.7
  @@ -57,27 +57,27 @@
       private Address returnAddress = new Address (555, "Monroe Street", "Madison", "WI", 54444, returnPhone);
       private int returnNumber = 66;
   
  -    public void out0_inout0_in0 () throws org.apache.axis.AxisFault, TestFailed
  +    public void out0Inout0In0 () throws org.apache.axis.AxisFault, TestFailed
       {
       }
   
  -    public void out0_inout0_in1 (String name) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0Inout0In1 (String name) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (!"out0_inout0_in1".equals (name))
  +        if (!"out0Inout0In1".equals (name))
           {
  -            System.err.println ("Test failure:  out0_inout0_in1");
  -            System.err.println ("expected name = out0_inout0_in1");
  +            System.err.println ("Test failure:  out0Inout0In1");
  +            System.err.println ("expected name = out0Inout0In1");
               System.err.println ("actual name = " + name);
               throw new TestFailed ();
           }
       }
   
  -    public void out0_inout0_inMany (String name, Address address) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0Inout0InMany (String name, Address address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (!"out0_inout0_inMany".equals (name) || !equals (address, expectedAddress))
  +        if (!"out0Inout0InMany".equals (name) || !equals (address, expectedAddress))
           {
  -            System.err.println ("Test failure:  out0_inout0_inMany");
  -            System.err.println ("expected name = out0_inout0_inMany");
  +            System.err.println ("Test failure:  out0Inout0InMany");
  +            System.err.println ("expected name = out0Inout0InMany");
               System.err.println ("actual name = " + name);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  @@ -85,42 +85,42 @@
           }
       }
   
  -    public void out0_inout1_in0 (PhoneHolder phone) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0Inout1In0 (PhoneHolder phone) throws org.apache.axis.AxisFault, TestFailed
       {
           if (equals (phone._value, expectedPhone))
               phone._value = returnPhone;
           else
           {
  -            System.err.println ("Test failure:  out0_inout1_in0");
  +            System.err.println ("Test failure:  out0Inout1In0");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone._value));
               throw new TestFailed ();
           }
       }
   
  -    public void out0_inout1_in1 (StringHolder name, Address address) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0Inout1In1 (StringHolder name, Address address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && "out0_inout1_in1".equals (name._value))
  +        if (equals (address, expectedAddress) && "out0Inout1In1".equals (name._value))
               name._value = name._value + " yo ho ho!";
           else
           {
  -            System.err.println ("Test failure:  out0_inout1_in1");
  +            System.err.println ("Test failure:  out0Inout1In1");
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  -            System.err.println ("expected name = out0_inout1_in1");
  +            System.err.println ("expected name = out0Inout1In1");
               System.err.println ("actual name = " + name._value);
               throw new TestFailed ();
           }
       }
   
  -    public void out0_inout1_inMany (String name, Address address, PhoneHolder phone) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0Inout1InMany (String name, Address address, PhoneHolder phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out0_inout1_inMany".equals (name) && equals (address, expectedAddress) && equals (phone._value, expectedPhone))
  +        if ("out0Inout1InMany".equals (name) && equals (address, expectedAddress) && equals (phone._value, expectedPhone))
               phone._value = returnPhone;
           else
           {
  -            System.err.println ("Test failure:  out0_inout1_inMany");
  -            System.err.println ("expected name = out0_inout1_inMany");
  +            System.err.println ("Test failure:  out0Inout1InMany");
  +            System.err.println ("expected name = out0Inout1InMany");
               System.err.println ("actual name = " + name);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  @@ -130,17 +130,17 @@
           }
       }
   
  -    public void out0_inoutMany_in0 (StringHolder name, AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0InoutManyIn0 (StringHolder name, AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out0_inoutMany_in0".equals (name._value) && equals (address._value, expectedAddress))
  +        if ("out0InoutManyIn0".equals (name._value) && equals (address._value, expectedAddress))
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
           }
           else
           {
  -            System.err.println ("Test failure:  out0_inoutMany_in0");
  -            System.err.println ("expected name = out0_inoutMany_in0");
  +            System.err.println ("Test failure:  out0InoutManyIn0");
  +            System.err.println ("expected name = out0InoutManyIn0");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -148,19 +148,19 @@
           }
       }
   
  -    public void out0_inoutMany_in1 (StringHolder name, AddressHolder address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0InoutManyIn1 (StringHolder name, AddressHolder address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && "out0_inoutMany_in1".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && "out0InoutManyIn1".equals (name._value) && equals (address._value, expectedAddress))
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
           }
           else
           {
  -            System.err.println ("Test failure:  out0_inoutMany_in1");
  +            System.err.println ("Test failure:  out0InoutManyIn1");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
  -            System.err.println ("expected name = out0_inoutMany_in1");
  +            System.err.println ("expected name = out0InoutManyIn1");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -169,21 +169,21 @@
       }
   
   
  -    public void out0_inoutMany_inMany (StringHolder name, AddressHolder address, Phone phone, int number) throws org.apache.axis.AxisFault, TestFailed
  +    public void out0InoutManyInMany (StringHolder name, AddressHolder address, Phone phone, int number) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && expectedNumber == number && "out0_inoutMany_inMany".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && expectedNumber == number && "out0InoutManyInMany".equals (name._value) && equals (address._value, expectedAddress))
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
           }
           else
           {
  -            System.err.println ("Test failure:  out0_inoutMany_inMany");
  +            System.err.println ("Test failure:  out0InoutManyInMany");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected number = " + expectedNumber);
               System.err.println ("actual number = " + number);
  -            System.err.println ("expected name = out0_inoutMany_inMany");
  +            System.err.println ("expected name = out0InoutManyInMany");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -192,38 +192,38 @@
       }
   
   
  -    public int out1_inout0_in0 () throws org.apache.axis.AxisFault, TestFailed
  +    public int out1Inout0In0 () throws org.apache.axis.AxisFault, TestFailed
       {
           return returnNumber;
       }
   
   
  -    public int out1_inout0_in1 (String name) throws org.apache.axis.AxisFault, TestFailed
  +    public int out1Inout0In1 (String name) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out1_inout0_in1".equals (name))
  +        if ("out1Inout0In1".equals (name))
           {
               return returnNumber;
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inout0_in1");
  -            System.err.println ("expected name = out1_inout0_in1");
  +            System.err.println ("Test failure:  out1Inout0In1");
  +            System.err.println ("expected name = out1Inout0In1");
               System.err.println ("actual name = " + name);
               throw new TestFailed ();
           }
       }
   
   
  -    public int out1_inout0_inMany (String name, Address address) throws org.apache.axis.AxisFault, TestFailed
  +    public int out1Inout0InMany (String name, Address address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out1_inout0_inMany".equals (name) && equals (address, expectedAddress))
  +        if ("out1Inout0InMany".equals (name) && equals (address, expectedAddress))
           {
               return returnNumber;
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inout0_inMany");
  -            System.err.println ("expected name = out1_inout0_inMany");
  +            System.err.println ("Test failure:  out1Inout0InMany");
  +            System.err.println ("expected name = out1Inout0InMany");
               System.err.println ("actual name = " + name);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  @@ -231,74 +231,74 @@
           }
       }
   
  -    public Address out1_inout1_in0 (StringHolder name) throws org.apache.axis.AxisFault, TestFailed
  +    public Address out1Inout1In0 (StringHolder name) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out1_inout1_in0".equals (name._value))
  +        if ("out1Inout1In0".equals (name._value))
           {
               name._value = name._value + " yo ho ho!";
               return returnAddress;
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inout1_in0");
  -            System.err.println ("expected name = out1_inout1_in0");
  +            System.err.println ("Test failure:  out1Inout1In0");
  +            System.err.println ("expected name = out1Inout1In0");
               System.err.println ("actual name = " + name._value);
               throw new TestFailed ();
           }
       }
   
  -    public String out1_inout1_in1 (StringHolder name, Address address) throws org.apache.axis.AxisFault, TestFailed
  +    public String out1Inout1In1 (StringHolder name, Address address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && "out1_inout1_in1".equals (name._value))
  +        if (equals (address, expectedAddress) && "out1Inout1In1".equals (name._value))
           {
               name._value = name._value + " yo ho ho!";
  -            return "out1_inout1_in1 arghhh!";
  +            return "out1Inout1In1 arghhh!";
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inout1_in1");
  +            System.err.println ("Test failure:  out1Inout1In1");
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  -            System.err.println ("expected name = out1_inout1_in1");
  +            System.err.println ("expected name = out1Inout1In1");
               System.err.println ("actual name = " + name._value);
               throw new TestFailed ();
           }
       }
   
   
  -    public String out1_inout1_inMany (StringHolder name, Address address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
  +    public String out1Inout1InMany (StringHolder name, Address address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && equals (phone, expectedPhone) && "out1_inout1_inMany".equals (name._value))
  +        if (equals (address, expectedAddress) && equals (phone, expectedPhone) && "out1Inout1InMany".equals (name._value))
           {
               name._value = name._value + " yo ho ho!";
  -            return "out1_inout1_inMany arghhh!";
  +            return "out1Inout1InMany arghhh!";
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inout1_inMany");
  +            System.err.println ("Test failure:  out1Inout1InMany");
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
  -            System.err.println ("expected name = out1_inout1_inMany");
  +            System.err.println ("expected name = out1Inout1InMany");
               System.err.println ("actual name = " + name._value);
               throw new TestFailed ();
           }
       }
   
   
  -    public String out1_inoutMany_in0 (StringHolder name, AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
  +    public String out1InoutManyIn0 (StringHolder name, AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out1_inoutMany_in0".equals (name._value) && equals (address._value, expectedAddress))
  +        if ("out1InoutManyIn0".equals (name._value) && equals (address._value, expectedAddress))
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
  -            return "out1_inoutMany_in0 arghhh!";
  +            return "out1InoutManyIn0 arghhh!";
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inoutMany_in0");
  -            System.err.println ("expected name = out1_inoutMany_in0");
  +            System.err.println ("Test failure:  out1InoutManyIn0");
  +            System.err.println ("expected name = out1InoutManyIn0");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -307,20 +307,20 @@
       }
   
   
  -    public String out1_inoutMany_in1 (StringHolder name, AddressHolder address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
  +    public String out1InoutManyIn1 (StringHolder name, AddressHolder address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && "out1_inoutMany_in1".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && "out1InoutManyIn1".equals (name._value) && equals (address._value, expectedAddress))
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
  -            return "out1_inoutMany_in1 arghhh!";
  +            return "out1InoutManyIn1 arghhh!";
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inoutMany_in1");
  +            System.err.println ("Test failure:  out1InoutManyIn1");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
  -            System.err.println ("expected name = out1_inoutMany_in1");
  +            System.err.println ("expected name = out1InoutManyIn1");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -329,22 +329,22 @@
       }
   
   
  -    public String out1_inoutMany_inMany (StringHolder name, AddressHolder address, Phone phone, int number) throws org.apache.axis.AxisFault, TestFailed
  +    public String out1InoutManyInMany (StringHolder name, AddressHolder address, Phone phone, int number) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && expectedNumber == number && "out1_inoutMany_inMany".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && expectedNumber == number && "out1InoutManyInMany".equals (name._value) && equals (address._value, expectedAddress))
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
  -            return "out1_inoutMany_inMany arghhh!";
  +            return "out1InoutManyInMany arghhh!";
           }
           else
           {
  -            System.err.println ("Test failure:  out1_inoutMany_inMany");
  +            System.err.println ("Test failure:  out1InoutManyInMany");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected number = " + expectedNumber);
               System.err.println ("actual number = " + number);
  -            System.err.println ("expected name = out1_inoutMany_inMany");
  +            System.err.println ("expected name = out1InoutManyInMany");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -353,7 +353,7 @@
       }
   
   
  -    public String outMany_inout0_in0 (AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
  +    public String outManyInout0In0 (AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
       {
           if (address._value == null)
           {
  @@ -365,34 +365,34 @@
       }
   
   
  -    public int outMany_inout0_in1 (String name, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInout0In1 (String name, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outMany_inout0_in1".equals (name) && otherName._value == null)
  +        if ("outManyInout0In1".equals (name) && otherName._value == null)
           {
               otherName._value = " yo ho ho!";
               return returnNumber;
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inout0_in1");
  -            System.err.println ("expected name = outMany_inout0_in1");
  +            System.err.println ("Test failure:  outManyInout0In1");
  +            System.err.println ("expected name = outManyInout0In1");
               System.err.println ("actual name = " + name);
               throw new TestFailed ();
           }
       }
   
   
  -    public int outMany_inout0_inMany (String name, Address address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInout0InMany (String name, Address address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outMany_inout0_inMany".equals (name) && equals (address, expectedAddress) && otherName._value == null)
  +        if ("outManyInout0InMany".equals (name) && equals (address, expectedAddress) && otherName._value == null)
           {
               otherName._value = " yo ho ho!";
               return returnNumber;
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inout0_inMany");
  -            System.err.println ("expected name = outMany_inout0_inMany");
  +            System.err.println ("Test failure:  outManyInout0InMany");
  +            System.err.println ("expected name = outManyInout0InMany");
               System.err.println ("actual name = " + name);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  @@ -401,9 +401,9 @@
       }
   
   
  -    public int outMany_inout1_in0 (StringHolder name, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInout1In0 (StringHolder name, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outMany_inout1_in0".equals (name._value) && otherName._value == null)
  +        if ("outManyInout1In0".equals (name._value) && otherName._value == null)
           {
               name._value = name._value + " yo ho ho!";
               otherName._value = " yo ho ho!";
  @@ -411,17 +411,17 @@
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inout1_in0");
  -            System.err.println ("expected name = outMany_inout1_in0");
  +            System.err.println ("Test failure:  outManyInout1In0");
  +            System.err.println ("expected name = outManyInout1In0");
               System.err.println ("actual name = " + name._value);
               throw new TestFailed ();
           }
       }
   
   
  -    public int outMany_inout1_in1 (StringHolder name, Address address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInout1In1 (StringHolder name, Address address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && "outMany_inout1_in1".equals (name._value) && otherName._value == null)
  +        if (equals (address, expectedAddress) && "outManyInout1In1".equals (name._value) && otherName._value == null)
           {
               name._value = name._value + " yo ho ho!";
               otherName._value = " yo ho ho!";
  @@ -429,10 +429,10 @@
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inout1_in1");
  +            System.err.println ("Test failure:  outManyInout1In1");
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  -            System.err.println ("expected name = out1_inoutMany_inMany");
  +            System.err.println ("expected name = out1InoutManyInMany");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected otherName = null");
               System.err.println ("actual otherName = " + otherName._value);
  @@ -441,9 +441,9 @@
       }
   
   
  -    public int outMany_inout1_inMany (String name, Address address, PhoneHolder phone, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInout1InMany (String name, Address address, PhoneHolder phone, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outMany_inout1_inMany".equals (name) && equals (address, expectedAddress) && equals (phone._value, expectedPhone) && otherName._value == null)
  +        if ("outManyInout1InMany".equals (name) && equals (address, expectedAddress) && equals (phone._value, expectedPhone) && otherName._value == null)
           {
               phone._value = returnPhone;
               otherName._value = " yo ho ho!";
  @@ -451,8 +451,8 @@
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inout1_inMany");
  -            System.err.println ("expected name = outMany_inout1_inMany");
  +            System.err.println ("Test failure:  outManyInout1InMany");
  +            System.err.println ("expected name = outManyInout1InMany");
               System.err.println ("actual name = " + name);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
  @@ -463,9 +463,9 @@
       }
   
   
  -    public int outMany_inoutMany_in0 (StringHolder name, AddressHolder address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInoutManyIn0 (StringHolder name, AddressHolder address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outMany_inoutMany_in0".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
  +        if ("outManyInoutManyIn0".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
  @@ -474,8 +474,8 @@
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inoutMany_in0");
  -            System.err.println ("expected name = outMany_inoutMany_in0");
  +            System.err.println ("Test failure:  outManyInoutManyIn0");
  +            System.err.println ("expected name = outManyInoutManyIn0");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -484,9 +484,9 @@
       }
   
   
  -    public int outMany_inoutMany_in1 (StringHolder name, AddressHolder address, Phone phone, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInoutManyIn1 (StringHolder name, AddressHolder address, Phone phone, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && "outMany_inoutMany_in1".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
  +        if (equals (phone, expectedPhone) && "outManyInoutManyIn1".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
  @@ -495,10 +495,10 @@
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inoutMany_in1");
  +            System.err.println ("Test failure:  outManyInoutManyIn1");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
  -            System.err.println ("expected name = out1_inoutMany_inMany");
  +            System.err.println ("expected name = out1InoutManyInMany");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  @@ -507,9 +507,9 @@
       }
   
   
  -    public int outMany_inoutMany_inMany (StringHolder name, AddressHolder address, Phone phone, int otherNumber, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
  +    public int outManyInoutManyInMany (StringHolder name, AddressHolder address, Phone phone, int otherNumber, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && expectedNumber == otherNumber && "outMany_inoutMany_inMany".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
  +        if (equals (phone, expectedPhone) && expectedNumber == otherNumber && "outManyInoutManyInMany".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
           {
               name._value = name._value + " yo ho ho!";
               address._value = returnAddress;
  @@ -518,12 +518,12 @@
           }
           else
           {
  -            System.err.println ("Test failure:  outMany_inoutMany_inMany");
  +            System.err.println ("Test failure:  outManyInoutManyInMany");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected number = " + expectedNumber);
               System.err.println ("actual number = " + otherNumber);
  -            System.err.println ("expected name = outMany_inoutMany_inMany");
  +            System.err.println ("expected name = outManyInoutManyInMany");
               System.err.println ("actual name = " + name._value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address._value));
  
  
  
  1.7       +54 -54    xml-axis/java/test/inout/inout.wsdl
  
  Index: inout.wsdl
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/inout/inout.wsdl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- inout.wsdl	2001/12/04 18:33:34	1.6
  +++ inout.wsdl	2001/12/05 21:45:09	1.7
  @@ -122,137 +122,137 @@
     <portType name="Inout">
   
       <!-- all permutations in order out, inout, in -->
  -    <operation name="out0_inout0_in0">
  +    <operation name="out0Inout0In0">
         <input message="tns:Msg0"/>
         <output message="tns:Msg0"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inout0_in1">
  +    <operation name="out0Inout0In1">
         <input message="tns:Msg1"/>
         <output message="tns:Msg0"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inout0_inMany">
  +    <operation name="out0Inout0InMany">
         <input message="tns:Msg2"/>
         <output message="tns:Msg0"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inout1_in0">
  +    <operation name="out0Inout1In0">
         <input message="tns:Msg3"/>
         <output message="tns:Msg3"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inout1_in1">
  +    <operation name="out0Inout1In1">
         <input message="tns:Msg2"/>
         <output message="tns:Msg1"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inout1_inMany">
  +    <operation name="out0Inout1InMany">
         <input message="tns:Msg23"/>
         <output message="tns:Msg3"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inoutMany_in0">
  +    <operation name="out0InoutManyIn0">
         <input message="tns:Msg2"/>
         <output message="tns:Msg2"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inoutMany_in1">
  +    <operation name="out0InoutManyIn1">
         <input message="tns:Msg23"/>
         <output message="tns:Msg2"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out0_inoutMany_inMany">
  +    <operation name="out0InoutManyInMany">
         <input message="tns:Msg234"/>
         <output message="tns:Msg2"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inout0_in0">
  +    <operation name="out1Inout0In0">
         <input message="tns:Msg0"/>
         <output message="tns:Msg4"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inout0_in1">
  +    <operation name="out1Inout0In1">
         <input message="tns:Msg1"/>
         <output message="tns:Msg4"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inout0_inMany">
  +    <operation name="out1Inout0InMany">
         <input message="tns:Msg2"/>
         <output message="tns:Msg4"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inout1_in0">
  +    <operation name="out1Inout1In0">
         <input message="tns:Msg1"/>
         <output message="tns:Msg2"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inout1_in1">
  +    <operation name="out1Inout1In1">
         <input message="tns:Msg2"/>
         <output message="tns:Msg15"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inout1_inMany">
  +    <operation name="out1Inout1InMany">
         <input message="tns:Msg23"/>
         <output message="tns:Msg15"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inoutMany_in0">
  +    <operation name="out1InoutManyIn0">
         <input message="tns:Msg2"/>
         <output message="tns:Msg25"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inoutMany_in1">
  +    <operation name="out1InoutManyIn1">
         <input message="tns:Msg23"/>
         <output message="tns:Msg25"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="out1_inoutMany_inMany">
  +    <operation name="out1InoutManyInMany">
         <input message="tns:Msg234"/>
         <output message="tns:Msg25"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inout0_in0">
  +    <operation name="outManyInout0In0">
         <input message="tns:Msg0"/>
         <output message="tns:Msg2"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inout0_in1">
  +    <operation name="outManyInout0In1">
         <input message="tns:Msg1"/>
         <output message="tns:Msg45"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inout0_inMany">
  +    <operation name="outManyInout0InMany">
         <input message="tns:Msg2"/>
         <output message="tns:Msg45"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inout1_in0">
  +    <operation name="outManyInout1In0">
         <input message="tns:Msg1"/>
         <output message="tns:Msg145"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inout1_in1">
  +    <operation name="outManyInout1In1">
         <input message="tns:Msg2"/>
         <output message="tns:Msg145"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inout1_inMany">
  +    <operation name="outManyInout1InMany">
         <input message="tns:Msg23"/>
         <output message="tns:Msg345"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inoutMany_in0">
  +    <operation name="outManyInoutManyIn0">
         <input message="tns:Msg2"/>
         <output message="tns:Msg245"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inoutMany_in1">
  +    <operation name="outManyInoutManyIn1">
         <input message="tns:Msg23"/>
         <output message="tns:Msg245"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
       </operation>
  -    <operation name="outMany_inoutMany_inMany">
  +    <operation name="outManyInoutManyInMany">
         <input message="tns:Msg236"/>
         <output message="tns:Msg245"/>
         <fault name="TestFailed" message="tns:TestFailed"/>
  @@ -264,7 +264,7 @@
     <binding name="InoutSOAPBinding" type="tns:Inout">
       <soap:binding style="rpc" 
                     transport="http://schemas.xmlsoap.org/soap/http"/>
  -    <operation name="out0_inout0_in0">
  +    <operation name="out0Inout0In0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -279,7 +279,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inout0_in1">
  +    <operation name="out0Inout0In1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -294,7 +294,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inout0_inMany">
  +    <operation name="out0Inout0InMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -309,7 +309,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inout1_in0">
  +    <operation name="out0Inout1In0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -324,7 +324,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inout1_in1">
  +    <operation name="out0Inout1In1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -339,7 +339,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inout1_inMany">
  +    <operation name="out0Inout1InMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -354,7 +354,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inoutMany_in0">
  +    <operation name="out0InoutManyIn0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -369,7 +369,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inoutMany_in1">
  +    <operation name="out0InoutManyIn1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -384,7 +384,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out0_inoutMany_inMany">
  +    <operation name="out0InoutManyInMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -399,7 +399,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inout0_in0">
  +    <operation name="out1Inout0In0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -414,7 +414,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inout0_in1">
  +    <operation name="out1Inout0In1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -429,7 +429,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inout0_inMany">
  +    <operation name="out1Inout0InMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -444,7 +444,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inout1_in0">
  +    <operation name="out1Inout1In0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -459,7 +459,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inout1_in1">
  +    <operation name="out1Inout1In1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -474,7 +474,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inout1_inMany">
  +    <operation name="out1Inout1InMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -489,7 +489,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inoutMany_in0">
  +    <operation name="out1InoutManyIn0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -504,7 +504,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inoutMany_in1">
  +    <operation name="out1InoutManyIn1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -519,7 +519,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="out1_inoutMany_inMany">
  +    <operation name="out1InoutManyInMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -534,7 +534,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inout0_in0">
  +    <operation name="outManyInout0In0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -549,7 +549,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inout0_in1">
  +    <operation name="outManyInout0In1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -564,7 +564,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inout0_inMany">
  +    <operation name="outManyInout0InMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -579,7 +579,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inout1_in0">
  +    <operation name="outManyInout1In0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -594,7 +594,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inout1_in1">
  +    <operation name="outManyInout1In1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -609,7 +609,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inout1_inMany">
  +    <operation name="outManyInout1InMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -624,7 +624,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inoutMany_in0">
  +    <operation name="outManyInoutManyIn0">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -639,7 +639,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inoutMany_in1">
  +    <operation name="outManyInoutManyIn1">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  @@ -654,7 +654,7 @@
         <fault name="TestFailed">
         </fault>
       </operation>
  -    <operation name="outMany_inoutMany_inMany">
  +    <operation name="outManyInoutManyInMany">
         <soap:operation soapAction=""/>
         <input>
           <soap:body use="encoded" 
  
  
  
  1.7       +126 -126  xml-axis/java/test/inout/DetailedInoutTestCase.java
  
  Index: DetailedInoutTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/inout/DetailedInoutTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DetailedInoutTestCase.java	2001/10/26 18:19:01	1.6
  +++ DetailedInoutTestCase.java	2001/12/05 21:45:09	1.7
  @@ -73,413 +73,413 @@
       private Address returnAddress = new Address (555, "Monroe Street", "Madison", "WI", 54444, returnPhone);
       private int returnNumber = 66;
   
  -    public void testOut0_inout0_in0 ()
  +    public void testOut0Inout0In0 ()
       {
           try
           {
  -            io.out0_inout0_in0 ();
  +            io.out0Inout0In0 ();
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure: out0_inout0_in0: " + t.getMessage());
  +            throw new AssertionFailedError("Test failure: out0Inout0In0: " + t.getMessage());
           }
       }
   
  -    public void testOut0_inout0_in1 ()
  +    public void testOut0Inout0In1 ()
       {
           try
           {
  -            io.out0_inout0_in1 ("out0_inout0_in1");
  +            io.out0Inout0In1 ("out0Inout0In1");
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inout0_in1" + t.getMessage());
  +            throw new AssertionFailedError("Test failure:  out0Inout0In1" + t.getMessage());
           }
       }
   
  -    public void testOut0_inout0_inMany ()
  +    public void testOut0Inout0InMany ()
       {
           try
           {
  -            io.out0_inout0_inMany ("out0_inout0_inMany", expectedAddress);
  +            io.out0Inout0InMany ("out0Inout0InMany", expectedAddress);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inout0_inMany" + t.getMessage());
  +            throw new AssertionFailedError("Test failure:  out0Inout0InMany" + t.getMessage());
           }
       }
   
  -    public void testOut0_inout1_in0 ()
  +    public void testOut0Inout1In0 ()
       {
           PhoneHolder ph = new PhoneHolder (expectedPhone);
           try
           {
  -            io.out0_inout1_in0 (ph);
  -            assertTrue("out0_inout1_in0 returned bad value", equals(ph._value, returnPhone));
  +            io.out0Inout1In0 (ph);
  +            assertTrue("out0Inout1In0 returned bad value", equals(ph._value, returnPhone));
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inout1_in0\nexpected phone = "
  +            throw new AssertionFailedError("Test failure:  out0Inout1In0\nexpected phone = "
                                              + printPhone (returnPhone) + "\nactual phone = "
                                              + printPhone (ph._value) + t.getMessage());
           }
       }
   
  -    public void testOut0_inout1_in1 ()
  +    public void testOut0Inout1In1 ()
       {
  -        StringHolder sh = new StringHolder ("out0_inout1_in1");
  +        StringHolder sh = new StringHolder ("out0Inout1In1");
           try
           {
  -            io.out0_inout1_in1 (sh, expectedAddress);
  -            assertEquals("StringHolder returned bad value", "out0_inout1_in1 yo ho ho!", sh._value);
  +            io.out0Inout1In1 (sh, expectedAddress);
  +            assertEquals("StringHolder returned bad value", "out0Inout1In1 yo ho ho!", sh._value);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inout1_in1\nexpected string = out0_inout1_in1 yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  out0Inout1In1\nexpected string = out0Inout1In1 yo ho ho!\nactual string = "
                                              + sh._value + t.getMessage());
           }
       }
   
  -    public void testOut0_inout1_inMany ()
  +    public void testOut0Inout1InMany ()
       {
           PhoneHolder ph = new PhoneHolder (expectedPhone);
           try
           {
  -            io.out0_inout1_inMany ("out0_inout1_inMany", expectedAddress, ph);
  -            assertTrue("out0_inout1_inMany returned bad value", equals(ph._value, returnPhone));
  +            io.out0Inout1InMany ("out0Inout1InMany", expectedAddress, ph);
  +            assertTrue("out0Inout1InMany returned bad value", equals(ph._value, returnPhone));
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inout1_inMany\nexpected phone = "
  +            throw new AssertionFailedError("Test failure:  out0Inout1InMany\nexpected phone = "
                                              + printPhone (returnPhone) + "\nactual phone = "
                                              + printPhone (ph._value) + t.getMessage());
           }
       }
   
  -    public void testOut0_inoutMany_in0 ()
  +    public void testOut0InoutManyIn0 ()
       {
  -        StringHolder sh = new StringHolder ("out0_inoutMany_in0");
  +        StringHolder sh = new StringHolder ("out0InoutManyIn0");
           AddressHolder ah = new AddressHolder (expectedAddress);
           try
           {
  -            io.out0_inoutMany_in0 (sh, ah);
  -            assertEquals("out0_inoutMany_in0 yo ho ho!", sh._value);
  -            assertTrue("out0_inoutMany_in0 returned bad value", equals (ah._value, returnAddress));
  +            io.out0InoutManyIn0 (sh, ah);
  +            assertEquals("out0InoutManyIn0 yo ho ho!", sh._value);
  +            assertTrue("out0InoutManyIn0 returned bad value", equals (ah._value, returnAddress));
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inoutMany_in0\nexpected string = out0_inoutMany_in0 yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  out0InoutManyIn0\nexpected string = out0InoutManyIn0 yo ho ho!\nactual string = "
                                              + sh._value + "\nexpected address =\n" + printAddress (returnAddress)
                                              + "\nactual address =\n" + printAddress (ah._value) + t.getMessage());
           }
       }
   
  -    public void testOut0_inoutMany_in1 ()
  +    public void testOut0InoutManyIn1 ()
       {
           try
           {
  -            StringHolder sh = new StringHolder ("out0_inoutMany_in1");
  +            StringHolder sh = new StringHolder ("out0InoutManyIn1");
               AddressHolder ah = new AddressHolder (expectedAddress);
  -            io.out0_inoutMany_in1 (sh, ah, expectedPhone);
  -            assertEquals("out0_inoutMany_in1 yo ho ho!", sh._value);
  -            assertTrue("testOut0_inoutMany_in1 returned bad value", equals (ah._value, returnAddress));
  +            io.out0InoutManyIn1 (sh, ah, expectedPhone);
  +            assertEquals("out0InoutManyIn1 yo ho ho!", sh._value);
  +            assertTrue("testOut0InoutManyIn1 returned bad value", equals (ah._value, returnAddress));
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inoutMany_in1\n" + t.getMessage());
  +            throw new AssertionFailedError("Test failure:  out0InoutManyIn1\n" + t.getMessage());
           }
       }
   
  -    public void testOut0_inoutMany_inMany ()
  +    public void testOut0InoutManyInMany ()
       {
  -        StringHolder sh = new StringHolder ("out0_inoutMany_inMany");
  +        StringHolder sh = new StringHolder ("out0InoutManyInMany");
           AddressHolder ah = new AddressHolder (expectedAddress);
           try
           {
  -            io.out0_inoutMany_inMany (sh, ah, expectedPhone, expectedNumber);
  -            assertEquals("out0_inoutMany_inMany yo ho ho!", sh._value);
  +            io.out0InoutManyInMany (sh, ah, expectedPhone, expectedNumber);
  +            assertEquals("out0InoutManyInMany yo ho ho!", sh._value);
               assertTrue(equals (ah._value, returnAddress));
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out0_inoutMany_inMany\nexpected string = out0_inoutMany_inMany yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  out0InoutManyInMany\nexpected string = out0InoutManyInMany yo ho ho!\nactual string = "
                                              + sh._value + "\nexpected address =\n" + printAddress (returnAddress)
                                              + "\nactual address =\n" + printAddress (ah._value) + t.getMessage());
           }
       }
   
  -    public void testOut1_inout0_in0 ()
  +    public void testOut1Inout0In0 ()
       {
           int ret = 0;
           try
           {
  -            ret = io.out1_inout0_in0 ();
  -            assertEquals("out1_inout0_in0 returned wrong value", returnNumber, ret);
  +            ret = io.out1Inout0In0 ();
  +            assertEquals("out1Inout0In0 returned wrong value", returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inout0_in0\nexpected number = "
  +            throw new AssertionFailedError("Test failure:  out1Inout0In0\nexpected number = "
                                              + returnNumber + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOut1_inout0_in1 ()
  +    public void testOut1Inout0In1 ()
       {
           int ret = 0;
           try
           {
  -            ret = io.out1_inout0_in1 ("out1_inout0_in1");
  +            ret = io.out1Inout0In1 ("out1Inout0In1");
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inout0_in1\nexpected number = "
  +            throw new AssertionFailedError("Test failure:  out1Inout0In1\nexpected number = "
                                              + returnNumber + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOut1_inout0_inMany ()
  +    public void testOut1Inout0InMany ()
       {
           int ret = 0;
           try
           {
  -            ret = io.out1_inout0_inMany ("out1_inout0_inMany", expectedAddress);
  +            ret = io.out1Inout0InMany ("out1Inout0InMany", expectedAddress);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inout0_inMany\nexpected number = "
  +            throw new AssertionFailedError("Test failure:  out1Inout0InMany\nexpected number = "
                                              + returnNumber + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOut1_inout1_in0 ()
  +    public void testOut1Inout1In0 ()
       {
  -        StringHolder sh = new StringHolder ("out1_inout1_in0");
  +        StringHolder sh = new StringHolder ("out1Inout1In0");
           Address ret = null;
           try
           {
  -            ret = io.out1_inout1_in0 (sh);
  -            assertEquals("out1_inout1_in0 yo ho ho!", sh._value);
  +            ret = io.out1Inout1In0 (sh);
  +            assertEquals("out1Inout1In0 yo ho ho!", sh._value);
               assertTrue(equals (ret, returnAddress));
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inout1_in0\nexpected string = out1_inout1_in0 yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  out1Inout1In0\nexpected string = out1Inout1In0 yo ho ho!\nactual string = "
                                              + sh._value + "\nexpected address =\n" + printAddress (returnAddress)
                                              + "\nactual address =\n" + printAddress (ret) + t.getMessage());
           }
       }
   
  -    public void testOut1_inout1_in1 ()
  +    public void testOut1Inout1In1 ()
       {
  -        StringHolder sh = new StringHolder ("out1_inout1_in1");
  +        StringHolder sh = new StringHolder ("out1Inout1In1");
           String ret = null;
           try
           {
  -            ret = io.out1_inout1_in1 (sh, expectedAddress);
  -            assertEquals("out1_inout1_in1 yo ho ho!", sh._value);
  -            assertEquals("out1_inout1_in1 arghhh!", ret);
  +            ret = io.out1Inout1In1 (sh, expectedAddress);
  +            assertEquals("out1Inout1In1 yo ho ho!", sh._value);
  +            assertEquals("out1Inout1In1 arghhh!", ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inout1_in1\nexpected string1 = out1_inout1_in1 yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected string2 = out1_inout1_in1 arghhh!\nactual string2 = " + ret);
  +            throw new AssertionFailedError("Test failure:  out1Inout1In1\nexpected string1 = out1Inout1In1 yo ho ho!\nactual string1 = "
  +                                           + sh._value + "\nexpected string2 = out1Inout1In1 arghhh!\nactual string2 = " + ret);
           }
       }
   
  -    public void testOut1_inout1_inMany ()
  +    public void testOut1Inout1InMany ()
       {
  -        StringHolder sh = new StringHolder ("out1_inout1_inMany");
  +        StringHolder sh = new StringHolder ("out1Inout1InMany");
           String ret = null;
           try
           {
  -            ret = io.out1_inout1_inMany (sh, expectedAddress, expectedPhone);
  -            assertEquals("out1_inout1_inMany yo ho ho!", sh._value);
  -            assertEquals("out1_inout1_inMany arghhh!", ret);
  +            ret = io.out1Inout1InMany (sh, expectedAddress, expectedPhone);
  +            assertEquals("out1Inout1InMany yo ho ho!", sh._value);
  +            assertEquals("out1Inout1InMany arghhh!", ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inout1_inMany\nexpected string1 = out1_inout1_inMany yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected string2 = out1_inout1_inMany arghhh!\nactual string2 = " + ret + t.getMessage());
  +            throw new AssertionFailedError("Test failure:  out1Inout1InMany\nexpected string1 = out1Inout1InMany yo ho ho!\nactual string1 = "
  +                                           + sh._value + "\nexpected string2 = out1Inout1InMany arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
   
  -    public void testOut1_inoutMany_in0 ()
  +    public void testOut1InoutManyIn0 ()
       {
  -        StringHolder sh = new StringHolder ("out1_inoutMany_in0");
  +        StringHolder sh = new StringHolder ("out1InoutManyIn0");
           AddressHolder ah = new AddressHolder (expectedAddress);
           String ret = null;
           try
           {
  -            ret = io.out1_inoutMany_in0 (sh, ah);
  -            assertEquals("out1_inoutMany_in0 yo ho ho!", sh._value);
  +            ret = io.out1InoutManyIn0 (sh, ah);
  +            assertEquals("out1InoutManyIn0 yo ho ho!", sh._value);
               assertTrue(equals (ah._value, returnAddress));
  -            assertEquals("out1_inoutMany_in0 arghhh!", ret);
  +            assertEquals("out1InoutManyIn0 arghhh!", ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inoutMany_in0\nexpected string1 = out1_inoutMany_in0 yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  out1InoutManyIn0\nexpected string1 = out1InoutManyIn0 yo ho ho!\nactual string1 = "
                                              + sh._value + "\nexpected address = " + printAddress (returnAddress)
                                              + "\nactual address = " + printAddress (ah._value)
  -                                           + "\nexpected string2 = out1_inoutMany_in0 arghhh!\nactual string2 = " + ret + t.getMessage());
  +                                           + "\nexpected string2 = out1InoutManyIn0 arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
   
  -    public void testOut1_inoutMany_in1 ()
  +    public void testOut1InoutManyIn1 ()
       {
  -        StringHolder sh = new StringHolder ("out1_inoutMany_in1");
  +        StringHolder sh = new StringHolder ("out1InoutManyIn1");
           AddressHolder ah = new AddressHolder (expectedAddress);
           String ret = null;
           try
           {
  -            ret = io.out1_inoutMany_in1 (sh, ah, expectedPhone);
  -            assertEquals("out1_inoutMany_in1 yo ho ho!", sh._value);
  +            ret = io.out1InoutManyIn1 (sh, ah, expectedPhone);
  +            assertEquals("out1InoutManyIn1 yo ho ho!", sh._value);
               assertTrue(equals (ah._value, returnAddress));
  -            assertEquals("out1_inoutMany_in1 arghhh!", ret);
  +            assertEquals("out1InoutManyIn1 arghhh!", ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inoutMany_in1\nexpected string1 = out1_inoutMany_in1 yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  out1InoutManyIn1\nexpected string1 = out1InoutManyIn1 yo ho ho!\nactual string1 = "
                                              + sh._value + "\nexpected address = " + printAddress (returnAddress)
                                              + "\nactual address = " + printAddress (ah._value)
  -                                           + "\nexpected string2 = out1_inoutMany_in1 arghhh!\nactual string2 = " + ret + t.getMessage());
  +                                           + "\nexpected string2 = out1InoutManyIn1 arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
   
  -    public void testOut1_inoutMany_inMany ()
  +    public void testOut1InoutManyInMany ()
       {
  -        StringHolder sh = new StringHolder ("out1_inoutMany_inMany");
  +        StringHolder sh = new StringHolder ("out1InoutManyInMany");
           AddressHolder ah = new AddressHolder (expectedAddress);
           String ret = null;
           try
           {
  -            ret = io.out1_inoutMany_inMany (sh, ah, expectedPhone, expectedNumber);
  -            assertEquals("out1_inoutMany_inMany yo ho ho!", sh._value);
  +            ret = io.out1InoutManyInMany (sh, ah, expectedPhone, expectedNumber);
  +            assertEquals("out1InoutManyInMany yo ho ho!", sh._value);
               assertTrue(equals (ah._value, returnAddress));
  -            assertEquals("out1_inoutMany_inMany arghhh!", ret);
  +            assertEquals("out1InoutManyInMany arghhh!", ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  out1_inoutMany_inMany\nexpected string1 = out1_inoutMany_inMany yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  out1InoutManyInMany\nexpected string1 = out1InoutManyInMany yo ho ho!\nactual string1 = "
                                              + sh._value + "\nexpected address = " + printAddress (returnAddress)
                                              + "\nactual address = " + printAddress (ah._value)
  -                                           + "\nexpected string2 = out1_inoutMany_inMany arghhh!\nactual string2 = " + ret + t.getMessage());
  +                                           + "\nexpected string2 = out1InoutManyInMany arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
   
  -    public void testOutMany_inout0_in0 ()
  +    public void testOutManyInout0In0 ()
       {
           AddressHolder ah = new AddressHolder (expectedAddress);
           String ret = null;
           try
           {
  -            ret = io.outMany_inout0_in0 (ah);
  +            ret = io.outManyInout0In0 (ah);
               assertTrue(equals (ah._value, returnAddress));
               assertEquals(" arghhh!", ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inout0_in0\nexpected address = "
  +            throw new AssertionFailedError("Test failure:  outManyInout0In0\nexpected address = "
                                              + printAddress (returnAddress) + "\nactual address = "
                                              + printAddress (ah._value) + "\nexpected string =  arghhh!\nactual string = "
                                              + ret + t.getMessage());
           }
       }
   
  -    public void testOutMany_inout0_in1 ()
  +    public void testOutManyInout0In1 ()
       {
           StringHolder sh = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inout0_in1 ("outMany_inout0_in1", sh);
  +            ret = io.outManyInout0In1 ("outManyInout0In1", sh);
               assertEquals(" yo ho ho!", sh._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inout0_in1\nexpected string =  yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  outManyInout0In1\nexpected string =  yo ho ho!\nactual string = "
                                              + sh._value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOutMany_inout0_inMany ()
  +    public void testOutManyInout0InMany ()
       {
           StringHolder sh = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inout0_inMany ("outMany_inout0_inMany", expectedAddress, sh);
  +            ret = io.outManyInout0InMany ("outManyInout0InMany", expectedAddress, sh);
               assertEquals(" yo ho ho!", sh._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inout0_inMany\nexpected string =  yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  outManyInout0InMany\nexpected string =  yo ho ho!\nactual string = "
                                              + sh._value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOutMany_inout1_in0 ()
  +    public void testOutManyInout1In0 ()
       {
  -        StringHolder shinout = new StringHolder ("outMany_inout1_in0");
  +        StringHolder shinout = new StringHolder ("outManyInout1In0");
           StringHolder shout = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inout1_in0 (shinout, shout);
  -            assertEquals("outMany_inout1_in0 yo ho ho!", shinout._value);
  +            ret = io.outManyInout1In0 (shinout, shout);
  +            assertEquals("outManyInout1In0 yo ho ho!", shinout._value);
               assertEquals(" yo ho ho!", shout._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inout1_in0\nexpected string1 = outMany_inout1_in0 yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  outManyInout1In0\nexpected string1 = outManyInout1In0 yo ho ho!\nactual string1 = "
                                              + shinout._value + "\nexpected string2 =  yo ho ho!\nactual string2 = "
                                              + shout._value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOutMany_inout1_in1 ()
  +    public void testOutManyInout1In1 ()
       {
  -        StringHolder shinout = new StringHolder ("outMany_inout1_in1");
  +        StringHolder shinout = new StringHolder ("outManyInout1In1");
           StringHolder shout = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inout1_in1 (shinout, expectedAddress, shout);
  -            assertEquals("outMany_inout1_in1 yo ho ho!", shinout._value);
  +            ret = io.outManyInout1In1 (shinout, expectedAddress, shout);
  +            assertEquals("outManyInout1In1 yo ho ho!", shinout._value);
               assertEquals(" yo ho ho!", shout._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inout1_in1\nexpected string1 = outMany_inout1_in1 yo ho ho!\nactual string = "
  +            throw new AssertionFailedError("Test failure:  outManyInout1In1\nexpected string1 = outManyInout1In1 yo ho ho!\nactual string = "
                                              + shinout._value + "\nexpected string2 =  yo ho ho!\nactual string2 = "
                                              + shout._value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
   
  -    public void testOutMany_inout1_inMany ()
  +    public void testOutManyInout1InMany ()
       {
           PhoneHolder ph = new PhoneHolder (expectedPhone);
           StringHolder sh = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inout1_inMany ("outMany_inout1_inMany", expectedAddress, ph, sh);
  +            ret = io.outManyInout1InMany ("outManyInout1InMany", expectedAddress, ph, sh);
               assertTrue(equals (ph._value, returnPhone));
               assertEquals(" yo ho ho!", sh._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inout1_inMany\nexpected phone = "
  +            throw new AssertionFailedError("Test failure:  outManyInout1InMany\nexpected phone = "
                                              + printPhone (returnPhone) + "\nactual phone = "
                                              + printPhone (ph._value) + "\nexpected string =  yo ho ho!\nactual string = "
                                              + sh._value + "\nexpected number = " + returnNumber
  @@ -487,23 +487,23 @@
           }
       }
   
  -    public void testOutMany_inoutMany_in0 ()
  +    public void testOutManyInoutManyIn0 ()
       {
  -        StringHolder shinout = new StringHolder ("outMany_inoutMany_in0");
  +        StringHolder shinout = new StringHolder ("outManyInoutManyIn0");
           AddressHolder ah = new AddressHolder (expectedAddress);
           StringHolder shout = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inoutMany_in0 (shinout, ah, shout);
  -            assertEquals("outMany_inoutMany_in0 yo ho ho!", shinout._value);
  +            ret = io.outManyInoutManyIn0 (shinout, ah, shout);
  +            assertEquals("outManyInoutManyIn0 yo ho ho!", shinout._value);
               assertTrue(equals (ah._value, returnAddress));
               assertEquals(" yo ho ho!", shout._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inoutMany_in0\nexpected string1 = outMany_inoutMany_in0 yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  outManyInoutManyIn0\nexpected string1 = outManyInoutManyIn0 yo ho ho!\nactual string1 = "
                                              + shinout._value + "\nexpected address = " + printAddress (returnAddress)
                                              + "\nactual address = " + printAddress (ah._value) + "\nexpected string2 =  yo ho ho!\nactual string2 = "
                                              + shout._value + "\nexpected number = " + returnNumber + "\nactual number = "
  @@ -511,23 +511,23 @@
           }
       }
   
  -    public void testOutMany_inoutMany_in1 ()
  +    public void testOutManyInoutManyIn1 ()
       {
  -        StringHolder shinout = new StringHolder ("outMany_inoutMany_in1");
  +        StringHolder shinout = new StringHolder ("outManyInoutManyIn1");
           AddressHolder ah = new AddressHolder (expectedAddress);
           StringHolder shout = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inoutMany_in1 (shinout, ah, expectedPhone, shout);
  -            assertEquals("outMany_inoutMany_in1 yo ho ho!", shinout._value);
  +            ret = io.outManyInoutManyIn1 (shinout, ah, expectedPhone, shout);
  +            assertEquals("outManyInoutManyIn1 yo ho ho!", shinout._value);
               assertTrue(equals (ah._value, returnAddress));
               assertEquals(" yo ho ho!", shout._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inoutMany_in1\nexpected string1 = outMany_inoutMany_in1 yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  outManyInoutManyIn1\nexpected string1 = outManyInoutManyIn1 yo ho ho!\nactual string1 = "
                                              + shinout._value + "\nexpected address = " + printAddress (returnAddress)
                                              + "\nactual address = " + printAddress (ah._value)
                                              + "\nexpected string2 =  yo ho ho!\nactual string2 = " + shout._value
  @@ -536,23 +536,23 @@
           }
       }
   
  -    public void testOutMany_inoutMany_inMany ()
  +    public void testOutManyInoutManyInMany ()
       {
  -        StringHolder shinout = new StringHolder ("outMany_inoutMany_inMany");
  +        StringHolder shinout = new StringHolder ("outManyInoutManyInMany");
           AddressHolder ah = new AddressHolder (expectedAddress);
           StringHolder shout = new StringHolder ();
           int ret = 0;
           try
           {
  -            ret = io.outMany_inoutMany_inMany (shinout, ah, expectedPhone, expectedNumber, shout);
  -            assertEquals("outMany_inoutMany_inMany yo ho ho!", shinout._value);
  +            ret = io.outManyInoutManyInMany (shinout, ah, expectedPhone, expectedNumber, shout);
  +            assertEquals("outManyInoutManyInMany yo ho ho!", shinout._value);
               assertTrue(equals (ah._value, returnAddress));
               assertEquals(" yo ho ho!", shout._value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
  -            throw new AssertionFailedError("Test failure:  outMany_inoutMany_inMany\nexpected string1 = outMany_inoutMany_inMany yo ho ho!\nactual string1 = "
  +            throw new AssertionFailedError("Test failure:  outManyInoutManyInMany\nexpected string1 = outManyInoutManyInMany yo ho ho!\nactual string1 = "
                                              + shinout._value + "\nexpected address = " + printAddress (returnAddress)
                                              + "\nactual address = " + printAddress (ah._value)
                                              + "\nexpected string2 =  yo ho ho!\nactual string2 = " + shout._value
  
  
  

Mime
View raw message