[asp.net] Don't attempt to use System.Web resources in System.Web.Extensions test...

WebTest is now a partial class and every code outside System.Web that uses it can copy its own
resources in addition to the common ones by implementing the CopyResourcesLocal partial method.

diff --git a/mcs/class/System.Web/System.Web_test.dll.sources b/mcs/class/System.Web/System.Web_test.dll.sources
index 780edc4d6040a61e0f5809ec0c362c316fc86b01..23ac22afc3b5a07a3e2e8354e82b6451225911e5 100644 (file)
--- a/mcs/class/System.Web/System.Web_test.dll.sources
+++ b/mcs/class/System.Web/System.Web_test.dll.sources
@@ -36,6 +36,7 @@ mainsoft/NunitWeb/NunitWeb/Response.cs
 mainsoft/NunitWeb/NunitWeb/StandardUrl.cs
 mainsoft/NunitWeb/NunitWeb/TestRoleProvider.cs
 mainsoft/NunitWeb/NunitWeb/WebTest.cs
+mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs
 mainsoft/NunitWeb/NunitWeb/WebTestResourcesSetupAttribute.cs
 mainsoft/NunitWeb/NunitWeb/Tests/TagsNestedInClientTag.cs
 mainsoft/NunitWeb/NunitWeb/Tests/TestSiteMapProvider.cs

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 dad9726ace61980b7cc6c1f421b13b4ae5780a56..3496770e2edf78d6950d69e748315a984df68415 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
@@ -22,7 +22,7 @@ namespace MonoTests.SystemWeb.Framework
        /// <seealso cref="Invoker"/>
        /// <seealso cref="Run"/>
        [Serializable]
-       public class WebTest
+       public partial class WebTest
        {
                /// <summary>
                /// Thrown when trying to copy a resource after appdomain was created. Please call
@@ -599,28 +599,15 @@ namespace MonoTests.SystemWeb.Framework
                        
                        CopyResource (myself, "My.ashx", "My.ashx");
                        CopyResource (myself, "Global.asax", "Global.asax");
-#if NET_2_0
-#if INSIDE_SYSTEM_WEB || DOTNET
-                       CopyPrefixedResources (myself, "App_GlobalResources/", "App_GlobalResources");
-                       CopyPrefixedResources (myself, "App_Code/", "App_Code");
-#endif
-#if DOTNET
-                       CopyResource (myself, "Web.config", "Web.config");
-#else
-#if NET_4_0
-                       CopyResource (myself, "Web.mono.config.4.0", "Web.config");
-#else
-                       CopyResource (myself, "Web.mono.config", "Web.config");
-#endif
-#endif
-#else
-                       CopyResource (myself, "Web.mono.config.1.1", "Web.config");
-#endif
                        CopyResource (myself, "MyPage.aspx", "MyPage.aspx");
                        CopyResource (myself, "MyPage.aspx.cs", "MyPage.aspx.cs");
                        CopyResource (myself, "MyPageWithMaster.aspx", "MyPageWithMaster.aspx");
                        CopyResource (myself, "My.master", "My.master");
+
+                       CopyResourcesLocal ();
                }
+
+               static partial void CopyResourcesLocal ();
 #endif
        }
 }

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs
new file mode 100644 (file)
index 0000000..a05f654
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace MonoTests.SystemWeb.Framework
+{
+       public partial class WebTest
+       {
+               static partial void CopyResourcesLocal ()
+               {
+                       Type myself = typeof (WebTest);
+#if NET_2_0
+                       CopyPrefixedResources (myself, "App_GlobalResources/", "App_GlobalResources");
+                       CopyPrefixedResources (myself, "App_Code/", "App_Code");
+#if DOTNET
+                       CopyResource (myself, "Web.config", "Web.config");
+#else
+#if NET_4_0
+                       CopyResource (myself, "Web.mono.config.4.0", "Web.config");
+#else
+                       CopyResource (myself, "Web.mono.config", "Web.config");
+#endif
+#endif
+#else
+                       CopyResource (myself, "Web.mono.config.1.1", "Web.config");
+#endif
+               }
+       }
+}