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

12
mcs/class/System.Web/Test/System.Web.UI/DesignTimeTemplateParserCas.cs
View File

@ -68,9 +68,6 @@ namespace MonoCasTests.System.Web.UI {
[Test]
[SecurityPermission (SecurityAction.PermitOnly, ControlThread = true, UnmanagedCode = true)]
#if ONLY_1_1
[ExpectedException (typeof (NullReferenceException))]
#endif
public void ParseControl_PermitOnly_ControlThreadUnmanagedCode ()
{
DesignTimeTemplateParser.ParseControl (dtpd);
@ -94,14 +91,10 @@ namespace MonoCasTests.System.Web.UI {
[Test]
[SecurityPermission (SecurityAction.PermitOnly, ControlThread = true, UnmanagedCode = true)]
#if ONLY_1_1
[ExpectedException (typeof (NullReferenceException))]
#endif
public void ParseTemplate_PermitOnly_ControlThreadUnmanagedCode ()
{
DesignTimeTemplateParser.ParseTemplate (dtpd);
}
#if NET_2_0
[Test]
[SecurityPermission (SecurityAction.Deny, ControlThread = true)]
[ExpectedException (typeof (SecurityException))]
@ -145,7 +138,6 @@ namespace MonoCasTests.System.Web.UI {
{
DesignTimeTemplateParser.ParseTheme (null, "theme", "path");
}
#endif
// LinkDemand
@ -159,10 +151,6 @@ namespace MonoCasTests.System.Web.UI {
return mi.Invoke (null, new object[1] { dtpd });
}
catch (TargetInvocationException tie) {
#if ONLY_1_1
if (tie.InnerException is NullReferenceException)
return String.Empty;
#endif
throw tie;
}
}