WW-5334 Extract StrutsPortletTestCaseTest and fix tests

plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java

@@ -21,11 +21,8 @@ package org.apache.struts2.junit;
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
-import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.junit.Test;
 
-import javax.portlet.PortletContext;
 import javax.servlet.ServletException;
 import java.io.UnsupportedEncodingException;
 
@@ -65,35 +62,6 @@ public class StrutsTestCaseTest extends StrutsSpringTestCase {
         assertEquals("FD", name);
     }
 
-    @Test
-    public void shouldPortletContextBeAvailable() throws Exception {
-        // given
-        assertNull(ActionContext.getContext().get(StrutsStatics.STRUTS_PORTLET_CONTEXT));
-
-        // when
-        String output = executeAction("/test/testAction.action");
-        assertEquals("Hello", output);
-
-        // then
-        Object portletContext = ActionContext.getContext().get(StrutsStatics.STRUTS_PORTLET_CONTEXT);
-        assertNotNull(portletContext);
-        assertTrue(portletContext instanceof PortletContext);
-    }
-
-    @Test
-    public void shouldAdditionalContextParamsBeAvailable() throws Exception {
-        // given
-        String key = "my-param";
-        assertNull(ActionContext.getContext().get(key));
-
-        // when
-        String output = executeAction("/test/testAction.action");
-        assertEquals("Hello", output);
-
-        // then
-        assertNotNull(ActionContext.getContext().get(key));
-    }
-
     @Override
     protected void applyAdditionalParams(ActionContext context) {
         context.put("my-param", new Object());

plugins/portlet-junit/src/test/java/org/apache/struts2/junit/StrutsPortletTestCaseTest.java

@@ -0,0 +1,64 @@
+/*
+ * 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 org.apache.struts2.junit;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import org.apache.struts2.StrutsStatics;
+
+import javax.portlet.PortletContext;
+
+public class StrutsPortletTestCaseTest extends StrutsPortletTestCase {
+
+    String KEY = "my-param";
+
+    public void testShouldPortletContextBeAvailable() throws Exception {
+        // given
+        assertNull(ActionContext.getContext().get(StrutsStatics.STRUTS_PORTLET_CONTEXT));
+
+        // when
+        ActionProxy proxy = getActionProxy("/test/testAction.action");
+        String result = proxy.execute();
+
+        // then
+        assertEquals(Action.SUCCESS, result);
+        Object portletContext = ActionContext.getContext().get(StrutsStatics.STRUTS_PORTLET_CONTEXT);
+        assertNotNull(portletContext);
+        assertTrue(portletContext instanceof PortletContext);
+    }
+
+    public void testShouldAdditionalContextParamsBeAvailable() throws Exception {
+        // given
+        assertNull(ActionContext.getContext().get(KEY));
+
+        // when
+        ActionProxy proxy = getActionProxy("/test/testAction.action");
+        String result = proxy.execute();
+
+        // then
+        assertEquals(Action.SUCCESS, result);
+        assertNotNull(ActionContext.getContext().get(KEY));
+    }
+
+    @Override
+    protected void applyAdditionalParams(ActionContext context) {
+        context.put(KEY, new Object());
+    }
+}

plugins/portlet-junit/src/test/resources/struts.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/*
+ * 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.
+ */
+-->
+<!DOCTYPE struts PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+        "https://struts.apache.org/dtds/struts-2.1.dtd">
+
+<struts>
+    <package name="test" namespace="/test" extends="struts-default">
+        <action name="testAction" class="com.opensymphony.xwork2.ActionSupport">
+            <result name="success" type="httpheader">
+                <param name="status">200</param>
+            </result>
+        </action>
+    </package>
+</struts>