Merge pull request #1222 from LogosBible/uri-trycreate

[mono.git] / mcs / class / System / Test / System / UriTest3.cs

diff --git a/mcs/class/System/Test/System/UriTest3.cs b/mcs/class/System/Test/System/UriTest3.cs
index f129bb87175db326990c55638ac169c699543850..7ff8924d0daaed4c9091dbdcbba456fa6b3a0323 100644 (file)
--- a/mcs/class/System/Test/System/UriTest3.cs
+++ b/mcs/class/System/Test/System/UriTest3.cs
@@ -184,6 +184,12 @@ namespace MonoTests.System
 
                        Assert.IsTrue (Uri.TryCreate ("http://mono-project.com/☕", UriKind.Absolute, out uri), "highunicode-Absolute");
                        Assert.AreEqual("http://mono-project.com/%E2%98%95", uri.AbsoluteUri, "highunicode-Absolute-AbsoluteUri");
+
+                       string mixedCaseUri = "http://mOnO-proJECT.com";
+                       uri = new Uri (mixedCaseUri);
+                       Uri uri2;
+                       Assert.IsTrue (Uri.TryCreate (mixedCaseUri, UriKind.Absolute, out uri2), "mixedcasehost-absolute");
+                       Assert.AreEqual (uri.AbsoluteUri, uri2.AbsoluteUri, "mixedcasehost-absoluteuri-absoluteuri");
                }
 
                [Test] // TryCreate (String, UriKind, Uri)
@@ -425,13 +431,8 @@ namespace MonoTests.System
                                http.IsBaseOf (null);
                                Assert.Fail ();
                        }
-#if NET_4_0
                        catch (ArgumentNullException) {
                        }
-#else
-                       catch (NullReferenceException) {
-                       }
-#endif
                }
 
                [Test]