Author: veithen
Date: Sat Jan 22 13:54:00 2011
New Revision: 1062155
URL: http://svn.apache.org/viewvc?rev=1062155&view=rev
Log:
Improved the SOAPFault tests so that the assertions about child elements not
only compare local names, but QNames.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
Sat Jan 22 13:54:00 2011
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap;
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP11Version;
@@ -47,22 +49,6 @@ public abstract class SOAPSpec {
public String getEnvelopeNamespaceURI() {
return SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
}
-
- public String getFaultCodeLocalName() {
- return SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME;
- }
-
- public String getFaultReasonLocalName() {
- return SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME;
- }
-
- public String getFaultRoleLocalName() {
- return SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME;
- }
-
- public String getFaultDetailLocalName() {
- return SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
- }
};
public static final SOAPSpec SOAP12 = new
SOAPSpec(SOAP12Version.getSingleton()) {
@@ -81,22 +67,6 @@ public abstract class SOAPSpec {
public String getEnvelopeNamespaceURI() {
return SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
}
-
- public String getFaultCodeLocalName() {
- return SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME;
- }
-
- public String getFaultReasonLocalName() {
- return SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME;
- }
-
- public String getFaultRoleLocalName() {
- return SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME;
- }
-
- public String getFaultDetailLocalName() {
- return SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
- }
};
private final SOAPVersion version;
@@ -109,10 +79,22 @@ public abstract class SOAPSpec {
public abstract SOAPFactory getFactory(OMMetaFactory metaFactory);
public abstract SOAPFactory getAltFactory(OMMetaFactory metaFactory);
public abstract String getEnvelopeNamespaceURI();
- public abstract String getFaultCodeLocalName();
- public abstract String getFaultReasonLocalName();
- public abstract String getFaultRoleLocalName();
- public abstract String getFaultDetailLocalName();
+
+ public QName getFaultCodeQName() {
+ return version.getFaultCodeQName();
+ }
+
+ public QName getFaultReasonQName() {
+ return version.getFaultReasonQName();
+ }
+
+ public QName getFaultRoleQName() {
+ return version.getFaultRoleQName();
+ }
+
+ public QName getFaultDetailQName() {
+ return version.getFaultDetailQName();
+ }
public String getNextRoleURI() {
return version.getNextRoleURI();
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCode.java
Sat Jan 22 13:54:00 2011
@@ -38,6 +38,6 @@ public class TestGetCode extends SOAPTes
"Fault Test:- After calling setCode method, Fault has no code",
soapFault.getCode());
assertEquals("Fault Test:- Fault code local name mismatch",
- spec.getFaultCodeLocalName(),
soapFault.getCode().getLocalName());
+ spec.getFaultCodeQName(), soapFault.getCode().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
Sat Jan 22 13:54:00 2011
@@ -35,6 +35,6 @@ public class TestGetCodeWithParser exten
soapFaultWithParser.getCode());
assertEquals(
"Fault Test with parser: - Fault code local name mismatch",
- spec.getFaultCodeLocalName(),
soapFaultWithParser.getCode().getLocalName());
+ spec.getFaultCodeQName(),
soapFaultWithParser.getCode().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetail.java
Sat Jan 22 13:54:00 2011
@@ -38,6 +38,6 @@ public class TestGetDetail extends SOAPT
"Fault Test:- After calling setDetail method, Fault has no
detail",
soapFault.getDetail());
assertEquals("Fault Test:- Fault detail local name mismatch",
- spec.getFaultDetailLocalName(),
soapFault.getDetail().getLocalName());
+ spec.getFaultDetailQName(), soapFault.getDetail().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
Sat Jan 22 13:54:00 2011
@@ -35,6 +35,6 @@ public class TestGetDetailWithParser ext
soapFaultWithParser.getDetail());
assertEquals(
"Fault Test with parser: - Fault detail local name mismatch",
- spec.getFaultDetailLocalName(),
soapFaultWithParser.getDetail().getLocalName());
+ spec.getFaultDetailQName(),
soapFaultWithParser.getDetail().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReason.java
Sat Jan 22 13:54:00 2011
@@ -38,6 +38,6 @@ public class TestGetReason extends SOAPT
"Fault Test:- After calling setReason method, Fault has no
reason",
soapFault.getReason());
assertEquals("Fault Test:- Fault reason local name mismatch",
- spec.getFaultReasonLocalName(),
soapFault.getReason().getLocalName());
+ spec.getFaultReasonQName(), soapFault.getReason().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
Sat Jan 22 13:54:00 2011
@@ -35,6 +35,6 @@ public class TestGetReasonWithParser ext
soapFaultWithParser.getReason());
assertEquals(
"Fault Test with parser: - Fault reason local name mismatch",
- spec.getFaultReasonLocalName(),
soapFaultWithParser.getReason().getLocalName());
+ spec.getFaultReasonQName(),
soapFaultWithParser.getReason().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRole.java
Sat Jan 22 13:54:00 2011
@@ -38,6 +38,6 @@ public class TestGetRole extends SOAPTes
"Fault Test:- After calling setRole method, Fault has no role",
soapFault.getRole());
assertEquals("Fault Test:- Fault role local name mismatch",
- spec.getFaultRoleLocalName(),
soapFault.getRole().getLocalName());
+ spec.getFaultRoleQName(), soapFault.getRole().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
Sat Jan 22 13:54:00 2011
@@ -35,6 +35,6 @@ public class TestGetRoleWithParser exten
soapFaultWithParser.getRole());
assertEquals(
"Fault Test with parser: - Fault role local name mismatch",
- spec.getFaultRoleLocalName(),
soapFaultWithParser.getRole().getLocalName());
+ spec.getFaultRoleQName(),
soapFaultWithParser.getRole().getQName());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetCode.java
Sat Jan 22 13:54:00 2011
@@ -35,7 +35,7 @@ public class TestSetCode extends SOAPTes
"Fault Test:- After calling setCode method, Fault has no code",
soapFault.getCode());
assertEquals("Fault Test:- Code local name mismatch",
- spec.getFaultCodeLocalName(),
soapFault.getCode().getLocalName());
+ spec.getFaultCodeQName(), soapFault.getCode().getQName());
try {
soapFault.setCode(altSoapFactory.createSOAPFaultCode());
fail("SOAPFaultCode should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetDetail.java
Sat Jan 22 13:54:00 2011
@@ -35,7 +35,7 @@ public class TestSetDetail extends SOAPT
"Fault Test:- After calling setDetail method, Fault has no
detail",
soapFault.getDetail());
assertEquals("Fault Test:- Fault detail local name mismatch",
- spec.getFaultDetailLocalName(),
soapFault.getDetail().getLocalName());
+ spec.getFaultDetailQName(), soapFault.getDetail().getQName());
try {
soapFault.setDetail(altSoapFactory.createSOAPFaultDetail());
fail("SOAPFaultDetail should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetReason.java
Sat Jan 22 13:54:00 2011
@@ -35,7 +35,7 @@ public class TestSetReason extends SOAPT
"Fault Test:- After calling setReason method, Fault has no
reason",
soapFault.getReason());
assertEquals("Fault Test:- Fault reason local name mismatch",
- spec.getFaultReasonLocalName(),
soapFault.getReason().getLocalName());
+ spec.getFaultReasonQName(), soapFault.getReason().getQName());
try {
soapFault.setReason(altSoapFactory.createSOAPFaultReason());
fail("SOAPFaultReason should not be set in to a SOAPFault for a
different SOAP version");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java?rev=1062155&r1=1062154&r2=1062155&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetRole.java
Sat Jan 22 13:54:00 2011
@@ -35,7 +35,7 @@ public class TestSetRole extends SOAPTes
"Fault Test:- After calling setRole method, Fault has no role",
soapFault.getRole());
assertEquals("Fault Test:- Fault role local name mismatch",
- spec.getFaultRoleLocalName(),
soapFault.getRole().getLocalName());
+ spec.getFaultRoleQName(), soapFault.getRole().getQName());
try {
soapFault.setRole(altSoapFactory.createSOAPFaultRole());
fail("SOAPFaultRole should not be set in to a SOAPFault for a
different SOAP version");
