* UriTest.cs: Removed extra tabs.

* UriTest3.cs: Added test for bug #325863. Improved test for absolute
URI.

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

diff --git a/mcs/class/System/Test/System/ChangeLog b/mcs/class/System/Test/System/ChangeLog
index 7bc39fc43a993e23df3f5504b5d3bc8d932bd526..cfe161237809d046f5847ac77f82a7369c172bcc 100644 (file)
--- a/mcs/class/System/Test/System/ChangeLog
+++ b/mcs/class/System/Test/System/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-16  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * UriTest.cs: Removed extra tabs.
+       * UriTest3.cs: Added test for bug #325863. Improved test for absolute
+       URI.
+
 2007-09-30  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * UriTest3.cs: Added test for bug #328768 and #323542.

diff --git a/mcs/class/System/Test/System/UriTest.cs b/mcs/class/System/Test/System/UriTest.cs
index 5efae863af2a8c1f42dadedd9ae0ed62f87681e1..fbaa8e06a8eb831e5b9a0f9c3e331448e6393fa2 100644 (file)
--- a/mcs/class/System/Test/System/UriTest.cs
+++ b/mcs/class/System/Test/System/UriTest.cs
@@ -1177,9 +1177,9 @@ namespace MonoTests.System
                        uri2 = new Uri ("http://www.contoso.com/index.htm?x=1");
                        Assert ("#2", uri1.GetHashCode () != uri2.GetHashCode ());
                        uri2 = new Uri ("http://www.contoso.com:80/index.htm");
-                       AssertEquals ("#3", uri1.GetHashCode (), uri2.GetHashCode ());                  
+                       AssertEquals ("#3", uri1.GetHashCode (), uri2.GetHashCode ());
                        uri2 = new Uri ("http://www.contoso.com:8080/index.htm");
-                       Assert ("#4", uri1.GetHashCode () != uri2.GetHashCode ());                      
+                       Assert ("#4", uri1.GetHashCode () != uri2.GetHashCode ());
                }
 
 #if NET_2_0
@@ -1202,8 +1202,8 @@ namespace MonoTests.System
                        Assert ("#5b", !uri3.Equals(uri4));
                }
 
-               [ExpectedException(typeof(InvalidOperationException))]
                [Test]
+               [ExpectedException(typeof(InvalidOperationException))]
                public void GetLeftPart_Partial1 ()
                {
                        Uri u = new Uri ("foo", UriKind.Relative);
@@ -1612,8 +1612,6 @@ namespace MonoTests.System
                }
 #endif
 
-
-
                // This test doesn't work on Linux, and arguably shouldn't work.
                // new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar" 
                // on Linux, as anyone sane would expect.  It *doesn't* under .NET 1.1

diff --git a/mcs/class/System/Test/System/UriTest3.cs b/mcs/class/System/Test/System/UriTest3.cs
index 5d0aafe5f7a44f4c2587c22a6c1f7ac802f93ebe..295797bd467179dfc46248afa19dd5686a0c58fc 100644 (file)
--- a/mcs/class/System/Test/System/UriTest3.cs
+++ b/mcs/class/System/Test/System/UriTest3.cs
@@ -62,9 +62,11 @@ namespace MonoTests.System
                public void Absolute_UriKind_Absolute ()
                {
                        Uri uri = new Uri (absolute, UriKind.Absolute);
-                       Assert.AreEqual ("www.mono-project.com", uri.DnsSafeHost, "DnsSafeHost");
-                       Assert.IsTrue (uri.IsAbsoluteUri, "IsAbsoluteUri");
-                       Assert.AreEqual (absolute, uri.OriginalString, "OriginalString");
+                       Assert.AreEqual ("www.mono-project.com", uri.DnsSafeHost, "#1");
+                       Assert.IsTrue (uri.IsAbsoluteUri, "#2");
+                       Assert.AreEqual (absolute, uri.OriginalString, "#3");
+                       Assert.AreEqual (absolute, uri.ToString (), "#4");
+                       Assert.IsFalse (uri.UserEscaped, "#5");
                }
 
                [Test]
@@ -88,6 +90,11 @@ namespace MonoTests.System
                        Assert.AreEqual ("foo/bar", uri.ToString (), "#C3");
                        Assert.IsFalse (uri.UserEscaped, "#C4");
 
+                       uri = new Uri ("/test.aspx", UriKind.Relative);
+                       Assert.IsFalse (uri.IsAbsoluteUri, "#D1");
+                       Assert.AreEqual ("/test.aspx", uri.OriginalString, "#D2");
+                       Assert.AreEqual ("/test.aspx", uri.ToString (), "#D3");
+                       Assert.IsFalse (uri.UserEscaped, "#D4");
                }
 
                [Test]