This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5340-ognl-guard
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 193ef74b1920c1f87028283e808396cdff41728c
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Thu Aug 31 20:43:23 2023 +1000
WW-5340 Fix tests
---
.../xwork2/DefaultActionInvocationTest.java | 6 ++++--
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 18 +++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
b/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
index db6e21b64..00c97c972 100644
---
a/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
@@ -28,6 +28,7 @@ import com.opensymphony.xwork2.mock.MockInterceptor;
import com.opensymphony.xwork2.mock.MockResult;
import com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory;
import com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory;
+import com.opensymphony.xwork2.ognl.DefaultOgnlGuard;
import com.opensymphony.xwork2.ognl.OgnlUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -532,8 +533,9 @@ public class DefaultActionInvocationTest extends
XWorkTestCase {
private OgnlUtil createOgnlUtil() {
return new OgnlUtil(
- new DefaultOgnlExpressionCacheFactory<>(),
- new DefaultOgnlBeanInfoCacheFactory<>()
+ new DefaultOgnlExpressionCacheFactory<>(),
+ new DefaultOgnlBeanInfoCacheFactory<>(),
+ new DefaultOgnlGuard()
);
}
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 559677e99..f9a62cdc7 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -1345,21 +1345,21 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testDefaultOgnlUtilAlternateConstructorArguments() {
// Code coverage test for the OgnlUtil alternate constructor method,
and verify expected behaviour.
try {
- OgnlUtil basicOgnlUtil = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), null);
+ OgnlUtil basicOgnlUtil = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), null, null);
fail("null beanInfoCacheFactory should result in exception");
- } catch (IllegalArgumentException iaex) {
+ } catch (NullPointerException iaex) {
// expected result
}
try {
- OgnlUtil basicOgnlUtil = new OgnlUtil(null, new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>());
+ OgnlUtil basicOgnlUtil = new OgnlUtil(null, new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>(), null);
fail("null expressionCacheFactory should result in exception");
- } catch (IllegalArgumentException iaex) {
+ } catch (NullPointerException iaex) {
// expected result
}
}
public void testDefaultOgnlUtilExclusionsAlternateConstructorPopulated() {
- OgnlUtil basicOgnlUtil = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>());
+ OgnlUtil basicOgnlUtil = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>(), new DefaultOgnlGuard());
internalTestInitialEmptyOgnlUtilExclusions(basicOgnlUtil);
internalTestOgnlUtilExclusionsImmutable(basicOgnlUtil);
@@ -1737,7 +1737,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testGetExcludedPackageNamesAlternateConstructorPopulated() {
// Getter should return an immutable collection
- OgnlUtil util = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<>(), new DefaultOgnlBeanInfoCacheFactory<>());
+ OgnlUtil util = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<>(), new DefaultOgnlBeanInfoCacheFactory<>(),
new DefaultOgnlGuard());
util.setExcludedPackageNames("java.lang,java.awt");
assertEquals(util.getExcludedPackageNames().size(), 2);
try {
@@ -1765,7 +1765,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testGetExcludedClassesAlternateConstructorPopulated() {
// Getter should return an immutable collection
- OgnlUtil util = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>());
+ OgnlUtil util = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>(), new DefaultOgnlGuard());
util.setExcludedClasses("java.lang.Runtime,java.lang.ProcessBuilder,java.net.URL");
assertEquals(util.getExcludedClasses().size(), 3);
try {
@@ -1793,7 +1793,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void
testGetExcludedPackageNamePatternsAlternateConstructorPopulated() {
// Getter should return an immutable collection
- OgnlUtil util = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>());
+ OgnlUtil util = new OgnlUtil(new
DefaultOgnlExpressionCacheFactory<String, Object>(), new
DefaultOgnlBeanInfoCacheFactory<Class<?>, BeanInfo>(), new DefaultOgnlGuard());
util.setExcludedPackageNamePatterns("java.lang.");
assertEquals(util.getExcludedPackageNamePatterns().size(), 1);
try {
@@ -1899,7 +1899,7 @@ public class OgnlUtilTest extends XWorkTestCase {
expressionFactory.setCacheMaxSize("25");
beanInfoFactory.setUseLRUCache("true");
beanInfoFactory.setCacheMaxSize("25");
- result = new OgnlUtil(expressionFactory, beanInfoFactory);
+ result = new OgnlUtil(expressionFactory, beanInfoFactory, new
DefaultOgnlGuard());
return result;
}
