You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2014/07/01 20:36:25 UTC
svn commit: r1607160 - in /webservices/axiom/trunk/modules:
axiom-api/src/test/java/org/apache/axiom/soap/
axiom-tests/src/test/java/org/apache/axiom/soap/
axiom-tests/src/test/java/org/apache/axiom/soap/impl/dom/
axiom-tests/src/test/java/org/apache/a...
Author: veithen
Date: Tue Jul 1 18:36:25 2014
New Revision: 1607160
URL: http://svn.apache.org/r1607160
Log:
AXIOM-311: Eliminated some old SOAPFaultValue and SOAPFaultText test cases that were checking getText/setText. These methods are defined by OMElement and are checked elsewhere.
Removed:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultCodeTestCase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultSubCodeTestCase.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultValueTestBase.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/dom/SOAPFaultValueTest.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/SOAPFaultValueTest.java
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPBodyTestCase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultReasonTestCase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultTestCase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPTestCase.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPBodyTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPBodyTestCase.java?rev=1607160&r1=1607159&r2=1607160&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPBodyTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPBodyTestCase.java Tue Jul 1 18:36:25 2014
@@ -25,9 +25,6 @@ public abstract class SOAPBodyTestCase e
protected SOAPBody soap11Body;
protected SOAPBody soap12Body;
- protected SOAPBody soap11BodyWithParser;
- protected SOAPBody soap12BodyWithParser;
-
public SOAPBodyTestCase(OMMetaFactory omMetaFactory) {
super(omMetaFactory);
@@ -37,9 +34,6 @@ public abstract class SOAPBodyTestCase e
super.setUp();
soap11Body = soap11Factory.createSOAPBody(soap11Envelope);
soap12Body = soap12Factory.createSOAPBody(soap12Envelope);
-
- soap11BodyWithParser = soap11EnvelopeWithParser.getBody();
- soap12BodyWithParser = soap12EnvelopeWithParser.getBody();
}
}
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultReasonTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultReasonTestCase.java?rev=1607160&r1=1607159&r2=1607160&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultReasonTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultReasonTestCase.java Tue Jul 1 18:36:25 2014
@@ -25,8 +25,6 @@ public abstract class SOAPFaultReasonTes
protected SOAPFaultReason soap11FaultReason;
protected SOAPFaultReason soap12FaultReason;
- protected SOAPFaultReason soap11FaultReasonWithParser;
- protected SOAPFaultReason soap12FaultReasonWithParser;
public SOAPFaultReasonTestCase(OMMetaFactory omMetaFactory) {
super(omMetaFactory);
@@ -36,8 +34,6 @@ public abstract class SOAPFaultReasonTes
super.setUp();
soap11FaultReason = soap11Factory.createSOAPFaultReason(soap11Fault);
soap12FaultReason = soap12Factory.createSOAPFaultReason(soap12Fault);
- soap11FaultReasonWithParser = soap11FaultWithParser.getReason();
- soap12FaultReasonWithParser = soap12FaultWithParser.getReason();
}
}
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultTestCase.java?rev=1607160&r1=1607159&r2=1607160&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPFaultTestCase.java Tue Jul 1 18:36:25 2014
@@ -24,8 +24,6 @@ import org.apache.axiom.om.OMMetaFactory
public abstract class SOAPFaultTestCase extends SOAPBodyTestCase {
protected SOAPFault soap11Fault;
protected SOAPFault soap12Fault;
- protected SOAPFault soap11FaultWithParser;
- protected SOAPFault soap12FaultWithParser;
public SOAPFaultTestCase(OMMetaFactory omMetaFactory) {
super(omMetaFactory);
@@ -35,7 +33,5 @@ public abstract class SOAPFaultTestCase
super.setUp();
soap11Fault = soap11Factory.createSOAPFault(soap11Body);
soap12Fault = soap12Factory.createSOAPFault(soap12Body);
- soap11FaultWithParser = soap11BodyWithParser.getFault();
- soap12FaultWithParser = soap12BodyWithParser.getFault();
}
}
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPTestCase.java?rev=1607160&r1=1607159&r2=1607160&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPTestCase.java Tue Jul 1 18:36:25 2014
@@ -36,12 +36,6 @@ public abstract class SOAPTestCase exten
protected SOAPEnvelope soap11Envelope;
protected SOAPEnvelope soap12Envelope;
- protected SOAPEnvelope soap11EnvelopeWithParser;
- protected SOAPEnvelope soap12EnvelopeWithParser;
-
- protected static final String SOAP11_FILE_NAME = "soap/soap11/message.xml";
- protected static final String SOAP12_FILE_NAME = "soap/soap12/message.xml";
-
public SOAPTestCase(OMMetaFactory omMetaFactory) {
this.omMetaFactory = omMetaFactory;
}
@@ -55,13 +49,6 @@ public abstract class SOAPTestCase exten
soap11Envelope = soap11Factory.createSOAPEnvelope();
soap12Envelope = soap12Factory.createSOAPEnvelope();
-
- soap11EnvelopeWithParser =
- (SOAPEnvelope) this.getSOAPBuilder(SOAP11_FILE_NAME)
- .getDocumentElement();
- soap12EnvelopeWithParser =
- (SOAPEnvelope) this.getSOAPBuilder(SOAP12_FILE_NAME)
- .getDocumentElement();
}
protected void tearDown() throws Exception {
@@ -69,9 +56,6 @@ public abstract class SOAPTestCase exten
soap11Envelope.close(false);
soap12Envelope.close(false);
-
- soap11EnvelopeWithParser.close(false);
- soap12EnvelopeWithParser.close(false);
}
protected StAXSOAPModelBuilder getSOAPBuilder(String fileName) throws Exception {
Modified: webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java?rev=1607160&r1=1607159&r2=1607160&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java (original)
+++ webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFaultTextTestBase.java Tue Jul 1 18:36:25 2014
@@ -23,8 +23,6 @@ import org.apache.axiom.om.OMMetaFactory
public class SOAPFaultTextTestBase extends SOAPFaultReasonTestCase {
protected SOAPFaultText soap12FaultText;
- protected String soap11FaultTextWithParser;
- protected SOAPFaultText soap12FaultTextWithParser;
public SOAPFaultTextTestBase(OMMetaFactory omMetaFactory) {
super(omMetaFactory);
@@ -33,8 +31,6 @@ public class SOAPFaultTextTestBase exten
protected void setUp() throws Exception {
super.setUp();
soap12FaultText = soap12Factory.createSOAPFaultText(soap12FaultReason);
- soap11FaultTextWithParser = soap11FaultReasonWithParser.getText();
- soap12FaultTextWithParser = soap12FaultReasonWithParser.getFirstSOAPText();
}
public void testSOAP12GetLang() {
@@ -48,37 +44,4 @@ public class SOAPFaultTextTestBase exten
"SOAP 1.2 Fault Text Test : - After calling setLang method, Lang attribute value mismatch",
"en", soap12FaultText.getLang());
}
-
- public void testSOAP12SetText() {
- soap12FaultText.setText("This is only a test");
- assertEquals(
- "SOAP 1.2 Fault Text Test : - After calling setText method, getText method return incorrect string",
- "This is only a test", soap12FaultText.getText());
- }
-
- public void testSOAP12GetText() {
- assertEquals(
- "SOAP 1.2 Fault Text Test : - After creating SOAPFaultText, it has a text",
- "", soap12FaultText.getText());
- soap12FaultText.setText("This is only a test");
- assertEquals(
- "SOAP 1.2 Fault Text Test : - After calling setText method, getText method return incorrect string",
- "This is only a test", soap12FaultText.getText());
- }
-
- //SOAP 1.1 Fault Text Test (With Parser)
- public void testSOAP11GetTextWithParser() {
- assertEquals(
- "SOAP 1.1 Fault Text Test With Parser : - getText method returns incorrect string",
- "Sender Timeout", soap11FaultTextWithParser.trim());
- }
-
- //SOAP 1.2 Fault Text Test (With Parser)
- public void testSOAP12GetTextWithParser() {
-
- assertEquals(
- "SOAP 1.2 Fault Text Test With Parser : - getText method returns incorrect string",
- "Sender Timeout", soap12FaultTextWithParser.getText());
-
- }
}