From 143be3f17343467df7201c457c62d25ddbf5fa44 Mon Sep 17 00:00:00 2001 From: jdyer1 Date: Mon, 6 Nov 2023 15:16:27 -0600 Subject: [PATCH] WN-5141 - fix one more test - remove mockobjects-http from core --- core/pom.xml | 11 ----------- .../exec/StrutsBackgroundProcessTest.java | 13 +++++++------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c7903634c..154b69254 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -279,17 +279,6 @@ mockobjects-core - - mockobjects - mockobjects-jdk1.4-j2ee1.3 - 0.09 - test - - - - - - jmock jmock diff --git a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java index 331b5a7a9..401946e2d 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java @@ -18,12 +18,6 @@ */ package org.apache.struts2.interceptor.exec; -import com.mockobjects.servlet.MockHttpServletRequest; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.mock.MockActionInvocation; -import org.apache.struts2.StrutsInternalTestCase; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -41,6 +35,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.struts2.StrutsInternalTestCase; +import org.springframework.mock.web.MockHttpServletRequest; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.mock.MockActionInvocation; + /** * Test case for BackgroundProcessTest. */