From fbdcd2c4a7ee2ec62da3cfa9f7b2d587f34d813f Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Dec 2020 16:39:29 +0100 Subject: [PATCH] WW-5063 Adds tests to cover new functionality --- .../xwork2/ActionChainResultTest.java | 39 +++++++++++++++++++ .../struts2/result/HttpHeaderResultTest.java | 31 +++++++++------ .../struts2/result/PlainResultTest.java | 11 ++++++ .../struts2/result/PostbackResultTest.java | 13 ++++++- .../result/ServletRedirectResultTest.java | 13 ++++++- .../struts2/views/xslt/XSLTResultTest.java | 12 ++++++ .../apache/struts2/json/JSONResultTest.java | 11 ++++++ 7 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionChainResultTest.java diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionChainResultTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionChainResultTest.java new file mode 100644 index 000000000..61fd3633a --- /dev/null +++ b/core/src/test/java/com/opensymphony/xwork2/ActionChainResultTest.java @@ -0,0 +1,39 @@ +/* + * 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 com.opensymphony.xwork2; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +public class ActionChainResultTest { + + @Test + public void testPassingNullInvocation() throws Exception{ + Result result = new ActionChainResult(); + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + +} \ No newline at end of file diff --git a/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java index 640804ed6..61a8f86f5 100644 --- a/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java @@ -25,7 +25,6 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; -import org.apache.struts2.result.HttpHeaderResult; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; @@ -36,18 +35,19 @@ import java.util.Map; */ public class HttpHeaderResultTest extends StrutsInternalTestCase { - ActionInvocation invocation; - HttpHeaderResult result; - HttpServletResponse response; - Mock responseMock; - ReflectionProvider reflectionProvider; + private Mock invocationMock; + private ActionInvocation invocation; + private HttpHeaderResult result; + private HttpServletResponse response; + private Mock responseMock; + private ReflectionProvider reflectionProvider; public void testHeaderValuesAreNotParsedWhenParseIsFalse() throws Exception { - Map params = new HashMap(); + Map params = new HashMap<>(); params.put("headers.foo", "${bar}"); params.put("headers.baz", "baz"); - Map values = new HashMap(); + Map values = new HashMap<>(); values.put("bar", "abc"); ActionContext.getContext().getValueStack().push(values); @@ -61,11 +61,11 @@ public class HttpHeaderResultTest extends StrutsInternalTestCase { } public void testHeaderValuesAreParsedAndSet() throws Exception { - Map params = new HashMap(); + Map params = new HashMap<>(); params.put("headers.foo", "${bar}"); params.put("headers.baz", "baz"); - Map values = new HashMap(); + Map values = new HashMap<>(); values.put("bar", "abc"); ActionContext.getContext().getValueStack().push(values); @@ -113,12 +113,21 @@ public class HttpHeaderResultTest extends StrutsInternalTestCase { responseMock.verify(); } + public void testPassingNullInvocation() throws Exception { + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + protected void setUp() throws Exception { super.setUp(); result = new HttpHeaderResult(); responseMock = new Mock(HttpServletResponse.class); response = (HttpServletResponse) responseMock.proxy(); - Mock invocationMock = new Mock(ActionInvocation.class); + invocationMock = new Mock(ActionInvocation.class); invocationMock.expectAndReturn("getInvocationContext", ActionContext.getContext()); invocationMock.expectAndReturn("getStack", ActionContext.getContext().getValueStack()); invocation = (ActionInvocation) invocationMock.proxy(); diff --git a/core/src/test/java/org/apache/struts2/result/PlainResultTest.java b/core/src/test/java/org/apache/struts2/result/PlainResultTest.java index 4cd193c0e..3c4264f72 100644 --- a/core/src/test/java/org/apache/struts2/result/PlainResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/PlainResultTest.java @@ -19,6 +19,7 @@ package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.mock.MockActionInvocation; import org.apache.struts2.StrutsException; import org.apache.struts2.StrutsInternalTestCase; @@ -127,6 +128,16 @@ public class PlainResultTest extends StrutsInternalTestCase { } } + public void testPassingNullInvocation() throws Exception{ + Result result = (PlainResult) response -> response.write("ignore"); + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + public void setUp() throws Exception { super.setUp(); invocation = new MockActionInvocation(); diff --git a/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java b/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java index 32c0cca31..1cc6d24d4 100644 --- a/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java @@ -21,6 +21,7 @@ package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; @@ -32,7 +33,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import static org.easymock.EasyMock.createControl; import static org.easymock.EasyMock.expect; - public class PostbackResultTest extends StrutsInternalTestCase { public void testWithNoNamespace() throws Exception { @@ -93,4 +93,15 @@ public class PostbackResultTest extends StrutsInternalTestCase { control.verify(); } + public void testPassingNullInvocation() throws Exception{ + Result result = new PostbackResult(); + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + + } diff --git a/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java index c6be2ab0d..321b3b525 100644 --- a/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java @@ -23,6 +23,7 @@ import com.mockobjects.dynamic.Mock; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.config.entities.PackageConfig; import com.opensymphony.xwork2.config.entities.ResultConfig; @@ -376,7 +377,7 @@ public class ServletRedirectResultTest extends StrutsInternalTestCase implements * the desired log warning when an IllegalStateException is thrown for statusCode SC_FOUND. */ public void testSendRedirectSCFoundIllegalStateException() { - HttpServletResponse httpServletResponseMock = (HttpServletResponse) createMock(HttpServletResponse.class); + HttpServletResponse httpServletResponseMock = createMock(HttpServletResponse.class); boolean iseCaught = false; view.setLocation("/bar/foo.jsp"); view.setStatusCode(HttpServletResponse.SC_FOUND); @@ -432,6 +433,16 @@ public class ServletRedirectResultTest extends StrutsInternalTestCase implements } } + public void testPassingNullInvocation() throws Exception{ + Result result = new ServletRedirectResult(); + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + protected void setUp() throws Exception { super.setUp(); configurationManager.getConfiguration(). diff --git a/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java b/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java index 0fc912f80..ecc2b8469 100644 --- a/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java +++ b/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java @@ -19,7 +19,9 @@ package org.apache.struts2.views.xslt; import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionChainResult; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.mock.MockActionInvocation; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.util.ValueStack; @@ -241,6 +243,16 @@ public class XSLTResultTest extends StrutsInternalTestCase { assertEquals(actual, "ISO-8859-1"); } + public void testPassingNullInvocation() throws Exception{ + Result result = new XSLTResult(); + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + protected void setUp() throws Exception { super.setUp(); request = new MockHttpServletRequest(); diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java index 5f6aef793..531f7ef26 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java @@ -35,6 +35,7 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletResponse; +import com.opensymphony.xwork2.Result; import org.apache.struts2.StrutsStatics; import org.apache.struts2.StrutsTestCase; import org.apache.struts2.util.TestUtils; @@ -713,6 +714,16 @@ public class JSONResultTest extends StrutsTestCase { assertEquals("UTF-8", encoding); } + public void testPassingNullInvocation() throws Exception{ + Result result = new JSONResult(); + try { + result.execute(null); + fail("Exception should be thrown!"); + } catch (IllegalArgumentException e) { + assertEquals("Invocation cannot be null!", e.getMessage()); + } + } + @Override protected void setUp() throws Exception { super.setUp();