Assertion -> Assert migration

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

mcs/class/System.Web/Test/System.Web.UI/ChtmlTextWriterTest.cs

@@ -106,7 +106,7 @@ namespace MonoTests.System.Web.UI {
 		public void AddRecognizedAttributeTest ()
 		{
 			chtml.AddRecognizedAttribute (absent_element, absent_attr);
-			Assertion.AssertEquals ("#A01", true, chtml.IsRecognizedAttribute (absent_element, absent_attr));
+			Assert.AreEqual (true, chtml.IsRecognizedAttribute (absent_element, absent_attr), "#A01");
 		}
 
 		[Test]
@@ -123,7 +123,7 @@ namespace MonoTests.System.Web.UI {
 			AddRecognizedAttributeTest ();
 
 			chtml.RemoveRecognizedAttribute (absent_element, absent_attr);
-			Assertion.AssertEquals ("#B01", false, chtml.IsRecognizedAttribute (absent_element, absent_attr));
+			Assert.AreEqual (false, chtml.IsRecognizedAttribute (absent_element, absent_attr), "#B01");
 
 			string version_two = "v2";
 			chtml.RemoveRecognizedAttribute (absent_element + version_two, absent_attr + version_two);
@@ -134,7 +134,7 @@ namespace MonoTests.System.Web.UI {
 		{
 			string br = "<br>";
 			chtml.WriteBreak ();
-			Assertion.AssertEquals ("#C01", true, br == writer.ToString ());
+			Assert.AreEqual (true, br == writer.ToString (), "#C01");
 		}
 
 		[Test]
@@ -144,7 +144,7 @@ namespace MonoTests.System.Web.UI {
 			string unencoded_text = "&lt;custID&gt; &amp; &lt;invoice#&gt;";
 			chtml.WriteEncodedText (encoded_text);
 
-			Assertion.AssertEquals ("#D01", true, unencoded_text == writer.ToString ());
+			Assert.AreEqual (true, unencoded_text == writer.ToString (), "#D01");
 		}
 
 		[Test]
@@ -160,7 +160,7 @@ namespace MonoTests.System.Web.UI {
 					i++;
 				}
 			}
-			Assertion.AssertEquals ("#E01", enum_values.Length, i);
+			Assert.AreEqual (enum_values.Length, i, "#E01");
 		}
 
 		[Test]
@@ -171,7 +171,7 @@ namespace MonoTests.System.Web.UI {
 
 			foreach (HtmlTextWriterStyle tag in Enum.GetValues (typeof (HtmlTextWriterStyle))) {
 				expected = (tag == HtmlTextWriterStyle.Display);
-				Assertion.AssertEquals ("#F0" + i++, expected, chtml.PublicOnStyleAttributeRender ("foo", "foo", tag));
+				Assert.AreEqual (expected, chtml.PublicOnStyleAttributeRender ("foo", "foo", tag), "#F0" + i++);
 			}
 		}
 
@@ -184,7 +184,7 @@ namespace MonoTests.System.Web.UI {
 
 			foreach (HtmlTextWriterTag tag in Enum.GetValues (typeof (HtmlTextWriterTag))) {
 				expected = (tag != HtmlTextWriterTag.Span);
-				Assertion.AssertEquals ("#G0" + i++, expected, chtml.PublicOnTagRender ("foo", tag));
+				Assert.AreEqual (expected, chtml.PublicOnTagRender ("foo", tag), "#G0" + i++);
 			}
 		}
 	}

mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs

@@ -559,7 +559,7 @@ namespace MonoTests.System.Web.UI {
 		public void WriteBreakTest ()
 		{
 			w.WriteBreak ();
-			Assertion.AssertEquals ("WriteBreakTest01", "<br />", sw.ToString ());
+			Assert.AreEqual ("<br />", sw.ToString (), "WriteBreakTest01");
 		}
 #endif
 		

mcs/class/System.Web/Test/System.Web.UI/XhtmlTextWriterTest.cs

@@ -104,19 +104,19 @@ namespace MonoTests.System.Web.UI {
 			Hashtable elem_attrs = (Hashtable) attrs [elem_name];
 
 			// absent attr
-			Assertion.AssertEquals ("#A01", null, elem_attrs [absent_attr]);
+			Assert.AreEqual (null, elem_attrs [absent_attr], "#A01");
 
 			// recently added attr
 			xhtml.AddRecognizedAttribute (elem_name, absent_attr);
-			Assertion.AssertEquals ("A02", true, elem_attrs [absent_attr]);
+			Assert.AreEqual (true, elem_attrs [absent_attr], "A02");
 
 			// ensure there's no absent_elem
-			Assertion.AssertEquals ("#A03", null, attrs [absent_elem]);
+			Assert.AreEqual (null, attrs [absent_elem], "#A03");
 
 			// Given absent_elem and absent_attr, we must add the element 
 			// and bind the given attr to it
 			xhtml.AddRecognizedAttribute (absent_elem, absent_attr);
-			Assertion.AssertEquals ("#A04", true, ((Hashtable) attrs [absent_elem]) [absent_attr]);
+			Assert.AreEqual (true, ((Hashtable) attrs [absent_elem]) [absent_attr], "#A04");
 
 			// Given a known element and attribute
 		}
@@ -135,11 +135,11 @@ namespace MonoTests.System.Web.UI {
 		{
 			// ensure we add it
 			xhtml.AddRecognizedAttribute (elem_name, absent_attr);
-			Assertion.AssertEquals ("#B01", true, ((Hashtable) attrs [elem_name]) [absent_attr]);
+			Assert.AreEqual (true, ((Hashtable) attrs [elem_name]) [absent_attr], "#B01");
 
 			// ensure we remove it
 			xhtml.RemoveRecognizedAttribute (elem_name, absent_attr);
-			Assertion.AssertEquals ("#B02", null, ((Hashtable) attrs [elem_name]) [absent_attr]);
+			Assert.AreEqual (null, ((Hashtable) attrs [elem_name]) [absent_attr], "#B02");
 
 			// if the element does not exist we must resume cleanly
 			xhtml.RemoveRecognizedAttribute (absent_elem, absent_attr);
@@ -154,16 +154,16 @@ namespace MonoTests.System.Web.UI {
 			int i = 0;
 
 			foreach (HtmlTextWriterStyle style in Enum.GetValues (typeof (HtmlTextWriterStyle)))
-				Assertion.AssertEquals ("#C0" + i++, false,
+				Assert.AreEqual (false,
 						xhtml.PublicOnStyleAttributeRender (xhtml.PublicGetStyleName (style), 
-									    "foo", style));
+										    "foo", style), "#C0" + i++);
 		}
 
 		[Test]
 		public void WriteBreakTest ()
 		{
 			xhtml.WriteBreak ();
-			Assertion.AssertEquals ("#D01", "<br/>", writer.ToString ());
+			Assert.AreEqual ("<br/>", writer.ToString (), "#D01");
 		}
 
 		[Test]
@@ -179,7 +179,7 @@ namespace MonoTests.System.Web.UI {
 					i++;
 				}
 			}
-			Assertion.AssertEquals ("#F01", attrs.Length, i);
+			Assert.AreEqual (attrs.Length, i, "#F01");
 		}
 	}
 }