cvs commit: xml-axis/java/test/saaj TestPrefixes.java PackageTests.java

[di...@apache.org]

dims        2003/03/24 05:50:15

  Modified:    java/src/org/apache/axis/message MessageElement.java
               java/test/saaj PackageTests.java
  Added:       java/test/saaj TestPrefixes.java
  Log:
  Fix and test case for Bug 18274 - prefix name not set during adding child element
  
  Revision  Changes    Path
  1.150     +3 -2      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.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- MessageElement.java	18 Mar 2003 20:01:21 -0000	1.149
  +++ MessageElement.java	24 Mar 2003 13:50:15 -0000	1.150
  @@ -904,8 +904,9 @@
       // JAXM SOAPElement methods...
   
       public SOAPElement addChildElement(Name name) throws SOAPException {
  -        MessageElement child = new MessageElement(name.getURI(),
  -                                                  name.getLocalName());
  +        MessageElement child = new MessageElement(name.getLocalName(), 
  +                                                  name.getPrefix(),
  +                                                  name.getURI());
           addChild(child);
           return child;
       }
  
  
  
  1.7       +1 -0      xml-axis/java/test/saaj/PackageTests.java
  
  Index: PackageTests.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/saaj/PackageTests.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PackageTests.java	20 Mar 2003 13:30:45 -0000	1.6
  +++ PackageTests.java	24 Mar 2003 13:50:15 -0000	1.7
  @@ -21,6 +21,7 @@
           suite.addTestSuite(test.saaj.TestEnvelope.class);
           suite.addTestSuite(test.saaj.TestSOAPFaultDetail.class);
           suite.addTestSuite(test.saaj.TestHeaders.class);
  +        suite.addTestSuite(test.saaj.TestPrefixes.class);
           return suite;
       }
   }
  
  
  
  1.1                  xml-axis/java/test/saaj/TestPrefixes.java
  
  Index: TestPrefixes.java
  ===================================================================
  package test.saaj;
  
  import javax.xml.soap.MessageFactory;
  import javax.xml.soap.SOAPBody;
  import javax.xml.soap.SOAPElement;
  import javax.xml.soap.SOAPEnvelope;
  import javax.xml.soap.SOAPMessage;
  import javax.xml.soap.SOAPPart;
  import java.io.ByteArrayOutputStream;
  
  /**
   * Test case for Prefixes
   */ 
  public class TestPrefixes extends junit.framework.TestCase {
  
      public TestPrefixes(String name) {
          super(name);
      }
  
      /**
       * Test for Bug 18274 - prefix name not set during adding child element
       * @throws Exception
       */ 
      public void testAddingPrefixesForChildElements() throws Exception {
          MessageFactory factory = MessageFactory.newInstance();
          SOAPMessage msg = factory.createMessage();
          SOAPPart sp = msg.getSOAPPart();
          SOAPEnvelope se = sp.getEnvelope();
          SOAPBody sb = se.getBody();
          SOAPElement el1 = sb.addBodyElement(se.createName
                  ("element1", "prefix1", "http://www.sun.com"));
          SOAPElement el2 = el1.addChildElement(se.createName
                  ("element2", "prefix2", "http://www.apache.org"));
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          msg.writeTo(baos);
          String xml = new String(baos.toByteArray());
          assertTrue(xml.indexOf("prefix1") != -1);
          assertTrue(xml.indexOf("prefix2") != -1);
          assertTrue(xml.indexOf("http://www.sun.com") != -1);
          assertTrue(xml.indexOf("http://www.apache.org") != -1);
      }
  }