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 e444450d2 Eliminate SAAJTestCase: inject fields directly into
subclasses as private
e444450d2 is described below
commit e444450d204dd1f69a6e1eda69f9d7fbf07f552b
Author: Copilot <[email protected]>
AuthorDate: Sat May 23 06:13:31 2026 +0100
Eliminate SAAJTestCase: inject fields directly into subclasses as private
Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
.../org/apache/axiom/ts/saaj/SAAJTestCase.java | 36 ----------------------
.../saaj/body/TestAddChildElementReification.java | 9 ++++--
.../saaj/element/TestAddChildElementLocalName.java | 9 ++++--
.../TestAddChildElementLocalNamePrefixAndURI.java | 9 ++++--
.../ts/saaj/element/TestGetOwnerDocument.java | 9 ++++--
.../ts/saaj/element/TestSetParentElement.java | 9 ++++--
.../TestExamineMustUnderstandHeaderElements.java | 13 ++++++--
7 files changed, 46 insertions(+), 48 deletions(-)
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
deleted file mode 100644
index df6cf76ca..000000000
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
+++ /dev/null
@@ -1,36 +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.saaj;
-
-import com.google.inject.Inject;
-import jakarta.xml.soap.MessageFactory;
-import jakarta.xml.soap.SOAPFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
-import org.junit.jupiter.api.function.Executable;
-
-public abstract class SAAJTestCase implements Executable {
- @Inject
- protected SOAPSpec spec;
-
- @Inject
- protected MessageFactory messageFactory;
-
- @Inject
- protected SOAPFactory soapFactory;
-}
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
index f0e2575e4..1ad234b95 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
@@ -20,12 +20,17 @@ package org.apache.axiom.ts.saaj.body;
import static org.assertj.core.api.Assertions.assertThat;
+import com.google.inject.Inject;
+import jakarta.xml.soap.MessageFactory;
import jakarta.xml.soap.SOAPBody;
import jakarta.xml.soap.SOAPBodyElement;
import jakarta.xml.soap.SOAPElement;
-import org.apache.axiom.ts.saaj.SAAJTestCase;
+import org.junit.jupiter.api.function.Executable;
+
+public class TestAddChildElementReification implements Executable {
+ @Inject
+ private MessageFactory messageFactory;
-public class TestAddChildElementReification extends SAAJTestCase {
@Override
public void execute() throws Throwable {
SOAPBody body = messageFactory.createMessage().getSOAPBody();
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
index 8d6837ad7..2b4a30a17 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
@@ -20,11 +20,16 @@ package org.apache.axiom.ts.saaj.element;
import static org.assertj.core.api.Assertions.assertThat;
+import com.google.inject.Inject;
import jakarta.xml.soap.SOAPElement;
-import org.apache.axiom.ts.saaj.SAAJTestCase;
+import jakarta.xml.soap.SOAPFactory;
+import org.junit.jupiter.api.function.Executable;
/** Tests the behavior of {@link SOAPElement#addChildElement(String)}. */
-public class TestAddChildElementLocalName extends SAAJTestCase {
+public class TestAddChildElementLocalName implements Executable {
+ @Inject
+ private SOAPFactory soapFactory;
+
@Override
public void execute() throws Throwable {
SOAPElement root = soapFactory.createElement("root", "p", "urn:test");
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
index 4a93acdf8..6d87aa864 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
@@ -20,14 +20,19 @@ package org.apache.axiom.ts.saaj.element;
import static org.assertj.core.api.Assertions.assertThat;
+import com.google.inject.Inject;
import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPFactory;
import javax.xml.XMLConstants;
-import org.apache.axiom.ts.saaj.SAAJTestCase;
+import org.junit.jupiter.api.function.Executable;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
/** Tests the behavior of {@link SOAPElement#addChildElement(String, String,
String)}. */
-public class TestAddChildElementLocalNamePrefixAndURI extends SAAJTestCase {
+public class TestAddChildElementLocalNamePrefixAndURI implements Executable {
+ @Inject
+ private SOAPFactory soapFactory;
+
@Override
public void execute() throws Throwable {
SOAPElement root = soapFactory.createElement("root", "ns1", "urn:ns1");
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
index 77a14f74d..c7e58b1af 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
@@ -20,10 +20,12 @@ package org.apache.axiom.ts.saaj.element;
import static org.assertj.core.api.Assertions.assertThat;
+import com.google.inject.Inject;
import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPFactory;
import jakarta.xml.soap.SOAPPart;
import javax.xml.namespace.QName;
-import org.apache.axiom.ts.saaj.SAAJTestCase;
+import org.junit.jupiter.api.function.Executable;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -31,7 +33,10 @@ import org.w3c.dom.Node;
* Tests the behavior of the {@link Node#getOwnerDocument()} method when
invoked on a {@link
* SOAPElement} as well as the properties of the returned document.
*/
-public class TestGetOwnerDocument extends SAAJTestCase {
+public class TestGetOwnerDocument implements Executable {
+ @Inject
+ private SOAPFactory soapFactory;
+
@Override
public void execute() throws Throwable {
Document doc = soapFactory.createElement(new
QName("test")).getOwnerDocument();
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
index fbb2af9c7..97464d9da 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
@@ -20,12 +20,17 @@ package org.apache.axiom.ts.saaj.element;
import static org.assertj.core.api.Assertions.assertThat;
+import com.google.inject.Inject;
import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPFactory;
import javax.xml.namespace.QName;
-import org.apache.axiom.ts.saaj.SAAJTestCase;
+import org.junit.jupiter.api.function.Executable;
import org.w3c.dom.NodeList;
-public class TestSetParentElement extends SAAJTestCase {
+public class TestSetParentElement implements Executable {
+ @Inject
+ private SOAPFactory soapFactory;
+
@Override
public void execute() throws Throwable {
SOAPElement parent = soapFactory.createElement(new QName("parent"));
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
index 07646a73d..413127671 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
@@ -20,16 +20,25 @@ package org.apache.axiom.ts.saaj.header;
import static org.assertj.core.api.Assertions.assertThat;
+import com.google.inject.Inject;
+import jakarta.xml.soap.MessageFactory;
import jakarta.xml.soap.MimeHeaders;
import jakarta.xml.soap.SOAPHeader;
import jakarta.xml.soap.SOAPHeaderElement;
import jakarta.xml.soap.SOAPMessage;
import java.io.InputStream;
import java.util.Iterator;
-import org.apache.axiom.ts.saaj.SAAJTestCase;
import org.apache.axiom.ts.soap.SOAPSampleSet;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.junit.jupiter.api.function.Executable;
+
+public class TestExamineMustUnderstandHeaderElements implements Executable {
+ @Inject
+ private SOAPSpec spec;
+
+ @Inject
+ private MessageFactory messageFactory;
-public class TestExamineMustUnderstandHeaderElements extends SAAJTestCase {
@Override
public void execute() throws Throwable {
MimeHeaders mimeHeaders = new MimeHeaders();
