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 2016/01/23 11:30:37 UTC
svn commit: r1726373 - in /webservices/axiom/trunk:
systests/old-tests/src/test/java/org/apache/axiom/soap/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/
Author: veithen
Date: Sat Jan 23 10:30:36 2016
New Revision: 1726373
URL: http://svn.apache.org/viewvc?rev=1726373&view=rev
Log:
Remove references to StAXSOAPModelBuilder from unit tests.
Modified:
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java?rev=1726373&r1=1726372&r2=1726373&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java Sat Jan 23 10:30:36 2016
@@ -20,13 +20,11 @@
package org.apache.axiom.soap;
import org.apache.axiom.om.OMTestCase;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
public class SOAPMessageTest extends OMTestCase {
public void testSOAPMessageCreation() throws Exception {
SOAPModelBuilder soapBuilder = getOMBuilder("");
- // TODO: avoid cast here
- SOAPMessage soapMessage = ((StAXSOAPModelBuilder)soapBuilder).getSoapMessage();
+ SOAPMessage soapMessage = soapBuilder.getSOAPMessage();
assertNotNull(soapMessage);
assertNotNull(soapMessage.getSOAPEnvelope());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java?rev=1726373&r1=1726372&r2=1726373&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java Sat Jan 23 10:30:36 2016
@@ -32,10 +32,10 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.builder.CustomBuilder;
+import org.apache.axiom.om.impl.builder.CustomBuilderSupport;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPModelBuilder;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
@@ -62,7 +62,7 @@ public abstract class FirstElementNameWi
if (supportsOptimization) {
// To detect if the child element is instantiated or not, we register a custom
// builder that throws an exception.
- ((StAXSOAPModelBuilder)builder).registerCustomBuilderForPayload(new CustomBuilder() {
+ ((CustomBuilderSupport)builder).registerCustomBuilderForPayload(new CustomBuilder() {
public OMElement create(String namespace, String localPart,
OMContainer parent, XMLStreamReader reader, OMFactory factory)
throws OMException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java?rev=1726373&r1=1726372&r2=1726373&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java Sat Jan 23 10:30:36 2016
@@ -24,9 +24,10 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.ds.custombuilder.ByteArrayCustomBuilder;
+import org.apache.axiom.om.impl.builder.CustomBuilderSupport;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
import org.apache.axiom.ts.soap.SOAPSampleAdapter;
@@ -39,8 +40,8 @@ public class TestRegisterCustomBuilder e
@Override
protected void runTest() throws Throwable {
- StAXSOAPModelBuilder builder = (StAXSOAPModelBuilder)SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getBuilder(metaFactory);
- builder.registerCustomBuilder(new QName("http://www.w3.org/2005/08/addressing", "To"), 3,
+ SOAPModelBuilder builder = SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getBuilder(metaFactory);
+ ((CustomBuilderSupport)builder).registerCustomBuilder(new QName("http://www.w3.org/2005/08/addressing", "To"), 3,
new ByteArrayCustomBuilder("utf-8"));
SOAPHeader header = builder.getSOAPEnvelope().getHeader();
ArrayList al = header.getHeaderBlocksWithNSURI("http://www.w3.org/2005/08/addressing");
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java?rev=1726373&r1=1726372&r2=1726373&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java Sat Jan 23 10:30:36 2016
@@ -29,8 +29,8 @@ import org.apache.axiom.om.OMSourcedElem
import org.apache.axiom.om.ds.ByteArrayDataSource;
import org.apache.axiom.om.ds.ByteArrayDataSource.ByteArray;
import org.apache.axiom.om.ds.custombuilder.ByteArrayCustomBuilder;
+import org.apache.axiom.om.impl.builder.CustomBuilderSupport;
import org.apache.axiom.soap.SOAPModelBuilder;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.ts.AxiomTestCase;
import org.apache.axiom.ts.soap.SOAPSample;
import org.apache.axiom.ts.soap.SOAPSampleAdapter;
@@ -48,7 +48,7 @@ public class TestRegisterCustomBuilderFo
@Override
protected void runTest() throws Throwable {
SOAPModelBuilder builder = message.getAdapter(SOAPSampleAdapter.class).getBuilder(metaFactory);
- ((StAXSOAPModelBuilder)builder).registerCustomBuilderForPayload(new ByteArrayCustomBuilder("utf-8"));
+ ((CustomBuilderSupport)builder).registerCustomBuilderForPayload(new ByteArrayCustomBuilder("utf-8"));
OMElement payload = builder.getSOAPEnvelope().getBody().getFirstElement();
if (message.getPayload() == null) {
assertNull(payload);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java?rev=1726373&r1=1726372&r2=1726373&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java Sat Jan 23 10:30:36 2016
@@ -23,16 +23,17 @@ import org.apache.axiom.om.OMMetaFactory
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.ds.custombuilder.ByteArrayCustomBuilder;
import org.apache.axiom.om.impl.builder.CustomBuilder;
+import org.apache.axiom.om.impl.builder.CustomBuilderSupport;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
/**
* Tests that a custom builder registered with
- * {@link StAXSOAPModelBuilder#registerCustomBuilderForPayload(CustomBuilder)} is still taken into
+ * {@link CustomBuilderSupport#registerCustomBuilderForPayload(CustomBuilder)} is still taken into
* account after using {@link SOAPBody#hasFault()}. This assumes that the Axiom implementation
* supports the optimization described by <a
* href="https://issues.apache.org/jira/browse/AXIOM-282">AXIOM-282</a>.
@@ -43,7 +44,7 @@ public class TestRegisterCustomBuilderFo
}
protected void runTest(SOAPEnvelope envelope) throws Throwable {
- StAXSOAPModelBuilder builder = (StAXSOAPModelBuilder)envelope.getBuilder();
+ SOAPModelBuilder builder = (SOAPModelBuilder)envelope.getBuilder();
// Do a fault check. This is normally done in the engine (Axiom) and should
// not cause inteference with the custom builder processing
@@ -51,7 +52,7 @@ public class TestRegisterCustomBuilderFo
// Do the registration here...this simulates when it could occure in the engine
// (After the fault check and during phase processing...probably dispatch phase)
- builder.registerCustomBuilderForPayload(new ByteArrayCustomBuilder("utf-8"));
+ ((CustomBuilderSupport)builder).registerCustomBuilderForPayload(new ByteArrayCustomBuilder("utf-8"));
OMElement bodyElement = envelope.getBody().getFirstElement();
assertTrue(bodyElement instanceof OMSourcedElement);