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

@ -73,7 +73,6 @@ namespace MonoTests.System.Web.UI.WebControls
[TestFixture]
public class MasterPageTest
{
#if NET_4_0
class MyTemplate : ITemplate
{
public const string MyText = "|MyTemplate.InstantiateIn called|";
@ -93,7 +92,6 @@ namespace MonoTests.System.Web.UI.WebControls
container.Controls.Add (new LiteralControl (MyText));
}
}
#endif
[TestFixtureSetUp]
public void CopyTestResources ()
{
@ -215,7 +213,6 @@ namespace MonoTests.System.Web.UI.WebControls
if (PageRenderHtml.IndexOf ("FromMasterMethod") < 0)
Assert.Fail ("MasterType TypeName test failed");
}
#if NET_4_0
[Test]
public void InstantiateInContentPlaceHolder ()
{
@ -295,7 +292,6 @@ namespace MonoTests.System.Web.UI.WebControls
return false;
}
#endif
public static void _RenderDefault (Page p)
{
p.Form.Controls.Add(new LiteralControl("Page dynamic text"));