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 85d1240d8 Migrate constructor injection to field injection in 
axiom-testsuite
85d1240d8 is described below

commit 85d1240d8c6df51d19b4826fa6c4350a3e0e3cc8
Author: Copilot <[email protected]>
AuthorDate: Sat May 16 22:35:34 2026 +0100

    Migrate constructor injection to field injection in axiom-testsuite
    
    Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
 .../axiom/ts/om/builder/TestCloseWithStream.java   |  6 +-
 ...erFromDOMWithNSUnawareNamespaceDeclaration.java |  7 +--
 .../ts/om/builder/TestCreateOMBuilderXOP.java      | 10 ++--
 .../axiom/ts/om/builder/TestDetachWithDOM.java     |  7 +--
 .../axiom/ts/om/builder/TestDetachWithStream.java  | 10 ++--
 .../ts/om/builder/TestGetDocumentElement.java      | 12 ++--
 .../TestAddChildWithIncompleteSibling.java         |  6 +-
 .../axiom/ts/om/container/TestGetBuilderNull.java  |  6 +-
 .../axiom/ts/om/container/TestGetDescendants.java  | 10 ++--
 .../ts/om/document/TestGetSAXResultSAXParser.java  |  9 +--
 .../axiom/ts/om/document/TestRemoveChildren.java   | 12 ++--
 .../sr/TestCharacterDataReaderFromParser.java      |  7 +--
 .../ts/om/document/sr/TestDTDReaderFromParser.java | 11 ++--
 .../element/TestAddAttributeGeneratedPrefix.java   |  7 +--
 .../ts/om/element/TestAddAttributeMultiple.java    |  6 +-
 .../ts/om/element/TestAddAttributeReplace.java     |  6 +-
 ...uteWithExistingNamespaceDeclarationInScope.java |  6 +-
 ...hExistingNamespaceDeclarationOnSameElement.java |  6 +-
 ...AddAttributeWithMaskedNamespaceDeclaration.java |  6 +-
 ...tributeWithoutExistingNamespaceDeclaration.java |  6 +-
 .../element/TestAddAttributeWithoutNamespace.java  | 10 +---
 .../ts/om/element/TestAddChildWithSameParent.java  |  7 +--
 .../axiom/ts/om/element/TestGetDescendants.java    |  7 +--
 .../ts/om/element/TestGetNamespaceContext.java     |  7 +--
 .../ts/om/element/TestGetNamespaceNormalized.java  |  7 +--
 .../element/TestGetSAXSourceIdentityTransform.java | 10 ++--
 ...estGetSAXSourceIdentityTransformOnFragment.java | 11 ++--
 .../axiom/ts/om/element/TestGetTextBinary.java     |  7 +--
 .../TestGetXMLStreamReaderOnNonRootElement.java    |  7 +--
 ...StreamReaderOnNonRootElementPartiallyBuilt.java | 12 ++--
 ...GetXMLStreamReaderWithIncompleteDescendant.java |  7 +--
 ...MLStreamReaderWithPreserveNamespaceContext.java | 12 ++--
 .../axiom/ts/om/element/TestRemoveChildren.java    |  7 +--
 .../axiom/ts/om/element/TestSerialization.java     |  6 +-
 .../element/sr/TestCloseAndContinueBuilding.java   |  7 +--
 .../axiom/ts/om/element/sr/TestCommentEvent.java   | 10 ++--
 .../ts/om/element/sr/TestGetBlobFromElement.java   |  7 +--
 .../element/sr/TestGetElementTextFromParser.java   | 26 ++++----
 .../ts/om/element/sr/TestGetNamespaceContext.java  |  7 +--
 .../factory/TestCreateOMTextFromBlobProvider.java  |  7 +--
 .../org/apache/axiom/ts/om/node/TestDetach.java    | 11 ++--
 .../axiom/ts/om/node/TestDetachFirstChild.java     |  7 +--
 .../ts/om/sourcedelement/TestAddAttribute.java     |  6 +-
 .../om/sourcedelement/TestCloneNonDestructive.java |  7 +--
 .../axiom/ts/om/sourcedelement/TestDetach.java     |  6 +-
 .../axiom/ts/om/sourcedelement/TestDiscard.java    |  6 +-
 .../TestGetSAXSourceWithPushOMDataSource.java      | 11 ++--
 .../TestPushOMDataSourceExpansion.java             |  6 +-
 .../axiom/ts/om/sourcedelement/TestSerialize.java  | 70 ++++++++++------------
 ...SerializeOMDataSourceWritingToOutputStream.java | 11 ++--
 .../ts/om/sourcedelement/TestSetLocalName.java     |  7 +--
 .../sourcedelement/sr/TestCloseWithoutCaching.java |  7 +--
 .../apache/axiom/ts/om/text/TestCloneBinary.java   |  7 +--
 .../org/apache/axiom/ts/om/text/TestSerialize.java |  7 +--
 .../org/apache/axiom/ts/om/xop/TestSerialize.java  |  7 +--
 .../apache/axiom/ts/om/xop/TestSetOptimize.java    |  7 +--
 .../apache/axiom/ts/om/xpath/TestAXIOMXPath.java   |  7 +--
 .../apache/axiom/ts/soap/builder/BadInputTest.java |  7 +--
 .../apache/axiom/ts/soap/builder/MessageTest.java  |  6 +-
 .../TestRegisterCustomBuilderForPayload.java       |  6 +-
 .../axiom/ts/soap/envelope/TestSerialize.java      | 15 ++---
 .../axiom/ts/soap/message/TestSerialize.java       | 15 ++---
 .../soap12/envelope/TestMTOMForwardStreaming.java  |  7 +--
 .../mtom/TestGetXMLStreamReaderMTOMEncoded.java    |  7 +--
 64 files changed, 192 insertions(+), 398 deletions(-)

diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
index e8da2ae6d..697f90006 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
@@ -33,12 +33,8 @@ public class TestCloseWithStream extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final StreamType streamType;
-
     @Inject
-    public TestCloseWithStream(StreamType streamType) {
-        this.streamType = streamType;
-    }
+    private StreamType streamType;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareNamespaceDeclaration.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareNamespaceDeclaration.java
index 9c7dc3376..9ae0b4886 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareNamespaceDeclaration.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareNamespaceDeclaration.java
@@ -33,12 +33,9 @@ public class 
TestCreateOMBuilderFromDOMWithNSUnawareNamespaceDeclaration extends
     @Inject
     private OMFactory factory;
 
-    private final String prefix;
-
     @Inject
-    public 
TestCreateOMBuilderFromDOMWithNSUnawareNamespaceDeclaration(@Named("prefix") 
String prefix) {
-        this.prefix = prefix;
-    }
+    @Named("prefix")
+    private String prefix;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderXOP.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderXOP.java
index 5f23a762b..3f318ec81 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderXOP.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderXOP.java
@@ -35,14 +35,12 @@ public class TestCreateOMBuilderXOP extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final XOPSample sample;
-    private final boolean build;
+    @Inject
+    private XOPSample sample;
 
     @Inject
-    public TestCreateOMBuilderXOP(XOPSample sample, @Named("build") boolean 
build) {
-        this.sample = sample;
-        this.build = build;
-    }
+    @Named("build")
+    private boolean build;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithDOM.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithDOM.java
index 818286c7a..4cfded596 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithDOM.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithDOM.java
@@ -36,12 +36,9 @@ public class TestDetachWithDOM extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean useDOMSource;
-
     @Inject
-    public TestDetachWithDOM(@Named("useDOMSource") boolean useDOMSource) {
-        this.useDOMSource = useDOMSource;
-    }
+    @Named("useDOMSource")
+    private boolean useDOMSource;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
index 7c5359e13..1828fd359 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
@@ -35,14 +35,12 @@ public class TestDetachWithStream extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final StreamType streamType;
-    private final boolean useStreamSource;
+    @Inject
+    private StreamType streamType;
 
     @Inject
-    public TestDetachWithStream(StreamType streamType, 
@Named("useStreamSource") boolean useStreamSource) {
-        this.streamType = streamType;
-        this.useStreamSource = useStreamSource;
-    }
+    @Named("useStreamSource")
+    private boolean useStreamSource;
 
     @Override
     protected final void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
index b583f34e4..c5fd508f7 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
@@ -42,15 +42,13 @@ public class TestGetDocumentElement extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final BuilderFactory builderFactory;
-    private final Boolean discardDocument;
+    @Inject
+    private BuilderFactory builderFactory;
 
     @Inject
-    public TestGetDocumentElement(
-            BuilderFactory builderFactory, @Named("discardDocument") @Nullable 
Boolean discardDocument) {
-        this.builderFactory = builderFactory;
-        this.discardDocument = discardDocument;
-    }
+    @Named("discardDocument")
+    @Nullable
+    private Boolean discardDocument;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestAddChildWithIncompleteSibling.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestAddChildWithIncompleteSibling.java
index 3db70b86c..64a55b607 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestAddChildWithIncompleteSibling.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestAddChildWithIncompleteSibling.java
@@ -41,12 +41,8 @@ public class TestAddChildWithIncompleteSibling extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final OMContainerFactory containerFactory;
-
     @Inject
