mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
View File

@ -816,11 +816,7 @@ namespace MonoTests.System.Web.UI
public static void ResolveUrl_Load (Page p)
{
#if TARGET_JVM
string appPath = "/MainsoftWebApp20";
#else
string appPath = "/NunitWeb";
#endif
Control ctrl = new Control ();
p.Controls.Add (ctrl);
Assert.AreEqual (appPath + "/MyPage.aspx", ctrl.ResolveUrl ("~/MyPage.aspx"), "ResolveClientUrl Failed");
@ -866,11 +862,7 @@ namespace MonoTests.System.Web.UI
public static void ResolveUrl2_Load (Page p)
{
#if TARGET_JVM
string appPath = "/MainsoftWebApp20";
#else
string appPath = "/NunitWeb";
#endif
Control uc = p.FindControl ("WebUserControl1");
Control ctrl = uc.FindControl ("Label");

8
mcs/class/System.Web/Test/System.Web.UI/PageTest.cs
View File

@ -784,9 +784,7 @@ namespace MonoTests.System.Web.UI {
[Test]
[Category ("NunitWeb")]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
public void AddOnPreRenderCompleteAsync ()
{
WebTest t = new WebTest ("AsyncPage.aspx");
@ -801,9 +799,7 @@ namespace MonoTests.System.Web.UI {
}
[Test]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
[Category ("NunitWeb")]
public void ExecuteRegisteredAsyncTasks ()
{
@ -820,9 +816,7 @@ namespace MonoTests.System.Web.UI {
[Test]
[Category ("NunitWeb")]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
[ExpectedException (typeof (Exception))]
public void AddOnPreRenderCompleteAsyncBeginThrows ()
{
@ -833,9 +827,7 @@ namespace MonoTests.System.Web.UI {
[Test]
[Category ("NunitWeb")]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
[ExpectedException (typeof (Exception))]
public void AddOnPreRenderCompleteAsyncEndThrows ()
{

27
mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
View File

@ -115,14 +115,6 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (true, t.DoSupportAutoEvents, "SupportAutoEvents");
}
#if TARGET_JVM
[Test]
public void TemplateControl_DefaultPropertyNotWorking ()
{
PokerTemplateControl t = new PokerTemplateControl ();
Assert.AreEqual (null, t.AppRelativeVirtualPath, "AppRelativeVirtualPath");
}
#endif
[Test]
[Category ("NunitWeb")]
@ -343,23 +335,6 @@ namespace MonoTests.System.Web.UI.WebControls
}
#if TARGET_JVM
[Test]
[ExpectedException(typeof(ArgumentNullException))]
public void TemplateControl_AppRelativeVirtualPathException1 ()
{
PokerTemplateControl t = new PokerTemplateControl ();
t.AppRelativeVirtualPath = null;
}
[Test]
[ExpectedException (typeof (ArgumentException))]
public void TemplateControl_AppRelativeVirtualPathException2 ()
{
PokerTemplateControl t = new PokerTemplateControl ();
t.AppRelativeVirtualPath = "fake";
}
#endif
[TestFixtureTearDown]
public void TearDown ()
{
@ -367,4 +342,4 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif
#endif