改进单元测试，使之能在servlet3环境下测试通过

xiaomM · Oct 23, 2012 · 7aa7634 · 7aa7634
1 parent c70361d
commit 7aa7634
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 0 deletions.
diff --git a/service/form/src/test/java/com/alibaba/citrus/service/form/AbstractFormServiceTests.java b/service/form/src/test/java/com/alibaba/citrus/service/form/AbstractFormServiceTests.java
@@ -32,6 +32,7 @@
 import com.alibaba.citrus.service.requestcontext.RequestContext;
 import com.alibaba.citrus.service.requestcontext.RequestContextChainingService;
 import com.alibaba.citrus.service.resource.support.context.ResourceLoadingXmlApplicationContext;
+import com.alibaba.citrus.util.internal.Servlet3Util;
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.httpunit.PostMethodWebRequest;
@@ -66,6 +67,10 @@ public abstract class AbstractFormServiceTests {
     protected HttpServletRequest            newRequest;
     protected HttpServletResponse           newResponse;
 
+    static {
+        Servlet3Util.setDisableServlet3Features(true); // 禁用servlet3，因为httpunit还不支持
+    }
+
     protected final void getFormService(String name) {
         getFormService(name, factory);
     }

diff --git a/...ce/pull/src/test/java/com/alibaba/citrus/service/pull/AbstractPullServiceConfigTests.java b/...ce/pull/src/test/java/com/alibaba/citrus/service/pull/AbstractPullServiceConfigTests.java
@@ -34,6 +34,7 @@
 import com.alibaba.citrus.springext.support.context.XmlApplicationContext;
 import com.alibaba.citrus.springext.support.parser.AbstractSingleBeanDefinitionParser;
 import com.alibaba.citrus.test.runner.TestNameAware;
+import com.alibaba.citrus.util.internal.Servlet3Util;
 import com.meterware.servletunit.InvocationContext;
 import com.meterware.servletunit.ServletRunner;
 import com.meterware.servletunit.ServletUnitClient;
@@ -53,6 +54,10 @@ public abstract class AbstractPullServiceConfigTests {
     protected        RequestContextChainingService requestContexts;
     protected        RequestContext                rc;
 
+    static {
+        Servlet3Util.setDisableServlet3Features(true); // 禁用servlet3，因为httpunit还不支持
+    }
+
     @BeforeClass
     public static final void initStaticFactory() {
         staticFactory = createContext("pull/services-pull.xml");

diff --git a/...test/java/com/alibaba/citrus/service/requestcontext/parser/ParserRequestContextTests.java b/...test/java/com/alibaba/citrus/service/requestcontext/parser/ParserRequestContextTests.java
@@ -362,6 +362,12 @@ private void initMockRequest(String method, String queryString, String charset,
         request = createMock(HttpServletRequest.class);
         response = createMock(HttpServletResponse.class);
 
+        expect(request.getAttribute("_outer_webx3_request_context_async_")).andReturn(null);
+        expectLastCall().anyTimes();
+
+        request.removeAttribute("_outer_webx3_request_context_async_");
+        expectLastCall().anyTimes();
+
         request.setAttribute(org.easymock.EasyMock.<String>anyObject(), anyObject());
         expectLastCall().anyTimes();
 

diff --git a/test/webx/src/main/java/com/alibaba/citrus/test/util/ServletTestContainer.java b/test/webx/src/main/java/com/alibaba/citrus/test/util/ServletTestContainer.java
@@ -41,6 +41,7 @@
 import com.alibaba.citrus.service.requestcontext.RequestContext;
 import com.alibaba.citrus.service.requestcontext.RequestContextChainingService;
 import com.alibaba.citrus.springext.support.parser.AbstractNamedBeanDefinitionParser;
+import com.alibaba.citrus.util.internal.Servlet3Util;
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
@@ -73,6 +74,10 @@ public class ServletTestContainer {
 
     private WebResponse clientResponse;
 
+    static {
+        Servlet3Util.setDisableServlet3Features(true); // 禁用servlet3，因为httpunit还不支持
+    }
+
     public ServletTestContainer() {
         servletRunner = new PatchedServletRunner();
 

diff --git a/webx/framework/src/test/java/com/alibaba/citrus/webx/AbstractWebxTests.java b/webx/framework/src/test/java/com/alibaba/citrus/webx/AbstractWebxTests.java
@@ -41,6 +41,7 @@
 import com.alibaba.citrus.service.pipeline.PipelineContext;
 import com.alibaba.citrus.service.requestcontext.rundata.RunData;
 import com.alibaba.citrus.util.ServletUtil;
+import com.alibaba.citrus.util.internal.Servlet3Util;
 import com.alibaba.citrus.util.io.StreamUtil;
 import com.alibaba.citrus.webx.handler.RequestHandler;
 import com.alibaba.citrus.webx.handler.RequestHandlerContext;
@@ -65,6 +66,10 @@ public abstract class AbstractWebxTests {
     protected int               clientResponseCode;
     protected String            clientResponseContent;
 
+    static {
+        Servlet3Util.setDisableServlet3Features(true); // 禁用servlet3，因为httpunit还不支持
+    }
+
     protected final void prepareWebClient(String webXmlName) throws Exception {
         prepareWebClient(webXmlName, "");
     }

diff --git a/webx/turbine/src/test/java/com/alibaba/citrus/turbine/AbstractWebTests.java b/webx/turbine/src/test/java/com/alibaba/citrus/turbine/AbstractWebTests.java
@@ -35,6 +35,7 @@
 import com.alibaba.citrus.service.requestcontext.rundata.RunData;
 import com.alibaba.citrus.springext.support.context.XmlApplicationContext;
 import com.alibaba.citrus.turbine.util.TurbineUtil;
+import com.alibaba.citrus.util.internal.Servlet3Util;
 import com.alibaba.citrus.webx.WebxComponent;
 import com.alibaba.citrus.webx.util.WebxUtil;
 import com.meterware.httpunit.PostMethodWebRequest;
@@ -62,6 +63,10 @@ public abstract class AbstractWebTests {
     protected HttpServletRequest            newRequest;
     protected HttpServletResponse           newResponse;
 
+    static {
+        Servlet3Util.setDisableServlet3Features(true); // 禁用servlet3，因为httpunit还不支持
+    }
+
     protected static ApplicationContext createContext(String name) {
         return new XmlApplicationContext(new FileSystemResource(new File(srcdir, name)), null);
     }

diff --git a/webx/turbine/src/test/java/com/alibaba/citrus/turbine/AbstractWebxTests.java b/webx/turbine/src/test/java/com/alibaba/citrus/turbine/AbstractWebxTests.java
@@ -37,6 +37,7 @@
 import com.alibaba.citrus.service.requestcontext.util.RequestContextUtil;
 import com.alibaba.citrus.turbine.util.TurbineUtil;
 import com.alibaba.citrus.util.ServletUtil;
+import com.alibaba.citrus.util.internal.Servlet3Util;
 import com.alibaba.citrus.util.io.StreamUtil;
 import com.alibaba.citrus.webx.WebxComponent;
 import com.alibaba.citrus.webx.WebxController;
@@ -76,6 +77,10 @@ public abstract class AbstractWebxTests {
     protected HttpServletRequest            newRequest;
     protected HttpServletResponse           newResponse;
 
+    static {
+        Servlet3Util.setDisableServlet3Features(true); // 禁用servlet3，因为httpunit还不支持
+    }
+
     @After
     public void clearClient() {
         if (client != null) {