Merge pull request #201 from QuickJack/master

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

diff --git a/mcs/class/System/Test/System.Net/CookieCollectionTest.cs b/mcs/class/System/Test/System.Net/CookieCollectionTest.cs
index d94c2164115085938dbb37c9dc721a426050afb7..87d2325bb178a25b7d670b16e37521e49beebd18 100644 (file)
--- a/mcs/class/System/Test/System.Net/CookieCollectionTest.cs
+++ b/mcs/class/System/Test/System.Net/CookieCollectionTest.cs
@@ -33,7 +33,7 @@ public class CookieCollectionTest
         [Test]\r
         public void Count ()\r
         {\r
-               Assertion.AssertEquals ("#1", col.Count, 3);\r
+               Assert.AreEqual (col.Count, 3, "#1");\r
        }\r
 \r
         [Test]\r
@@ -42,18 +42,18 @@ public class CookieCollectionTest
                Cookie c = null;\r
                try {\r
                        c = col [-1];\r
-                       Assertion.Fail ("#1");\r
+                       Assert.Fail ("#1");\r
                } catch (ArgumentOutOfRangeException) {\r
                }\r
                try {\r
                        c = col [col.Count];\r
-                       Assertion.Fail ("#2");\r
+                       Assert.Fail ("#2");\r
                } catch (ArgumentOutOfRangeException) {\r
                }\r
                c = col ["name1"];\r
-               Assertion.AssertEquals ("#3", c.Name, "name1");\r
+               Assert.AreEqual (c.Name, "name1", "#3");\r
                c = col ["NAME2"];\r
-               Assertion.AssertEquals ("#4", c.Name, "name2");\r
+               Assert.AreEqual (c.Name, "name2", "#4");\r
        }\r
        \r
         [Test]\r
@@ -62,7 +62,7 @@ public class CookieCollectionTest
                try {\r
                        Cookie c = null;\r
                        col.Add (c);\r
-                       Assertion.Fail ("#1");\r
+                       Assert.Fail ("#1");\r
                } catch (ArgumentNullException) {\r
                }\r
                \r
@@ -70,13 +70,13 @@ public class CookieCollectionTest
                // so we'll have to fail to.\r
                try {\r
                        col.Add (col);\r
-                       Assertion.Fail ("#2");\r
+                       Assert.Fail ("#2");\r
                } catch (Exception) {\r
                }\r
-               Assertion.AssertEquals ("#3", col.Count, 3);\r
+               Assert.AreEqual (col.Count, 3, "#3");\r
                \r
                col.Add (new Cookie("name1", "value1"));                \r
-               Assertion.AssertEquals ("#4", col.Count, 3);\r
+               Assert.AreEqual (col.Count, 3, "#4");\r
                \r
                CookieCollection col2 = new CookieCollection();\r
                Cookie c4 = new Cookie("name4", "value4");\r
@@ -84,9 +84,9 @@ public class CookieCollectionTest
                col2.Add (c4);\r
                col2.Add (c5);\r
                col.Add (col2);\r
-               Assertion.AssertEquals ("#5", col.Count, 5);\r
-               Assertion.AssertEquals ("#6", col ["NAME4"], c4);\r
-               Assertion.AssertEquals ("#7", col [4], c5);\r
+               Assert.AreEqual (col.Count, 5, "#5");\r
+               Assert.AreEqual (col ["NAME4"], c4, "#6");\r
+               Assert.AreEqual (col [4], c5, "#7");\r
        }\r
        \r
         [Test]\r
@@ -94,9 +94,9 @@ public class CookieCollectionTest
        {\r
                Array a = Array.CreateInstance (typeof (Cookie), 3);\r
                col.CopyTo (a, 0);\r
-               Assertion.AssertEquals ("#1", a.GetValue (0), col [0]);\r
-               Assertion.AssertEquals ("#2", a.GetValue (1), col [1]);\r
-               Assertion.AssertEquals ("#3", a.GetValue (2), col [2]);\r
+               Assert.AreEqual (a.GetValue (0), col [0], "#1");\r
+               Assert.AreEqual (a.GetValue (1), col [1], "#2");\r
+               Assert.AreEqual (a.GetValue (2), col [2], "#3");\r
        }\r
        \r
         [Test]\r
@@ -105,11 +105,11 @@ public class CookieCollectionTest
                IEnumerator enumerator = col.GetEnumerator ();\r
                enumerator.MoveNext ();\r
                Cookie c = (Cookie) enumerator.Current;\r
-               Assertion.AssertEquals ("#1", c, col [0]);\r
+               Assert.AreEqual (c, col [0], "#1");\r
                col.Add (new Cookie ("name6", "value6"));\r
                try {\r
                        enumerator.MoveNext ();\r
-                       Assertion.Fail ("#2");\r
+                       Assert.Fail ("#2");\r
                } catch (InvalidOperationException) {\r
                }\r
        }\r