Merge pull request #2400 from esdrubal/extrahead

[mono.git] / mcs / class / System / Test / System.Net / DnsCas.cs

diff --git a/mcs/class/System/Test/System.Net/DnsCas.cs b/mcs/class/System/Test/System.Net/DnsCas.cs
index f362e8291ea0ee8bae8287e49b9553fd7e618233..d984553e17b49e1e6dd4cd78e6b1b36460225481 100644 (file)
--- a/mcs/class/System/Test/System.Net/DnsCas.cs
+++ b/mcs/class/System/Test/System.Net/DnsCas.cs
@@ -30,14 +30,13 @@ namespace MonoCasTests.System.Net {
                static ManualResetEvent reset;
                private string message;
                private string hostname;
-               private IPAddress ip;
 
                [TestFixtureSetUp]
                public void FixtureSetUp ()
                {
                        reset = new ManualResetEvent (false);
                        hostname = Dns.GetHostName ();
-                       ip = Dns.Resolve (site).AddressList[0];
+                       var ip = Dns.Resolve (site).AddressList[0];
                }
 
                [TestFixtureTearDown]
@@ -113,13 +112,9 @@ namespace MonoCasTests.System.Net {
 
                [Test]
                [DnsPermission (SecurityAction.Deny, Unrestricted = true)]
-#if NET_2_0
                [ExpectedException (typeof (ArgumentNullException))]
                // so it's not a declarative attribute on the method as the
                // null check is done before throwing the SecurityException
-#else
-               [ExpectedException (typeof (SecurityException))]
-#endif
                public void Deny_GetHostByName_Null ()
                {
                        Dns.GetHostByName (null);
@@ -152,7 +147,6 @@ namespace MonoCasTests.System.Net {
                        Dns.Resolve (null);
                }
 
-#if NET_2_0
                // TODO: New 2.0 methods aren't yet implemented in Mono
 /*
                [Test]
@@ -219,7 +213,6 @@ namespace MonoCasTests.System.Net {
                        Dns.GetHostAddresses (null);
                }
 */
-#endif
 
                // ensure that only DnsPermission is required to call the methods
 
@@ -278,7 +271,6 @@ namespace MonoCasTests.System.Net {
                        Dns.Resolve (null);
                }
 
-#if NET_2_0
                // TODO: New 2.0 methods aren't yet implemented in Mono
 /*
                [Test]
@@ -345,7 +337,6 @@ namespace MonoCasTests.System.Net {
                        Dns.GetHostAddresses (null);
                }
 */
-#endif
 
                // async tests (for stack propagation)
 
@@ -416,7 +407,6 @@ namespace MonoCasTests.System.Net {
                        Assert.IsNull (message, message);
                }
 
-#if NET_2_0
                // TODO: New 2.0 methods aren't yet implemented in Mono
 /*
                [DnsPermission (SecurityAction.Deny, Unrestricted = true)]
@@ -501,7 +491,6 @@ namespace MonoCasTests.System.Net {
                        Assert.IsNull (message, message);
                }
 */
-#endif
        }
 }