Cleanup and modernize mockrunner-servlet unit tests

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/workflows/build.yml

@@ -22,3 +22,15 @@ jobs:
         java-version: 1.8
     - name: Build with Maven
       run: mvn -B package --file pom.xml
+    - name: Store JVM Crash and Surefire Logs
+      if: always() # Forces this step to run even if the Maven build fails
+      uses: actions/upload-artifact@v4
+      with:
+        name: maven-crash-logs
+        path: |
+          **/hs_err_pid*.log
+          **/target/surefire-reports/*.dump*
+          **/target/surefire-reports/*.txt
+    - name: Check System Logs for Memory (OOM) Kills
+      if: always()
+      run: dmesg | grep -i -E 'oom[-_]killer|killed process' || echo "No OS-level OOM kills detected."

.gitignore

@@ -7,3 +7,4 @@
 /.project
 /.settings/
 /.DS_Store
+/.metadata/

mockrunner-all/pom.xml

@@ -5,8 +5,7 @@
 	<parent>
 		<groupId>com.mockrunner</groupId>
 		<artifactId>mockrunner</artifactId>
-		<version>2.0.7-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<version>2.0.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mockrunner-all</artifactId>
@@ -17,75 +16,75 @@
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-core</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-jms</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-jms</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-ejb</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-ejb</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-jdbc</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-jdbc</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-jca</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-servlet</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-servlet</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-tag</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-struts</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mockrunner</groupId>
 			<artifactId>mockrunner-struts</artifactId>
-			<version>2.0.7-SNAPSHOT</version>
+			<version>2.0.8-SNAPSHOT</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
@@ -105,6 +104,10 @@
 			<groupId>jboss</groupId>
 			<artifactId>jboss-j2ee</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.spec.javax.rmi</groupId>
+			<artifactId>jboss-rmi-api_1.0_spec</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -154,7 +157,7 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>release-module-exclusives</id>

mockrunner-all/src/main/java/com/mockrunner/base/HTMLOutputTestCase.java

@@ -56,7 +56,7 @@ protected org.w3c.dom.Document getOutputAsW3CDocument()
     /**
      * Delegates to {@link HTMLOutputModule#getOutputAsJDOMDocument}
      */
-    protected org.jdom.Document getOutputAsJDOMDocument()
+    protected org.jdom2.Document getOutputAsJDOMDocument()
     {
         return getHTMLOutputModule().getOutputAsJDOMDocument();
     }

mockrunner-all/src/test/java/com/mockrunner/test/web/HTMLOutputModuleTest.java

@@ -17,7 +17,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.junit.Before;
 import org.junit.Test;
 

mockrunner-core/pom.xml

@@ -5,8 +5,7 @@
 	<parent>
 		<groupId>com.mockrunner</groupId>
 		<artifactId>mockrunner</artifactId>
-		<version>2.0.7-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<version>2.0.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mockrunner-core</artifactId>
@@ -31,8 +30,8 @@
 
 		<!-- needed for XML Util -->
 		<dependency>
-			<groupId>jdom</groupId>
-			<artifactId>jdom</artifactId>
+			<groupId>org.jdom</groupId>
+			<artifactId>jdom2</artifactId>
 		</dependency>
 
 		<!-- needed for StringUtil (Perl5Compiler) -->

mockrunner-core/src/main/java/com/mockrunner/test/util/XmlUtilTest.java

@@ -5,8 +5,8 @@
 
 import junit.framework.TestCase;
 
-import org.jdom.Document;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.Element;
 
 import com.mockrunner.util.web.XmlUtil;
 

mockrunner-core/src/main/java/com/mockrunner/util/web/XmlUtil.java

@@ -5,9 +5,9 @@
 
 import org.apache.xerces.parsers.DOMParser;
 import org.cyberneko.html.HTMLConfiguration;
-import org.jdom.Element;
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.output.XMLOutputter;
 import org.xml.sax.InputSource;
 
 import com.mockrunner.base.NestedApplicationException;
@@ -34,10 +34,10 @@ public class XmlUtil
      * </pre>
      * 
      * the method returns the h1 tag as <code>Element</code>.
-     * @param document the <code>org.jdom.Document</code>
+     * @param document the <code>org.jdom2.Document</code>
      * @return the body <code>Element</code>
      */
-    public static Element getBodyFragmentFromJDOMDocument(org.jdom.Document document)
+    public static Element getBodyFragmentFromJDOMDocument(org.jdom2.Document document)
     {
         Element element = document.getRootElement().getChild("BODY");
         if(null == element)
@@ -57,17 +57,17 @@ public static Element getBodyFragmentFromJDOMDocument(org.jdom.Document document
      * @return the body element
      * @deprecated use {@link #getBodyFragmentFromJDOMDocument}
      */
-    public static Element getBodyFragmentJDOMDocument(org.jdom.Document document)
+    public static Element getBodyFragmentJDOMDocument(org.jdom2.Document document)
     {
         return getBodyFragmentFromJDOMDocument(document);
     }
 
     /**
      * Returns the documents XML content as a string.
-     * @param document the <code>org.jdom.Document</code>
+     * @param document the <code>org.jdom2.Document</code>
      * @return the output as string
      */
-    public static String createStringFromJDOMDocument(org.jdom.Document document)
+    public static String createStringFromJDOMDocument(org.jdom2.Document document)
     {
         try
         {
@@ -83,9 +83,9 @@ public static String createStringFromJDOMDocument(org.jdom.Document document)
      * Creates a JDOM <code>Document</code> from a specified
      * W3C <code>Document</code>.
      * @param document the <code>org.w3c.dom.Document</code>
-     * @return the <code>org.jdom.Document</code>
+     * @return the <code>org.jdom2.Document</code>
      */
-    public static org.jdom.Document createJDOMDocument(org.w3c.dom.Document document)
+    public static org.jdom2.Document createJDOMDocument(org.w3c.dom.Document document)
     {
         return new DOMBuilder().build(document);
     }