(ws-axiom) branch master updated: Refactor SpringWSTestSuiteBuilder to build ScenarioConfig list and inline addScenarioTests

[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 4065199fe Refactor SpringWSTestSuiteBuilder to build ScenarioConfig 
list and inline addScenarioTests
4065199fe is described below

commit 4065199feaab4897b719ff03f90a9314745fade2
Author: Andreas Veithen-Knowles <andreas.veit...@gmail.com>
AuthorDate: Thu Mar 12 23:41:26 2026 +0000

    Refactor SpringWSTestSuiteBuilder to build ScenarioConfig list and inline 
addScenarioTests
---
 .../ts/springws/SpringWSTestSuiteBuilder.java      | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
index e02103e16..00b5b898a 100644
--- 
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
+++ 
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
@@ -18,6 +18,9 @@
  */
 package org.apache.axiom.ts.springws;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.axiom.testing.multiton.Multiton;
 import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -47,6 +50,13 @@ public class SpringWSTestSuiteBuilder extends 
MatrixTestSuiteBuilder {
 
     @Override
     protected void addTests() {
+        List<ScenarioConfig> configs = new ArrayList<>();
+        configs.add(new ScenarioConfig(altMessageFactoryConfigurator, 
messageFactoryConfigurator));
+        if (altMessageFactoryConfigurator != messageFactoryConfigurator) {
+            configs.add(
+                    new ScenarioConfig(messageFactoryConfigurator, 
altMessageFactoryConfigurator));
+        }
+
         addTest(new 
TestCreateWebServiceMessageFromInputStreamMTOM(messageFactoryConfigurator));
         for (SOAPSpec spec : Multiton.getInstances(SOAPSpec.class)) {
             addTest(new 
TestCreateWebServiceMessage(messageFactoryConfigurator, spec));
@@ -56,25 +66,15 @@ public class SpringWSTestSuiteBuilder extends 
MatrixTestSuiteBuilder {
             addTest(
                     new 
TestCreateWebServiceMessageFromInputStreamVersionMismatch(
                             messageFactoryConfigurator, spec));
-            addScenarioTests(
-                    new ScenarioConfig(altMessageFactoryConfigurator, 
messageFactoryConfigurator),
-                    spec);
-            if (altMessageFactoryConfigurator != messageFactoryConfigurator) {
-                addScenarioTests(
-                        new ScenarioConfig(
-                                messageFactoryConfigurator, 
altMessageFactoryConfigurator),
-                        spec);
+            for (ScenarioConfig config : configs) {
+                addTest(new ClientServerTest(config, spec));
+                addTest(new WSAddressingDOMTest(config, spec));
+                addTest(new JAXB2Test(config, spec));
+                addTest(new BrokerScenarioTest(config, spec));
+                addTest(new ValidationTest(config, spec));
+                addTest(new SecureEchoTest(config, spec));
+                addTest(new SoapActionTest(config, spec));
             }
         }
     }
-
-    private void addScenarioTests(ScenarioConfig config, SOAPSpec spec) {
-        addTest(new ClientServerTest(config, spec));
-        addTest(new WSAddressingDOMTest(config, spec));
-        addTest(new JAXB2Test(config, spec));
-        addTest(new BrokerScenarioTest(config, spec));
-        addTest(new ValidationTest(config, spec));
-        addTest(new SecureEchoTest(config, spec));
-        addTest(new SoapActionTest(config, spec));
-    }
 }