Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "WN-5141"

Browse Source 
This reverts commit 1c43fd1dc7.
This commit is contained in:
jdyer1
2023-11-13 14:55:42 -06:00
committed by Lukasz Lenart
parent b52f18ced4
commit 0b9ca66f50
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+1 -1
View File
@@ -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;
core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
+8 -11
View File
@@ -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;
core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
+3 -2
View File
@@ -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);