2004-05-27 Sebastien Pouliot <sebastien@ximian.com>

	* QueueTest.cs: Test for synchronized clones.
	* SortedListTest.cs: Added cases for synchronized capacity and testing
	the interface from the internal enumerator.

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

diff --git a/mcs/class/corlib/Test/System.Collections/ChangeLog b/mcs/class/corlib/Test/System.Collections/ChangeLog
index bec065924a1e9ab7ae431b844311e555a3cec0f4..ea91e3bac0cee29e81719fb13e5a34a098ff0e60 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections/ChangeLog
+++ b/mcs/class/corlib/Test/System.Collections/ChangeLog
@@ -4,7 +4,9 @@
        synchronized (if the original was).
        * QueueTest.cs: Added case where we try to get Current after the last
        MoveNext. Added case to ensure that MoveNext always return false 
-       (after the first time).
+       (after the first time). Test for synchronized clones.
+       * SortedListTest.cs: Added cases for synchronized capacity and testing
+       the interface from the internal enumerator.
 
 2004-05-26  Sebastien Pouliot  <sebastien@ximian.com>
 

diff --git a/mcs/class/corlib/Test/System.Collections/QueueTest.cs b/mcs/class/corlib/Test/System.Collections/QueueTest.cs
index ad59b972c54371b0018bf5ae3805b095b685e889..dbc2577de2d564b59ca1b93d4236b5945a8d6a23 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections/QueueTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/QueueTest.cs
@@ -306,7 +306,7 @@ namespace MonoTests.System.Collections {
                        }\r
                        AssertNotNull (e.Current);\r
                }\r
-
+\r
                [Test]\r
                public void EnumeratorFalseAfterMoveNextAll () \r
                {\r
@@ -444,13 +444,20 @@ namespace MonoTests.System.Collections {
                        }\r
                }\r
 \r
-               public void TestSynchronizedClone() \r
+               [Test]\r
+               public void SynchronizedClone () \r
                {\r
-                       SetUp();\r
-                       Queue q1sync =Queue.Synchronized(q1);\r
-                       AssertEquals("q1sync.IsSyncronized", true, q1sync.IsSynchronized); \r
+                       Queue q1sync = Queue.Synchronized (q1);\r
+                       Assert ("q1sync.IsSyncronized", q1sync.IsSynchronized); \r
+                       AssertEquals ("q1sync.Count", q1.Count, q1sync.Count);\r
+\r
+                       Queue q1syncsync = Queue.Synchronized (q1sync);\r
+                       Assert ("q1syncsync must be synchronized too", q1syncsync.IsSynchronized);\r
+                       AssertEquals ("q1syncsync.Count", q1.Count, q1syncsync.Count);\r
+\r
                        Queue q1syncclone = (Queue) q1sync.Clone();\r
-                       AssertEquals("clone must be synchronized too", true, q1syncclone.IsSynchronized);\r
+                       Assert ("clone must be synchronized too", q1syncclone.IsSynchronized);\r
+                       AssertEquals ("q1syncclone.Count", q1.Count, q1syncclone.Count);\r
                }\r
        }\r
 }\r

diff --git a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
index 33ad0ccb311fa9073e3a6d36a977a9601da49b4f..66e744253eeb4b72c0797561fabc9e7f60bb6b72 100755 (executable)
--- a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
@@ -137,9 +137,16 @@ public class SortedListTest : Assertion {
         public void TestCapacity2 ()\r
         {\r
                 SortedList list = new SortedList ();\r
-                list.Capacity = 5;\r
 \r
+                list.Capacity = 5;\r
                 AssertEquals (5, list.Capacity);\r
+\r
+               SortedList sync = SortedList.Synchronized (list);\r
+                AssertEquals (5, sync.Capacity);\r
+\r
+               list.Capacity = 20;\r
+                AssertEquals (20, list.Capacity);\r
+                AssertEquals (20, sync.Capacity);\r
         }\r
 \r
         [Test]\r
@@ -472,12 +479,17 @@ public class SortedListTest : Assertion {
        }\r
 \r
         [Test]\r
-       public void TestGetEnumerator() {\r
+       public void GetEnumerator ()\r
+       {\r
                SortedList sl1 = DefaultSL();\r
                IDictionaryEnumerator e = sl1.GetEnumerator();\r
                AssertNotNull("sl.GetEnumerator: does not return enumerator", e);\r
                AssertEquals("sl.GetEnumerator: enumerator not working(1)",e.MoveNext(),true);\r
                AssertNotNull("sl.GetEnumerator: enumerator not working(2)",e.Current);\r
+\r
+               Assert ("ICloneable", (e is ICloneable));\r
+               Assert ("IDictionaryEnumerator", (e is ICloneable));\r
+               Assert ("IEnumerator", (e is ICloneable));\r
        }\r
 \r
         [Test]\r