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 2015/05/25 21:29:38 UTC
svn commit: r1681637 [2/2] - in /webservices/axiom/trunk:
systests/old-tests/src/test/java/org/apache/axiom/om/
systests/old-tests/src/test/java/org/apache/axiom/om/factory/
systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/
systests...
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
-import org.apache.axiom.ts.soap.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
public class TestGetValueWithParser extends SOAPTestCase {
public TestGetValueWithParser(OMMetaFactory metaFactory) {
@@ -31,7 +31,7 @@ public class TestGetValueWithParser exte
}
protected void runTest() throws Throwable {
- SOAPFaultCode code = TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getCode();
+ SOAPFaultCode code = SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getCode();
assertNull(code.getValue());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java Mon May 25 19:29:37 2015
@@ -23,8 +23,8 @@ import org.apache.axiom.soap.SOAP12Const
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
-import org.apache.axiom.ts.soap.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
public class TestGetValueWithParser extends SOAPTestCase {
public TestGetValueWithParser(OMMetaFactory metaFactory) {
@@ -32,7 +32,7 @@ public class TestGetValueWithParser exte
}
protected void runTest() throws Throwable {
- SOAPFaultCode faultCode = TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getCode();
+ SOAPFaultCode faultCode = SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getCode();
assertNotNull(
"SOAP 1.2 Fault Code Test with parser : - getValue method returns null",
faultCode.getValue());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
-import org.apache.axiom.ts.soap.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
public class TestGetFirstSOAPTextWithParser extends SOAPTestCase {
public TestGetFirstSOAPTextWithParser(OMMetaFactory metaFactory) {
@@ -31,7 +31,7 @@ public class TestGetFirstSOAPTextWithPar
}
protected void runTest() throws Throwable {
- SOAPFaultReason faultReason = TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getReason();
+ SOAPFaultReason faultReason = SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getReason();
assertFalse(
"SOAP 1.2 FaultReason Test With Parser : - getFirstSOAPText method returns null",
faultReason.getFirstSOAPText() == null);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.soap.SOAP12Const
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
-import org.apache.axiom.ts.soap.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
public class TestGetLangWithParser extends SOAPTestCase {
public TestGetLangWithParser(OMMetaFactory metaFactory) {
@@ -33,7 +33,7 @@ public class TestGetLangWithParser exten
}
protected void runTest() throws Throwable {
- SOAPFaultText faultText = TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getReason().getFirstSOAPText();
+ SOAPFaultText faultText = SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault().getReason().getFirstSOAPText();
assertTrue(
"SOAP 1.2 Fault Text Test With Parser : - getLang method returns incorrect string",
faultText.getLang().equals("en"));
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java Mon May 25 19:29:37 2015
@@ -27,7 +27,7 @@ import org.apache.axiom.soap.SOAPFactory
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -40,7 +40,7 @@ public class TestLazySOAPFactorySelectio
protected void runTest() throws Throwable {
// Create a SOAP model builder without specifying the SOAP version.
SOAPMessage message = OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
- TestMessageSet.NO_HEADER.getMessage(spec).getInputStream(), null).getSOAPMessage();
+ SOAPSampleSet.NO_HEADER.getMessage(spec).getInputStream(), null).getSOAPMessage();
// At this stage, the SOAPFactory instance has not yet been determined.
// However, if we cast the SOAPMessage to a Document and use it to create e new Element,
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/META-INF/services/org.apache.axiom.testing.multiton.AdapterFactory
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/META-INF/services/org.apache.axiom.testing.multiton.AdapterFactory?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/META-INF/services/org.apache.axiom.testing.multiton.AdapterFactory (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/META-INF/services/org.apache.axiom.testing.multiton.AdapterFactory Mon May 25 19:29:37 2015
@@ -19,5 +19,5 @@
org.apache.axiom.ts.StreamTypeAdapterFactory
org.apache.axiom.ts.soap.BooleanAttributeAdapterFactory
org.apache.axiom.ts.soap.SOAPElementTypeAdapterFactory
+org.apache.axiom.ts.soap.SOAPSampleAdapterFactory
org.apache.axiom.ts.soap.SOAPSpecAdapterFactory
-org.apache.axiom.ts.soap.TestMessageAdapterFactory
\ No newline at end of file
Modified: webservices/axiom/trunk/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java (original)
+++ webservices/axiom/trunk/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java Mon May 25 19:29:37 2015
@@ -31,7 +31,7 @@ import org.apache.axiom.ts.saaj.FactoryS
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.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
public class TestExamineMustUnderstandHeaderElements extends SAAJTestCase {
private final SOAPSpec spec;
@@ -50,7 +50,7 @@ public class TestExamineMustUnderstandHe
MessageFactory messageFactory = spec.getAdapter(FactorySelector.class).newMessageFactory(saajImplementation, dynamic);
MimeHeaders mimeHeaders = new MimeHeaders();
mimeHeaders.addHeader("Content-Type", spec.getContentType());
- InputStream in = TestMessageSet.MUST_UNDERSTAND.getMessage(spec).getInputStream();
+ InputStream in = SOAPSampleSet.MUST_UNDERSTAND.getMessage(spec).getInputStream();
try {
SOAPMessage message = messageFactory.createMessage(mimeHeaders, in);
SOAPHeader header = message.getSOAPHeader();
Copied: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSample.java (from r1681628, webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedTestMessage.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSample.java?p2=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSample.java&p1=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedTestMessage.java&r1=1681628&r2=1681637&rev=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedTestMessage.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSample.java Mon May 25 19:29:37 2015
@@ -36,11 +36,11 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-final class ConvertedTestMessage extends TestMessage {
- private final TestMessage soap12Message;
+final class ConvertedSOAPSample extends SOAPSample {
+ private final SOAPSample soap12Message;
private byte[] content;
- ConvertedTestMessage(TestMessage soap12Message, String name) {
+ ConvertedSOAPSample(SOAPSample soap12Message, String name) {
super(SOAPSpec.SOAP11, name);
this.soap12Message = soap12Message;
}
Copied: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java (from r1681628, webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessage.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java?p2=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java&p1=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessage.java&r1=1681628&r2=1681637&rev=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessage.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java Mon May 25 19:29:37 2015
@@ -39,24 +39,24 @@ import org.xml.sax.InputSource;
/**
* A SOAP test message.
*/
-public abstract class TestMessage extends Multiton {
+public abstract class SOAPSample extends Multiton {
private final SOAPSpec spec;
private final String name;
- TestMessage(SOAPSpec spec, String name) {
+ SOAPSample(SOAPSpec spec, String name) {
this.spec = spec;
this.name = name;
}
@Instances
- private static TestMessage[] instances() {
- List<TestMessage> instances = new ArrayList<TestMessage>();
- for (TestMessageSet set : getInstances(TestMessageSet.class)) {
+ private static SOAPSample[] instances() {
+ List<SOAPSample> instances = new ArrayList<SOAPSample>();
+ for (SOAPSampleSet set : getInstances(SOAPSampleSet.class)) {
for (SOAPSpec spec : getInstances(SOAPSpec.class)) {
instances.add(set.getMessage(spec));
}
}
- return instances.toArray(new TestMessage[instances.size()]);
+ return instances.toArray(new SOAPSample[instances.size()]);
}
/**
Copied: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleSet.java (from r1681628, webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleSet.java?p2=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleSet.java&p1=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java&r1=1681628&r2=1681637&rev=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleSet.java Mon May 25 19:29:37 2015
@@ -23,49 +23,49 @@ import org.apache.axiom.testing.multiton
/**
* A set of two equivalent SOAP messages, one for SOAP 1.1 and one for SOAP 1.2.
*/
-public final class TestMessageSet extends Multiton {
+public final class SOAPSampleSet extends Multiton {
/**
* A simple SOAP message without header.
*/
- public static final TestMessageSet NO_HEADER = new TestMessageSet("no-header");
+ public static final SOAPSampleSet NO_HEADER = new SOAPSampleSet("no-header");
/**
* A SOAP request with WS-Addressing headers.
*/
- public static final TestMessageSet WSA = new TestMessageSet("wsa");
+ public static final SOAPSampleSet WSA = new SOAPSampleSet("wsa");
/**
* A simple SOAP request with a comment in the XML prolog.
*/
- public static final TestMessageSet COMMENT_IN_PROLOG = new TestMessageSet("comment-in-prolog");
+ public static final SOAPSampleSet COMMENT_IN_PROLOG = new SOAPSampleSet("comment-in-prolog");
/**
* A SOAP response with a simple SOAP fault containing a fault code (without subcode), reason
* (English only) and detail.
*/
- public static final TestMessageSet SIMPLE_FAULT = new TestMessageSet("simple-fault");
+ public static final SOAPSampleSet SIMPLE_FAULT = new SOAPSampleSet("simple-fault");
/**
* A SOAP request having a header block with a custom role.
*/
- public static final TestMessageSet CUSTOM_ROLE_REQUEST = new TestMessageSet("custom-role-request");
+ public static final SOAPSampleSet CUSTOM_ROLE_REQUEST = new SOAPSampleSet("custom-role-request");
/**
* A SOAP fault response with a custom role (corresponding to {@link #CUSTOM_ROLE_REQUEST}).
*/
- public static final TestMessageSet CUSTOM_ROLE_FAULT = new TestMessageSet("custom-role-fault");
+ public static final SOAPSampleSet CUSTOM_ROLE_FAULT = new SOAPSampleSet("custom-role-fault");
/**
* A SOAP request with a single mustUnderstand header.
*/
- public static final TestMessageSet MUST_UNDERSTAND = new TestMessageSet("must-understand");
+ public static final SOAPSampleSet MUST_UNDERSTAND = new SOAPSampleSet("must-understand");
- private final TestMessage soap11Message;
- private final TestMessage soap12Message;
+ private final SOAPSample soap11Message;
+ private final SOAPSample soap12Message;
- private TestMessageSet(String name) {
- soap12Message = new SimpleTestMessage(SOAPSpec.SOAP12, "test-message/set/" + name + ".xml", "soap12/" + name);
- soap11Message = new ConvertedTestMessage(soap12Message, "soap11/" + name);
+ private SOAPSampleSet(String name) {
+ soap12Message = new SimpleSOAPSample(SOAPSpec.SOAP12, "test-message/set/" + name + ".xml", "soap12/" + name);
+ soap11Message = new ConvertedSOAPSample(soap12Message, "soap11/" + name);
}
/**
@@ -75,7 +75,7 @@ public final class TestMessageSet extend
* the SOAP specification version
* @return the test message
*/
- public TestMessage getMessage(SOAPSpec spec) {
+ public SOAPSample getMessage(SOAPSpec spec) {
return spec == SOAPSpec.SOAP11 ? soap11Message : soap12Message;
}
}
Copied: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleSOAPSample.java (from r1681628, webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleTestMessage.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleSOAPSample.java?p2=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleSOAPSample.java&p1=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleTestMessage.java&r1=1681628&r2=1681637&rev=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleTestMessage.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleSOAPSample.java Mon May 25 19:29:37 2015
@@ -21,20 +21,20 @@ package org.apache.axiom.ts.soap;
import java.io.InputStream;
// TODO: this should eventually have package access
-public final class SimpleTestMessage extends TestMessage {
+public final class SimpleSOAPSample extends SOAPSample {
private final String resourceName;
- public SimpleTestMessage(SOAPSpec spec, String resourceName) {
+ public SimpleSOAPSample(SOAPSpec spec, String resourceName) {
this(spec, resourceName, resourceName);
}
- SimpleTestMessage(SOAPSpec spec, String resourceName, String name) {
+ SimpleSOAPSample(SOAPSpec spec, String resourceName, String name) {
super(spec, name);
this.resourceName = resourceName;
}
@Override
public InputStream getInputStream() {
- return SimpleTestMessage.class.getClassLoader().getResourceAsStream(resourceName);
+ return SimpleSOAPSample.class.getClassLoader().getResourceAsStream(resourceName);
}
}
Modified: webservices/axiom/trunk/testing/soap-testsuite/src/test/java/org/apache/axiom/ts/soap/ValidationTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/test/java/org/apache/axiom/ts/soap/ValidationTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/test/java/org/apache/axiom/ts/soap/ValidationTest.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/test/java/org/apache/axiom/ts/soap/ValidationTest.java Mon May 25 19:29:37 2015
@@ -26,9 +26,9 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
public class ValidationTest extends TestCase {
- private final TestMessage message;
+ private final SOAPSample message;
- public ValidationTest(TestMessage message) {
+ public ValidationTest(SOAPSample message) {
super(message.getName());
this.message = message;
}
@@ -40,7 +40,7 @@ public class ValidationTest extends Test
public static TestSuite suite() {
TestSuite suite = new TestSuite();
- for (TestMessage message : getInstances(TestMessage.class)) {
+ for (SOAPSample message : getInstances(SOAPSample.class)) {
suite.addTest(new ValidationTest(message));
}
return suite;
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java Mon May 25 19:29:37 2015
@@ -21,7 +21,7 @@ package org.apache.axiom.ts.springws.soa
import java.io.InputStream;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
import org.apache.axiom.ts.springws.SimpleTestCase;
import org.springframework.ws.soap.SoapEnvelope;
@@ -39,7 +39,7 @@ public class TestCreateWebServiceMessage
@Override
protected void runTest(SoapMessageFactory messageFactory) throws Throwable {
- SoapMessage message = messageFactory.createWebServiceMessage(TestMessageSet.NO_HEADER.getMessage(spec).getInputStream());
+ SoapMessage message = messageFactory.createWebServiceMessage(SOAPSampleSet.NO_HEADER.getMessage(spec).getInputStream());
SoapEnvelope env = message.getEnvelope();
assertNull(env.getHeader());
assertNotNull(env.getBody());