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/29 11:40:28 UTC
svn commit: r1727522 - in /webservices/axiom/branches/1.2.x/testing: ./
soap-testsuite/src/main/java/org/apache/axiom/ts/soap/
spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/
spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springw...
Author: veithen
Date: Fri Jan 29 10:40:28 2016
New Revision: 1727522
URL: http://svn.apache.org/viewvc?rev=1727522&view=rev
Log:
Partial merge of r1727513 to the 1.2 branch.
Added:
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamMTOM.java
- copied unchanged from r1727513, webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamMTOM.java
Modified:
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TransportInputStreamImpl.java
webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MessageSample.java
webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 29 10:40:28 2016
@@ -0,0 +1,15 @@
+/webservices/axiom/branches/AXIOM-201/testing:1183599-1433135
+/webservices/axiom/branches/AXIOM-399/testing:1329379-1331100
+/webservices/axiom/branches/AXIOM-412/testing:1311325-1325526
+/webservices/axiom/branches/AXIOM-420/testing:1334121-1336372
+/webservices/axiom/branches/AXIOM-435/testing:1361507-1366198
+/webservices/axiom/branches/AXIOM-437/testing:1364041-1364239
+/webservices/axiom/branches/AXIOM-476/testing:1718738-1718932
+/webservices/axiom/branches/CHECK_PARENT_BUG/testing:1338398-1338886
+/webservices/axiom/branches/CLONE/testing:1337822-1339011
+/webservices/axiom/branches/CLONE_NODE/testing:1346607-1353106
+/webservices/axiom/branches/JAXB2_DS/testing:1366463-1367737
+/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
Modified: webservices/axiom/branches/1.2.x/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java?rev=1727522&r1=1727521&r2=1727522&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java (original)
+++ webservices/axiom/branches/1.2.x/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java Fri Jan 29 10:40:28 2016
@@ -114,4 +114,9 @@ public class SOAPSample extends XMLSampl
}
return new InputSource(new ByteArrayInputStream(baos.toByteArray()));
}
+
+ @Override
+ protected String getMediaType() {
+ return spec.getContentType();
+ }
}
Modified: webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java?rev=1727522&r1=1727521&r2=1727522&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java Fri Jan 29 10:40:28 2016
@@ -31,6 +31,7 @@ import org.apache.axiom.ts.springws.scen
import org.apache.axiom.ts.springws.scenario.wsadom.WSAddressingDOMTest;
import org.apache.axiom.ts.springws.soap.messagefactory.TestCreateWebServiceMessage;
import org.apache.axiom.ts.springws.soap.messagefactory.TestCreateWebServiceMessageFromInputStream;
+import org.apache.axiom.ts.springws.soap.messagefactory.TestCreateWebServiceMessageFromInputStreamMTOM;
public class SpringWSTestSuiteBuilder extends MatrixTestSuiteBuilder {
private final MessageFactoryConfigurator messageFactoryConfigurator;
@@ -46,6 +47,7 @@ public class SpringWSTestSuiteBuilder ex
protected void addTests() {
addSimpleTests(messageFactoryConfigurator, SOAPSpec.SOAP11);
addSimpleTests(messageFactoryConfigurator, SOAPSpec.SOAP12);
+ addTest(new TestCreateWebServiceMessageFromInputStreamMTOM(messageFactoryConfigurator));
addScenarioTests(new ScenarioConfig(altMessageFactoryConfigurator, messageFactoryConfigurator), SOAPSpec.SOAP11);
addScenarioTests(new ScenarioConfig(altMessageFactoryConfigurator, messageFactoryConfigurator), SOAPSpec.SOAP12);
if (altMessageFactoryConfigurator != messageFactoryConfigurator) {
Modified: webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TransportInputStreamImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TransportInputStreamImpl.java?rev=1727522&r1=1727521&r2=1727522&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TransportInputStreamImpl.java (original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TransportInputStreamImpl.java Fri Jan 29 10:40:28 2016
@@ -23,13 +23,13 @@ import java.io.InputStream;
import java.util.Collections;
import java.util.Iterator;
-import org.apache.axiom.ts.soap.SOAPSample;
+import org.apache.axiom.ts.xml.MessageSample;
import org.springframework.ws.transport.TransportInputStream;
final class TransportInputStreamImpl extends TransportInputStream {
- private final SOAPSample sample;
+ private final MessageSample sample;
- TransportInputStreamImpl(SOAPSample sample) {
+ TransportInputStreamImpl(MessageSample sample) {
this.sample = sample;
}
@@ -46,9 +46,7 @@ final class TransportInputStreamImpl ext
@Override
public Iterator<String> getHeaders(String name) throws IOException {
if (name.equalsIgnoreCase("Content-Type")) {
- return Collections.singleton(
- sample.getSOAPSpec().getContentType() + "; charset=\"" + sample.getEncoding()
- + "\"").iterator();
+ return Collections.singleton(sample.getContentType()).iterator();
} else {
return Collections.<String>emptySet().iterator();
}
Modified: webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MessageSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MessageSample.java?rev=1727522&r1=1727521&r2=1727522&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MessageSample.java (original)
+++ webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MessageSample.java Fri Jan 29 10:40:28 2016
@@ -30,6 +30,8 @@ public abstract class MessageSample exte
this.content = content;
}
+ public abstract String getContentType();
+
/**
* Get the content of this message.
*
Modified: webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java?rev=1727522&r1=1727521&r2=1727522&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java (original)
+++ webservices/axiom/branches/1.2.x/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java Fri Jan 29 10:40:28 2016
@@ -138,4 +138,13 @@ public class XMLSample extends MessageSa
in.close();
return result.toArray(new XMLSample[result.size()]);
}
+
+ @Override
+ public final String getContentType() {
+ return getMediaType() + "; charset=\"" + getEncoding() + "\"";
+ }
+
+ protected String getMediaType() {
+ return "application/xml";
+ }
}