* XmlResolverTest.cs: Fix ResolveUri test on Windows when current

directory is not on C drive.

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

diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog
index 48a501ae131a494e75387472c56c8fe534f95563..d2914d9c149ca27451bfc7c7845ebb96b3b67d6b 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-22  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * XmlResolverTest.cs: Fix ResolveUri test on Windows when current
+       directory is not on C drive.
+
 2009-05-12  Jonas Larsson  <jonas.larsson@manodo.se>
 
        * XmlValidatingReaderTests.cs : test for bug #502168

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
index b4358abcc7e30fc85afa397b61207065de3dc421..5865dbe07bc7c3ddbd49b5ed4f835450ec64038b 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
@@ -74,9 +74,11 @@ namespace MonoTest.System.Xml {
                        Uri uri = xr.ResolveUri (null, "/Moonlight");
                        // note: this is *very* different from [silver|moon]light
                        Assert.IsTrue (uri.IsAbsoluteUri, "null,string");
-                       if (isWin32)
-                               Assert.AreEqual ("file:///C:/Moonlight", uri.ToString (), "ToString");
-                       else
+                       if (isWin32) {
+                               string currentdir = Directory.GetCurrentDirectory ();
+                               string volume = currentdir.Substring (0, 2);
+                               Assert.AreEqual ("file:///" + volume + "/Moonlight", uri.ToString (), "ToString");
+                       } else
                                Assert.AreEqual ("file:///Moonlight", uri.ToString (), "ToString");
 
                        uri = new Uri ("http://www.mono-project.com");
@@ -101,6 +103,6 @@ namespace MonoTest.System.Xml {
                        u2 = xr.ResolveUri (null, "file:///mystuff");
                        Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/file");
                }
-#endif
+#endif\r
        }
 }