-    public TestAddChildWithIncompleteSibling(OMContainerFactory 
containerFactory) {
-        this.containerFactory = containerFactory;
-    }
+    private OMContainerFactory containerFactory;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
index 8fcb523b1..be92f9b09 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
@@ -33,12 +33,8 @@ public class TestGetBuilderNull extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final OMContainerFactory containerFactory;
-
     @Inject
-    public TestGetBuilderNull(OMContainerFactory containerFactory) {
-        this.containerFactory = containerFactory;
-    }
+    private OMContainerFactory containerFactory;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
index 6ba08d8c0..9c31bd823 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
@@ -36,14 +36,12 @@ public class TestGetDescendants extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final OMContainerFactory containerFactory;
-    private final boolean includeSelf;
+    @Inject
+    private OMContainerFactory containerFactory;
 
     @Inject
-    public TestGetDescendants(OMContainerFactory containerFactory, 
@Named("includeSelf") boolean includeSelf) {
-        this.containerFactory = containerFactory;
-        this.includeSelf = includeSelf;
-    }
+    @Named("includeSelf")
+    private boolean includeSelf;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResultSAXParser.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResultSAXParser.java
index 2b07a01ee..017a638c2 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResultSAXParser.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResultSAXParser.java
@@ -40,14 +40,11 @@ public class TestGetSAXResultSAXParser extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final SAXImplementation saxImplementation;
-    private final XMLSample file;
+    @Inject
+    private SAXImplementation saxImplementation;
 
     @Inject
-    public TestGetSAXResultSAXParser(SAXImplementation saxImplementation, 
XMLSample file) {
-        this.saxImplementation = saxImplementation;
-        this.file = file;
-    }
+    private XMLSample file;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
index 1c5aa7aee..015ebd6bc 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
@@ -38,15 +38,13 @@ public class TestRemoveChildren extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean complete;
-    private final boolean accessDocumentElement;
+    @Inject
+    @Named("complete")
+    private boolean complete;
 
     @Inject
-    public TestRemoveChildren(
-            @Named("complete") boolean complete, 
@Named("accessDocumentElement") boolean accessDocumentElement) {
-        this.complete = complete;
-        this.accessDocumentElement = accessDocumentElement;
-    }
+    @Named("accessDocumentElement")
+    private boolean accessDocumentElement;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
index 9b89bfb54..f20c4abce 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
@@ -41,12 +41,9 @@ public class TestCharacterDataReaderFromParser extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-
     @Inject
