Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -1226,7 +1226,7 @@ namespace MonoTests.System.Web.UI.WebControls
string pageHtml = t.Run ();
string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_1, renderedHtml, "#A1");
Assert.AreEqual (originalHtml_1.Replace ("\r\n", "\n"), renderedHtml, "#A1");
FormRequest fr = new FormRequest (t.Response, "form1");
fr.Controls.Add ("__EVENTTARGET");
@ -1236,7 +1236,7 @@ namespace MonoTests.System.Web.UI.WebControls
pageHtml = t.Run ();
renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_2, renderedHtml, "#A2");
Assert.AreEqual (originalHtml_2.Replace ("\r\n", "\n"), renderedHtml, "#A2");
}
[Test (Description="Bug #535701, test 2")]
@ -1262,7 +1262,7 @@ namespace MonoTests.System.Web.UI.WebControls
string pageHtml = t.Run ();
string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_1, renderedHtml, "#A1");
Assert.AreEqual (originalHtml_1.Replace ("\r\n", "\n"), renderedHtml, "#A1");
FormRequest fr = new FormRequest (t.Response, "form1");
fr.Controls.Add ("__EVENTTARGET");
@ -1272,7 +1272,7 @@ namespace MonoTests.System.Web.UI.WebControls
pageHtml = t.Run ();
renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_2, renderedHtml, "#A2");
Assert.AreEqual (originalHtml_2.Replace ("\r\n", "\n"), renderedHtml, "#A2");
}
[Test (Description="Bug #604053")]