You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2001/08/11 16:26:11 UTC

cvs commit: xml-axis/java/test/RPCDispatch TestSerializedRPC.java

rubys       01/08/11 07:26:11

  Modified:    java/src/org/apache/axis/message RPCHandler.java
               java/test/RPCDispatch TestSerializedRPC.java
  Log:
  Test case should not depend on order of attributes as this is parser
  dependent.
  
  Revision  Changes    Path
  1.6       +5 -4      xml-axis/java/src/org/apache/axis/message/RPCHandler.java
  
  Index: RPCHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RPCHandler.java	2001/07/17 12:41:23	1.5
  +++ RPCHandler.java	2001/08/11 14:26:11	1.6
  @@ -124,10 +124,11 @@
               //
               if (type==null && defaultParamTypes!=null &&
                   params.size()<=defaultParamTypes.length) {
  -                TypeMappingRegistry typeMap = context.
  -                                                  getTypeMappingRegistry();
  -                type = typeMap.getTypeQName(
  -                                         defaultParamTypes[params.size()-1]);
  +                TypeMappingRegistry typeMap = context.getTypeMappingRegistry();
  +                int index = params.size()-1;
  +                if (index+1<defaultParamTypes.length)
  +                    if (defaultParamTypes[0]==MessageContext.class) index++;
  +                type = typeMap.getTypeQName(defaultParamTypes[index]);
                   if (DEBUG_LOG) {
                       System.err.println("Type from default parms was " + type);
                   }
  
  
  
  1.8       +2 -2      xml-axis/java/test/RPCDispatch/TestSerializedRPC.java
  
  Index: TestSerializedRPC.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestSerializedRPC.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestSerializedRPC.java	2001/08/10 13:08:22	1.7
  +++ TestSerializedRPC.java	2001/08/11 14:26:11	1.8
  @@ -173,12 +173,12 @@
                                      ser);
           
           // invoke the service and verify the result
  -        String arg = "<arg0 xmlns:foo=\"urn:foo\" xsi:type=\"foo:Data\">";
  +        String arg = "<arg0 xmlns:foo=\"urn:foo\">";
           arg += "<field1>5</field1><field2>abc</field2><field3>3</field3>";
           arg += "</arg0>";
           
           // invoke the service and verify the result
  -        assertEquals(arg, rpc("argAsDOM", arg, false));
  +        assertEquals(arg, rpc("argAsDOM", arg, true));
       }
       
       public static void main(String args[]) {