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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mcs/class/System.Web/Test/System.Web.UI/TemplateControlCas.cs
View File

@ -57,11 +57,7 @@ namespace MonoCasTests.System.Web.UI {
[Test]
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#if NET_2_0
[ExpectedException (typeof (ArgumentNullException))]
#else
[ExpectedException (typeof (HttpException))]
#endif
public void LoadControl_Deny_Unrestricted ()
{
NonAbstractTemplateControl tc = new NonAbstractTemplateControl ();
@ -70,11 +66,7 @@ namespace MonoCasTests.System.Web.UI {
[Test]
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
#if NET_2_0
[ExpectedException (typeof (ArgumentNullException))]
#else
[ExpectedException (typeof (HttpException))]
#endif
public void LoadTemplate_Deny_Unrestricted ()
{
NonAbstractTemplateControl tc = new NonAbstractTemplateControl ();
@ -91,11 +83,7 @@ namespace MonoCasTests.System.Web.UI {
tc.ParseControl (null);
}
catch (NullReferenceException) {
#if NET_2_0
throw;
#else
Assert.Ignore ("NRE");
#endif
}
}
@ -108,11 +96,7 @@ namespace MonoCasTests.System.Web.UI {
TemplateControl.ReadStringResource (null);
}
catch (TypeInitializationException) {
#if NET_2_0
Assert.Ignore ("exception during initialization");
#else
throw;
#endif
}
}
@ -133,7 +117,6 @@ namespace MonoCasTests.System.Web.UI {
tc.CommitTransaction -= new EventHandler (Handler);
tc.Error -= new EventHandler (Handler);
}
#if NET_2_0
[Test]
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
[ExpectedException (typeof (TypeInitializationException))]
@ -153,6 +136,5 @@ namespace MonoCasTests.System.Web.UI {
// mono
}
}
#endif
}
}