Author: gert
Date: 2007-10-16 07:11:06 -0400 (Tue, 16 Oct 2007)
New Revision: 87574
Modified:
trunk/mcs/class/System/Test/System/ChangeLog
trunk/mcs/class/System/Test/System/UriTest.cs
trunk/mcs/class/System/Test/System/UriTest3.cs
Log:
* UriTest.cs: Removed extra tabs.
* UriTest3.cs: Added test for bug #325863. Improved test for absolute
URI.
Modified: trunk/mcs/class/System/Test/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/Test/System/ChangeLog 2007-10-16 11:09:16 UTC
(rev 87573)
+++ trunk/mcs/class/System/Test/System/ChangeLog 2007-10-16 11:11:06 UTC
(rev 87574)
@@ -1,3 +1,9 @@
+2007-10-16 Gert Driesen <[EMAIL PROTECTED]>
+
+ * UriTest.cs: Removed extra tabs.
+ * UriTest3.cs: Added test for bug #325863. Improved test for absolute
+ URI.
+
2007-09-30 Gert Driesen <[EMAIL PROTECTED]>
* UriTest3.cs: Added test for bug #328768 and #323542.
Modified: trunk/mcs/class/System/Test/System/UriTest.cs
===================================================================
--- trunk/mcs/class/System/Test/System/UriTest.cs 2007-10-16 11:09:16 UTC
(rev 87573)
+++ trunk/mcs/class/System/Test/System/UriTest.cs 2007-10-16 11:11:06 UTC
(rev 87574)
@@ -1177,9 +1177,9 @@
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 @@
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 @@
}
#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
Modified: trunk/mcs/class/System/Test/System/UriTest3.cs
===================================================================
--- trunk/mcs/class/System/Test/System/UriTest3.cs 2007-10-16 11:09:16 UTC
(rev 87573)
+++ trunk/mcs/class/System/Test/System/UriTest3.cs 2007-10-16 11:11:06 UTC
(rev 87574)
@@ -62,9 +62,11 @@
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 @@
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]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
