Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2014-09-26 16:43:36 +0400
committerAlexander Köplinger <alex.koeplinger@outlook.com>2015-01-17 07:45:39 +0300
commit746650d1b93114b60feb155c2ee778a9e16ccb6d (patch)
treef8e1eb791640ba6fd887da5e64cde3a1139b42b0 /mcs/class/System.ServiceProcess
parent7d1cd56c5d97683f6dae35cb9143d8789b71c2de (diff)
[bcl] Remove more NET_2_0 checks from class libs
Diffstat (limited to 'mcs/class/System.ServiceProcess')
-rw-r--r--mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs4
-rw-r--r--mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionTest.cs15
2 files changed, 0 insertions, 19 deletions
diff --git a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
index 1b2d4d957b6..6b404fb974a 100644
--- a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
+++ b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
@@ -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);
diff --git a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionTest.cs b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionTest.cs
index 68666c883a5..a9b3f2a06b9 100644
--- a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionTest.cs
+++ b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerPermissionTest.cs
@@ -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);