Fix failures when running tests in J2EE mode

svn path=/trunk/mcs/; revision=73069

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 42fba3906301295b2c84b70777c52a5d944bf684..939ad93b239d31f25d544d998d206939642b2edd 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-18  Eyal Alaluf  <eyala@mainsoft.com>
+
+       * run-mono-tests.bat: Add J2EE jar to classpath.
+
 2007-02-12  Marek Habersack  <grendello@gmail.com>
 
        * System.Web.dll.sources: added PreservationFile.cs

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index 9a936bc15025c910f63770c399dbadcae128c93b..28fa7076c6513008549fa82513060b18ec9fbbd9 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-18  Eyal Alaluf  <eyala@mainsoft.com>
+
+       * HttpContext.jvm.cs, HttpRequest.jvm.cs: Adapt for tunning under test
+         harness where we don't have a SevletRequest/Response.
+
 2007-02-13  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * HttpApplication.cs: fixed InitOnce, httpModules section is global and

diff --git a/mcs/class/System.Web/System.Web/HttpContext.jvm.cs b/mcs/class/System.Web/System.Web/HttpContext.jvm.cs
index d59f8349ed080cc28cce364f8a41166878e98e00..495ee753be374f1fb7adeeca8dcdbe5fb25edced 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpContext.jvm.cs
+++ b/mcs/class/System.Web/System.Web/HttpContext.jvm.cs
@@ -49,7 +49,8 @@ namespace System.Web {
 \r
                internal object GetWorkerService(Type t)\r
                {\r
-                       return ((IServiceProvider) WorkerRequest).GetService(t);\r
+                       IServiceProvider prv = WorkerRequest as IServiceProvider;\r
+                       return prv != null ? prv.GetService(t) : null;\r
                }\r
 \r
                internal HttpServlet Servlet {\r

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.jvm.cs b/mcs/class/System.Web/System.Web/HttpRequest.jvm.cs
index 37873d1f7c909643ed45be1b4d6228118d5d4b35..d7ccbbab8d87171b805193993850da2ff76e3bb9 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRequest.jvm.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.jvm.cs
@@ -57,6 +57,9 @@ namespace System.Web
                void LoadWwwForm ()\r
                {\r
                        HttpServletRequest servletReq = context.ServletRequest;\r
+                       if (servletReq == null)\r
+                               return;\r
+\r
                        servletReq.setCharacterEncoding (ContentEncoding.WebName);\r
 \r
                        for (java.util.Enumeration e = servletReq.getParameterNames(); e.hasMoreElements() ;) {\r
@@ -121,7 +124,10 @@ namespace System.Web
 \r
                internal void GetSessionCookiesForPortal (HttpCookieCollection cookies)\r
                {\r
-                       HttpSession javaSession = context.ServletRequest.getSession(false);\r
+                       HttpServletRequest servletReq = context.ServletRequest;\r
+                       if (servletReq == null)\r
+                               return;\r
+                       HttpSession javaSession = servletReq.getSession(false);\r
                        if (javaSession == null)\r
                                return;\r
 \r
@@ -160,6 +166,8 @@ namespace System.Web
                                return;\r
 \r
                        HttpServletRequest servletReq = context.ServletRequest;\r
+                       if (servletReq == null)\r
+                               return;\r
                        bool inPortletMode = servletReq is IPortletRequest;\r
                        bool shouldStoreCookiesCollection = false;\r
                        HttpSession javaSession = servletReq.getSession(false);\r

diff --git a/mcs/class/System.Web/run-mono-tests.bat b/mcs/class/System.Web/run-mono-tests.bat
index e4c4e16d8622641587d31c61f3da808ba8b5b064..6a1cb7f72a9a52a92cbb0deca5ec4c938b78c41c 100755 (executable)
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -45,6 +45,7 @@ REM @echo Set environment
 REM ********************************************************\r
 \r
 set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set TOMCAT_PATH=%VMW_HOME%\jakarta-tomcat\common\lib\\r
 set JAVA_HOME=%VMW_HOME%\jre5\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
@@ -60,6 +61,8 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\derby.jar
 \r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\NunitWeb.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\HtmlCompare.jar\r
+\r
+set TOMCAT_CLASSPATH=%TOMCAT_PATH%servlet-api.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
 if "%GH_VERSION%"=="" (\r
@@ -79,7 +82,7 @@ set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CON
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.\r
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%\r
 \r
-set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%;%TOMCAT_CLASSPATH%"\r
 \r
 REM ********************************************************\r
 @echo Building GH solution...\r