From 0b9ca66f50da2390751f5ff69bdae5aafadd0c39 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 13 Nov 2023 14:55:42 -0600
Subject: [PATCH] Revert "WN-5141"

This reverts commit 1c43fd1dc77f0478823c668bca8a0a31f7e9dd6b.
---
 .../struts2/ServletActionContextTest.java     |  2 +-
 .../freemarker/FreeMarkerResultTest.java      | 19 ++++++++-----------
 .../struts2/views/jsp/IncludeTagTest.java     |  5 +++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
index 516d9437f..393fca956 100644
--- a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+++ b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockServletContext;
 
+import com.mockobjects.servlet.MockServletContext;
 import com.opensymphony.xwork2.ActionContext;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
index 14593aa2b..935d2aef2 100644
--- a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
+++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
@@ -18,26 +18,23 @@
  */
 package org.apache.struts2.views.freemarker;
 
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.apache.struts2.StrutsInternalTestCase;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
-import org.apache.struts2.views.jsp.StrutsMockServletContext;
-import org.junit.Ignore;
-import org.springframework.mock.web.MockHttpServletRequest;
-
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.mock.MockActionInvocation;
 import com.opensymphony.xwork2.mock.MockActionProxy;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory;
+import org.apache.struts2.StrutsInternalTestCase;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts2.views.jsp.StrutsMockServletContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 /**
  * Test case for FreeMarkerResult.
  */
-@Ignore
 public class FreeMarkerResultTest extends StrutsInternalTestCase {
 
     ValueStack stack;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
index 7ca1daf12..ea21fa029 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
@@ -26,6 +26,7 @@ import static org.easymock.EasyMock.verify;
 
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.components.Include;
+import org.springframework.mock.web.MockRequestDispatcher;
 
 import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.ServletRequest;
@@ -37,7 +38,7 @@ import jakarta.servlet.ServletResponse;
  */
 public class IncludeTagTest extends AbstractTagTest {
 
-    private RequestDispatcher mockRequestDispatcher;
+    private MockRequestDispatcher mockRequestDispatcher;
 
     private IncludeTag tag;
 
@@ -367,7 +368,7 @@ public class IncludeTagTest extends AbstractTagTest {
         super.setUp();
         tag = new IncludeTag();
 
-        mockRequestDispatcher = (RequestDispatcher) createMock(RequestDispatcher.class);
+        mockRequestDispatcher = (MockRequestDispatcher) createMock(RequestDispatcher.class);
 
         request.setRequestDispatcher(mockRequestDispatcher);
         tag.setPageContext(pageContext);