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 2026/05/11 10:53:31 UTC
(ws-axiom) branch master updated: Remove SOAPTestCase and increase usage of field injection
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 89813f5f5 Remove SOAPTestCase and increase usage of field injection
89813f5f5 is described below
commit 89813f5f57c3831ab5b59257a1228cd00c48e833
Author: Andreas Veithen-Knowles <an...@gmail.com>
AuthorDate: Mon May 11 11:52:44 2026 +0100
Remove SOAPTestCase and increase usage of field injection
---
.../org/apache/axiom/ts/soap/SOAPTestCase.java | 29 ----------------------
.../axiom/ts/soap/SampleBasedSOAPTestCase.java | 13 ++++++----
.../body/FirstElementNameWithParserTestCase.java | 8 +++---
.../apache/axiom/ts/soap/body/TestAddFault1.java | 11 +++-----
.../apache/axiom/ts/soap/body/TestAddFault2.java | 11 +++-----
.../axiom/ts/soap/body/TestCloneOMElement.java | 3 ++-
.../apache/axiom/ts/soap/body/TestGetFault.java | 11 +++-----
.../axiom/ts/soap/body/TestGetFaultFakeFault.java | 11 +++-----
.../axiom/ts/soap/body/TestGetFaultNoFault.java | 15 +++--------
.../axiom/ts/soap/body/TestGetFaultWithParser.java | 3 ++-
.../TestGetFirstElementLocalNameEmptyBody.java | 11 +++-----
.../TestGetFirstElementLocalNameWithParser2.java | 5 ++--
...FirstElementLocalNameWithParserNoLookahead.java | 11 +++-----
.../soap/body/TestGetFirstElementNSEmptyBody.java | 11 +++-----
.../apache/axiom/ts/soap/body/TestHasFault.java | 11 +++-----
.../ts/soap/body/TestHasFaultAfterReplace.java | 11 +++-----
.../axiom/ts/soap/body/TestHasFaultFakeFault.java | 11 +++-----
.../axiom/ts/soap/body/TestHasFaultNoFault.java | 15 +++--------
.../soap/body/TestHasFaultWithOMSEUnknownName.java | 11 +++-----
.../axiom/ts/soap/body/TestHasFaultWithParser.java | 3 ++-
.../axiom/ts/soap/builder/TestCommentInEpilog.java | 11 +++-----
.../axiom/ts/soap/builder/TestCommentInProlog.java | 16 ++++++------
.../TestCreateSOAPModelBuilderFromDOMSource.java | 11 +++-----
.../TestCreateSOAPModelBuilderFromSAXSource.java | 11 +++-----
...ateSOAPModelBuilderMTOMContentTypeMismatch.java | 10 +++-----
.../org/apache/axiom/ts/soap/builder/TestDTD.java | 11 +++-----
.../ts/soap/builder/TestRegisterCustomBuilder.java | 16 ++++++------
...CustomBuilderForPayloadAfterSOAPFaultCheck.java | 3 ++-
.../axiom/ts/soap/envelope/CloneTestCase.java | 11 +++++---
.../ts/soap/envelope/TestAddElementAfterBody.java | 14 +++++------
.../ts/soap/envelope/TestBodyHeaderOrder.java | 11 +++-----
.../apache/axiom/ts/soap/envelope/TestDetach.java | 3 ++-
.../apache/axiom/ts/soap/envelope/TestGetBody.java | 11 +++-----
.../soap/envelope/TestGetBodyOnEmptyEnvelope.java | 11 +++-----
.../TestGetBodyOnEnvelopeWithHeaderOnly.java | 11 +++-----
.../ts/soap/envelope/TestGetBodyWithParser.java | 3 ++-
.../axiom/ts/soap/envelope/TestGetHeader.java | 11 +++-----
.../ts/soap/envelope/TestGetHeaderWithParser.java | 3 ++-
.../envelope/TestGetHeaderWithParserNoHeader.java | 3 ++-
.../ts/soap/envelope/TestGetOrCreateHeader.java | 11 +++-----
.../TestGetOrCreateHeaderWithParserNoHeader.java | 3 ++-
.../TestGetSOAPBodyFirstElementLocalNameAndNS.java | 15 +++--------
...APBodyFirstElementLocalNameAndNSWithParser.java | 15 +++--------
...ithoutCachingWithPartiallyBuiltHeaderBlock.java | 3 ++-
.../axiom/ts/soap/envelope/TestHasFault.java | 11 +++-----
.../ts/soap/envelope/TestHasFaultWithParser.java | 3 ++-
.../TestSerializeAndConsumeWithOMSEInBody.java | 11 +++-----
.../ts/soap/envelope/TestSerializeAsChild.java | 11 +++-----
.../CreateSOAPElementWithoutParentTestCase.java | 8 +++---
.../soap/factory/TestCreateDefaultSOAPMessage.java | 11 +++-----
.../factory/TestCreateSOAPElementWithParent.java | 21 +++++++---------
.../TestCreateSOAPEnvelopeWithCustomPrefix.java | 11 +++-----
.../factory/TestCreateSOAPFaultWithException.java | 15 ++++-------
.../TestCreateSOAPHeaderBlockFromOMElement.java | 11 +++-----
.../ts/soap/factory/TestFactoryIsSingleton.java | 14 +++++------
.../ts/soap/factory/TestGetDefaultEnvelope.java | 11 +++-----
.../soap/factory/TestGetDefaultFaultEnvelope.java | 11 +++-----
.../axiom/ts/soap/factory/TestGetMetaFactory.java | 11 +++-----
.../axiom/ts/soap/factory/TestGetNamespace.java | 11 +++-----
.../apache/axiom/ts/soap/fault/TestChildOrder.java | 20 ++++++---------
.../axiom/ts/soap/fault/TestGetCodeWithParser.java | 5 ++--
.../ts/soap/fault/TestGetDetailWithParser.java | 3 ++-
.../axiom/ts/soap/fault/TestGetException.java | 11 +++-----
.../ts/soap/fault/TestGetReasonWithParser.java | 3 ++-
.../axiom/ts/soap/fault/TestGetRoleWithParser.java | 3 ++-
.../axiom/ts/soap/fault/TestSetException.java | 11 +++-----
.../axiom/ts/soap/fault/TestWrongParent1.java | 11 +++-----
.../axiom/ts/soap/fault/TestWrongParent2.java | 11 +++-----
.../axiom/ts/soap/fault/TestWrongParent3.java | 11 +++-----
.../ts/soap/faultcode/TestGetValueAsQName.java | 11 +++-----
.../faultcode/TestGetValueAsQNameWithParser.java | 3 ++-
.../ts/soap/faultdetail/TestAddDetailEntry.java | 11 +++-----
...tailEntriesUsingDefaultNamespaceWithParser.java | 3 ++-
.../soap/faultdetail/TestGetAllDetailEntries.java | 11 +++-----
.../TestGetAllDetailEntriesWithParser.java | 3 ++-
.../ts/soap/faultdetail/TestSerialization.java | 11 +++-----
.../ts/soap/faultdetail/TestWSCommons202.java | 11 +++-----
.../ts/soap/faultnode/TestGetFaultNodeValue.java | 11 +++-----
.../faultnode/TestGetFaultNodeValueWithParser.java | 3 ++-
.../ts/soap/faultnode/TestSetFaultNodeValue.java | 11 +++-----
.../axiom/ts/soap/faultrole/TestGetRoleValue.java | 11 +++-----
.../axiom/ts/soap/faultrole/TestSetRoleValue.java | 11 +++-----
.../axiom/ts/soap/faulttext/TestGetLang.java | 11 +++-----
.../axiom/ts/soap/faulttext/TestSetLang.java | 11 +++-----
.../header/TestAddChildWithPlainOMElement.java | 11 +++-----
.../axiom/ts/soap/header/TestAddHeaderBlock.java | 11 +++-----
.../soap/header/TestAddHeaderBlockFromQName.java | 11 +++-----
...estAddHeaderBlockFromQNameWithoutNamespace.java | 11 +++-----
.../TestAddHeaderBlockWithoutNamespace1.java | 11 +++-----
.../TestAddHeaderBlockWithoutNamespace2.java | 11 +++-----
.../ts/soap/header/TestDiscardIncomplete.java | 3 ++-
.../ts/soap/header/TestExamineAllHeaderBlocks.java | 11 +++-----
.../ts/soap/header/TestExamineHeaderBlocks.java | 11 +++-----
...xamineMustUnderstandHeaderBlocksWithParser.java | 2 ++
.../ts/soap/header/TestExtractAllHeaderBlocks.java | 11 +++-----
.../soap/header/TestGetHeaderBlocksWithNSURI.java | 11 +++-----
.../TestGetHeadersToProcessWithNamespace.java | 11 +++-----
.../soap/headerblock/BooleanAttributeTestCase.java | 8 +++---
.../ts/soap/headerblock/TestBlobOMDataSource.java | 11 +++-----
.../axiom/ts/soap/headerblock/TestClone.java | 15 +++++------
.../TestCloneProcessedWithoutPreservingModel.java | 11 +++-----
.../axiom/ts/soap/headerblock/TestGetRole.java | 11 +++-----
.../axiom/ts/soap/headerblock/TestGetVersion.java | 11 +++-----
.../TestSetAttributeNamespacePrefix.java | 15 ++++-------
.../axiom/ts/soap/headerblock/TestSetRole.java | 11 +++-----
.../TestSetRoleWithoutExistingNamespaceDecl.java | 11 +++-----
.../ts/soap/headerblock/TestWrongParent1.java | 11 +++-----
.../ts/soap/headerblock/TestWrongParent2.java | 11 +++-----
.../ts/soap/headerblock/TestWrongParent3.java | 11 +++-----
.../apache/axiom/ts/soap/message/TestClone.java | 14 +++++------
.../axiom/ts/soap/message/TestCloneIncomplete.java | 14 +++++------
.../message/TestGetCharsetEncodingWithParser.java | 11 +++-----
.../soap/message/TestGetOMFactoryWithParser.java | 11 +++-----
.../ts/soap/message/TestSetOMDocumentElement.java | 11 +++-----
.../TestSetOMDocumentElementNonSOAPEnvelope.java | 11 +++-----
.../axiom/ts/soap/misc/GetSetChildTestCase.java | 8 +++---
.../soap/xpath/TestXPathAppliedToSOAPEnvelope.java | 15 ++++-------
.../apache/axiom/ts/soap11/fault/TestGetNode.java | 11 +++-----
.../apache/axiom/ts/soap11/fault/TestSetNode.java | 11 +++-----
.../axiom/ts/soap11/faultcode/TestGetValue.java | 11 +++-----
.../soap11/faultcode/TestGetValueWithParser.java | 3 ++-
.../ts/soap11/faultcode/TestSetValueFromQName.java | 11 +++-----
.../ts/soap11/faultreason/TestAddSOAPText.java | 11 +++-----
.../soap11/faultreason/TestGetFirstSOAPText.java | 11 +++-----
.../soap11/faultreason/TestGetTextWithCDATA.java | 11 +++-----
.../soap12/factory/TestCreateSOAPFaultSubCode.java | 11 +++-----
.../apache/axiom/ts/soap12/fault/TestGetNode.java | 11 +++-----
.../ts/soap12/fault/TestMoreChildrenAddition.java | 11 +++-----
.../apache/axiom/ts/soap12/fault/TestSetNode.java | 11 +++-----
.../ts/soap12/faultcode/TestSetValueFromQName.java | 11 +++-----
.../TestSetValueFromQNameWithExistingValue.java | 11 +++-----
.../ts/soap12/faultreason/TestAddSOAPText.java | 11 +++-----
.../faultreason/TestAddSOAPTextMultiple.java | 11 +++-----
.../TestAddSOAPTextWithSOAPVersionMismatch.java | 11 +++-----
.../TestGetFaultReasonTextCaseSensitivity.java | 11 +++-----
...TestGetFaultReasonTextWithoutLangAttribute.java | 11 +++-----
.../soap12/faultreason/TestGetFirstSOAPText.java | 11 +++-----
.../TestExamineMustUnderstandHeaderBlocks.java | 11 +++-----
.../soapdom/header/TestExamineAllHeaderBlocks.java | 11 +++-----
.../TestExamineMustUnderstandHeaderBlocks.java | 11 +++-----
.../message/TestLazySOAPFactorySelection.java | 13 ++++------
141 files changed, 476 insertions(+), 976 deletions(-)
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
deleted file mode 100644
index 6df39a280..000000000
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.ts.soap;
-
-import junit.framework.TestCase;
-
-public abstract class SOAPTestCase extends TestCase {
- protected final SOAPSpec spec;
-
- public SOAPTestCase(SOAPSpec spec) {
- this.spec = spec;
- }
-}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java
index 497d2fa40..e09008f65 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java
@@ -18,23 +18,26 @@
*/
package org.apache.axiom.ts.soap;
-import com.google.inject.Inject;
-
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPEnvelope;
-public abstract class SampleBasedSOAPTestCase extends SOAPTestCase {
+import com.google.inject.Inject;
+
+import junit.framework.TestCase;
+
+public abstract class SampleBasedSOAPTestCase extends TestCase {
@Inject private OMMetaFactory metaFactory;
+ protected final SOAPSpec spec;
private final SOAPSample sample;
public SampleBasedSOAPTestCase(SOAPSpec spec, SOAPSampleSet sampleSet) {
- super(spec);
+ this.spec = spec;
sample = sampleSet.getMessage(spec);
}
public SampleBasedSOAPTestCase(SOAPSample sample) {
- super(sample.getSOAPSpec());
+ this.spec = sample.getSOAPSpec();
this.sample = sample;
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
index 8a7e36776..1ccc45ec1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import junit.framework.TestCase;
+
import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
@@ -40,20 +42,20 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public abstract class FirstElementNameWithParserTestCase extends SOAPTestCase {
+public abstract class FirstElementNameWithParserTestCase extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
+ protected final SOAPSpec spec;
protected final QName qname;
private final boolean supportsOptimization;
public FirstElementNameWithParserTestCase(
SOAPSpec spec, QName qname, boolean supportsOptimization) {
- super(spec);
+ this.spec = spec;
this.qname = qname;
this.supportsOptimization = supportsOptimization;
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
index 6322347a3..6b1f939b6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddFault1 extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestAddFault1(SOAPSpec spec) {
- super(spec);
- }
+public class TestAddFault1 extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
index 1aa07e377..e13ba9324 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddFault2 extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestAddFault2(SOAPSpec spec) {
- super(spec);
- }
+public class TestAddFault2 extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
index 4a64e9fb4..f645aeb44 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.body;
-import com.google.inject.Inject;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
@@ -29,6 +28,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestCloneOMElement extends SampleBasedSOAPTestCase {
@Inject
public TestCloneOMElement(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
index 6b1f94ffc..0c150b6f0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFault extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetFault(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetFault extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
index 739dd15b1..f15ac0bab 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
@@ -21,24 +21,19 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPBody#getFault()} if the {@link SOAPBody} contains a plain {@link
* OMElement} with a name corresponding to a SOAP fault. In this case, the method is expected to
* return <code>null</code>.
*/
-public class TestGetFaultFakeFault extends SOAPTestCase {
+public class TestGetFaultFakeFault extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetFaultFakeFault(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPBody body = soapFactory.getDefaultEnvelope().getBody();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
index 8ba28dbf5..dc4ef9193 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
@@ -22,21 +22,14 @@ import javax.xml.namespace.QName;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFaultNoFault extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
-
- private final QName qname;
+import junit.framework.TestCase;
- @Inject
- public TestGetFaultNoFault(SOAPSpec spec, QName qname) {
- super(spec);
- this.qname = qname;
- }
+public class TestGetFaultNoFault extends TestCase {
+ @Inject private SOAPFactory soapFactory;
+ @Inject private QName qname;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
index e366a0a8f..82fd99708 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.body;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -26,6 +25,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetFaultWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetFaultWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
index 6406f903e..6b2f15af8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
@@ -21,23 +21,18 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link SOAPBody#getFirstElementLocalName()} returns <code>null</code> if the body is
* empty.
*/
-public class TestGetFirstElementLocalNameEmptyBody extends SOAPTestCase {
+public class TestGetFirstElementLocalNameEmptyBody extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetFirstElementLocalNameEmptyBody(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
index 9a1dcfbba..b0c6d01d5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
@@ -18,8 +18,6 @@
*/
package org.apache.axiom.ts.soap.body;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.soap.SOAPBody;
@@ -28,6 +26,9 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
public class TestGetFirstElementLocalNameWithParser2 extends SampleBasedSOAPTestCase {
private final boolean buildPayload;
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
index 6f6d0d649..8e281b61c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
@@ -29,25 +29,20 @@ import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link SOAPBody#getFirstElementLocalName()} returns the expected result if the parser
* has already progressed past the start of the payload and the optimization described in <a
* href="https://issues.apache.org/jira/browse/AXIOM-282">AXIOM-282</a> is no longer applicable.
*/
-public class TestGetFirstElementLocalNameWithParserNoLookahead extends SOAPTestCase {
+public class TestGetFirstElementLocalNameWithParserNoLookahead extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetFirstElementLocalNameWithParserNoLookahead(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope orgEnvelope = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
index 76a07e2b1..26fea3f1b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
@@ -21,22 +21,17 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link SOAPBody#getFirstElementNS()} returns <code>null</code> if the body is empty.
*/
-public class TestGetFirstElementNSEmptyBody extends SOAPTestCase {
+public class TestGetFirstElementNSEmptyBody extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetFirstElementNSEmptyBody(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
index 77721089f..16e29acc6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestHasFault extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestHasFault(SOAPSpec spec) {
- super(spec);
- }
+public class TestHasFault extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
index 6fca2799f..2ad1e29ea 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
@@ -22,25 +22,20 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link SOAPBody#hasFault()} returns the correct value after a {@link SOAPFault} child
* has been replaced by an {@link OMElement} that is not a {@link SOAPFault}. Earlier versions of
* Axiom attempted to cache the result of {@link SOAPBody#hasFault()}, but this cached value was not
* updated correctly in all situations. This is a regression test for this issue.
*/
-public class TestHasFaultAfterReplace extends SOAPTestCase {
+public class TestHasFaultAfterReplace extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestHasFaultAfterReplace(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPBody body = soapFactory.getDefaultFaultEnvelope().getBody();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
index 0eb9afd8b..69d8e6836 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
@@ -21,24 +21,19 @@ package org.apache.axiom.ts.soap.body;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPBody#hasFault()} if the {@link SOAPBody} contains a plain {@link
* OMElement} with a name corresponding to a SOAP fault. In this case, the method is expected to
* return <code>false</code>.
*/
-public class TestHasFaultFakeFault extends SOAPTestCase {
+public class TestHasFaultFakeFault extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestHasFaultFakeFault(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPBody body = soapFactory.getDefaultEnvelope().getBody();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
index a8a2027da..ced595713 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
@@ -22,21 +22,14 @@ import javax.xml.namespace.QName;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestHasFaultNoFault extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
-
- private final QName qname;
+import junit.framework.TestCase;
- @Inject
- public TestHasFaultNoFault(SOAPSpec spec, QName qname) {
- super(spec);
- this.qname = qname;
- }
+public class TestHasFaultNoFault extends TestCase {
+ @Inject private SOAPFactory soapFactory;
+ @Inject private QName qname;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
index ed53790a6..6860fe5dd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
@@ -23,23 +23,18 @@ import org.apache.axiom.om.ds.StringOMDataSource;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that a call to {@link SOAPBody#hasFault()} doesn't cause expansion of an {@link
* OMSourcedElement} with an unknown name that is the first child of the SOAP body.
*/
-public class TestHasFaultWithOMSEUnknownName extends SOAPTestCase {
+public class TestHasFaultWithOMSEUnknownName extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestHasFaultWithOMSEUnknownName(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
index 2d065297c..336081076 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap.body;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestHasFaultWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestHasFaultWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
index 2f552b3e9..fa9dcad5e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
@@ -26,24 +26,19 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that the SOAP builder creates {@link OMComment} nodes for comments appearing after the
* document element.
*/
-public class TestCommentInEpilog extends SOAPTestCase {
+public class TestCommentInEpilog extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestCommentInEpilog(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope =
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
index f15f83c2e..d2350f2d2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
@@ -18,24 +18,22 @@
*/
package org.apache.axiom.ts.soap.builder;
-import com.google.inject.Inject;
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMMetaFactory;
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.SOAPSampleAdapter;
import org.apache.axiom.ts.soap.SOAPSampleSet;
+import org.apache.axiom.ts.soap.SOAPSpec;
+
+import com.google.inject.Inject;
+
+import junit.framework.TestCase;
/** Tests that the SOAP builder creates {@link OMComment} nodes for comments in the XML prolog. */
-public class TestCommentInProlog extends SOAPTestCase {
+public class TestCommentInProlog extends TestCase {
@Inject private OMMetaFactory metaFactory;
-
- @Inject
- public TestCommentInProlog(SOAPSpec spec) {
- super(spec);
- }
+ @Inject private SOAPSpec spec;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java
index 8bb5068d9..c7f23f725 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java
@@ -31,19 +31,16 @@ import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.ts.jaxp.dom.DOMImplementation;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import com.google.inject.Inject;
-public class TestCreateSOAPModelBuilderFromDOMSource extends SOAPTestCase {
- @Inject private OMMetaFactory metaFactory;
+import junit.framework.TestCase;
- @Inject
- public TestCreateSOAPModelBuilderFromDOMSource(SOAPSpec spec) {
- super(spec);
- }
+public class TestCreateSOAPModelBuilderFromDOMSource extends TestCase {
+ @Inject private OMMetaFactory metaFactory;
+ @Inject private SOAPSpec spec;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java
index a453e9c39..cf4635733 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java
@@ -35,19 +35,16 @@ import org.apache.axiom.ts.jaxp.sax.SAXImplementation;
import org.apache.axiom.ts.soap.SOAPSample;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import com.google.inject.Inject;
-public class TestCreateSOAPModelBuilderFromSAXSource extends SOAPTestCase {
- @Inject private OMMetaFactory metaFactory;
+import junit.framework.TestCase;
- @Inject
- public TestCreateSOAPModelBuilderFromSAXSource(SOAPSpec spec) {
- super(spec);
- }
+public class TestCreateSOAPModelBuilderFromSAXSource extends TestCase {
+ @Inject private OMMetaFactory metaFactory;
+ @Inject private SOAPSpec spec;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
index 94eb2ad70..a39333ef3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
@@ -34,7 +34,6 @@ import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.ts.soap.SOAPSample;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import org.apache.axiom.util.UIDGenerator;
import com.google.inject.Inject;
@@ -45,19 +44,16 @@ import jakarta.mail.Session;
import jakarta.mail.internet.MimeBodyPart;
import jakarta.mail.internet.MimeMessage;
import jakarta.mail.internet.MimeMultipart;
+import junit.framework.TestCase;
/**
* Tests that {@link OMXMLBuilderFactory#createSOAPModelBuilder(OMMetaFactory, MultipartBody)}
* produces an error if the SOAP version used in the root part doesn't match the Content-Type of the
* message.
*/
-public class TestCreateSOAPModelBuilderMTOMContentTypeMismatch extends SOAPTestCase {
+public class TestCreateSOAPModelBuilderMTOMContentTypeMismatch extends TestCase {
@Inject private OMMetaFactory metaFactory;
-
- @Inject
- public TestCreateSOAPModelBuilderMTOMContentTypeMismatch(SOAPSpec spec) {
- super(spec);
- }
+ @Inject private SOAPSpec spec;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
index f260f391a..7d2e882ab 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
@@ -30,25 +30,20 @@ import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that the SOAP model builder rejects attempts to create a DTD. Note that this test is
* implemented using {@link OMXMLBuilderFactory#createStAXSOAPModelBuilder(XMLStreamReader)} because
* the methods taking a stream as input will generally reject DTDs at a much lower level.
*/
-public class TestDTD extends SOAPTestCase {
+public class TestDTD extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestDTD(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
String message = "<!DOCTYPE test []>" + soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
index 6eed7f821..6830c62e4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.builder;
-import com.google.inject.Inject;
import java.util.ArrayList;
import org.apache.axiom.blob.MemoryBlob;
@@ -30,18 +29,17 @@ import org.apache.axiom.om.ds.custombuilder.CustomBuilderSupport;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPModelBuilder;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import org.apache.axiom.ts.soap.SOAPSampleAdapter;
import org.apache.axiom.ts.soap.SOAPSampleSet;
+import org.apache.axiom.ts.soap.SOAPSpec;
-public class TestRegisterCustomBuilder extends SOAPTestCase {
- @Inject private OMMetaFactory metaFactory;
+import com.google.inject.Inject;
- @Inject
- public TestRegisterCustomBuilder(SOAPSpec spec) {
- super(spec);
- }
+import junit.framework.TestCase;
+
+public class TestRegisterCustomBuilder extends TestCase {
+ @Inject private OMMetaFactory metaFactory;
+ @Inject private SOAPSpec spec;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
index 485bddee2..7b8ac0792 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.builder;
-import com.google.inject.Inject;
import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMSourcedElement;
@@ -32,6 +31,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/**
* Tests that a custom builder registered with {@link
* CustomBuilderSupport#registerCustomBuilderForPayload(CustomBuilder)} is still taken into account
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
index a33cfe852..b1742903f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
@@ -21,19 +21,22 @@ package org.apache.axiom.ts.soap.envelope;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import java.util.Iterator;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.soap.SOAPCloneOptions;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
-import java.util.Iterator;
+import junit.framework.TestCase;
+
+public abstract class CloneTestCase extends TestCase {
+ protected final SOAPSpec spec;
-public abstract class CloneTestCase extends SOAPTestCase {
public CloneTestCase(SOAPSpec spec) {
- super(spec);
+ this.spec = spec;
}
/**
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
index c69aa6319..92301a06f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
@@ -27,25 +27,23 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import junit.framework.TestCase;
+
/**
* Test that attempts to add an arbitrary element to the SOAP envelope (after the body). This is
* allowed in SOAP 1.1, but not in SOAP 1.2.
*/
-public class TestAddElementAfterBody extends SOAPTestCase {
+public class TestAddElementAfterBody extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- private final boolean header;
-
@Inject
- public TestAddElementAfterBody(SOAPSpec spec, @Named("header") boolean header) {
- super(spec);
- this.header = header;
- }
+ @Named("header")
+ private boolean header;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
index bff1120a1..f55c4972e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
@@ -21,20 +21,15 @@ package org.apache.axiom.ts.soap.envelope;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
// Make sure order of header/body creation doesn't matter
-public class TestBodyHeaderOrder extends SOAPTestCase {
+public class TestBodyHeaderOrder extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestBodyHeaderOrder(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope env = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
index 1d906643d..4d993673f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -26,6 +25,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/**
* Tests {@link OMNode#detach()} when used on a {@link SOAPEnvelope}. Older Axiom versions threw an
* exception in that case. This is not correct because obviously one may want to detach a SOAP
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
index cf8911e25..3403c8eff 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
@@ -23,17 +23,14 @@ import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetBody extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetBody(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetBody extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
index 919c83bc7..8f9593cdd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
@@ -19,18 +19,13 @@
package org.apache.axiom.ts.soap.envelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetBodyOnEmptyEnvelope extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetBodyOnEmptyEnvelope(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetBodyOnEmptyEnvelope extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
index 9339b696d..6f30dc264 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
@@ -20,20 +20,15 @@ package org.apache.axiom.ts.soap.envelope;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
// Regression test for AXIOM-218
-public class TestGetBodyOnEnvelopeWithHeaderOnly extends SOAPTestCase {
+public class TestGetBodyOnEnvelopeWithHeaderOnly extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetBodyOnEnvelopeWithHeaderOnly(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
index df54c5879..60f4f2028 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -26,6 +25,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetBodyWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetBodyWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
index 88eb8a3a6..6cac98046 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
@@ -23,17 +23,14 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetHeader extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetHeader(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetHeader extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
index 8859a685e..4e7266f28 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
@@ -26,6 +25,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetHeaderWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetHeaderWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
index 26e92fc73..211093b1f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/**
* Tests the behavior of {@link SOAPEnvelope#getHeader()} on a message that has no header. In
* particular it tests that the call doesn't build the {@link SOAPBody}.
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
index ecc6a572a..9b99abd76 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.envelope;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetOrCreateHeader extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetOrCreateHeader(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetOrCreateHeader extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
index 3d2f01208..1fa6b2f5f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
@@ -26,6 +25,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/**
* Tests the behavior of {@link SOAPEnvelope#getOrCreateHeader()} on a message that has no header.
* It checks that the call creates a new {@link SOAPHeader} and that it doesn't build the {@link
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
index 8838ea935..923bbd98b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
@@ -24,21 +24,14 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetSOAPBodyFirstElementLocalNameAndNS extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
-
- private final QName qname;
+import junit.framework.TestCase;
- @Inject
- public TestGetSOAPBodyFirstElementLocalNameAndNS(SOAPSpec spec, QName qname) {
- super(spec);
- this.qname = qname;
- }
+public class TestGetSOAPBodyFirstElementLocalNameAndNS extends TestCase {
+ @Inject private SOAPFactory soapFactory;
+ @Inject private QName qname;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
index 875bff011..798972184 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
@@ -29,28 +29,21 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPEnvelope#getSOAPBodyFirstElementLocalName()} and {@link
* SOAPEnvelope#getSOAPBodyFirstElementNS()} for a {@link SOAPEnvelope} constructed from a parser.
* In this case, the Axiom implementation may choose to use a special optimization to get the name
* of the element without actually instantiating the corresponding {@link OMElement}.
*/
-public class TestGetSOAPBodyFirstElementLocalNameAndNSWithParser extends SOAPTestCase {
+public class TestGetSOAPBodyFirstElementLocalNameAndNSWithParser extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
-
- private final QName qname;
-
- @Inject
- public TestGetSOAPBodyFirstElementLocalNameAndNSWithParser(SOAPSpec spec, QName qname) {
- super(spec);
- this.qname = qname;
- }
+ @Inject private QName qname;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
index 2ea250514..c3dfade03 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -32,6 +31,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/**
* Tests the behavior of {@link OMContainer#getXMLStreamReaderWithoutCaching()} on a {@link
* SOAPEnvelope} with a partially built {@link SOAPHeaderBlock}. A {@link SOAPHeaderBlock} is an
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
index 979d1dee1..b1934bea3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.envelope;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestHasFault extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestHasFault(SOAPSpec spec) {
- super(spec);
- }
+public class TestHasFault extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
index 5360ba2f0..0d066af6e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
@@ -18,12 +18,13 @@
*/
package org.apache.axiom.ts.soap.envelope;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestHasFaultWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestHasFaultWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
index 2e74972a0..c9b348cd6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
@@ -36,20 +36,15 @@ import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Regression test for WSCOMMONS-226. */
-public class TestSerializeAndConsumeWithOMSEInBody extends SOAPTestCase {
+public class TestSerializeAndConsumeWithOMSEInBody extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSerializeAndConsumeWithOMSEInBody(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java
index 660000059..2466427a3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java
@@ -28,20 +28,15 @@ import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Regression test for <a href="https://issues.apache.org/jira/browse/AXIOM-474">AXIOM-474</a>. */
-public class TestSerializeAsChild extends SOAPTestCase {
+public class TestSerializeAsChild extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSerializeAsChild(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createDefaultSOAPMessage().getSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
index c07807954..38866af28 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
@@ -29,13 +29,15 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.ts.soap.SOAPElementType;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
-public abstract class CreateSOAPElementWithoutParentTestCase extends SOAPTestCase {
+import junit.framework.TestCase;
+
+public abstract class CreateSOAPElementWithoutParentTestCase extends TestCase {
+ protected final SOAPSpec spec;
protected final SOAPElementType type;
public CreateSOAPElementWithoutParentTestCase(SOAPSpec spec, SOAPElementType type) {
- super(spec);
+ this.spec = spec;
this.type = type;
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
index bc6a24fe6..6d2eec2f7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
@@ -26,22 +26,19 @@ import org.apache.axiom.soap.SOAPEnvelope;
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 com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Checks the content of the SOAP envelope returned by {@link
* SOAPFactory#createDefaultSOAPMessage()}.
*/
-public class TestCreateDefaultSOAPMessage extends SOAPTestCase {
+public class TestCreateDefaultSOAPMessage extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestCreateDefaultSOAPMessage(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPMessage message = soapFactory.createDefaultSOAPMessage();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
index f4506e177..59637973f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
@@ -34,11 +34,12 @@ import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.ts.soap.SOAPElementType;
import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import junit.framework.TestCase;
+
/**
* Tests {@link SOAPFactory#createSOAPHeader(SOAPEnvelope)}, {@link
* SOAPFactory#createSOAPBody(SOAPEnvelope)}, {@link SOAPFactory#createSOAPFault(SOAPBody)}, {@link
@@ -52,21 +53,17 @@ import com.google.inject.name.Named;
* SOAPFactory#createSOAPFaultNode(SOAPFault)}, {@link SOAPFactory#createSOAPFaultRole(SOAPFault)}
* and {@link SOAPFactory#createSOAPFaultDetail(SOAPFault)} with a non null parent.
*/
-public class TestCreateSOAPElementWithParent extends SOAPTestCase {
+public class TestCreateSOAPElementWithParent extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- private final SOAPElementType type;
- private final SOAPElementType parentType;
+ @Inject
+ @Named("childType")
+ private SOAPElementType type;
@Inject
- public TestCreateSOAPElementWithParent(
- SOAPSpec spec,
- @Named("childType") SOAPElementType type,
- @Named("type") SOAPElementType parentType) {
- super(spec);
- this.type = type;
- this.parentType = parentType;
- }
+ @Named("type")
+ private SOAPElementType parentType;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
index 460f5137d..0f4c7529a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
@@ -25,19 +25,16 @@ import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests the behavior of {@link SOAPFactory#createSOAPEnvelope(OMNamespace)}. */
-public class TestCreateSOAPEnvelopeWithCustomPrefix extends SOAPTestCase {
+public class TestCreateSOAPEnvelopeWithCustomPrefix extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestCreateSOAPEnvelopeWithCustomPrefix(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
String prefix = "my-soap";
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
index b192baa98..582378184 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
@@ -30,23 +30,18 @@ import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
import com.google.inject.name.Named;
-public class TestCreateSOAPFaultWithException extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- private final boolean withParent;
+public class TestCreateSOAPFaultWithException extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Inject
- public TestCreateSOAPFaultWithException(
- SOAPSpec spec, @Named("withParent") boolean withParent) {
- super(spec);
- this.withParent = withParent;
- }
+ @Named("withParent")
+ private boolean withParent;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java
index 934f27352..49870b715 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java
@@ -28,20 +28,15 @@ import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestCreateSOAPHeaderBlockFromOMElement extends SOAPTestCase {
+import junit.framework.TestCase;
+
+public class TestCreateSOAPHeaderBlockFromOMElement extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestCreateSOAPHeaderBlockFromOMElement(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
OMElement original =
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
index abf91af62..488668cda 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
@@ -18,25 +18,23 @@
*/
package org.apache.axiom.ts.soap.factory;
-import com.google.inject.Inject;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.soap.FactorySelector;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
+
+import com.google.inject.Inject;
+
+import junit.framework.TestCase;
/**
* Tests that the SOAP factories returned by {@link OMMetaFactory} are singletons. More precisely
* this unit test checks that subsequent calls to {@link OMMetaFactory#getSOAP11Factory()} and
* {@link OMMetaFactory#getSOAP12Factory()} return the same instances.
*/
-public class TestFactoryIsSingleton extends SOAPTestCase {
+public class TestFactoryIsSingleton extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private OMMetaFactory metaFactory;
- @Inject
- public TestFactoryIsSingleton(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
FactorySelector factorySelector = spec.getAdapter(FactorySelector.class);
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
index c09e15b69..2a7d61f1e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
@@ -26,19 +26,16 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Checks the content of the SOAP envelope returned by {@link SOAPFactory#getDefaultEnvelope()}. */
-public class TestGetDefaultEnvelope extends SOAPTestCase {
+public class TestGetDefaultEnvelope extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetDefaultEnvelope(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope env = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java
index 9f4ed9d58..df616c7b0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java
@@ -21,19 +21,16 @@ package org.apache.axiom.ts.soap.factory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests the behavior of {@link org.apache.axiom.soap.SOAPFactory#getDefaultFaultEnvelope()}. */
-public class TestGetDefaultFaultEnvelope extends SOAPTestCase {
+public class TestGetDefaultFaultEnvelope extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetDefaultFaultEnvelope(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultFaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java
index ff3ccbcf3..3dd5d0fba 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java
@@ -21,24 +21,19 @@ package org.apache.axiom.ts.soap.factory;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMFactory#getMetaFactory()} returns the reference of the {@link OMMetaFactory}
* from which the reference to the {@link OMFactory} was obtained.
*/
-public class TestGetMetaFactory extends SOAPTestCase {
+public class TestGetMetaFactory extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetMetaFactory(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
assertSame(metaFactory, soapFactory.getMetaFactory());
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java
index 1d1f35db8..3cf5c0830 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java
@@ -22,17 +22,14 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetNamespace extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetNamespace(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetNamespace extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
index 26aeea0bf..f01431b28 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
@@ -32,7 +32,6 @@ import org.apache.axiom.ts.jaxp.dom.DOMImplementation;
import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
import org.apache.axiom.ts.soap.SOAPFaultChild;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -40,6 +39,8 @@ import org.w3c.dom.Node;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import junit.framework.TestCase;
+
/**
* Tests that the children added using methods such as {@link SOAPFault#setCode(SOAPFaultCode)} and
* {@link SOAPFault#setReason(SOAPFaultReason)} appear in the order required by the SOAP specs when
@@ -47,21 +48,14 @@ import com.google.inject.name.Named;
*
* <p>Regression test for <a href="https://issues.apache.org/jira/browse/AXIOM-392">AXIOM-392</a>.
*/
-public class TestChildOrder extends SOAPTestCase {
+public class TestChildOrder extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- private final SOAPFaultChild[] inputOrder;
- private final SerializationStrategy serializationStrategy;
-
@Inject
- public TestChildOrder(
- SOAPSpec spec,
- @Named("inputOrder") SOAPFaultChild[] inputOrder,
- SerializationStrategy serializationStrategy) {
- super(spec);
- this.inputOrder = inputOrder;
- this.serializationStrategy = serializationStrategy;
- }
+ private @Named("inputOrder") SOAPFaultChild[] inputOrder;
+
+ @Inject private SerializationStrategy serializationStrategy;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
index 8e3c199ff..4a2578e7e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap.fault;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPSampleSet;
+import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetCodeWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetCodeWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
index 4630b3f52..21a700e97 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap.fault;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetDetailWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetDetailWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java
index ee30d6557..6c7e8d328 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java
@@ -25,18 +25,13 @@ import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetException extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetException(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetException extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
index 9a32cbd68..2ad533e00 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap.fault;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetReasonWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetReasonWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
index a94d313f1..091624ed3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap.fault;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetRoleWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetRoleWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
index b6c7022de..7282cc3ef 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
@@ -25,18 +25,13 @@ import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetException extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestSetException(SOAPSpec spec) {
- super(spec);
- }
+public class TestSetException extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
index 094c50b18..2ffe7bbd6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMContainer#addChild(OMNode)} throws an exception if an attempt is made to add
* a {@link SOAPFault} to a SOAP element other than {@link SOAPBody}.
*/
-public class TestWrongParent1 extends SOAPTestCase {
+public class TestWrongParent1 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestWrongParent1(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFaultCode parent = soapFactory.createSOAPFaultCode();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
index 0c5b2b728..f287d1895 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMNode#insertSiblingAfter(OMNode)} throws an exception if an attempt is made to
* add a {@link SOAPFault} as a child of a SOAP element other than {@link SOAPBody}.
*/
-public class TestWrongParent2 extends SOAPTestCase {
+public class TestWrongParent2 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestWrongParent2(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope parent = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
index 46a9e7991..33fbcd907 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMNode#insertSiblingBefore(OMNode)} throws an exception if an attempt is made
* to add a {@link SOAPFault} as a child of a SOAP element other than {@link SOAPBody}.
*/
-public class TestWrongParent3 extends SOAPTestCase {
+public class TestWrongParent3 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestWrongParent3(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPHeader parent = soapFactory.createSOAPHeader();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java
index 4e5782e28..d1b826613 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java
@@ -24,18 +24,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetValueAsQName extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetValueAsQName(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetValueAsQName extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
index 04ee7a653..eff1135e5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.faultcode;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFaultClassifier;
import org.apache.axiom.soap.SOAPFaultCode;
@@ -26,6 +25,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/**
* Tests the behavior of {@link SOAPFaultClassifier#getValueAsQName()} on a {@link SOAPFaultCode}.
*/
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
index 97597f002..2877b029b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
@@ -27,20 +27,15 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
// SOAP Fault Detail Test (Programaticaly Created)
-public class TestAddDetailEntry extends SOAPTestCase {
+public class TestAddDetailEntry extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestAddDetailEntry(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java
index 7d2cdf330..b2f8c2d86 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.faultdetail;
-import com.google.inject.Inject;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -27,6 +26,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
/** Tests parsing of a SOAP fault that has detail entries that use a default namespace. */
public class TestDetailEntriesUsingDefaultNamespaceWithParser extends SampleBasedSOAPTestCase {
@Inject
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
index 6935748dd..e7fa059be 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
@@ -27,18 +27,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetAllDetailEntries extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetAllDetailEntries(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetAllDetailEntries extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
index 3f8df46b3..2ce654e5b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.ts.soap.faultdetail;
-import com.google.inject.Inject;
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -28,6 +27,8 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
// SOAP Fault Detail Test (With Parser)
public class TestGetAllDetailEntriesWithParser extends SampleBasedSOAPTestCase {
@Inject
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java
index fb8662372..fe19a463c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java
@@ -26,20 +26,15 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
// Regression test for AXIOM-196
-public class TestSerialization extends SOAPTestCase {
+public class TestSerialization extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSerialization(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java
index 8db4e5767..b84bf0a2f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap.faultdetail;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestWSCommons202 extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestWSCommons202(SOAPSpec spec) {
- super(spec);
- }
+public class TestWSCommons202 extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java
index 80e8b1d43..af110dbc4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java
@@ -20,18 +20,13 @@ package org.apache.axiom.ts.soap.faultnode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultNode;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFaultNodeValue extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetFaultNodeValue(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetFaultNodeValue extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
index 59ba44fba..63f98b393 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
@@ -18,12 +18,13 @@
*/
package org.apache.axiom.ts.soap.faultnode;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetFaultNodeValueWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetFaultNodeValueWithParser(SOAPSpec spec) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java
index 81ddbab5c..f2acf5f3d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java
@@ -20,18 +20,13 @@ package org.apache.axiom.ts.soap.faultnode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultNode;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetFaultNodeValue extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestSetFaultNodeValue(SOAPSpec spec) {
- super(spec);
- }
+public class TestSetFaultNodeValue extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java
index c3d8d60db..8e0554a4e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java
@@ -20,18 +20,13 @@ package org.apache.axiom.ts.soap.faultrole;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultRole;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetRoleValue extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetRoleValue(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetRoleValue extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java
index a2d10a15d..3af705cb6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java
@@ -20,18 +20,13 @@ package org.apache.axiom.ts.soap.faultrole;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultRole;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetRoleValue extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestSetRoleValue(SOAPSpec spec) {
- super(spec);
- }
+public class TestSetRoleValue extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java
index 1b7c7da79..c711ca0fc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java
@@ -22,18 +22,13 @@ import javax.xml.XMLConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultText;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetLang extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetLang(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetLang extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
index 7a3eefd24..dbb49803c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
@@ -22,18 +22,13 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultText;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetLang extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestSetLang(SOAPSpec spec) {
- super(spec);
- }
+public class TestSetLang extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
index a53f1fc19..c26a7484d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
@@ -25,20 +25,15 @@ import java.util.Iterator;
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.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Regression test for AXIOM-512. */
-public class TestAddChildWithPlainOMElement extends SOAPTestCase {
+public class TestAddChildWithPlainOMElement extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestAddChildWithPlainOMElement(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPHeader soapHeader = soapFactory.createSOAPHeader();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
index 8693e61cc..90e664754 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
@@ -26,18 +26,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddHeaderBlock extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestAddHeaderBlock(SOAPSpec spec) {
- super(spec);
- }
+public class TestAddHeaderBlock extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java
index b7e77a4e9..46c987a68 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java
@@ -24,20 +24,15 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests the behavior of {@link SOAPHeader#addHeaderBlock(QName)}. */
-public class TestAddHeaderBlockFromQName extends SOAPTestCase {
+public class TestAddHeaderBlockFromQName extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestAddHeaderBlockFromQName(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope env = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
index 7f9837f37..b7f46e6f2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
@@ -26,23 +26,18 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPHeader#addHeaderBlock(QName)} when passing a {@link QName} with
* no namespace.
*/
-public class TestAddHeaderBlockFromQNameWithoutNamespace extends SOAPTestCase {
+public class TestAddHeaderBlockFromQNameWithoutNamespace extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestAddHeaderBlockFromQNameWithoutNamespace(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
index 09be03eed..9f33e41f9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
@@ -25,23 +25,18 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPHeader#addHeaderBlock(String, OMNamespace)} when passing a
* <code>null</code> value for the {@link OMNamespace} parameter.
*/
-public class TestAddHeaderBlockWithoutNamespace1 extends SOAPTestCase {
+public class TestAddHeaderBlockWithoutNamespace1 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestAddHeaderBlockWithoutNamespace1(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
index 586b21b24..6f5c53c16 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
@@ -25,23 +25,18 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPHeader#addHeaderBlock(String, OMNamespace)} when passing an
* {@link OMNamespace} object with an empty namespace URI.
*/
-public class TestAddHeaderBlockWithoutNamespace2 extends SOAPTestCase {
+public class TestAddHeaderBlockWithoutNamespace2 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestAddHeaderBlockWithoutNamespace2(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
index 45e253c9c..06afeaeff 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
@@ -18,12 +18,13 @@
*/
package org.apache.axiom.ts.soap.header;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
// Regression test for AXIOM-223 (see r567512)
public class TestDiscardIncomplete extends SampleBasedSOAPTestCase {
@Inject
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
index e1d6f9456..689a04596 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
@@ -25,18 +25,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestExamineAllHeaderBlocks extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestExamineAllHeaderBlocks(SOAPSpec spec) {
- super(spec);
- }
+public class TestExamineAllHeaderBlocks extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java
index 1904a77d6..2c66d5d6a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java
@@ -26,17 +26,14 @@ 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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestExamineHeaderBlocks extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestExamineHeaderBlocks(SOAPSpec spec) {
- super(spec);
- }
+public class TestExamineHeaderBlocks extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
index 27e6ec846..5dc7d1924 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
@@ -33,6 +33,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
import com.google.inject.Inject;
public class TestExamineMustUnderstandHeaderBlocksWithParser extends SampleBasedSOAPTestCase {
+ @Inject private SOAPSpec spec;
+
@Inject
public TestExamineMustUnderstandHeaderBlocksWithParser(SOAPSpec spec) {
super(spec, SOAPSampleSet.HEADERS);
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java
index d8710e49b..d47e9d075 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java
@@ -25,18 +25,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestExtractAllHeaderBlocks extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestExtractAllHeaderBlocks(SOAPSpec spec) {
- super(spec);
- }
+public class TestExtractAllHeaderBlocks extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
index ab447e6c6..4582df829 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
@@ -25,18 +25,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetHeaderBlocksWithNSURI extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetHeaderBlocksWithNSURI(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetHeaderBlocksWithNSURI extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java
index 6e509f1c8..696b81d1a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java
@@ -26,20 +26,15 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests the behavior of {@link SOAPHeader#getHeadersToProcess(RolePlayer, String)} */
-public class TestGetHeadersToProcessWithNamespace extends SOAPTestCase {
+public class TestGetHeadersToProcessWithNamespace extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetHeadersToProcessWithNamespace(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java
index 4ec514a3c..d9cf6a6b0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java
@@ -20,13 +20,15 @@ package org.apache.axiom.ts.soap.headerblock;
import org.apache.axiom.ts.soap.HeaderBlockAttribute;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
-public abstract class BooleanAttributeTestCase extends SOAPTestCase {
+import junit.framework.TestCase;
+
+public abstract class BooleanAttributeTestCase extends TestCase {
+ protected final SOAPSpec spec;
protected final HeaderBlockAttribute attribute;
public BooleanAttributeTestCase(SOAPSpec spec, HeaderBlockAttribute attribute) {
- super(spec);
+ this.spec = spec;
this.attribute = attribute;
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
index 76d0890fd..6291784e1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
@@ -31,20 +31,15 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests functionality of BlobOMDataSource */
-public class TestBlobOMDataSource extends SOAPTestCase {
+public class TestBlobOMDataSource extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestBlobOMDataSource(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope soapEnvelope = soapFactory.createSOAPEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
index c39712181..d96a323d8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
@@ -25,23 +25,20 @@ import org.apache.axiom.soap.SOAPCloneOptions;
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.SOAPTestCase;
import org.jspecify.annotations.Nullable;
import com.google.inject.Inject;
import com.google.inject.name.Named;
-public class TestClone extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- private final Boolean processed;
+public class TestClone extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Inject
- public TestClone(SOAPSpec spec, @Named("processed") @Nullable Boolean processed) {
- super(spec);
- this.processed = processed;
- }
+ @Named("processed")
+ @Nullable
+ private Boolean processed;
private void checkProcessed(SOAPHeader clonedHeader, SOAPHeaderBlock orgHeaderBlock) {
SOAPHeaderBlock clonedHeaderBlock =
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
index 4971cf2ef..ddf19866b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
@@ -24,25 +24,20 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPCloneOptions;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Test cloning a {@link SOAPHeaderBlock} flagged as processed, but without preserving the model. In
* this case the result is a plain {@link OMElement} instance and the processed flag is ignored.
*
* <p>This is a regression test for an issue in older Axiom versions.
*/
-public class TestCloneProcessedWithoutPreservingModel extends SOAPTestCase {
+public class TestCloneProcessedWithoutPreservingModel extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestCloneProcessedWithoutPreservingModel(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPHeaderBlock headerBlock =
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
index 735eb7e0f..c0d90374d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
@@ -23,18 +23,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetRole extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetRole(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetRole extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java
index 58238c47e..7b57c0582 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java
@@ -22,17 +22,14 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPVersion;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetVersion extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetVersion(SOAPSpec spec) {
- super(spec);
- }
+public class TestGetVersion extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
index c2c3b90b3..5e6af8cb7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
@@ -26,10 +26,11 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.ts.soap.HeaderBlockAttribute;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that setting a SOAP header block attribute uses the correct namespace prefix from the
* attribute's QName, not the attribute's local name.
@@ -40,16 +41,10 @@ import com.google.inject.Inject;
* used as its own namespace prefix (e.g. {@code xmlns:role="..."} and {@code role:role="..."}
* instead of reusing the SOAP envelope prefix).
*/
-public class TestSetAttributeNamespacePrefix extends SOAPTestCase {
+public class TestSetAttributeNamespacePrefix extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
-
- private final HeaderBlockAttribute attribute;
-
- @Inject
- public TestSetAttributeNamespacePrefix(SOAPSpec spec, HeaderBlockAttribute attribute) {
- super(spec);
- this.attribute = attribute;
- }
+ @Inject private HeaderBlockAttribute attribute;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
index 2dd522ebd..89d00a15c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
@@ -23,18 +23,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetRole extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestSetRole(SOAPSpec spec) {
- super(spec);
- }
+public class TestSetRole extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java
index 21e699a0f..8109464d3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java
@@ -25,19 +25,16 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.ts.soap.HeaderBlockAttribute;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests that {@link SOAPHeaderBlock#setRole(String)} adds a namespace declaration if necessary. */
-public class TestSetRoleWithoutExistingNamespaceDecl extends SOAPTestCase {
+public class TestSetRoleWithoutExistingNamespaceDecl extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSetRoleWithoutExistingNamespaceDecl(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPHeaderBlock headerBlock =
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
index e481219a1..8a26af5a5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMContainer#addChild(OMNode)} throws an exception if an attempt is made to add
* a {@link SOAPHeaderBlock} to a SOAP element other than {@link SOAPHeader}.
*/
-public class TestWrongParent1 extends SOAPTestCase {
+public class TestWrongParent1 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestWrongParent1(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPBody parent = soapFactory.createSOAPBody();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
index 3e7539f46..03ced88ca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMNode#insertSiblingAfter(OMNode)} throws an exception if an attempt is made to
* add a {@link SOAPHeaderBlock} as a child of a SOAP element other than {@link SOAPHeader}.
*/
-public class TestWrongParent2 extends SOAPTestCase {
+public class TestWrongParent2 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestWrongParent2(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFault parent = soapFactory.createSOAPFault();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
index a9b5e3f47..0e3a6554d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMNode#insertSiblingBefore(OMNode)} throws an exception if an attempt is made
* to add a {@link SOAPHeaderBlock} as a child of a SOAP element other than {@link SOAPHeader}.
*/
-public class TestWrongParent3 extends SOAPTestCase {
+public class TestWrongParent3 extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestWrongParent3(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFaultDetail parent = soapFactory.createSOAPFaultDetail();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
index e5ff23d1a..b46e7487e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
@@ -26,26 +26,24 @@ import org.apache.axiom.soap.SOAPEnvelope;
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 com.google.inject.Inject;
import com.google.inject.name.Named;
+import junit.framework.TestCase;
+
/**
* Tests that the clone of a {@link SOAPMessage} created by {@link
* OMInformationItem#clone(OMCloneOptions)} is a {@link SOAPMessage} if and only if {@link
* OMCloneOptions#isPreserveModel()} is <code>true</code>.
*/
-public class TestClone extends SOAPTestCase {
+public class TestClone extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- private final boolean preserveModel;
-
@Inject
- public TestClone(SOAPSpec spec, @Named("preserveModel") boolean preserveModel) {
- super(spec);
- this.preserveModel = preserveModel;
- }
+ @Named("preserveModel")
+ private boolean preserveModel;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
index e6b6e8339..7a7ce8af2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
@@ -27,27 +27,25 @@ import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.ts.soap.SOAPSampleAdapter;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMInformationItem#clone(OMCloneOptions)} correctly clones a {@link SOAPMessage}
* that is incomplete. In particular, the test checks that {@link OMInformationItem#getOMFactory()}
* returns the correct factory (which is determined lazily) on the clone.
*/
-public class TestCloneIncomplete extends SOAPTestCase {
+public class TestCloneIncomplete extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- private final boolean preserveModel;
-
@Inject
- public TestCloneIncomplete(SOAPSpec spec, @Named("preserveModel") boolean preserveModel) {
- super(spec);
- this.preserveModel = preserveModel;
- }
+ @Named("preserveModel")
+ private boolean preserveModel;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
index 62065f8c3..d6f17164d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
@@ -28,21 +28,16 @@ import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
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 com.google.inject.Inject;
+import junit.framework.TestCase;
+
/** Tests {@link OMDocument#getCharsetEncoding()} on a {@link SOAPMessage} created by a builder. */
-public class TestGetCharsetEncodingWithParser extends SOAPTestCase {
+public class TestGetCharsetEncodingWithParser extends TestCase {
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetCharsetEncodingWithParser(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
String encoding = "iso-8859-15";
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
index 34b70c864..a374130e0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
@@ -25,24 +25,21 @@ import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.ts.soap.SOAPSampleAdapter;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link OMInformationItem#getOMFactory()} returns the expected {@link SOAPFactory} when
* invoked on a {@link SOAPMessage} created by a builder. Note that this is non trivial because the
* factory is auto-detected based on the namespace URI of the SOAP envelope.
*/
-public class TestGetOMFactoryWithParser extends SOAPTestCase {
+public class TestGetOMFactoryWithParser extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private OMMetaFactory metaFactory;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetOMFactoryWithParser(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPMessage message =
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java
index 8fde0a244..126577732 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java
@@ -23,23 +23,18 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
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 com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link OMDocument#setOMDocumentElement(OMElement)} when used to set a
* {@link SOAPEnvelope} as the root element of a {@link SOAPMessage}.
*/
-public class TestSetOMDocumentElement extends SOAPTestCase {
+public class TestSetOMDocumentElement extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSetOMDocumentElement(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPMessage message = soapFactory.createSOAPMessage();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
index ef092780c..219357735 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
@@ -28,24 +28,19 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.soap.SOAPEnvelope;
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 com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link OMDocument#setOMDocumentElement(OMElement)} when an attempt is made
* to set an {@link OMElement} that is not a {@link SOAPEnvelope} as the root element of a {@link
* SOAPMessage}. In this case, an exception should be thrown.
*/
-public class TestSetOMDocumentElementNonSOAPEnvelope extends SOAPTestCase {
+public class TestSetOMDocumentElementNonSOAPEnvelope extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSetOMDocumentElementNonSOAPEnvelope(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPMessage message = soapFactory.createSOAPMessage();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java
index e9c49eab7..00eb87f4e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java
@@ -23,18 +23,20 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPElementType;
import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public abstract class GetSetChildTestCase extends SOAPTestCase {
+import junit.framework.TestCase;
+
+public abstract class GetSetChildTestCase extends TestCase {
@Inject private SOAPFactory soapFactory;
+ protected final SOAPSpec spec;
protected final SOAPElementType type;
protected final SOAPElementType childType;
public GetSetChildTestCase(SOAPSpec spec, SOAPElementType type, SOAPElementType childType) {
- super(spec);
+ this.spec = spec;
this.type = type;
this.childType = childType;
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
index 3e6435178..75adea97a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
@@ -23,24 +23,19 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import junit.framework.TestCase;
+
/** Regression test for <a href="https://issues.apache.org/jira/browse/AXIOM-141">AXIOM-141</a>. */
-public class TestXPathAppliedToSOAPEnvelope extends SOAPTestCase {
+public class TestXPathAppliedToSOAPEnvelope extends TestCase {
@Inject private SOAPFactory soapFactory;
- private boolean createDocument;
-
@Inject
- public TestXPathAppliedToSOAPEnvelope(
- SOAPSpec spec, @Named("createDocument") boolean createDocument) {
- super(spec);
- this.createDocument = createDocument;
- }
+ @Named("createDocument")
+ private boolean createDocument;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
index faa51f0ca..6e78f2660 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
@@ -20,23 +20,18 @@ package org.apache.axiom.ts.soap11.fault;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link SOAPFault#getNode()} returns <code>null</code> (instead of throwing an {@link
* UnsupportedOperationException}) for SOAP 1.1 faults.
*/
-public class TestGetNode extends SOAPTestCase {
+public class TestGetNode extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetNode() {
- super(SOAPSpec.SOAP11);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
index 819a6bb81..bc996fef4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
@@ -22,18 +22,13 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetNode extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestSetNode() {
- super(SOAPSpec.SOAP11);
- }
+public class TestSetNode extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java
index 3c1a95819..5f60dbd8f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java
@@ -25,23 +25,18 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultClassifier;
import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that {@link SOAPFaultClassifier#getValue()} returns <code>null</code> when invoked on a
* SOAP 1.1 {@link SOAPFaultCode}.
*/
-public class TestGetValue extends SOAPTestCase {
+public class TestGetValue extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestGetValue() {
- super(SOAPSpec.SOAP11);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope env = soapFactory.getDefaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
index b89997d3b..a489c1898 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
@@ -18,13 +18,14 @@
*/
package org.apache.axiom.ts.soap11.faultcode;
-import com.google.inject.Inject;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
+import com.google.inject.Inject;
+
public class TestGetValueWithParser extends SampleBasedSOAPTestCase {
@Inject
public TestGetValueWithParser() {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
index e2f9c2135..bfd486717 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
@@ -26,23 +26,18 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultClassifier;
import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPFaultClassifier#setValue(QName)} when invoked on a SOAP 1.1
* {@link SOAPFaultCode}.
*/
-public class TestSetValueFromQName extends SOAPTestCase {
+public class TestSetValueFromQName extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSetValueFromQName() {
- super(SOAPSpec.SOAP11);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFaultCode code = soapFactory.getDefaultFaultEnvelope().getBody().getFault().getCode();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java
index 08b560fb9..d2d74de69 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap11.faultreason;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddSOAPText extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestAddSOAPText() {
- super(SOAPSpec.SOAP11);
- }
+public class TestAddSOAPText extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
index edd33f1b5..4ba54a9e5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
@@ -23,18 +23,13 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFirstSOAPText extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetFirstSOAPText() {
- super(SOAPSpec.SOAP11);
- }
+public class TestGetFirstSOAPText extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
index da549e46e..b22f555b1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
@@ -30,19 +30,14 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultReason;
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.AxiomTestCase;
import com.google.inject.Inject;
-public class TestGetTextWithCDATA extends SOAPTestCase {
- @Inject private OMMetaFactory metaFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetTextWithCDATA() {
- super(SOAPSpec.SOAP11);
- }
+public class TestGetTextWithCDATA extends TestCase {
+ @Inject private OMMetaFactory metaFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
index 995015599..8f5bd83eb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
@@ -28,23 +28,18 @@ import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests {@link SOAPFactory#createSOAPFaultSubCode(SOAPFaultCode)} when used with a {@link
* SOAPFaultCode} that has already a {@link SOAPFaultValue} child.
*/
-public class TestCreateSOAPFaultSubCode extends SOAPTestCase {
+public class TestCreateSOAPFaultSubCode extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestCreateSOAPFaultSubCode() {
- super(SOAPSpec.SOAP12);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultFaultEnvelope();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
index b577282bb..71db78dbe 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap12.fault;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetNode extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetNode() {
- super(SOAPSpec.SOAP12);
- }
+public class TestGetNode extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java
index be8154558..3b032c002 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap12.fault;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestMoreChildrenAddition extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestMoreChildrenAddition() {
- super(SOAPSpec.SOAP12);
- }
+public class TestMoreChildrenAddition extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
index 1a8d0a675..ac0bb57f3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
@@ -24,20 +24,15 @@ import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.ts.soap.AltSOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestSetNode extends SOAPTestCase {
+import junit.framework.TestCase;
+
+public class TestSetNode extends TestCase {
@Inject private SOAPFactory soapFactory;
@Inject @AltSOAPFactory private SOAPFactory altSoapFactory;
- @Inject
- public TestSetNode() {
- super(SOAPSpec.SOAP12);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
index 8baebd3f3..80e355baa 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultClassifier;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultValue;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPFaultClassifier#setValue(QName)} when invoked on an empty SOAP
* 1.2 {@link SOAPFaultCode}.
*/
-public class TestSetValueFromQName extends SOAPTestCase {
+public class TestSetValueFromQName extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSetValueFromQName() {
- super(SOAPSpec.SOAP12);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFaultCode code = soapFactory.createSOAPFaultCode();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
index b27a9d019..46102bc25 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
@@ -27,23 +27,18 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultClassifier;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultValue;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests the behavior of {@link SOAPFaultClassifier#setValue(QName)} when invoked on a SOAP 1.2
* {@link SOAPFaultCode} that already has a {@link SOAPFaultValue} child.
*/
-public class TestSetValueFromQNameWithExistingValue extends SOAPTestCase {
+public class TestSetValueFromQNameWithExistingValue extends TestCase {
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestSetValueFromQNameWithExistingValue() {
- super(SOAPSpec.SOAP12);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFaultCode code = soapFactory.getDefaultFaultEnvelope().getBody().getFault().getCode();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java
index 4d29c2902..bcef237f4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap12.faultreason;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddSOAPText extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestAddSOAPText() {
- super(SOAPSpec.SOAP12);
- }
+public class TestAddSOAPText extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
index 0b811f599..b285d1e19 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
@@ -24,18 +24,13 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.soap.SOAPFaultText;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddSOAPTextMultiple extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestAddSOAPTextMultiple() {
- super(SOAPSpec.SOAP12);
- }
+public class TestAddSOAPTextMultiple extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
index cfd7af6ca..29440f4bf 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
@@ -24,20 +24,15 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.ts.soap.AltSOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestAddSOAPTextWithSOAPVersionMismatch extends SOAPTestCase {
+import junit.framework.TestCase;
+
+public class TestAddSOAPTextWithSOAPVersionMismatch extends TestCase {
@Inject private SOAPFactory soapFactory;
@Inject @AltSOAPFactory private SOAPFactory altSoapFactory;
- @Inject
- public TestAddSOAPTextWithSOAPVersionMismatch() {
- super(SOAPSpec.SOAP12);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPFault soap12Fault = soapFactory.createSOAPFault();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
index 47b4dc038..2149cdf9a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
@@ -25,18 +25,13 @@ import java.util.Locale;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.soap.SOAPFaultText;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFaultReasonTextCaseSensitivity extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetFaultReasonTextCaseSensitivity() {
- super(SOAPSpec.SOAP12);
- }
+public class TestGetFaultReasonTextCaseSensitivity extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
index 3f4d5d11b..1d0e75b13 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
@@ -25,18 +25,13 @@ import java.util.Locale;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.soap.SOAPFaultText;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFaultReasonTextWithoutLangAttribute extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetFaultReasonTextWithoutLangAttribute() {
- super(SOAPSpec.SOAP12);
- }
+public class TestGetFaultReasonTextWithoutLangAttribute extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java
index ad1b0cdf0..2b7bacb4b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java
@@ -21,18 +21,13 @@ package org.apache.axiom.ts.soap12.faultreason;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
import com.google.inject.Inject;
-public class TestGetFirstSOAPText extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestGetFirstSOAPText() {
- super(SOAPSpec.SOAP12);
- }
+public class TestGetFirstSOAPText extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java
index 0d92e3546..b89f13edf 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java
@@ -25,18 +25,13 @@ import org.apache.axiom.soap.SOAPEnvelope;
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.SOAPTestCase;
import com.google.inject.Inject;
-public class TestExamineMustUnderstandHeaderBlocks extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestExamineMustUnderstandHeaderBlocks() {
- super(SOAPSpec.SOAP12);
- }
+public class TestExamineMustUnderstandHeaderBlocks extends TestCase {
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
index bbaae8410..f7a07c358 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
@@ -29,25 +29,22 @@ 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.SOAPTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import com.google.inject.Inject;
+import junit.framework.TestCase;
+
/**
* Tests that child elements of a {@link SOAPHeader} created using the DOM API are converted on the
* fly and returned as {@link SOAPHeaderBlock} instances by {@link
* SOAPHeader#examineAllHeaderBlocks()}.
*/
-public class TestExamineAllHeaderBlocks extends SOAPTestCase {
+public class TestExamineAllHeaderBlocks extends TestCase {
+ @Inject private SOAPSpec spec;
@Inject private SOAPFactory soapFactory;
- @Inject
- public TestExamineAllHeaderBlocks(SOAPSpec spec) {
- super(spec);
- }
-
@Override
protected void runTest() throws Throwable {
SOAPHeader header = soapFactory.createSOAPHeader();
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java
index 002340d46..96593edf2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java
@@ -29,19 +29,16 @@ 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.SOAPTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import com.google.inject.Inject;
-public class TestExamineMustUnderstandHeaderBlocks extends SOAPTestCase {
- @Inject private SOAPFactory soapFactory;
+import junit.framework.TestCase;
- @Inject
- public TestExamineMustUnderstandHeaderBlocks(SOAPSpec spec) {
- super(spec);
- }
+public class TestExamineMustUnderstandHeaderBlocks extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private SOAPFactory soapFactory;
@Override
protected void runTest() throws Throwable {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
index eb9dc39c0..be2bb93de 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
@@ -21,20 +21,17 @@ package org.apache.axiom.ts.soapdom.message;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
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.SOAPSampleSet;
+import org.apache.axiom.ts.soap.SOAPSpec;
import org.w3c.dom.Document;
import com.google.inject.Inject;
-public class TestLazySOAPFactorySelection extends SOAPTestCase {
- @Inject private OMMetaFactory metaFactory;
+import junit.framework.TestCase;
- @Inject
- public TestLazySOAPFactorySelection(SOAPSpec spec) {
- super(spec);
- }
+public class TestLazySOAPFactorySelection extends TestCase {
+ @Inject private SOAPSpec spec;
+ @Inject private OMMetaFactory metaFactory;
@Override
protected void runTest() throws Throwable {