Author: igorz
Date: 2007-04-26 11:21:15 -0400 (Thu, 26 Apr 2007)
New Revision: 76332
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
Log:
merged r76326-76327
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
2007-04-26 15:17:09 UTC (rev 76331)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
2007-04-26 15:21:15 UTC (rev 76332)
@@ -42,6 +42,13 @@
[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 @@
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 @@
}
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]
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
2007-04-26 15:17:09 UTC (rev 76331)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/Web.config
2007-04-26 15:21:15 UTC (rev 76332)
@@ -7,7 +7,7 @@
<add path="WebResource.axd" verb="GET"
type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />
<add path="page.fake" verb ="GET"
type="MonoTests.SystemWeb.Framework.MyHandler"/>
</httpHandlers>
- <membership>
+ <membership defaultProvider="FakeProvider">
<providers>
<add name="FakeProvider"
type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"
enablePasswordRetrieval="false" enablePasswordReset="true"
requiresQuestionAndAnswer="true"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
