Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -105,11 +105,7 @@ namespace MonoTests.System.Web.UI.WebControls {
Poker t = new Poker ();
t.TextMode = TextBoxMode.MultiLine;
t.Text = "</textarea>";
#if NET_4_0
string exp = "<textarea rows=\"2\" cols=\"20\">\r\n&lt;/textarea&gt;</textarea>";
#else
string exp = "<textarea rows=\"2\" cols=\"20\">&lt;/textarea&gt;</textarea>";
#endif
HtmlDiff.AssertAreEqual(exp, t.Render (),"MultilineRenderEscape");
}
@ -164,11 +160,7 @@ namespace MonoTests.System.Web.UI.WebControls {
t.ValidationGroup = "VG";
t.CausesValidation = true;
t.TextMode = TextBoxMode.MultiLine;
#if NET_4_0
string exp = "<textarea rows=\"2\" cols=\"20\">\r\n</textarea>";
#else
string exp = "<textarea rows=\"2\" cols=\"20\"></textarea>";
#endif
HtmlDiff.AssertAreEqual (exp, t.Render (),"ValidationRender");
}