Merge pull request #1304 from slluis/mac-proxy-autoconfig

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

diff --git a/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs b/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
index 58d12cc6d22c1fb1cba73e68ec48a0b74c4f2f26..f0c3272f721ef14a3340283fc4c102accd8cf1b3 100644 (file)
--- a/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
+++ b/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
@@ -19,7 +19,7 @@ namespace MonoTests.System.Net
 {\r
 \r
 [TestFixture]\r
-public class ServicePointManagerTest : Assertion\r
+public class ServicePointManagerTest\r
 {\r
        private Uri googleUri;\r
        private Uri yahooUri;\r
@@ -46,7 +46,7 @@ public class ServicePointManagerTest : Assertion
                [Category ("InetAccess")]\r
         public void MaxServicePointManagers ()\r
         {\r
-               AssertEquals ("#1", 0, ServicePointManager.MaxServicePoints);\r
+               Assert.AreEqual (0, ServicePointManager.MaxServicePoints, "#1");\r
                \r
                DoWebRequest (googleUri);\r
                Thread.Sleep (100);\r
@@ -86,9 +86,13 @@ public class ServicePointManagerTest : Assertion
        {\r
                ServicePointManager.MaxServicePoints = 0;\r
                ServicePoint sp = ServicePointManager.FindServicePoint (googleUri, new WebProxy (apacheUri));\r
-               AssertEquals ("#1", apacheUri, sp.Address);\r
-               AssertEquals ("#2", 2, sp.ConnectionLimit);\r
-               AssertEquals ("#3", "http", sp.ConnectionName);\r
+               Assert.AreEqual (apacheUri, sp.Address, "#1");\r
+#if NET_2_1\r
+               Assert.AreEqual (10, sp.ConnectionLimit, "#2");\r
+#else\r
+               Assert.AreEqual (2, sp.ConnectionLimit, "#2");\r
+#endif\r
+               Assert.AreEqual ("http", sp.ConnectionName, "#3");\r
        }\r
        \r
        private void DoWebRequest (Uri uri)\r