Use standard .ashx for handler instead of "page.fake"; handle Application_Error in...

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

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj
index 317b0abaeed25ca94033bb583b882f982bb321a1..c62aa2063ee9dbca26746ef08009b58ed4f2ca58 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj
@@ -61,18 +61,18 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <EmbeddedResource Include="Resources\Web.config" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <EmbeddedResource Include="Resources\MyPage.aspx">\r
       <SubType>ASPXCodeBehind</SubType>\r
     </EmbeddedResource>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <EmbeddedResource Include="Resources\My.master" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Resources\MyPageWithMaster.aspx">\r
+    <EmbeddedResource Include="Resources\MyPageWithMaster.aspx"/>\r
+    <EmbeddedResource Include ="Resources\Global.asax">\r
+      <LogicalName>Global.asax</LogicalName>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include ="Resources\My.ashx">\r
+      <LogicalName>My.ashx</LogicalName>\r
     </EmbeddedResource>\r
+\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\MainsoftWebTest\HtmlCompare.csproj">\r

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
index ca7859d51dbb4ad6307d4478e2b4fcc07a6283f7..00d316ae6827d556e95d58b2c8880762eb7853f9 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
@@ -12,7 +12,6 @@
 \r
     <httpHandlers>\r
       <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />\r
-      <add path="page.fake" verb ="GET" type="MonoTests.SystemWeb.Framework.MyHandler"/>      \r
     </httpHandlers>\r
     <membership>\r
       <providers>\r

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config
index ac4e5e0d110047bc7649e78fdde7c3cdb4835bfb..025e7cc6eb839b79932dec53fb9ef4552bb0ce15 100755 (executable)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config
@@ -9,7 +9,6 @@
 \r
     <httpHandlers>\r
       <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />\r
-      <add path="page.fake" verb ="GET" type="MonoTests.SystemWeb.Framework.MyHandler"/>      \r
     </httpHandlers>\r
     <membership>\r
       <providers>\r

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs
index 54252d6df07e2f46d9121acf2614a2a4c173d0fc..0c2e7685320c0e9c10ff6e45fd14a3b82262c924 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs
@@ -12,7 +12,7 @@ namespace MonoTests.SystemWeb.Framework
                /// <see cref="HandlerInvoker"/>\r
                /// </summary>\r
                /// <seealso cref="HandlerInvoker"/>\r
-               public const string FAKE_PAGE = "page.fake";
+               public const string FAKE_PAGE = "My.ashx";
                /// <summary>\r
                /// An empty page for generic usage.\r
                /// </summary>

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
index 8d92a716f0f4ca2e0be27e85d8c4aa033d4508c0..f16440b6f86aa1d9cea3a0ab93594966a427dec8 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
@@ -390,6 +390,8 @@ namespace MonoTests.SystemWeb.Framework
 
                private static void CopyResources ()
                {\r
+                       CopyResource (typeof (WebTest), "My.ashx", "My.ashx");\r
+                       CopyResource (typeof (WebTest), "Global.asax", "Global.asax");\r
 #if VISUAL_STUDIO
                        CopyResource (typeof (WebTest),
                                "MonoTests.SystemWeb.Framework.Resources.Web.config",