Imported Upstream version 4.0.0~alpha1

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

View File

@ -128,9 +128,7 @@ namespace MonoTests.System.ServiceProcess {
case 13:
case 32:
case 92:
#if NET_2_0
case 133:
#endif
case 160:
// known invalid chars
break;
@ -153,9 +151,7 @@ namespace MonoTests.System.ServiceProcess {
}
[Test]
#if NET_2_0
[ExpectedException (typeof (ArgumentException))]
#endif
public void ServiceName_Empty ()
{
ServiceControllerPermissionAttribute a = new ServiceControllerPermissionAttribute (SecurityAction.Assert);

View File

@ -83,9 +83,7 @@ namespace MonoTests.System.ServiceProcess {
}
[Test]
#if NET_2_0
[ExpectedException (typeof (ArgumentException))]
#endif
public void PermissionState_Bad ()
{
PermissionState ps = (PermissionState)77;
@ -214,11 +212,7 @@ namespace MonoTests.System.ServiceProcess {
public void IsSubset_Null ()
{
ServiceControllerPermission scp = new ServiceControllerPermission (PermissionState.None);
#if NET_2_0
Assert.IsTrue (scp.IsSubsetOf (null), "null");
#else
Assert.IsFalse (scp.IsSubsetOf (null), "null");
#endif
}
[Test]
@ -337,12 +331,7 @@ namespace MonoTests.System.ServiceProcess {
}
[Test]
#if NET_2_0
[ExpectedException (typeof (ArgumentNullException))]
#else
// Problem inherited from ResourcePermissionBase
[ExpectedException (typeof (NullReferenceException))]
#endif
public void FromXml_Null ()
{
ServiceControllerPermission scp = new ServiceControllerPermission (PermissionState.None);
@ -350,9 +339,7 @@ namespace MonoTests.System.ServiceProcess {
}
[Test]
#if NET_2_0
[ExpectedException (typeof (ArgumentException))]
#endif
public void FromXml_WrongTag ()
{
ServiceControllerPermission scp = new ServiceControllerPermission (PermissionState.None);
@ -364,9 +351,7 @@ namespace MonoTests.System.ServiceProcess {
}
[Test]
#if NET_2_0
[ExpectedException (typeof (ArgumentException))]
#endif
public void FromXml_WrongTagCase ()
{
ServiceControllerPermission scp = new ServiceControllerPermission (PermissionState.None);