Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WN-5141

Browse Source 
- use servlet api mocks from Spring instead of MockObjects
This commit is contained in:
jdyer1
2023-10-30 12:46:34 -05:00
committed by Lukasz Lenart
parent 416dd7e22b
commit 380b157bef
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+7 -5
View File
@@ -18,16 +18,18 @@
*/
package org.apache.struts2;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
import java.util.HashMap;
import java.util.Map;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import com.mockobjects.servlet.MockServletContext;
import com.opensymphony.xwork2.ActionContext;
import junit.framework.TestCase;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
import junit.framework.TestCase;
/**
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
+2 -3
View File
@@ -25,13 +25,12 @@ import java.util.Locale;
import java.util.Map;
import java.util.Vector;
import org.springframework.mock.web.MockHttpServletRequest;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.HttpSession;
import junit.framework.AssertionFailedError;
import com.mockobjects.servlet.MockHttpServletRequest;
/**
* StrutsMockHttpServletRequest
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.UUID;
import com.mockobjects.servlet.MockHttpSession;
import org.springframework.mock.web.MockHttpSession;
/**