* VirtualPathUtilityTest.cs: refactoring:

make tests run in TARGET_JVM environment

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

diff --git a/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs b/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
index 26be86d2f7c66fca9b86c1e9d0993585203d4492..afa944a705838c84966fe98aa20f2b579acfe84f 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
@@ -42,6 +42,13 @@ namespace MonoTests.System.Web {
 
        [TestFixture]
        public class VirtualPathUtilityTest {
+
+#if TARGET_JVM
+               const string NunitWebAppName = "MainsoftWebApp20";
+#else
+               const string NunitWebAppName = "NunitWeb";
+#endif
+
                [Test]
                public void AppendTrailingSlash ()
                {
@@ -494,13 +501,13 @@ namespace MonoTests.System.Web {
 
                public static void GetFileName4_Load (Page p)
                {
-                       Assert.AreEqual ("NunitWeb", VPU.GetFileName ("~/"));
+                       Assert.AreEqual (NunitWebAppName, VPU.GetFileName ("~/"));
                        Assert.AreEqual ("hola", VPU.GetFileName ("~/hola"));
                        Assert.AreEqual ("hola", VPU.GetFileName ("~/hola/"));
                        Assert.AreEqual ("hi", VPU.GetFileName ("~/hi/there/.."));
                        Assert.AreEqual ("there", VPU.GetFileName ("~/hi/there/."));
 
-                       Assert.AreEqual ("NunitWeb", VPU.GetFileName ("~"));
+                       Assert.AreEqual (NunitWebAppName, VPU.GetFileName ("~"));
                        Assert.AreEqual ("", VPU.GetFileName ("~/.."));
                        Assert.AreEqual ("", VPU.GetFileName ("~/../"));
                        Assert.AreEqual ("hi", VPU.GetFileName ("~/../hi"));
@@ -710,8 +717,8 @@ namespace MonoTests.System.Web {
                }
         public static void ToAbsolute6_Load(Page p)
         {
-                       Assert.AreEqual ("/NunitWeb/", VPU.ToAbsolute ("~/"));
-                       Assert.AreEqual ("/NunitWeb", VPU.ToAbsolute ("~"));
+                       Assert.AreEqual ("/" + NunitWebAppName + "/", VPU.ToAbsolute ("~/"));
+                       Assert.AreEqual ("/" + NunitWebAppName, VPU.ToAbsolute ("~"));
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
index 33c80c248f79e6f8aea338a2972138efd7dd8310..ad852dada6ef7a3704169bd2b7391d931929c260 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
+++ b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
@@ -7,7 +7,7 @@
       <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
+    <membership defaultProvider="FakeProvider">\r
       <providers>\r
         <add name="FakeProvider" type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"\r
              enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true"\r