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 2017/12/10 20:19:31 UTC
svn commit: r1817728 - in /webservices/axiom/branches/1.2.x: ./ testing/
testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/
testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/
testing/saaj-testsuite/src/main/java/org/apache/...
Author: veithen
Date: Sun Dec 10 20:19:31 2017
New Revision: 1817728
URL: http://svn.apache.org/viewvc?rev=1817728&view=rev
Log:
Merge r1817725 and r1817727 to the 1.2 branch.
Added:
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
- copied unchanged from r1817727, webservices/axiom/trunk/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/FactorySelector.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuiteBuilder.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SOAPSpecAdapterFactory.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 10 20:19:31 2017
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781488,1791831,1795059,1795067,1795081,1796558,1815009
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781488,1791831,1795059,1795067,1795081,1796558,1815009,1817725,1817727
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 10 20:19:31 2017
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1817725,1817727
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/FactorySelector.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/FactorySelector.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/FactorySelector.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/FactorySelector.java Sun Dec 10 20:19:31 2017
@@ -31,5 +31,6 @@ import org.apache.axiom.ts.soap.SOAPSpec
*/
@AdapterType
public interface FactorySelector {
- MessageFactory newMessageFactory(SAAJImplementation saajImplementation, boolean dynamic) throws SOAPException;
+ MessageFactory newMessageFactory(SAAJImplementation saajImplementation) throws SOAPException;
+ SOAPFactory newSOAPFactory(SAAJImplementation saajImplementation) throws SOAPException;
}
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java Sun Dec 10 20:19:31 2017
@@ -18,12 +18,28 @@
*/
package org.apache.axiom.ts.saaj;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+
import org.apache.axiom.testutils.suite.MatrixTestCase;
+import org.apache.axiom.ts.soap.SOAPSpec;
public abstract class SAAJTestCase extends MatrixTestCase {
protected final SAAJImplementation saajImplementation;
+ protected final SOAPSpec spec;
- public SAAJTestCase(SAAJImplementation saajImplementation) {
+ public SAAJTestCase(SAAJImplementation saajImplementation, SOAPSpec spec) {
this.saajImplementation = saajImplementation;
+ this.spec = spec;
+ addTestParameter("spec", spec.getName());
+ }
+
+ protected final MessageFactory newMessageFactory() throws SOAPException {
+ return spec.getAdapter(FactorySelector.class).newMessageFactory(saajImplementation);
+ }
+
+ protected final SOAPFactory newSOAPFactory() throws SOAPException {
+ return spec.getAdapter(FactorySelector.class).newSOAPFactory(saajImplementation);
}
}
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuiteBuilder.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuiteBuilder.java Sun Dec 10 20:19:31 2017
@@ -19,10 +19,10 @@
package org.apache.axiom.ts.saaj;
import javax.xml.soap.SAAJMetaFactory;
-import javax.xml.soap.SOAPConstants;
import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
import org.apache.axiom.ts.saaj.body.TestAddChildElementReification;
+import org.apache.axiom.ts.saaj.element.TestAddChildElementLocalName;
import org.apache.axiom.ts.saaj.element.TestGetOwnerDocument;
import org.apache.axiom.ts.saaj.element.TestSetParentElement;
import org.apache.axiom.ts.saaj.header.TestExamineMustUnderstandHeaderElements;
@@ -37,17 +37,15 @@ public class SAAJTestSuiteBuilder extend
@Override
protected void addTests() {
- addTest(new TestExamineMustUnderstandHeaderElements(saajImplementation, SOAPSpec.SOAP11, false));
- addTest(new TestExamineMustUnderstandHeaderElements(saajImplementation, SOAPSpec.SOAP12, false));
- addTest(new TestExamineMustUnderstandHeaderElements(saajImplementation, SOAPSpec.SOAP11, true));
- addTest(new TestExamineMustUnderstandHeaderElements(saajImplementation, SOAPSpec.SOAP12, true));
- addTest(new TestSetParentElement(saajImplementation, SOAPConstants.SOAP_1_1_PROTOCOL));
- addTest(new TestSetParentElement(saajImplementation, SOAPConstants.SOAP_1_2_PROTOCOL));
- addTest(new TestSetParentElement(saajImplementation, SOAPConstants.DYNAMIC_SOAP_PROTOCOL));
- addTest(new TestGetOwnerDocument(saajImplementation, SOAPConstants.SOAP_1_1_PROTOCOL));
- addTest(new TestGetOwnerDocument(saajImplementation, SOAPConstants.SOAP_1_2_PROTOCOL));
- addTest(new TestGetOwnerDocument(saajImplementation, SOAPConstants.DYNAMIC_SOAP_PROTOCOL));
- addTest(new TestAddChildElementReification(saajImplementation, SOAPSpec.SOAP11));
- addTest(new TestAddChildElementReification(saajImplementation, SOAPSpec.SOAP12));
+ addTests(SOAPSpec.SOAP11);
+ addTests(SOAPSpec.SOAP12);
+ }
+
+ private void addTests(SOAPSpec spec) {
+ addTest(new TestExamineMustUnderstandHeaderElements(saajImplementation, spec));
+ addTest(new TestAddChildElementLocalName(saajImplementation, spec));
+ addTest(new TestSetParentElement(saajImplementation, spec));
+ addTest(new TestGetOwnerDocument(saajImplementation, spec));
+ addTest(new TestAddChildElementReification(saajImplementation, spec));
}
}
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SOAPSpecAdapterFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SOAPSpecAdapterFactory.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SOAPSpecAdapterFactory.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SOAPSpecAdapterFactory.java Sun Dec 10 20:19:31 2017
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.saaj;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
import org.apache.axiom.testing.multiton.AdapterFactory;
import org.apache.axiom.testing.multiton.Adapters;
@@ -31,21 +32,25 @@ public class SOAPSpecAdapterFactory impl
if (spec == SOAPSpec.SOAP11) {
adapters.add(new FactorySelector() {
@Override
- public MessageFactory newMessageFactory(SAAJImplementation saajImplementation,
- boolean dynamic) throws SOAPException {
- return saajImplementation.newMessageFactory(dynamic
- ? SOAPConstants.DYNAMIC_SOAP_PROTOCOL
- : SOAPConstants.SOAP_1_1_PROTOCOL);
+ public MessageFactory newMessageFactory(SAAJImplementation saajImplementation) throws SOAPException {
+ return saajImplementation.newMessageFactory(SOAPConstants.SOAP_1_1_PROTOCOL);
+ }
+
+ @Override
+ public SOAPFactory newSOAPFactory(SAAJImplementation saajImplementation) throws SOAPException {
+ return saajImplementation.newSOAPFactory(SOAPConstants.SOAP_1_1_PROTOCOL);
}
});
} else if (spec == SOAPSpec.SOAP12) {
adapters.add(new FactorySelector() {
@Override
- public MessageFactory newMessageFactory(SAAJImplementation saajImplementation,
- boolean dynamic) throws SOAPException {
- return saajImplementation.newMessageFactory(dynamic
- ? SOAPConstants.DYNAMIC_SOAP_PROTOCOL
- : SOAPConstants.SOAP_1_2_PROTOCOL);
+ public MessageFactory newMessageFactory(SAAJImplementation saajImplementation) throws SOAPException {
+ return saajImplementation.newMessageFactory(SOAPConstants.SOAP_1_2_PROTOCOL);
+ }
+
+ @Override
+ public SOAPFactory newSOAPFactory(SAAJImplementation saajImplementation) throws SOAPException {
+ return saajImplementation.newSOAPFactory(SOAPConstants.SOAP_1_2_PROTOCOL);
}
});
}
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java Sun Dec 10 20:19:31 2017
@@ -20,29 +20,22 @@ package org.apache.axiom.ts.saaj.body;
import static com.google.common.truth.Truth.assertThat;
-import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPElement;
-import org.apache.axiom.ts.saaj.FactorySelector;
import org.apache.axiom.ts.saaj.SAAJImplementation;
import org.apache.axiom.ts.saaj.SAAJTestCase;
import org.apache.axiom.ts.soap.SOAPSpec;
public class TestAddChildElementReification extends SAAJTestCase {
- private final SOAPSpec spec;
-
public TestAddChildElementReification(SAAJImplementation saajImplementation, SOAPSpec spec) {
- super(saajImplementation);
- this.spec = spec;
- addTestParameter("spec", spec.getName());
+ super(saajImplementation, spec);
}
@Override
protected void runTest() throws Throwable {
- MessageFactory mf = spec.getAdapter(FactorySelector.class).newMessageFactory(saajImplementation, false);
- SOAPBody body = mf.createMessage().getSOAPBody();
+ SOAPBody body = newMessageFactory().createMessage().getSOAPBody();
SOAPElement child = body.addChildElement((SOAPElement)body.getOwnerDocument().createElementNS("urn:test", "p:test"));
assertThat(child).isInstanceOf(SOAPBodyElement.class);
}
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java Sun Dec 10 20:19:31 2017
@@ -22,11 +22,11 @@ import static com.google.common.truth.Tr
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPPart;
import org.apache.axiom.ts.saaj.SAAJImplementation;
import org.apache.axiom.ts.saaj.SAAJTestCase;
+import org.apache.axiom.ts.soap.SOAPSpec;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -35,18 +35,13 @@ import org.w3c.dom.Node;
* as well as the properties of the returned document.
*/
public class TestGetOwnerDocument extends SAAJTestCase {
- private final String protocol;
-
- public TestGetOwnerDocument(SAAJImplementation saajImplementation, String protocol) {
- super(saajImplementation);
- this.protocol = protocol;
- addTestParameter("protocol", protocol);
+ public TestGetOwnerDocument(SAAJImplementation saajImplementation, SOAPSpec spec) {
+ super(saajImplementation, spec);
}
@Override
protected void runTest() throws Throwable {
- SOAPFactory factory = saajImplementation.newSOAPFactory(protocol);
- Document doc = factory.createElement(new QName("test")).getOwnerDocument();
+ Document doc = newSOAPFactory().createElement(new QName("test")).getOwnerDocument();
assertThat(doc).isNotInstanceOf(SOAPPart.class);
assertThat(doc).isNotInstanceOf(javax.xml.soap.Node.class);
assertThat(doc.createElementNS(null, "test")).isInstanceOf(SOAPElement.class);
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java Sun Dec 10 20:19:31 2017
@@ -20,25 +20,20 @@ package org.apache.axiom.ts.saaj.element
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPFactory;
import org.apache.axiom.ts.saaj.SAAJImplementation;
import org.apache.axiom.ts.saaj.SAAJTestCase;
+import org.apache.axiom.ts.soap.SOAPSpec;
import org.w3c.dom.NodeList;
public class TestSetParentElement extends SAAJTestCase {
- private final String protocol;
-
- public TestSetParentElement(SAAJImplementation saajImplementation, String protocol) {
- super(saajImplementation);
- this.protocol = protocol;
- addTestParameter("protocol", protocol);
+ public TestSetParentElement(SAAJImplementation saajImplementation, SOAPSpec spec) {
+ super(saajImplementation, spec);
}
@Override
protected void runTest() throws Throwable {
- SOAPFactory factory = saajImplementation.newSOAPFactory(protocol);
- SOAPElement parent = factory.createElement(new QName("parent"));
+ SOAPElement parent = newSOAPFactory().createElement(new QName("parent"));
SOAPElement child1 = parent.addChildElement(new QName("child1"));
SOAPElement child2 = (SOAPElement)parent.getOwnerDocument().createElementNS(null, "child2");
child2.setParentElement(parent);
Modified: webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java?rev=1817728&r1=1817727&r2=1817728&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java (original)
+++ webservices/axiom/branches/1.2.x/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java Sun Dec 10 20:19:31 2017
@@ -21,38 +21,28 @@ package org.apache.axiom.ts.saaj.header;
import java.io.InputStream;
import java.util.Iterator;
-import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
-import org.apache.axiom.ts.saaj.FactorySelector;
import org.apache.axiom.ts.saaj.SAAJImplementation;
import org.apache.axiom.ts.saaj.SAAJTestCase;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPSampleSet;
public class TestExamineMustUnderstandHeaderElements extends SAAJTestCase {
- private final SOAPSpec spec;
- private final boolean dynamic;
-
- public TestExamineMustUnderstandHeaderElements(SAAJImplementation saajImplementation, SOAPSpec spec, boolean dynamic) {
- super(saajImplementation);
- this.spec = spec;
- this.dynamic = dynamic;
- addTestParameter("spec", spec.getName());
- addTestParameter("dynamic", dynamic);
+ public TestExamineMustUnderstandHeaderElements(SAAJImplementation saajImplementation, SOAPSpec spec) {
+ super(saajImplementation, spec);
}
@Override
protected void runTest() throws Throwable {
- MessageFactory messageFactory = spec.getAdapter(FactorySelector.class).newMessageFactory(saajImplementation, dynamic);
MimeHeaders mimeHeaders = new MimeHeaders();
mimeHeaders.addHeader("Content-Type", spec.getContentType());
InputStream in = SOAPSampleSet.MUST_UNDERSTAND.getMessage(spec).getInputStream();
try {
- SOAPMessage message = messageFactory.createMessage(mimeHeaders, in);
+ SOAPMessage message = newMessageFactory().createMessage(mimeHeaders, in);
SOAPHeader header = message.getSOAPHeader();
Iterator it = header.examineMustUnderstandHeaderElements(null);
assertTrue(it.hasNext());