svn commit: r1201448 - /axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java

2011-11-13 Thread veithen 
Author: veithen
Date: Sun Nov 13 16:08:50 2011
New Revision: 1201448

URL: http://svn.apache.org/viewvc?rev=1201448&view=rev
Log:
Use proper assertions instead of the generic assertTrue.

Modified:

axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java?rev=1201448&r1=1201447&r2=1201448&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java
 Sun Nov 13 16:08:50 2011
@@ -85,9 +85,9 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 Object fault = ((BaseFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == BaseFault.class);
+assertSame(BaseFault.class, fault.getClass());
 BaseFault bf = (BaseFault) fault;
-assertTrue(bf.getA() == 2);
+assertEquals(2, bf.getA());
 
 // Repeat to verify 
 try{
@@ -105,9 +105,9 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 fault = ((BaseFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == BaseFault.class);
+assertSame(BaseFault.class, fault.getClass());
 bf = (BaseFault) fault;
-assertTrue(bf.getA() == 2);
+assertEquals(2, bf.getA());
 
 }
 /**
@@ -131,10 +131,10 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 Object fault = ((BaseFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == DerivedFault1.class);
+assertSame(DerivedFault1.class, fault.getClass());
 DerivedFault1 df = (DerivedFault1) fault;
-assertTrue(df.getA() == 2);
-assertTrue(df.getB().equals("DerivedFault1"));
+assertEquals(2, df.getA());
+assertEquals("DerivedFault1", df.getB());
 
 // Repeat to verify behavior
 try{
@@ -152,10 +152,10 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 fault = ((BaseFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == DerivedFault1.class);
+assertSame(DerivedFault1.class, fault.getClass());
 df = (DerivedFault1) fault;
-assertTrue(df.getA() == 2);
-assertTrue(df.getB().equals("DerivedFault1"));
+assertEquals(2, df.getA());
+assertEquals("DerivedFault1", df.getB());
 
 }
 /**
@@ -179,11 +179,11 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 Object fault = ((BaseFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == DerivedFault2.class);
+assertSame(DerivedFault2.class, fault.getClass());
 DerivedFault2 df = (DerivedFault2) fault;
-assertTrue(df.getA() == 2);
-assertTrue(df.getB().equals("DerivedFault2"));  
-assertTrue(df.getC() == 2);
+assertEquals(2, df.getA());
+assertEquals("DerivedFault2", df.getB());  
+assertEquals(2F, df.getC());
 
 // Repeat to verify behavior
 try{
@@ -201,11 +201,11 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 fault = ((BaseFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == DerivedFault2.class);
+assertSame(DerivedFault2.class, fault.getClass());
 df = (DerivedFault2) fault;
-assertTrue(df.getA() == 2);
-assertTrue(df.getB().equals("DerivedFault2"));  
-assertTrue(df.getC() == 2);
+assertEquals(2, df.getA());
+assertEquals("DerivedFault2", df.getB());  
+assertEquals(2F, df.getC());
 }
 
 /**
@@ -230,12 +230,12 @@ public class FaultsServiceTests extends 
 
 assertNotNull(exception);
 Object fault = ((ComplexFault_Exception)exception).getFaultInfo();
-assertTrue(fault.getClass() == ComplexFault.class);
+assertSame(ComplexFault.class, fault.getClass());
 ComplexFault cf = (ComplexFault) fault;
-assertTrue(cf.getA() == 2);
-assertTrue(cf.getB().equals("Complex"));  
-assertTrue(cf.getC() == 2);
-assertTrue(cf.getD() == 5);
+assertEquals(2, cf.getA());
+assertEquals("Complex", cf.getB());  
+assertEquals(2F, cf.getC());
+assertEquals(5, cf.getD());
 
 
 // Re

svn commit: r1201467 - in /axis/axis2/java/core/trunk/modules/saaj: src/org/apache/axis2/saaj/SOAPElementImpl.java test/org/apache/axis2/saaj/SOAPElementTest.java

2011-11-13 Thread veithen 
Author: veithen
Date: Sun Nov 13 18:09:32 2011
New Revision: 1201467

URL: http://svn.apache.org/viewvc?rev=1201467&view=rev
Log:
Fixed an issue in SAAJ revealed by AXIOM-376.

Modified:

axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java

axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java

Modified: 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1201467&r1=1201466&r2=1201467&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 Sun Nov 13 18:09:32 2011
@@ -173,10 +173,23 @@ public class SOAPElementImpl extends Nod
 /* (non-Javadoc)
 * @see javax.xml.soap.SOAPElement#addChildElement(java.lang.String, 
java.lang.String, java.lang.String)
 */
-public SOAPElement addChildElement(String localName, String prefix, String 
uri)
+public SOAPElement addChildElement(String localName, String prefix, String 
namespaceURI)
 throws SOAPException {
-OMNamespace omNamespace = prefix == null || prefix.length() == 0 ? 
element.declareDefaultNamespace(uri) : element.declareNamespace(uri, prefix);
-return addChildElement(localName, omNamespace.getPrefix());
+if (prefix == null) {
+prefix = "";
+}
+SOAPElementImpl childEle =
+new SOAPElementImpl((ElementImpl)getOwnerDocument().
+createElementNS(namespaceURI, prefix.length() == 0 ? 
localName : prefix + ":" + localName));
+
+childEle.element.setUserData(SAAJ_NODE, childEle, null);
+childEle.element.setNamespace(prefix.length() == 0
+? childEle.element.declareDefaultNamespace(namespaceURI)
+: childEle.element.declareNamespace(namespaceURI, prefix));
+element.appendChild(childEle.element);
+((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE, 
this, null);
+childEle.setParentElement(this);
+return childEle;
 }
 
 /* (non-Javadoc)
@@ -189,18 +202,7 @@ public class SOAPElementImpl extends Nod
 throw new SOAPException("Namespace not declared for the give 
prefix: " + prefix);
 }
 
-SOAPElementImpl childEle =
-new SOAPElementImpl((ElementImpl)getOwnerDocument().
-createElementNS(namespaceURI, prefix + ":" + 
localName));
-
-childEle.element.setUserData(SAAJ_NODE, childEle, null);
-childEle.element.setNamespace(prefix == null || prefix.length() == 0
-? childEle.element.declareDefaultNamespace(namespaceURI)
-: childEle.element.declareNamespace(namespaceURI, prefix));
-element.appendChild(childEle.element);
-((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE, 
this, null);
-childEle.setParentElement(this);
-return childEle;
+return addChildElement(localName, prefix, namespaceURI);
 }
 
 /* (non-Javadoc)

Modified: 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java?rev=1201467&r1=1201466&r2=1201467&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
 Sun Nov 13 18:09:32 2011
@@ -38,6 +38,7 @@ import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.SOAPEnvelope;
 import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
 import javax.xml.soap.SOAPHeader;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
@@ -196,6 +197,31 @@ public class SOAPElementTest extends Ass
 }
 
 @Validated @Test
+public void testAddChildElementWithUndeclaredNamespace() throws Exception {
+SOAPElement element = SOAPFactory.newInstance().createElement("test");
+SOAPElement child = element.addChildElement("test", "p", "urn:ns");
+assertEquals(0, element.getAttributes().getLength());
+assertEquals("urn:ns", child.getNamespaceURI());
+assertEquals("p", child.getPrefix());
+assertEquals("test", child.getLocalName());
+Attr nsDecl = 
child.getAttributeNodeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "p");
+assertNotNull(nsDecl);
+assertEquals("urn:ns", nsDecl.getValue());
+}
+
+@Validated @Test
+