AspNetHostingPermissionTest.cs: Fixed for NET_1_1 which has a different (but bad...

svn path=/trunk/mcs/; revision=39104

diff --git a/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs b/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs
index acb9145790647accd37a6772e77953a60ce73aa2..102a843b866d6606928e7d0d16b1623545435af4 100755 (executable)
--- a/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs
+++ b/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs
@@ -145,7 +145,11 @@ namespace MonoTests.System.Web {
                        // No intersection with null\r
                        foreach (AspNetHostingPermissionLevel ppl in AllLevel) {\r
                                anhp.Level = ppl;\r
+#if NET_2_0\r
                                Assert.IsNull (anhp.Intersect (null), ppl.ToString ());\r
+#else\r
+                               Assert.AreEqual (anhp.ToString (), anhp.Intersect (null).ToString (), ppl.ToString ());\r
+#endif\r
                        }\r
                }\r
 \r

diff --git a/mcs/class/System/Test/System.Web/ChangeLog b/mcs/class/System/Test/System.Web/ChangeLog
index 58d61fa297864fdc6bab6e7b28bf628ffac7bee1..65431f32828cdd7249829469101ca5361f7074d0 100644 (file)
--- a/mcs/class/System/Test/System.Web/ChangeLog
+++ b/mcs/class/System/Test/System.Web/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-18  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AspNetHostingPermissionTest.cs: Fixed for NET_1_1 which has a 
+       different (but bad) behaviour for intersecting with null.
+
+
 2004-09-10  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AspNetHostingPermissionAttributeTest.cs: New. Unit tests for AspNet