Merge pull request #2057 from directhex/monolite-on-jenkins

[mono.git] / mcs / class / System / Test / System.Net / CredentialCacheTest.cs

diff --git a/mcs/class/System/Test/System.Net/CredentialCacheTest.cs b/mcs/class/System/Test/System.Net/CredentialCacheTest.cs
index 1b7df0b3f1572ad867cd776147e977247504f74b..58cbeef572589761dc102164c70e4de78f56234f 100644 (file)
--- a/mcs/class/System/Test/System.Net/CredentialCacheTest.cs
+++ b/mcs/class/System/Test/System.Net/CredentialCacheTest.cs
@@ -42,56 +42,56 @@ public class CredentialCacheTest
        \r
                try {\r
                        c.Add (new Uri("http://www.ximian.com"), "Basic", cred1);\r
-                       Assertion.Fail ("#1: should have failed");\r
+                       Assert.Fail ("#1: should have failed");\r
                } catch (ArgumentException) { }\r
 \r
                c.Add (new Uri("http://www.contoso.com/"), "**Unknown**", cred1);\r
                result = c.GetCredential (new Uri("http://www.contoso.com/"), "**Unknown**");\r
-               Assertion.AssertEquals ("#3", result, cred1);\r
+               Assert.AreEqual (result, cred1, "#3");\r
                c.Remove (new Uri("http://www.contoso.com/"), "**Unknown**");\r
                result = c.GetCredential (new Uri("http://www.contoso.com/"), "**Unknown**");\r
-               Assertion.Assert ("#4", result == null);\r
+               Assert.IsTrue (result == null, "#4");\r
 \r
                c.Add (new Uri("http://www.contoso.com/"), "**Unknown**", cred1);\r
                result = c.GetCredential (new Uri("http://www.contoso.com"), "**Unknown**");\r
-               Assertion.AssertEquals ("#5", result, cred1);\r
+               Assert.AreEqual (result, cred1, "#5");\r
                c.Remove (new Uri("http://www.contoso.com"), "**Unknown**");\r
                result = c.GetCredential (new Uri("http://www.contoso.com"), "**Unknown**");\r
-               Assertion.Assert ("#6", result == null);\r
+               Assert.IsTrue (result == null, "#6");\r
 \r
                c.Add (new Uri("http://www.contoso.com/portal/"), "**Unknown**", cred1);\r
                result = c.GetCredential (new Uri("http://www.contoso.com/portal/foo/bar.html"), "**Unknown**");\r
-               Assertion.AssertEquals ("#7", result, cred1);\r
+               Assert.AreEqual (result, cred1, "#7");\r
                c.Remove (new Uri("http://www.contoso.com"), "**Unknown**");\r
                result = c.GetCredential (new Uri("http://www.contoso.com"), "**Unknown**");\r
-               Assertion.Assert ("#8", result == null);\r
+               Assert.IsTrue (result == null, "#8");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news/index.aspx"), "Basic");\r
-               Assertion.AssertEquals ("#9", result, cred3);\r
+               Assert.AreEqual (result, cred3, "#9");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news/index"), "Basic");\r
-               Assertion.AssertEquals ("#10", result, cred3);\r
+               Assert.AreEqual (result, cred3, "#10");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news/"), "Basic");\r
-               Assertion.AssertEquals ("#11", result, cred3);\r
+               Assert.AreEqual (result, cred3, "#11");\r
                \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news"), "Basic");\r
-               Assertion.AssertEquals ("#12", result, cred4);\r
+               Assert.AreEqual (result, cred4, "#12");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/ne"), "Basic");\r
-               Assertion.AssertEquals ("#13", result, cred4);\r
+               Assert.AreEqual (result, cred4, "#13");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/"), "Basic");\r
-               Assertion.AssertEquals ("#14", result, cred4);                          \r
+               Assert.AreEqual (result, cred4, "#14");                         \r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/portal"), "Basic");\r
-               Assertion.AssertEquals ("#15", result, cred5);\r
+               Assert.AreEqual (result, cred5, "#15");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com:80/"), "Basic");\r
-               Assertion.AssertEquals ("#16", result, cred5);\r
+               Assert.AreEqual (result, cred5, "#16");\r
 \r
                result = c.GetCredential (new Uri("http://www.contoso.com"), "Basic");\r
-               Assertion.AssertEquals ("#17", result, cred5);          \r
+               Assert.AreEqual (result, cred5, "#17");         \r
 \r
                /*              \r
                IEnumerator e = c.GetEnumerator ();\r
@@ -99,6 +99,23 @@ public class CredentialCacheTest
                        Console.WriteLine (e.Current.GetType () + " : " + e.Current.ToString ());\r
                }\r
                */\r
+               result = c.GetCredential ("www.ximian.com", 80, "Basic");\r
+               Assert.IsTrue (result == null, "#18");          \r
+\r
+               c.Add ("www.ximian.com", 80, "Basic", cred1);\r
+\r
+               try {\r
+                       c.Add ("www.ximian.com", 80, "Basic", cred1);\r
+                       Assert.Fail ("#19: should have failed");\r
+               } catch (ArgumentException) { }\r
+\r
+               result = c.GetCredential ("www.ximian.com", 80, "Basic");\r
+               Assert.AreEqual (result, cred1, "#20");         \r
+\r
+               c.Remove (new Uri("http://www.contoso.com"), "Basic");\r
+               c.Add ("www.contoso.com", 80, "Basic", cred5);\r
+               result = c.GetCredential (new Uri("http://www.contoso.com"), "Basic");\r
+               Assert.IsTrue (result == null, "#21");          \r
        }\r
 }\r
 \r