Merge pull request apache#732 from apache/WW-5334-fix-cyclic

WW-5334 Enable usage of junit-plugin inside velocity-plugin
atlassian-forks · Aug 19, 2023 · ea124a4 · ea124a4
2 parents 44f0a1b + 8248017
commit ea124a4
Show file tree

Hide file tree

Showing 31 changed files with 254 additions and 261 deletions.
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
@@ -56,12 +56,10 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
 
         <dependency>

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
@@ -108,22 +108,18 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
 
         <dependency>
@@ -134,10 +130,6 @@
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
 
        <dependency>
            <groupId>junit</groupId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -260,7 +260,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
@@ -55,17 +55,6 @@
             <artifactId>javax.el</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- this library is excluded in the parent pom as it clashes with Easymock dependencies -->
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <version>3.2</version>
-        </dependency>
 
         <!--
          The Java EE API modules listed below are all marked @Deprecated(forRemoval=true), because they are scheduled

diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
@@ -58,13 +58,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>

diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
@@ -49,10 +49,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
@@ -68,11 +64,6 @@
             <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <properties>

diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
@@ -32,10 +32,6 @@
     <name>DEPRECATED: Struts 2 Embedded JSP Plugin, since 6.0.0</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-velocity-plugin</artifactId>
@@ -65,11 +61,6 @@
             <artifactId>request</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-juli</artifactId>

diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
@@ -32,10 +32,6 @@
     <name>Struts 2 Jasper Reports Plugin</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
             <artifactId>jasperreports</artifactId>
@@ -62,11 +58,6 @@
             <artifactId>struts2-junit-plugin</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
@@ -33,14 +33,6 @@
     <name>Struts 2 Java Templates Plugin</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>

diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
@@ -61,11 +61,6 @@
             <artifactId>struts2-junit-plugin</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>

diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
@@ -54,22 +54,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>

diff --git a/plugins/junit/README.md b/plugins/junit/README.md
@@ -1,7 +1,4 @@
-# Struts 2 JFreeChart plugin
+# Struts 2 JUnit plugin
 The JUnit Plugin supports testing actions within a Struts invocation, meaning that a full request is simulated, 
 and the output of the action can be tested.
 You will find more details in [documentation](https://struts.apache.org/plugins/junit/).
-
-## Installation
-Just drop this plugin JAR into `WEB-INF/lib` folder or add it as a Maven dependency.
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
@@ -49,11 +49,6 @@
             <artifactId>struts2-spring-plugin</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -66,24 +61,11 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Portlet -->
-        <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-portlet-plugin</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-portlet-mocks-plugin</artifactId>
-            <optional>true</optional>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.23.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java
@@ -19,13 +19,9 @@
 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;
 
@@ -64,38 +60,4 @@ public void testGetValueFromStack() throws ServletException, UnsupportedEncoding
         String name = (String) findValueAfterExecute("name");
         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());
-    }
 }
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
@@ -84,11 +84,6 @@
             <artifactId>struts2-velocity-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
@@ -105,14 +100,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
     <properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
@@ -49,11 +49,6 @@
             <artifactId>xstream</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -50,6 +50,7 @@
         <module>pell-multipart</module>
         <module>plexus</module>
         <module>portlet</module>
+        <module>portlet-junit</module>
         <module>portlet-mocks</module>
         <module>portlet-tiles</module>
         <module>rest</module>
@@ -66,6 +67,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Test dependencies -->
@@ -74,7 +76,23 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/plugins/portlet-junit/README.md b/plugins/portlet-junit/README.md
@@ -0,0 +1,2 @@
+# Struts 2 Portlet JUnit plugin
+The Portlet JUnit Plugin supports testing applications that use the Portlet Plugin.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Struts 2 Portlet JUnit plugin
		The Portlet JUnit Plugin supports testing applications that use the Portlet Plugin.