(struts) 02/02: WW-5352 Move method to XWorkTestCase

[kusal]

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch WW-5352-ognlvaluestack
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 9c575becfe730853aedd8e89c0a15db47307b524
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Jan 14 18:08:56 2024 +1100

    WW-5352 Move method to XWorkTestCase
---
 .../java/com/opensymphony/xwork2/XWorkTestCase.java    | 10 ++++++++++
 .../opensymphony/xwork2/ognl/OgnlValueStackTest.java   | 18 ++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java 
b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
index dc6bb2508..e615e1a79 100644
--- a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
+++ b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
@@ -73,6 +73,16 @@ public abstract class XWorkTestCase extends TestCase {
         actionProxyFactory = container.getInstance(ActionProxyFactory.class);
     }
 
+    protected void loadButSet(Map<String, ?> properties) {
+        loadConfigurationProviders(new StubConfigurationProvider() {
+            @Override
+            public void register(ContainerBuilder builder,
+                                 LocatableProperties props) throws 
ConfigurationException {
+                properties.forEach((k,v)-> props.setProperty(k, 
String.valueOf(v)));
+            }
+        });
+    }
+
     protected <T> void loadButAdd(final Class<T> type, final T impl) {
         loadButAdd(type, Container.DEFAULT_NAME, impl);
     }
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java 
b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
index ad5a301ad..3bdfd67fc 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
@@ -106,20 +106,10 @@ public class OgnlValueStackTest extends XWorkTestCase {
      *
      * @param allowStaticField new allowStaticField configuration
      */
-    private void reloadTestContainerConfiguration(boolean allowStaticField) {
+    private void reloadContainer(boolean allowStaticField) {
         Map<String, String> properties = new HashMap<>();
         properties.put(StrutsConstants.STRUTS_ALLOW_STATIC_FIELD_ACCESS, 
Boolean.toString(allowStaticField));
-        reloadTestContainerConfiguration(properties);
-    }
-
-    private void reloadTestContainerConfiguration(Map<String, String> 
properties) {
-        loadConfigurationProviders(new StubConfigurationProvider() {
-            @Override
-            public void register(ContainerBuilder builder,
-                                 LocatableProperties props) throws 
ConfigurationException {
-                properties.forEach(props::setProperty);
-            }
-        });
+        loadButSet(properties);
         refreshContainerFields();
     }
 
@@ -1184,7 +1174,7 @@ public class OgnlValueStackTest extends XWorkTestCase {
      * when static access flag is set to false.
      */
     public void testOgnlValueStackFromOgnlValueStackFactoryNoStaticAccess() 
throws IllegalAccessException {
-        reloadTestContainerConfiguration(false);
+        reloadContainer(false);
         Object accessedValue;
 
         assertFalse("OgnlValueStackFactory staticFieldAccess (set false) not 
false?",
@@ -1216,7 +1206,7 @@ public class OgnlValueStackTest extends XWorkTestCase {
      * when static access flag is set to true.
      */
     public void testOgnlValueStackFromOgnlValueStackFactoryAllStaticAccess() 
throws IllegalAccessException {
-        reloadTestContainerConfiguration(true);
+        reloadContainer(true);
         Object accessedValue;
 
         assertTrue("OgnlValueStackFactory staticFieldAccess (set true) not 
true?",