Remove depending on order of iteration in read-only collections' test
authorMaciej Piechotka <uzytkownik2@gmail.com>
Mon, 27 Dec 2010 14:37:43 +0000 (15:37 +0100)
committerMaciej Piechotka <uzytkownik2@gmail.com>
Mon, 27 Dec 2010 14:38:39 +0000 (15:38 +0100)
tests/testreadonlycollection.vala

index 30874ee..75232ff 100644 (file)
@@ -83,13 +83,27 @@ public class ReadOnlyCollectionTests : Gee.TestCase {
 
                Iterator<string> iterator = ro_collection.iterator ();
 
-               assert (iterator.has_next ());
-               assert (iterator.next ());
-               assert (iterator.get () == "one");
+               bool one_found = false;
+               bool two_found = false;
+
+               while (iterator.next ()) {
+                       assert (iterator.valid);
+                       switch(iterator.get ()) {
+                       case "one":
+                               assert (! one_found);
+                               one_found = true;
+                               break;
+                       case "two":
+                               assert (! two_found);
+                               two_found = true;
+                               break;
+                       default:
+                               assert_not_reached ();
+                       }
+               }
 
-               assert (iterator.has_next ());
-               assert (iterator.next ());
-               assert (iterator.get () == "two");
+               assert (one_found);
+               assert (two_found);
 
                assert (! iterator.has_next ());
                assert (! iterator.next ());
@@ -97,7 +111,6 @@ public class ReadOnlyCollectionTests : Gee.TestCase {
                iterator = ro_collection.iterator ();
                assert (iterator.has_next ());
                assert (iterator.next ());
-               assert (iterator.get () == "one");
 
                if (Test.trap_fork (0, TestTrapFlags.SILENCE_STDOUT |
                                       TestTrapFlags.SILENCE_STDERR)) {