cvs commit: xml-axis/java/test/message TestMessageElement.java

[dims]

dims        2002/11/04 11:40:56

  Modified:    java/src/org/apache/axis/message MessageElement.java
               java/test/message TestMessageElement.java
  Log:
  Fix and Testcase for Bug 14136 - getCompleteAttributes in MessageElement problems
  
  Revision  Changes    Path
  1.133     +6 -1      xml-axis/java/src/org/apache/axis/message/MessageElement.java
  
  Index: MessageElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/MessageElement.java,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- MessageElement.java       4 Nov 2002 16:32:05 -0000       1.132
  +++ MessageElement.java       4 Nov 2002 19:40:54 -0000       1.133
  @@ -304,7 +304,12 @@
           if (namespaces == null)
               return attributes;
   
  -        AttributesImpl attrs = new AttributesImpl(attributes);
  +        AttributesImpl attrs = null;
  +        if (attributes == NullAttributes.singleton)
  +            attrs = new AttributesImpl();
  +        else
  +            attrs = new AttributesImpl(attributes);
  +        
           for (Iterator iterator = namespaces.iterator(); iterator.hasNext();) {
               Mapping mapping = (Mapping) iterator.next();
               String prefix = mapping.getPrefix();
  
  
  
  1.5       +14 -0     xml-axis/java/test/message/TestMessageElement.java
  
  Index: TestMessageElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/message/TestMessageElement.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestMessageElement.java   22 Sep 2002 17:26:29 -0000      1.4
  +++ TestMessageElement.java   4 Nov 2002 19:40:56 -0000       1.5
  @@ -67,6 +67,7 @@
   import org.apache.axis.Message;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.DeserializationContextImpl;
  +import org.xml.sax.Attributes;
   
   import java.util.Iterator;
   
  @@ -147,5 +148,18 @@
                            children.next());
           }
           assertTrue("Unexpected child", !children.hasNext());
  +    }
  +
  +    public void testGetCompleteAttributes() throws Exception {
  +        MessageElement me = 
  +            new MessageElement("http://www.wolfram.com","Test";);
  +        me.addNamespaceDeclaration("pre", "http://www.wolfram2.com";);
  +        Attributes attrs = me.getCompleteAttributes();
  +        assertEquals(attrs.getLength(), 1);
  +    }
  +    
  +    public static void main(String[] args) throws Exception {
  +        TestMessageElement tester = new TestMessageElement("TestMessageElement");
  +        tester.testGetCompleteAttributes();
       }
   }