(ws-axiom) branch master updated: Introduce Params record for document TestDigest test parameters

[veithen]

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 a3987d807 Introduce Params record for document TestDigest test 
parameters
a3987d807 is described below

commit a3987d8071fb3de19bc6ecbda891b9e082c9cc9a
Author: Andreas Veithen-Knowles <andreas.veit...@gmail.com>
AuthorDate: Sun Mar 22 20:09:34 2026 +0000

    Introduce Params record for document TestDigest test parameters
---
 .../org/apache/axiom/ts/om/OMTestSuiteBuilder.java | 21 +++----------------
 .../apache/axiom/ts/om/document/TestDigest.java    | 24 +++++++++++++++-------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
index ddbd13dfe..df0acc7b7 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
@@ -238,24 +238,9 @@ public class OMTestSuiteBuilder extends 
MatrixTestSuiteBuilder {
         for (XMLSample file : getInstances(XMLSample.class)) {
             addTest(new org.apache.axiom.ts.om.document.TestClone(metaFactory, 
file));
         }
-        addTest(
-                new org.apache.axiom.ts.om.document.TestDigest(
-                        metaFactory, "digest1.xml", "MD5", 
"3e5d68c6607bc56c9c171560e4f19db9"));
-        addTest(
-                new org.apache.axiom.ts.om.document.TestDigest(
-                        metaFactory,
-                        "digest2.xml",
-                        "SHA1",
-                        "3c47a807517d867d42ffacb2d3e9da81895d5aac"));
-        addTest(
-                new org.apache.axiom.ts.om.document.TestDigest(
-                        metaFactory, "digest3.xml", "SHA", 
"41466144c1cab4234fb127cfb8cf92f9"));
-        addTest(
-                new org.apache.axiom.ts.om.document.TestDigest(
-                        metaFactory,
-                        "digest4.xml",
-                        "SHA",
-                        "be3b0836cd6f0ceacdf3d40b49a0468d03d2ba2e"));
+        for (var params : org.apache.axiom.ts.om.document.TestDigest.PARAMS) {
+            addTest(new 
org.apache.axiom.ts.om.document.TestDigest(metaFactory, params));
+        }
         addTest(new 
org.apache.axiom.ts.om.document.TestGetOMDocumentElement(metaFactory));
         addTest(
                 new 
org.apache.axiom.ts.om.document.TestGetOMDocumentElementAfterDetach(
diff --git 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java
 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java
index 6e7bf5597..52096ba4d 100644
--- 
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java
+++ 
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java
@@ -26,19 +26,29 @@ import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.om.DigestTestCase;
 
+import com.google.common.collect.ImmutableList;
+
 public class TestDigest extends DigestTestCase {
-    private final String file;
+    public record Params(String file, String algorithm, String expectedDigest) 
{}
+
+    public static final ImmutableList<Params> PARAMS =
+            ImmutableList.of(
+                    new Params("digest1.xml", "MD5", 
"3e5d68c6607bc56c9c171560e4f19db9"),
+                    new Params("digest2.xml", "SHA1", 
"3c47a807517d867d42ffacb2d3e9da81895d5aac"),
+                    new Params("digest3.xml", "SHA", 
"41466144c1cab4234fb127cfb8cf92f9"),
+                    new Params("digest4.xml", "SHA", 
"be3b0836cd6f0ceacdf3d40b49a0468d03d2ba2e"));
+
+    private final Params params;
 
-    public TestDigest(
-            OMMetaFactory metaFactory, String file, String algorithm, String 
expectedDigest) {
-        super(metaFactory, algorithm, expectedDigest);
-        this.file = file;
-        addTestParameter("file", file);
+    public TestDigest(OMMetaFactory metaFactory, Params params) {
+        super(metaFactory, params.algorithm(), params.expectedDigest());
+        this.params = params;
+        addTestParameter("file", params.file());
     }
 
     @Override
     protected OMInformationItem createInformationItem() throws Exception {
-        InputStream in = TestDigest.class.getResourceAsStream(file);
+        InputStream in = TestDigest.class.getResourceAsStream(params.file());
         try {
             OMDocument document =
                     
OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), in)