svn commit: r1681637 [1/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...

Mon, 25 May 2015 12:30:12 -0700 

Author: veithen
Date: Mon May 25 19:29:37 2015
New Revision: 1681637

URL: http://svn.apache.org/r1681637
Log:
Rename TestMessage to SOAPSample (for consistency with XMLSample and 
MIMESample).

Added:
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
      - copied, changed from r1681628, 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapterFactory.java
      - copied, changed from r1681628, 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapterFactory.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSample.java
      - copied, changed from r1681628, 
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedTestMessage.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java
      - copied, changed from r1681628, 
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessage.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleSet.java
      - copied, changed from r1681628, 
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleSOAPSample.java
      - copied, changed from r1681628, 
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleTestMessage.java
Removed:
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapterFactory.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedTestMessage.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SimpleTestMessage.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessage.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
Modified:
    
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
    
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
    
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
    
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
    
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
    
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.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
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParserOptimized.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
    
webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/META-INF/services/org.apache.axiom.testing.multiton.AdapterFactory
    
webservices/axiom/trunk/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
    
webservices/axiom/trunk/testing/soap-testsuite/src/test/java/org/apache/axiom/ts/soap/ValidationTest.java
    
webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java

Modified: 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
 Mon May 25 19:29:37 2015
@@ -22,7 +22,7 @@ package org.apache.axiom.om;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 import junit.framework.TestCase;
 
@@ -33,7 +33,7 @@ public class OMCachingTest extends TestC
         OMElement documentElement = null;
         try {
             // first build the OM tree without caching and see whether up can 
cosume it again
-            OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createOMBuilder(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
+            OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createOMBuilder(SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
             documentElement = builder.getDocumentElement();
             String envelopeString = documentElement.toStringWithConsume();
         } catch (XMLStreamException e) {
@@ -56,7 +56,7 @@ public class OMCachingTest extends TestC
         OMElement documentElement = null;
         try {
             // first build the OM tree without caching and see whether up can 
cosume it again
-            OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createOMBuilder(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
+            OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createOMBuilder(SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
             documentElement = builder.getDocumentElement();
             String envelopeString = documentElement.toString();
             envelopeString = documentElement.toStringWithConsume();

Modified: 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMTestCase.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
 (original)
+++ 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
 Mon May 25 19:29:37 2015
@@ -25,7 +25,7 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 public abstract class OMTestCase extends AbstractTestCase {
     protected SOAPModelBuilder builder;
@@ -52,7 +52,7 @@ public abstract class OMTestCase extends
     protected SOAPModelBuilder getOMBuilder(String fileName) throws Exception {
         InputStream in;
         if ("".equals(fileName) || fileName == null) {
-            in = 
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream();
+            in = 
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream();
         } else {
             in = getTestResource(fileName);
         }

Modified: 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
 Mon May 25 19:29:37 2015
@@ -35,7 +35,7 @@ import org.apache.axiom.soap.SOAPFactory
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 import javax.xml.namespace.QName;
 
@@ -119,7 +119,7 @@ public class OMLinkedListImplFactoryTest
 
     public void testCreateSOAPHeaderBlock() throws Exception {
         OMXMLParserWrapper omBuilder = 
OMXMLBuilderFactory.createSOAPModelBuilder(
-                
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
+                
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
         SOAPEnvelope soapEnvelope = (SOAPEnvelope) 
omBuilder.getDocumentElement();
         SOAPHeader soapHeader = soapEnvelope.getHeader();
         SOAPHeaderBlock soapHeaderBlock = omFactory.createSOAPHeaderBlock(

Modified: 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
 Mon May 25 19:29:37 2015
@@ -32,7 +32,7 @@ import org.apache.axiom.om.util.StAXUtil
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.commons.io.output.NullOutputStream;
 
 import javax.xml.stream.XMLStreamReader;
@@ -46,7 +46,7 @@ public class ElementSerializerTest exten
     private OMXMLParserWrapper builder;
 
     protected void setUp() throws Exception {
-        reader = 
StAXUtils.createXMLStreamReader(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
+        reader = 
StAXUtils.createXMLStreamReader(SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
         writer = StAXUtils.createXMLStreamWriter(new NullOutputStream(),
                 OMConstants.DEFAULT_CHAR_SET_ENCODING);
         builder =

Modified: 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
 Mon May 25 19:29:37 2015
@@ -29,7 +29,7 @@ import org.apache.axiom.om.util.StAXUtil
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
@@ -40,7 +40,7 @@ import java.io.ByteArrayOutputStream;
 public class OMSerializerTest extends AbstractTestCase {
     public void testElementPullStream1() throws Exception {
         OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createSOAPModelBuilder(
-                
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
+                
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
         SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
         StreamingOMSerializer serializer = new StreamingOMSerializer();
         ByteArrayOutputStream byteArrayOutputStream = new 
ByteArrayOutputStream();
@@ -56,7 +56,7 @@ public class OMSerializerTest extends Ab
     public void testElementPullStream1WithCacheOff() throws Exception {
 
         OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createSOAPModelBuilder(
-                
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
+                
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
         ByteArrayOutputStream byteArrayOutputStream = new 
ByteArrayOutputStream();
         XMLStreamWriter writer = 
StAXUtils.createXMLStreamWriter(byteArrayOutputStream,
                 OMConstants.DEFAULT_CHAR_SET_ENCODING);
@@ -83,7 +83,7 @@ public class OMSerializerTest extends Ab
 
     public void testElementPullStream2() throws Exception {
         OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createSOAPModelBuilder(
-                
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
+                
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
         ByteArrayOutputStream byteArrayOutputStream = new 
ByteArrayOutputStream();
         XMLStreamWriter writer = 
StAXUtils.createXMLStreamWriter(byteArrayOutputStream);
 

Modified: 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
 Mon May 25 19:29:37 2015
@@ -25,12 +25,12 @@ import org.apache.axiom.om.OMAbstractFac
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 public class OMElementHelperTest extends TestCase {
     public void testImportOMElement() throws Exception {
         OMElement documentElement =
-                
OMXMLBuilderFactory.createOMBuilder(OMAbstractFactory.getOMFactory(), 
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream())
+                
OMXMLBuilderFactory.createOMBuilder(OMAbstractFactory.getOMFactory(), 
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream())
                         .getDocumentElement();
 
         // first lets try to import an element created from llom in to llom 
factory. This should return the same element

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
 Mon May 25 19:29:37 2015
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMXMLBuilderF
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.ts.AxiomTestCase;
 import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 /**
  *Test the discard method
@@ -41,7 +41,7 @@ public class TestDiscardIncomplete exten
         // an element from it
         // TODO: we shouldn't use a SOAP message here
         OMXMLParserWrapper builder = 
OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
-                
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
+                
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
         documentElement = builder.getDocumentElement();
 
         documentElement.getFirstElement().discard();

Copied: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
 (from r1681628, 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java)
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java?p2=webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java&p1=webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java&r1=1681628&r2=1681637&rev=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
 Mon May 25 19:29:37 2015
@@ -29,19 +29,19 @@ import org.junit.Assert;
 import org.xml.sax.InputSource;
 
 /**
- * {@link TestMessage} adapter that adds some Axiom specific methods to 
retrieve the content of the
+ * {@link SOAPSample} adapter that adds some Axiom specific methods to 
retrieve the content of the
  * test message.
  */
 @AdapterType
-public final class TestMessageAdapter {
-    private final TestMessage testMessage;
+public final class SOAPSampleAdapter {
+    private final SOAPSample sample;
 
-    TestMessageAdapter(TestMessage testMessage) {
-        this.testMessage = testMessage;
+    SOAPSampleAdapter(SOAPSample sample) {
+        this.sample = sample;
     }
     
     public SOAPModelBuilder getBuilder(OMMetaFactory metaFactory) {
-        return 
metaFactory.createSOAPModelBuilder(StAXParserConfiguration.SOAP, new 
InputSource(testMessage.getInputStream()));
+        return 
metaFactory.createSOAPModelBuilder(StAXParserConfiguration.SOAP, new 
InputSource(sample.getInputStream()));
     }
     
     public SOAPMessage getSOAPMessage(OMMetaFactory metaFactory) {
@@ -51,7 +51,7 @@ public final class TestMessageAdapter {
     public SOAPEnvelope getSOAPEnvelope(OMMetaFactory metaFactory) {
         SOAPEnvelope envelope = getBuilder(metaFactory).getSOAPEnvelope();
         // TODO: this is not the right place to assert this
-        Assert.assertSame(testMessage.getSOAPSpec().getEnvelopeNamespaceURI(), 
((SOAPFactory)envelope.getOMFactory()).getSoapVersionURI());
+        Assert.assertSame(sample.getSOAPSpec().getEnvelopeNamespaceURI(), 
((SOAPFactory)envelope.getOMFactory()).getSoapVersionURI());
         return envelope;
     }
 }

Copied: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapterFactory.java
 (from r1681628, 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapterFactory.java)
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapterFactory.java?p2=webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapterFactory.java&p1=webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapterFactory.java&r1=1681628&r2=1681637&rev=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapterFactory.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapterFactory.java
 Mon May 25 19:29:37 2015
@@ -21,8 +21,8 @@ package org.apache.axiom.ts.soap;
 import org.apache.axiom.testing.multiton.AdapterFactory;
 import org.apache.axiom.testing.multiton.Adapters;
 
-public class TestMessageAdapterFactory implements AdapterFactory<TestMessage> {
-    public void createAdapters(TestMessage testMessage, Adapters adapters) {
-        adapters.add(new TestMessageAdapter(testMessage));
+public class SOAPSampleAdapterFactory implements AdapterFactory<SOAPSample> {
+    public void createAdapters(SOAPSample sample, Adapters adapters) {
+        adapters.add(new SOAPSampleAdapter(sample));
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
 Mon May 25 19:29:37 2015
@@ -39,24 +39,24 @@ public class SOAPTestSuiteBuilder extend
             "soap12/header-bad-case.xml", "soap12/header-no-namespace.xml", 
"soap12/processing-instruction.xml", "soap12/entity-reference.xml",
             "soap12/additional-element-after-body.xml"};
     
-    private static final TestMessage[] goodSOAPFiles = {
-        new SimpleTestMessage(SOAPSpec.SOAP11, 
TestConstants.WHITESPACE_MESSAGE),
-        new SimpleTestMessage(SOAPSpec.SOAP11, TestConstants.MINIMAL_MESSAGE),
-        new SimpleTestMessage(SOAPSpec.SOAP11, 
TestConstants.REALLY_BIG_MESSAGE),
-        new SimpleTestMessage(SOAPSpec.SOAP11, 
TestConstants.EMPTY_BODY_MESSAGE),
-        new SimpleTestMessage(SOAPSpec.SOAP11, "soap/soap11/soapfault.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP11, "soap/soap11/soapfault2.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP11, 
"soap/soap11/bodyNotQualified.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP11, "soap/soap11/message.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP12, "soap/soap12/message.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP11, 
"soap/soap11/faultelements-with-comment.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP11, 
"soap/soap11/additional-element-after-body.xml"),
-        TestMessageSet.NO_HEADER.getMessage(SOAPSpec.SOAP11),
-        TestMessageSet.NO_HEADER.getMessage(SOAPSpec.SOAP12),
-        new SimpleTestMessage(SOAPSpec.SOAP11, "soap/soap11/empty-header.xml"),
-        new SimpleTestMessage(SOAPSpec.SOAP12, "soap/soap12/empty-header.xml"),
-        TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11),
-        TestMessageSet.WSA.getMessage(SOAPSpec.SOAP12),
+    private static final SOAPSample[] goodSOAPFiles = {
+        new SimpleSOAPSample(SOAPSpec.SOAP11, 
TestConstants.WHITESPACE_MESSAGE),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, TestConstants.MINIMAL_MESSAGE),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, 
TestConstants.REALLY_BIG_MESSAGE),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, 
TestConstants.EMPTY_BODY_MESSAGE),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, "soap/soap11/soapfault.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, "soap/soap11/soapfault2.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, 
"soap/soap11/bodyNotQualified.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, "soap/soap11/message.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP12, "soap/soap12/message.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, 
"soap/soap11/faultelements-with-comment.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, 
"soap/soap11/additional-element-after-body.xml"),
+        SOAPSampleSet.NO_HEADER.getMessage(SOAPSpec.SOAP11),
+        SOAPSampleSet.NO_HEADER.getMessage(SOAPSpec.SOAP12),
+        new SimpleSOAPSample(SOAPSpec.SOAP11, "soap/soap11/empty-header.xml"),
+        new SimpleSOAPSample(SOAPSpec.SOAP12, "soap/soap12/empty-header.xml"),
+        SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11),
+        SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP12),
     };
     
     private static final QName[] generalQNames = {
@@ -295,7 +295,7 @@ public class SOAPTestSuiteBuilder extend
         for (int i=0; i<badSOAPFiles.length; i++) {
             addTest(new 
org.apache.axiom.ts.soap.builder.BadInputTest(metaFactory, badSOAPFiles[i]));
         }
-        for (TestMessage msg : goodSOAPFiles) {
+        for (SOAPSample msg : goodSOAPFiles) {
             addTest(new 
org.apache.axiom.ts.soap.builder.MessageTest(metaFactory, msg));
             if (supportsOMSourcedElement) {
                 addTest(new 
org.apache.axiom.ts.soap.builder.TestRegisterCustomBuilderForPayload(metaFactory,
 msg));

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 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;
 import org.custommonkey.xmlunit.XMLAssert;
 
 public class TestCloneOMElement extends SOAPTestCase {
@@ -34,7 +34,7 @@ public class TestCloneOMElement extends
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope soapEnvelope = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope soapEnvelope = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         SOAPBody body = soapEnvelope.getBody();
 
         OMElement firstClonedBodyElement = body.cloneOMElement();

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
 Mon May 25 19:29:37 2015
@@ -23,8 +23,8 @@ import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPConstants;
 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 TestGetFaultWithParser extends SOAPTestCase {
     public TestGetFaultWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -32,7 +32,7 @@ public class TestGetFaultWithParser exte
     }
 
     protected void runTest() throws Throwable {
-        SOAPBody body = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody();
+        SOAPBody body = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody();
         assertNotNull(
                 "Body Test With parser :- getFault method returns null",
                 body.getFault());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPBody;
 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 TestHasFaultWithParser extends SOAPTestCase {
     public TestHasFaultWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -31,7 +31,7 @@ public class TestHasFaultWithParser exte
     }
 
     protected void runTest() throws Throwable {
-        SOAPBody body = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody();
+        SOAPBody body = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody();
         assertTrue(
                 "Body Test With parser :- hasFault method returns false",
                 body.hasFault());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
 Mon May 25 19:29:37 2015
@@ -22,12 +22,12 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.AxiomTestCase;
-import org.apache.axiom.ts.soap.TestMessage;
+import org.apache.axiom.ts.soap.SOAPSample;
 
 public class MessageTest extends AxiomTestCase {
-    private final TestMessage message;
+    private final SOAPSample message;
 
-    public MessageTest(OMMetaFactory metaFactory, TestMessage message) {
+    public MessageTest(OMMetaFactory metaFactory, SOAPSample message) {
         super(metaFactory);
         this.message = message;
         addTestParameter("message", message.getName());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.om.OMNode;
 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.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 /**
  * Tests that the SOAP builder creates {@link OMComment} nodes for comments in 
the XML prolog.
@@ -36,7 +36,7 @@ public class TestCommentInProlog extends
     }
 
     protected void runTest() throws Throwable {
-        SOAPMessage message = 
TestMessageSet.COMMENT_IN_PROLOG.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPMessage(metaFactory);
+        SOAPMessage message = 
SOAPSampleSet.COMMENT_IN_PROLOG.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPMessage(metaFactory);
         OMNode firstChild = message.getFirstOMChild();
         assertTrue(firstChild instanceof OMComment);
     }

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=1681637&r1=1681636&r2=1681637&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
 Mon May 25 19:29:37 2015
@@ -29,8 +29,8 @@ import org.apache.axiom.soap.SOAPHeaderB
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 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 TestRegisterCustomBuilder extends SOAPTestCase {
     public TestRegisterCustomBuilder(OMMetaFactory metaFactory, SOAPSpec spec) 
{
@@ -39,7 +39,7 @@ public class TestRegisterCustomBuilder e
 
     @Override
     protected void runTest() throws Throwable {
-        StAXSOAPModelBuilder builder = 
(StAXSOAPModelBuilder)TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getBuilder(metaFactory);
+        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,
                 new ByteArrayCustomBuilder("utf-8"));
         SOAPHeader header = builder.getSOAPEnvelope().getHeader();

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=1681637&r1=1681636&r2=1681637&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
 Mon May 25 19:29:37 2015
@@ -29,15 +29,15 @@ import org.apache.axiom.om.ds.custombuil
 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.TestMessage;
-import org.apache.axiom.ts.soap.TestMessageAdapter;
+import org.apache.axiom.ts.soap.SOAPSample;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.xml.sax.InputSource;
 
 public class TestRegisterCustomBuilderForPayload extends AxiomTestCase {
-    private final TestMessage message;
+    private final SOAPSample message;
 
-    public TestRegisterCustomBuilderForPayload(OMMetaFactory metaFactory, 
TestMessage message) {
+    public TestRegisterCustomBuilderForPayload(OMMetaFactory metaFactory, 
SOAPSample message) {
         super(metaFactory);
         this.message = message;
         addTestParameter("message", message.getName());
@@ -45,7 +45,7 @@ public class TestRegisterCustomBuilderFo
 
     @Override
     protected void runTest() throws Throwable {
-        SOAPModelBuilder builder = 
message.getAdapter(TestMessageAdapter.class).getBuilder(metaFactory);
+        SOAPModelBuilder builder = 
message.getAdapter(SOAPSampleAdapter.class).getBuilder(metaFactory);
         ((StAXSOAPModelBuilder)builder).registerCustomBuilderForPayload(new 
ByteArrayCustomBuilder("utf-8"));
         OMElement payload = 
builder.getSOAPEnvelope().getBody().getFirstElement();
         if (message.getPayload() == null) {

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=1681637&r1=1681636&r2=1681637&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
 Mon May 25 19:29:37 2015
@@ -28,8 +28,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 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;
 
 /**
  * Tests that a custom builder registered with
@@ -44,7 +44,7 @@ public class TestRegisterCustomBuilderFo
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         StAXSOAPModelBuilder builder = 
(StAXSOAPModelBuilder)envelope.getBuilder();
         
         // Do a fault check.  This is normally done in the engine (Axiom) and 
should

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
 Mon May 25 19:29:37 2015
@@ -23,8 +23,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPHeader;
 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;
 
 /**
  * Test the behavior when adding a header to an envelope that has not yet been 
built completely.
@@ -36,7 +36,7 @@ public class TestAddHeaderToIncompleteEn
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.NO_HEADER.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.NO_HEADER.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         assertNull(envelope.getHeader());
         SOAPHeader header = soapFactory.createSOAPHeader(envelope);
         assertSame(header, envelope.getHeader());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
 Mon May 25 19:29:37 2015
@@ -19,19 +19,19 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.ts.soap.TestMessage;
-import org.apache.axiom.ts.soap.TestMessageAdapter;
+import org.apache.axiom.ts.soap.SOAPSample;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
 
 public class TestClone extends CloneTestCase {
-    private final TestMessage message;
+    private final SOAPSample message;
 
-    public TestClone(OMMetaFactory metaFactory, TestMessage message) {
+    public TestClone(OMMetaFactory metaFactory, SOAPSample message) {
         super(metaFactory, message.getSOAPSpec());
         this.message = message;
         addTestParameter("message", message.getName());
     }
 
     protected void runTest() throws Throwable {
-        
copyAndCheck(message.getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory));
+        
copyAndCheck(message.getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory));
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPEnvelope;
 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;
 
 /**
  * Tests {@link OMNode#detach()} when used on a {@link SOAPEnvelope}. Older 
Axiom versions threw an
@@ -38,7 +38,7 @@ public class TestDetach extends SOAPTest
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.NO_HEADER.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.NO_HEADER.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         OMDocument document = (OMDocument)envelope.getParent();
         envelope.detach();
         assertNull(envelope.getParent());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.soap.SOAPConstan
 import org.apache.axiom.soap.SOAPEnvelope;
 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 TestGetBodyWithParser extends SOAPTestCase {
     public TestGetBodyWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -33,7 +33,7 @@ public class TestGetBodyWithParser exten
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.NO_HEADER.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.NO_HEADER.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         SOAPBody body = envelope.getBody();
         assertEquals("Body Test : - Body local name mismatch",
                 SOAPConstants.BODY_LOCAL_NAME, body.getLocalName());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPHeader;
 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 TestGetHeaderWithParser extends SOAPTestCase {
     public TestGetHeaderWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -33,7 +33,7 @@ public class TestGetHeaderWithParser ext
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         SOAPHeader header = envelope.getHeader();
         assertEquals("Header Test : - Header local name mismatch",
                 SOAPConstants.HEADER_LOCAL_NAME, header.getLocalName());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
 Mon May 25 19:29:37 2015
@@ -23,8 +23,8 @@ import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 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;
 
 /**
  * Tests the behavior of {@link SOAPEnvelope#getHeader()} on a message that 
has no header. In
@@ -36,7 +36,7 @@ public class TestGetHeaderWithParserNoHe
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.NO_HEADER.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.NO_HEADER.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         assertNull(envelope.getHeader());
         assertFalse(envelope.getBody().isComplete());
     }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPHeader;
 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;
 
 /**
  * Tests the behavior of {@link SOAPEnvelope#getOrCreateHeader()} on a message 
that has no header.
@@ -38,7 +38,7 @@ public class TestGetOrCreateHeaderWithPa
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.NO_HEADER.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.NO_HEADER.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         SOAPHeader header = envelope.getOrCreateHeader();
         assertNotNull(header);
         assertSame(envelope.getFirstElement(), header);

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
 Mon May 25 19:29:37 2015
@@ -30,8 +30,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPHeaderBlock;
 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;
 
 /**
  * Tests the behavior of {@link 
OMContainer#getXMLStreamReaderWithoutCaching()} on a
@@ -46,7 +46,7 @@ public class TestGetXMLStreamReaderWitho
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         SOAPHeaderBlock headerBlock = 
(SOAPHeaderBlock)envelope.getHeader().getFirstChildWithName(
                 new QName("http://www.w3.org/2005/08/addressing";, "ReplyTo"));
         headerBlock.getFirstElement().getFirstOMChild();

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPEnvelope;
 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 TestHasFaultWithParser extends SOAPTestCase {
     public TestHasFaultWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -31,7 +31,7 @@ public class TestHasFaultWithParser exte
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope env = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope env = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         assertTrue(env.hasFault());
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParserOptimized.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParserOptimized.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParserOptimized.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParserOptimized.java
 Mon May 25 19:29:37 2015
@@ -29,7 +29,7 @@ import org.apache.axiom.soap.SOAPEnvelop
 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.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 public class TestHasFaultWithParserOptimized extends SOAPTestCase {
     public TestHasFaultWithParserOptimized(OMMetaFactory metaFactory, SOAPSpec 
spec) {
@@ -42,7 +42,7 @@ public class TestHasFaultWithParserOptim
         // implementation.
         
         XMLStreamReader soap11Parser = StAXUtils.createXMLStreamReader(
-                TestMessageSet.SIMPLE_FAULT.getMessage(spec).getInputStream(), 
null);
+                SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getInputStream(), 
null);
         QName qname = new QName(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, 
SOAP11Constants.BODY_FAULT_LOCAL_NAME, "SOAP-ENV");
         XMLStreamReaderWithQName parser = new 
XMLStreamReaderWithQName(soap11Parser, qname);
         SOAPModelBuilder soap11Builder = 
OMXMLBuilderFactory.createStAXSOAPModelBuilder(metaFactory, parser);

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
 Mon May 25 19:29:37 2015
@@ -24,33 +24,33 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.ts.AxiomTestCase;
 import org.apache.axiom.ts.dimension.ExpansionStrategy;
 import org.apache.axiom.ts.dimension.serialization.SerializationStrategy;
-import org.apache.axiom.ts.soap.TestMessage;
+import org.apache.axiom.ts.soap.SOAPSample;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.xml.sax.InputSource;
 
 public class TestSerialize extends AxiomTestCase {
-    private final TestMessage testMessage;
+    private final SOAPSample message;
     private final ExpansionStrategy expansionStrategy;
     private final SerializationStrategy serializationStrategy;
 
-    public TestSerialize(OMMetaFactory metaFactory, TestMessage testMessage,
+    public TestSerialize(OMMetaFactory metaFactory, SOAPSample message,
             ExpansionStrategy expansionStrategy, SerializationStrategy 
serializationStrategy) {
         super(metaFactory);
-        this.testMessage = testMessage;
+        this.message = message;
         this.expansionStrategy = expansionStrategy;
         this.serializationStrategy = serializationStrategy;
-        addTestParameter("message", testMessage.getName());
+        addTestParameter("message", message.getName());
         expansionStrategy.addTestParameters(this);
         serializationStrategy.addTestParameters(this);
     }
 
     protected void runTest() throws Throwable {
         SOAPEnvelope soapEnvelope = 
OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
-                testMessage.getInputStream(), null).getSOAPEnvelope();
+                message.getInputStream(), null).getSOAPEnvelope();
         expansionStrategy.apply(soapEnvelope);
         XMLAssert.assertXMLIdentical(XMLUnit.compareXML(
-                new InputSource(testMessage.getInputStream()),
+                new InputSource(message.getInputStream()),
                 
serializationStrategy.serialize(soapEnvelope).getInputSource()), true);
         soapEnvelope.close(false);
     }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPFault;
 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 TestGetCodeWithParser extends SOAPTestCase {
     public TestGetCodeWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -31,7 +31,7 @@ public class TestGetCodeWithParser exten
     }
 
     protected void runTest() throws Throwable {
-        SOAPFault soapFaultWithParser = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault();
+        SOAPFault soapFaultWithParser = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault();
         assertNotNull(
                 "Fault Test with parser: - getCode method returns null",
                 soapFaultWithParser.getCode());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPFault;
 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 TestGetDetailWithParser extends SOAPTestCase {
     public TestGetDetailWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -31,7 +31,7 @@ public class TestGetDetailWithParser ext
     }
 
     protected void runTest() throws Throwable {
-        SOAPFault soapFaultWithParser = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault();
+        SOAPFault soapFaultWithParser = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault();
         assertNotNull(
                 "Fault Test with parser: - getDetail method returns null",
                 soapFaultWithParser.getDetail());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPFault;
 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 TestGetReasonWithParser extends SOAPTestCase {
     public TestGetReasonWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -31,7 +31,7 @@ public class TestGetReasonWithParser ext
     }
 
     protected void runTest() throws Throwable {
-        SOAPFault soapFaultWithParser = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault();
+        SOAPFault soapFaultWithParser = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory).getBody().getFault();
         assertNotNull(
                 "Fault Test with parser: - getReason method returns null",
                 soapFaultWithParser.getReason());

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
 Mon May 25 19:29:37 2015
@@ -25,8 +25,8 @@ import org.apache.axiom.soap.SOAPFaultCl
 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;
 
 /**
  * Tests the behavior of {@link SOAPFaultClassifier#getValueAsQName()} on a 
{@link SOAPFaultCode}.
@@ -37,7 +37,7 @@ public class TestGetValueAsQNameWithPars
     }
 
     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();
         assertEquals(new QName(spec.getEnvelopeNamespaceURI(), "Receiver"), 
faultCode.getValueAsQName());
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPEnvelope;
 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 TestGetFaultNodeValueWithParser extends SOAPTestCase {
     public TestGetFaultNodeValueWithParser(OMMetaFactory metaFactory, SOAPSpec 
spec) {
@@ -32,7 +32,7 @@ public class TestGetFaultNodeValueWithPa
 
     @Override
     protected void runTest() throws Throwable {
-        SOAPEnvelope env = 
TestMessageSet.CUSTOM_ROLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope env = 
SOAPSampleSet.CUSTOM_ROLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         assertEquals("http://gateway.corp.example.org/";, 
env.getBody().getFault().getNode().getFaultNodeValue());
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPEnvelope;
 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 TestGetRoleValueWithParser extends SOAPTestCase {
     public TestGetRoleValueWithParser(OMMetaFactory metaFactory, SOAPSpec 
spec) {
@@ -32,7 +32,7 @@ public class TestGetRoleValueWithParser
 
     @Override
     protected void runTest() throws Throwable {
-        SOAPEnvelope env = 
TestMessageSet.CUSTOM_ROLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope env = 
SOAPSampleSet.CUSTOM_ROLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         assertEquals("http://www.example.org/gateway/cache";, 
env.getBody().getFault().getRole().getRoleValue());
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPEnvelope;
 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 TestGetLangFromParser extends SOAPTestCase {
     public TestGetLangFromParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -32,7 +32,7 @@ public class TestGetLangFromParser exten
 
     @Override
     protected void runTest() throws Throwable {
-        SOAPEnvelope env = 
TestMessageSet.SIMPLE_FAULT.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope env = 
SOAPSampleSet.SIMPLE_FAULT.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         assertEquals("en", 
env.getBody().getFault().getReason().getFirstSOAPText().getLang());
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
 Mon May 25 19:29:37 2015
@@ -22,8 +22,8 @@ import org.apache.axiom.om.OMMetaFactory
 import org.apache.axiom.soap.SOAPEnvelope;
 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;
 
 // Regression test for AXIOM-223 (see r567512)
 public class TestDiscardIncomplete extends SOAPTestCase {
@@ -32,7 +32,7 @@ public class TestDiscardIncomplete exten
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         envelope.getHeader().discard();
         envelope.getBody().toStringWithConsume();
     }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
 Mon May 25 19:29:37 2015
@@ -28,8 +28,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPHeader;
 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;
 
 /**
  * Tests the behavior of {@link OMNode#discard()} on a {@link SOAPHeader} that 
is partially built,
@@ -42,7 +42,7 @@ public class TestDiscardPartiallyBuilt e
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         SOAPHeader header = envelope.getHeader();
         OMElement from = header.getFirstChildWithName(new 
QName("http://www.w3.org/2005/08/addressing";, "ReplyTo"));
         from.getFirstElement().getFirstOMChild();

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
 Mon May 25 19:29:37 2015
@@ -25,8 +25,8 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPHeaderBlock;
 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 TestExamineAllHeaderBlocksWithParser extends SOAPTestCase {
     public TestExamineAllHeaderBlocksWithParser(OMMetaFactory metaFactory, 
SOAPSpec spec) {
@@ -34,7 +34,7 @@ public class TestExamineAllHeaderBlocksW
     }
 
     protected void runTest() throws Throwable {
-        SOAPEnvelope envelope = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+        SOAPEnvelope envelope = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPEnvelope(metaFactory);
         Iterator iterator = envelope.getHeader().examineAllHeaderBlocks();
         iterator.hasNext();
         SOAPHeaderBlock headerBlock = (SOAPHeaderBlock)iterator.next();

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
 Mon May 25 19:29:37 2015
@@ -25,8 +25,8 @@ import org.apache.axiom.om.OMMetaFactory
 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.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 /**
  * Tests that {@link OMInformationItem#clone(OMCloneOptions)} correctly clones 
a {@link SOAPMessage}
@@ -43,7 +43,7 @@ public class TestCloneIncomplete extends
     }
 
     protected void runTest() throws Throwable {
-        SOAPMessage message = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPMessage(metaFactory);
+        SOAPMessage message = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPMessage(metaFactory);
         OMCloneOptions options = new OMCloneOptions();
         options.setPreserveModel(preserveModel);
         OMInformationItem clone = message.clone(options);

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
 Mon May 25 19:29:37 2015
@@ -24,8 +24,8 @@ 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.TestMessageAdapter;
-import org.apache.axiom.ts.soap.TestMessageSet;
+import org.apache.axiom.ts.soap.SOAPSampleAdapter;
+import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 /**
  * Tests that {@link OMInformationItem#getOMFactory()} returns the expected 
{@link SOAPFactory}
@@ -38,7 +38,7 @@ public class TestGetOMFactoryWithParser
     }
 
     protected void runTest() throws Throwable {
-        SOAPMessage message = 
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPMessage(metaFactory);
+        SOAPMessage message = 
SOAPSampleSet.WSA.getMessage(spec).getAdapter(SOAPSampleAdapter.class).getSOAPMessage(metaFactory);
         assertSame(soapFactory, message.getOMFactory());
     }
 }

Modified: 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java?rev=1681637&r1=1681636&r2=1681637&view=diff
==============================================================================
--- 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
 (original)
+++ 
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
 Mon May 25 19:29:37 2015
@@ -24,34 +24,34 @@ import org.apache.axiom.soap.SOAPMessage
 import org.apache.axiom.ts.AxiomTestCase;
 import org.apache.axiom.ts.dimension.ExpansionStrategy;
 import org.apache.axiom.ts.dimension.serialization.SerializationStrategy;
-import org.apache.axiom.ts.soap.TestMessage;
+import org.apache.axiom.ts.soap.SOAPSample;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.xml.sax.InputSource;
 
 public class TestSerialize extends AxiomTestCase {
-    private final TestMessage testMessage;
+    private final SOAPSample message;
     private final ExpansionStrategy expansionStrategy;
     private final SerializationStrategy serializationStrategy;
 
-    public TestSerialize(OMMetaFactory metaFactory, TestMessage testMessage,
+    public TestSerialize(OMMetaFactory metaFactory, SOAPSample message,
             ExpansionStrategy expansionStrategy, SerializationStrategy 
serializationStrategy) {
         super(metaFactory);
-        this.testMessage = testMessage;
+        this.message = message;
         this.expansionStrategy = expansionStrategy;
         this.serializationStrategy = serializationStrategy;
-        addTestParameter("message", testMessage.getName());
+        addTestParameter("message", message.getName());
         expansionStrategy.addTestParameters(this);
         serializationStrategy.addTestParameters(this);
     }
 
     protected void runTest() throws Throwable {
-        SOAPMessage message = 
OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
-                testMessage.getInputStream(), null).getSOAPMessage();
-        expansionStrategy.apply(message);
+        SOAPMessage soapMessage = 
OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
+                message.getInputStream(), null).getSOAPMessage();
+        expansionStrategy.apply(soapMessage);
         XMLAssert.assertXMLIdentical(XMLUnit.compareXML(
-                new InputSource(testMessage.getInputStream()),
-                serializationStrategy.serialize(message).getInputSource()), 
true);
-        message.close(false);
+                new InputSource(message.getInputStream()),
+                
serializationStrategy.serialize(soapMessage).getInputSource()), true);
+        soapMessage.close(false);
     }
 }

Reply via email to