-    public TestCharacterDataReaderFromParser(@Named("cache") boolean cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
index 191c53838..e9ef8a828 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
@@ -39,14 +39,13 @@ public class TestDTDReaderFromParser extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean build;
-    private final boolean cache;
+    @Inject
+    @Named("build")
+    private boolean build;
 
     @Inject
-    public TestDTDReaderFromParser(@Named("build") boolean build, 
@Named("cache") boolean cache) {
-        this.build = build;
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
index 77385f3cc..4579256aa 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
@@ -38,12 +38,9 @@ public class TestAddAttributeGeneratedPrefix extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean defaultNamespaceInScope;
-
     @Inject
-    public TestAddAttributeGeneratedPrefix(@Named("defaultNamespaceInScope") 
boolean defaultNamespaceInScope) {
-        this.defaultNamespaceInScope = defaultNamespaceInScope;
-    }
+    @Named("defaultNamespaceInScope")
+    private boolean defaultNamespaceInScope;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java
index e68f1f919..6e6821a3f 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java
@@ -36,12 +36,8 @@ public class TestAddAttributeMultiple extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public TestAddAttributeMultiple(AddAttributeStrategy strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java
index f99303841..a74811b21 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java
@@ -39,12 +39,8 @@ public class TestAddAttributeReplace extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public TestAddAttributeReplace(AddAttributeStrategy strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
index 7c1338658..80ec48f73 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
@@ -37,12 +37,8 @@ public class 
TestAddAttributeWithExistingNamespaceDeclarationInScope extends Axi
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public 
TestAddAttributeWithExistingNamespaceDeclarationInScope(AddAttributeStrategy 
strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
index 4941b3680..ce9ccfa39 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
@@ -37,12 +37,8 @@ public class 
TestAddAttributeWithExistingNamespaceDeclarationOnSameElement exten
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public 
TestAddAttributeWithExistingNamespaceDeclarationOnSameElement(AddAttributeStrategy
 strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
index 5236a59f1..cf3f5cd56 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
@@ -51,12 +51,8 @@ public class TestAddAttributeWithMaskedNamespaceDeclaration 
extends AxiomTestCas
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public TestAddAttributeWithMaskedNamespaceDeclaration(AddAttributeStrategy 
strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
index 4203f512d..367af3909 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
@@ -37,12 +37,8 @@ public class 
TestAddAttributeWithoutExistingNamespaceDeclaration extends AxiomTe
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public 
TestAddAttributeWithoutExistingNamespaceDeclaration(AddAttributeStrategy 
strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
index 59c038be4..6313045b0 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
@@ -38,15 +38,11 @@ public class TestAddAttributeWithoutNamespace extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy addAttributeStrategy;
-    private final NoNamespaceStrategy noNamespaceStrategy;
+    @Inject
+    private AddAttributeStrategy addAttributeStrategy;
 
     @Inject
-    public TestAddAttributeWithoutNamespace(
-            AddAttributeStrategy addAttributeStrategy, NoNamespaceStrategy 
noNamespaceStrategy) {
-        this.addAttributeStrategy = addAttributeStrategy;
-        this.noNamespaceStrategy = noNamespaceStrategy;
-    }
+    private NoNamespaceStrategy noNamespaceStrategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
index 9ffd52d77..6c5d578ff 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
@@ -38,12 +38,9 @@ public class TestAddChildWithSameParent extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean build;
-
     @Inject
-    public TestAddChildWithSameParent(@Named("build") boolean build) {
-        this.build = build;
-    }
+    @Named("build")
+    private boolean build;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
index fbca636f1..256223f34 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
@@ -33,12 +33,9 @@ public class TestGetDescendants extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean includeSelf;
-
     @Inject
-    public TestGetDescendants(@Named("includeSelf") boolean includeSelf) {
-        this.includeSelf = includeSelf;
-    }
+    @Named("includeSelf")
+    private boolean includeSelf;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
index d3d175fa5..b7076f28c 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
@@ -37,12 +37,9 @@ public class TestGetNamespaceContext extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean detached;
-
     @Inject
-    public TestGetNamespaceContext(@Named("detached") boolean detached) {
-        this.detached = detached;
-    }
+    @Named("detached")
+    private boolean detached;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
index 451df73af..b9ebe8044 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
@@ -46,12 +46,9 @@ public class TestGetNamespaceNormalized extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean useNull;
-
     @Inject
-    public TestGetNamespaceNormalized(@Named("useNull") boolean useNull) {
-        this.useNull = useNull;
-    }
+    @Named("useNull")
+    private boolean useNull;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java
index 13c939947..fadfe0256 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java
@@ -36,14 +36,12 @@ public class TestGetSAXSourceIdentityTransform extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final XSLTImplementation xsltImplementation;
-    private final boolean cache;
+    @Inject
+    private XSLTImplementation xsltImplementation;
 
     @Inject
-    public TestGetSAXSourceIdentityTransform(XSLTImplementation 
xsltImplementation, @Named("cache") boolean cache) {
-        this.xsltImplementation = xsltImplementation;
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     private InputStream getInput() {
         return 
TestGetSAXSourceIdentityTransform.class.getResourceAsStream("test.xml");
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
index f1681d0da..51b894175 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
@@ -62,15 +62,12 @@ public class TestGetSAXSourceIdentityTransformOnFragment 
extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final XSLTImplementation xsltImplementation;
-    private final boolean cache;
+    @Inject
+    private XSLTImplementation xsltImplementation;
 
     @Inject
-    public TestGetSAXSourceIdentityTransformOnFragment(
-            XSLTImplementation xsltImplementation, @Named("cache") boolean 
cache) {
-        this.xsltImplementation = xsltImplementation;
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     private InputStream getInput() {
         return 
TestGetSAXSourceIdentityTransformOnFragment.class.getResourceAsStream("test.xml");
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
index c10977eed..11617d1a1 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
@@ -39,12 +39,9 @@ public class TestGetTextBinary extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean compact;
-
     @Inject
-    public TestGetTextBinary(@Named("compact") boolean compact) {
-        this.compact = compact;
-    }
+    @Named("compact")
+    private boolean compact;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
index 7f1bacb7d..2b60f4c48 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
@@ -41,12 +41,9 @@ public class TestGetXMLStreamReaderOnNonRootElement extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-
     @Inject
-    public TestGetXMLStreamReaderOnNonRootElement(@Named("cache") boolean 
cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
index 4e27aebf7..b182d1c1a 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
@@ -39,15 +39,13 @@ public class 
TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt extends AxiomT
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-    private final int build;
+    @Inject
+    @Named("cache")
+    private boolean cache;
 
     @Inject
-    public TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt(
-            @Named("cache") boolean cache, @Named("build") int build) {
-        this.cache = cache;
-        this.build = build;
-    }
+    @Named("build")
+    private int build;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
index 39c0d1eb0..b9a0ebd62 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
@@ -45,12 +45,9 @@ public class TestGetXMLStreamReaderWithIncompleteDescendant 
extends AxiomTestCas
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-
     @Inject
-    public TestGetXMLStreamReaderWithIncompleteDescendant(@Named("cache") 
boolean cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
index 5a6e9f9eb..fc4cdb3f9 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
@@ -42,15 +42,13 @@ public class 
TestGetXMLStreamReaderWithPreserveNamespaceContext extends AxiomTes
     @Inject
     private OMFactory factory;
 
-    private final boolean preserveNamespaceContext;
-    private final boolean cache;
+    @Inject
+    @Named("preserveNamespaceContext")
+    private boolean preserveNamespaceContext;
 
     @Inject
-    public TestGetXMLStreamReaderWithPreserveNamespaceContext(
-            @Named("preserveNamespaceContext") boolean 
preserveNamespaceContext, @Named("cache") boolean cache) {
-        this.preserveNamespaceContext = preserveNamespaceContext;
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
index 2bab22fac..291904136 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
@@ -36,12 +36,9 @@ public class TestRemoveChildren extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean complete;
-
     @Inject
-    public TestRemoveChildren(@Named("complete") boolean complete) {
-        this.complete = complete;
-    }
+    @Named("complete")
+    private boolean complete;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
index 00ee220ef..f94bc0053 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
@@ -87,12 +87,8 @@ public class TestSerialization extends AxiomTestCase {
                     "D",
                     "<person><name xmlns=\"urn:ns\">John</name><age 
xmlns=\"urn:ns\">34</age><weight xmlns=\"urn:ns\">50</weight></person>"));
 
-    private final Params params;
-
     @Inject
-    public TestSerialization(Params params) {
-        this.params = params;
-    }
+    private Params params;
 
     private static OMNamespace createNamespace(OMFactory factory, String type) 
{
         if (type.equals("Q")) {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
index 872fe3f73..08e096bdc 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
@@ -43,12 +43,9 @@ public class TestCloseAndContinueBuilding extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-
     @Inject
-    public TestCloseAndContinueBuilding(@Named("cache") boolean cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
index f01ef1c05..3096de77c 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
@@ -35,14 +35,12 @@ public class TestCommentEvent extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final BuilderFactory builderFactory;
-    private final boolean cache;
+    @Inject
+    private BuilderFactory builderFactory;
 
     @Inject
-    public TestCommentEvent(BuilderFactory builderFactory, @Named("cache") 
boolean cache) {
-        this.builderFactory = builderFactory;
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
index 5b3da31a8..bca002bb4 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
@@ -42,12 +42,9 @@ public class TestGetBlobFromElement extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-
     @Inject
-    public TestGetBlobFromElement(@Named("cache") boolean cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
index 8748a9d4f..2131d3543 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
@@ -38,26 +38,20 @@ public class TestGetElementTextFromParser extends 
AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final BuilderFactory builderFactory;
-    private final boolean cache;
-    private final int build;
+    @Inject
+    private BuilderFactory builderFactory;
+
+    @Inject
+    @Named("cache")
+    private boolean cache;
 
     /**
-     * Constructor.
-     *
-     * @param metaFactory
-     * @param builderFactory
-     * @param cache
-     * @param build the number of descendants that should be built before 
calling {@link
-     *     OMContainer#getXMLStreamReader(boolean)}
+     * The number of descendants that should be built before calling {@link
+     * OMContainer#getXMLStreamReader(boolean)}.
      */
     @Inject
-    public TestGetElementTextFromParser(
-            BuilderFactory builderFactory, @Named("cache") boolean cache, 
@Named("build") int build) {
-        this.builderFactory = builderFactory;
-        this.cache = cache;
-        this.build = build;
-    }
+    @Named("build")
+    private int build;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
index 237d99cd6..63ccb3158 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
@@ -33,12 +33,9 @@ public class TestGetNamespaceContext extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean cache;
-
     @Inject
-    public TestGetNamespaceContext(@Named("cache") boolean cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
index 49f569e1c..ba7a156ba 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
@@ -51,12 +51,9 @@ public class TestCreateOMTextFromBlobProvider extends 
AxiomTestCase {
         }
     }
 
-    private final boolean nullContentID;
-
     @Inject
-    public TestCreateOMTextFromBlobProvider(@Named("nullContentId") boolean 
nullContentID) {
-        this.nullContentID = nullContentID;
-    }
+    @Named("nullContentId")
+    private boolean nullContentID;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
index b90f6c01a..8c74e27fa 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
@@ -36,14 +36,13 @@ public class TestDetach extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean document;
-    private final boolean build;
+    @Inject
+    @Named("document")
+    private boolean document;
 
     @Inject
-    public TestDetach(@Named("document") boolean document, @Named("build") 
boolean build) {
-        this.document = document;
-        this.build = build;
-    }
+    @Named("build")
+    private boolean build;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
index 9bcc014c6..4a8a0bbf3 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
@@ -33,12 +33,9 @@ public class TestDetachFirstChild extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean build;
-
     @Inject
-    public TestDetachFirstChild(@Named("build") boolean build) {
-        this.build = build;
-    }
+    @Named("build")
+    private boolean build;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
index 43621b83a..c2923ee79 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
@@ -38,12 +38,8 @@ public class TestAddAttribute extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final AddAttributeStrategy strategy;
-
     @Inject
-    public TestAddAttribute(AddAttributeStrategy strategy) {
-        this.strategy = strategy;
-    }
+    private AddAttributeStrategy strategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
index f657b69c1..2f52afa10 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
@@ -37,12 +37,9 @@ public class TestCloneNonDestructive extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean copyOMDataSources;
-
     @Inject
-    public TestCloneNonDestructive(@Named("copyOMDataSources") boolean 
copyOMDataSources) {
-        this.copyOMDataSources = copyOMDataSources;
-    }
+    @Named("copyOMDataSources")
+    private boolean copyOMDataSources;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java
index d6c219867..0c6ca2c26 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java
@@ -38,12 +38,8 @@ public class TestDetach extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final ExpansionStrategy expansionStrategy;
-
     @Inject
-    public TestDetach(ExpansionStrategy expansionStrategy) {
-        this.expansionStrategy = expansionStrategy;
-    }
+    private ExpansionStrategy expansionStrategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
index 4e3b43643..64b5aad03 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
@@ -33,12 +33,8 @@ public class TestDiscard extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final ExpansionStrategy expansionStrategy;
-
     @Inject
-    public TestDiscard(ExpansionStrategy expansionStrategy) {
-        this.expansionStrategy = expansionStrategy;
-    }
+    private ExpansionStrategy expansionStrategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java
index 97bc22945..0bb6bab82 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java
@@ -42,15 +42,12 @@ public class TestGetSAXSourceWithPushOMDataSource extends 
AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final PushOMDataSourceScenario scenario;
-    private boolean serializeParent;
+    @Inject
+    private PushOMDataSourceScenario scenario;
 
     @Inject
-    public TestGetSAXSourceWithPushOMDataSource(
-            PushOMDataSourceScenario scenario, @Named("serializeParent") 
boolean serializeParent) {
-        this.scenario = scenario;
-        this.serializeParent = serializeParent;
-    }
+    @Named("serializeParent")
+    private boolean serializeParent;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
index ab5ffa9fc..b3e731bda 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
@@ -58,12 +58,8 @@ public class TestPushOMDataSourceExpansion extends 
AxiomTestCase {
         }
     }
 
-    private final PushOMDataSourceScenario scenario;
-
     @Inject
-    public TestPushOMDataSourceExpansion(PushOMDataSourceScenario scenario) {
-        this.scenario = scenario;
-    }
+    private PushOMDataSourceScenario scenario;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
index 5be6019e0..2e5c7e2e1 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
@@ -30,8 +30,6 @@ import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMSourcedElement;
-import org.apache.axiom.om.ds.AbstractPullOMDataSource;
-import org.apache.axiom.om.ds.AbstractPushOMDataSource;
 import org.apache.axiom.ts.AxiomTestCase;
 import org.apache.axiom.ts.dimension.ElementContext;
 import org.apache.axiom.ts.dimension.ExpansionStrategy;
@@ -45,47 +43,39 @@ public class TestSerialize extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean push;
-    private final boolean destructive;
-    private final ElementContext elementContext;
-    private final ExpansionStrategy expansionStrategy;
-    private final SerializationStrategy serializationStrategy;
-    private final boolean serializeParent;
-    private final int count;
-
     /**
-     * Constructor.
-     *
-     * @param metaFactory the meta factory for the implementation to be tested
-     * @param push specifies whether the data source to be used extends {@link
-     *     AbstractPullOMDataSource} (<code>false</code>) or {@link 
AbstractPushOMDataSource} (
-     *     <code>true</code>)
-     * @param destructive specifies if the {@link OMDataSource} is destructive 
or not
-     * @param elementContext specifies if an how the {@link OMSourcedElement} 
is to be placed inside
-     *     an {@link OMContainer}
-     * @param serializationStrategy the serialization strategy to test
-     * @param serializeParent specifies if the parent of the {@link 
OMSourcedElement} should be
-     *     serialized instead of the {@link OMSourcedElement} itself
-     * @param count the number of times the {@link OMSourcedElement} will be 
serialized; the only
-     *     meaningful values are 1 and 2
+     * Specifies whether the data source to be used extends {@link 
AbstractPullOMDataSource} (<code>
+     * false</code>) or {@link AbstractPushOMDataSource} (<code>true</code>).
      */
     @Inject
-    public TestSerialize(
-            @Named("push") boolean push,
-            @Named("destructive") boolean destructive,
-            ElementContext elementContext,
-            ExpansionStrategy expansionStrategy,
-            SerializationStrategy serializationStrategy,
-            @Named("serializeParent") boolean serializeParent,
-            @Named("count") int count) {
-        this.push = push;
-        this.destructive = destructive;
-        this.elementContext = elementContext;
-        this.expansionStrategy = expansionStrategy;
-        this.serializationStrategy = serializationStrategy;
-        this.serializeParent = serializeParent;
-        this.count = count;
-    }
+    @Named("push")
+    private boolean push;
+
+    /** Specifies if the {@link OMDataSource} is destructive or not. */
+    @Inject
+    @Named("destructive")
+    private boolean destructive;
+
+    /** Specifies if and how the {@link OMSourcedElement} is to be placed 
inside an {@link OMContainer}. */
+    @Inject
+    private ElementContext elementContext;
+
+    @Inject
+    private ExpansionStrategy expansionStrategy;
+
+    /** The serialization strategy to test. */
+    @Inject
+    private SerializationStrategy serializationStrategy;
+
+    /** Specifies if the parent of the {@link OMSourcedElement} should be 
serialized instead of the {@link OMSourcedElement} itself. */
+    @Inject
+    @Named("serializeParent")
+    private boolean serializeParent;
+
+    /** The number of times the {@link OMSourcedElement} will be serialized; 
the only meaningful values are 1 and 2. */
+    @Inject
+    @Named("count")
+    private int count;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java
index 4876feeab..f4035cbfd 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java
@@ -84,15 +84,12 @@ public class TestSerializeOMDataSourceWritingToOutputStream 
extends AxiomTestCas
         }
     }
 
-    private final SerializationStrategy serializationStrategy;
-    private final boolean serializeParent;
+    @Inject
+    private SerializationStrategy serializationStrategy;
 
     @Inject
-    public TestSerializeOMDataSourceWritingToOutputStream(
-            SerializationStrategy serializationStrategy, 
@Named("serializeParent") boolean serializeParent) {
-        this.serializationStrategy = serializationStrategy;
-        this.serializeParent = serializeParent;
-    }
+    @Named("serializeParent")
+    private boolean serializeParent;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
index 64a01a542..a8b173db3 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
@@ -40,12 +40,9 @@ public class TestSetLocalName extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private boolean expand;
-
     @Inject
-    public TestSetLocalName(@Named("expand") boolean expand) {
-        this.expand = expand;
-    }
+    @Named("expand")
+    private boolean expand;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
index 8bbc9b2ce..5fbe350da 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
@@ -39,12 +39,9 @@ public class TestCloseWithoutCaching extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final int events;
-
     @Inject
-    public TestCloseWithoutCaching(@Named("events") int events) {
-        this.events = events;
-    }
+    @Named("events")
+    private int events;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
index cfaaf0e2e..44d7f4014 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
@@ -37,12 +37,9 @@ public class TestCloneBinary extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private boolean fetch;
-
     @Inject
-    public TestCloneBinary(@Named("fetch") boolean fetch) {
-        this.fetch = fetch;
-    }
+    @Named("fetch")
+    private boolean fetch;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestSerialize.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestSerialize.java
index 26ec16758..427ea8925 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestSerialize.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestSerialize.java
@@ -35,12 +35,9 @@ public class TestSerialize extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final int type;
-
     @Inject
-    public TestSerialize(@Named("type") int type) {
-        this.type = type;
-    }
+    @Named("type")
+    private int type;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
index ddc6eb861..883da07be 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
@@ -40,12 +40,9 @@ public class TestSerialize extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean base64;
-
     @Inject
-    public TestSerialize(@Named("base64") boolean base64) {
-        this.base64 = base64;
-    }
+    @Named("base64")
+    private boolean base64;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
index 0e3ce93b0..867119ef9 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
@@ -43,12 +43,9 @@ public class TestSetOptimize extends AxiomTestCase {
     @Inject
     private OMFactory factory;
 
-    private final boolean optimize;
-
     @Inject
-    public TestSetOptimize(@Named("optimize") boolean optimize) {
-        this.optimize = optimize;
-    }
+    @Named("optimize")
+    private boolean optimize;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java
index 603288789..b690f34f8 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java
@@ -27,12 +27,9 @@ public class TestAXIOMXPath extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final String methodName;
-
     @Inject
-    public TestAXIOMXPath(@Named("methodName") String methodName) {
-        this.methodName = methodName;
-    }
+    @Named("methodName")
+    private String methodName;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
index af44930d6..df86afd98 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
@@ -33,12 +33,9 @@ public class BadInputTest extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final String file;
-
     @Inject
-    public BadInputTest(@Named("file") String file) {
-        this.file = file;
-    }
+    @Named("file")
+    private String file;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
index 5ee5734a4..20833a2ae 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
@@ -29,12 +29,8 @@ public class MessageTest extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final SOAPSample message;
-
     @Inject
-    public MessageTest(SOAPSample message) {
-        this.message = message;
-    }
+    private SOAPSample message;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
index cd97d338f..3d4c9e297 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
@@ -43,12 +43,8 @@ public class TestRegisterCustomBuilderForPayload extends 
AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final SOAPSample message;
-
     @Inject
-    public TestRegisterCustomBuilderForPayload(SOAPSample message) {
-        this.message = message;
-    }
+    private SOAPSample message;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
index 842597f63..03b5ceb08 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
@@ -34,17 +34,14 @@ public class TestSerialize extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final SOAPSample message;
-    private final ExpansionStrategy expansionStrategy;
-    private final SerializationStrategy serializationStrategy;
+    @Inject
+    private SOAPSample message;
 
     @Inject
-    public TestSerialize(
-            SOAPSample message, ExpansionStrategy expansionStrategy, 
SerializationStrategy serializationStrategy) {
-        this.message = message;
-        this.expansionStrategy = expansionStrategy;
-        this.serializationStrategy = serializationStrategy;
-    }
+    private ExpansionStrategy expansionStrategy;
+
+    @Inject
+    private SerializationStrategy serializationStrategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
index d2f969189..99ed0773f 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
@@ -34,17 +34,14 @@ public class TestSerialize extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final SOAPSample message;
-    private final ExpansionStrategy expansionStrategy;
-    private final SerializationStrategy serializationStrategy;
+    @Inject
+    private SOAPSample message;
 
     @Inject
-    public TestSerialize(
-            SOAPSample message, ExpansionStrategy expansionStrategy, 
SerializationStrategy serializationStrategy) {
-        this.message = message;
-        this.expansionStrategy = expansionStrategy;
-        this.serializationStrategy = serializationStrategy;
-    }
+    private ExpansionStrategy expansionStrategy;
+
+    @Inject
+    private SerializationStrategy serializationStrategy;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
index c24ec97a6..9b68a0d8f 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
@@ -48,12 +48,9 @@ public class TestMTOMForwardStreaming extends AxiomTestCase {
     @Inject
     private OMMetaFactory metaFactory;
 
-    private final boolean buildSOAPPart;
-
     @Inject
-    public TestMTOMForwardStreaming(@Named("buildSOAPPart") boolean 
buildSOAPPart) {
-        this.buildSOAPPart = buildSOAPPart;
-    }
+    @Named("buildSOAPPart")
+    private boolean buildSOAPPart;
 
     @Override
     protected void runTest() throws Throwable {
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
index ed2419d36..731d7472f 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
@@ -40,12 +40,9 @@ public class TestGetXMLStreamReaderMTOMEncoded extends 
AxiomTestCase {
 
     private static final QName XOP_INCLUDE = new 
QName("http://www.w3.org/2004/08/xop/include";, "Include");
 
-    private final boolean cache;
-
     @Inject
-    public TestGetXMLStreamReaderMTOMEncoded(@Named("cache") boolean cache) {
-        this.cache = cache;
-    }
+    @Named("cache")
+    private boolean cache;
 
     @Override
     protected void runTest() throws Throwable {

Reply via email to