Revert "Convert HashSet, LinkedHashSet to factory methods and custom implementations."

pkg/unmodifiable_collection/test/unmodifiable_collection_test.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:unmodifiable_collection/unmodifiable_collection.dart";
 import "package:unittest/unittest.dart";
 
 // Test unmodifiable collection views.
 // The collections should pass through the operations that are allowed,
 // an throw on the ones that aren't without affecting the original.
@@ skipping 207 matching lines @@
     if (original.length != 1) {
       expect(() => wrapped.singleWhere((_) => true), throws);
     } else {
       expect(wrapped.singleWhere((_) => true),
              equals(original.singleWhere((_) => true)));
     }
     expect(() => wrapped.singleWhere((_) => false), throws);
   });
 
   test("$name - skip", () {
-    expect(wrapped.skip(0), orderedEquals(original.skip(0)));
-    expect(wrapped.skip(1), orderedEquals(original.skip(1)));
-    expect(wrapped.skip(5), orderedEquals(original.skip(5)));
+    expect(wrapped.skip(0), equals(original.skip(0)));
+    expect(wrapped.skip(1), equals(original.skip(1)));
+    expect(wrapped.skip(5), equals(original.skip(5)));
   });
 
   test("$name - skipWhile", () {
     expect(wrapped.skipWhile((x) => true),
-           orderedEquals(original.skipWhile((x) => true)));
+           equals(original.skipWhile((x) => true)));
     expect(wrapped.skipWhile((x) => false),
-           orderedEquals(original.skipWhile((x) => false)));
+           equals(original.skipWhile((x) => false)));
     expect(wrapped.skipWhile((x) => x != 42),
-           orderedEquals(original.skipWhile((x) => x != 42)));
+           equals(original.skipWhile((x) => x != 42)));
   });
 
   test("$name - take", () {
-    expect(wrapped.take(0), orderedEquals(original.take(0)));
-    expect(wrapped.take(1), orderedEquals(original.take(1)));
-    expect(wrapped.take(5), orderedEquals(original.take(5)));
+    expect(wrapped.take(0), equals(original.take(0)));
+    expect(wrapped.take(1), equals(original.take(1)));
+    expect(wrapped.take(5), equals(original.take(5)));
   });
 
   test("$name - takeWhile", () {
     expect(wrapped.takeWhile((x) => true),
-           orderedEquals(original.takeWhile((x) => true)));
+           equals(original.takeWhile((x) => true)));
     expect(wrapped.takeWhile((x) => false),
-           orderedEquals(original.takeWhile((x) => false)));
+           equals(original.takeWhile((x) => false)));
     expect(wrapped.takeWhile((x) => x != 42),
-           orderedEquals(original.takeWhile((x) => x != 42)));
+           equals(original.takeWhile((x) => x != 42)));
   });
 
   test("$name - toList", () {
-    expect(wrapped.toList(), orderedEquals(original.toList()));
+    expect(wrapped.toList(), equals(original.toList()));
     expect(wrapped.toList(growable: false),
-           orderedEquals(original.toList(growable: false)));
+           equals(original.toList(growable: false)));
   });
 
   test("$name - toSet", () {
-    expect(wrapped.toSet(), unorderedEquals(original.toSet()));
+    expect(wrapped.toSet(), equals(original.toSet()));
   });
 
   test("$name - where", () {
     expect(wrapped.where((x) => true),
-           orderedEquals(original.where((x) => true)));
+           equals(original.where((x) => true)));
     expect(wrapped.where((x) => false),
-           orderedEquals(original.where((x) => false)));
+           equals(original.where((x) => false)));
     expect(wrapped.where((x) => x != 42),
-           orderedEquals(original.where((x) => x != 42)));
+           equals(original.where((x) => x != 42)));
   });
 }
 
 void testReadList(List original, List wrapped, String name) {
   test("$name - length", () {
     expect(wrapped.length, equals(original.length));
   });
 
   test("$name - isEmpty", () {
     expect(wrapped.isEmpty, equals(original.isEmpty));
@@ skipping 81 matching lines @@
       original[0] = originalFirst;
     } else {
       expect(() { wrapped[0] = 42; }, throws);
     }
   });
 
   test("$name - sort", () {
     List sortCopy = new List.from(original);
     sortCopy.sort();
     wrapped.sort();
-    expect(original, orderedEquals(sortCopy));
+    expect(original, equals(sortCopy));
     original.setAll(0, copy);
   });
 
   test("$name - fillRange", () {
     wrapped.fillRange(0, wrapped.length, 37);
     for (int i = 0; i < original.length; i++) {
       expect(original[i], equals(37));
     }
     original.setAll(0, copy);
   });
@@ skipping 82 matching lines @@
 
   test("$name - containsAll", () {
     expect(wrapped.containsAll(copy), isTrue);
     expect(wrapped.containsAll(copy.toList()), isTrue);
     expect(wrapped.containsAll([]), isTrue);
     expect(wrapped.containsAll([42]), equals(original.containsAll([42])));
   });
 
   test("$name - intersection", () {
     expect(wrapped.intersection(new Set()), isEmpty);
-    expect(wrapped.intersection(copy), unorderedEquals(original));
+    expect(wrapped.intersection(copy), equals(original));
     expect(wrapped.intersection(new Set.from([42])),
             new Set.from(original.contains(42) ? [42] : []));
   });
 
   test("$name - union", () {
-    expect(wrapped.union(new Set()), unorderedEquals(original));
-    expect(wrapped.union(copy), unorderedEquals(original));
+    expect(wrapped.union(new Set()), equals(original));
+    expect(wrapped.union(copy), equals(original));
     expect(wrapped.union(new Set.from([42])),
            equals(original.union(new Set.from([42]))));
   });
 
   test("$name - difference", () {
-    expect(wrapped.difference(new Set()), unorderedEquals(original));
+    expect(wrapped.difference(new Set()), equals(original));
     expect(wrapped.difference(copy), isEmpty);
     expect(wrapped.difference(new Set.from([42])),
            equals(original.difference(new Set.from([42]))));
   });
 }
 
 void testNoChangeSet(Set original, Set wrapped, String name) {
-  List originalElements = original.toList();
+  Set copy = new Set.from(original);
 
   testThrows(name, thunk) {
     test(name, () {
       expect(thunk, throwsUnsupportedError);
       // No modifications happened.
-      expect(original.toList(), equals(originalElements));
+      expect(original, equals(copy));
     });
   }
 
   testThrows("$name - add throws", () {
     wrapped.add(42);
   });
 
   testThrows("$name - addAll throws", () {
     wrapped.addAll([42]);
   });
@@ skipping 61 matching lines @@
 
   test("$name forEach", () {
     int origCnt = 0;
     int wrapCnt = 0;
     wrapped.forEach((k, v) { wrapCnt += 1 << k + 3 * v; });
     original.forEach((k, v) { origCnt += 1 << k + 3 * v; });
     expect(wrapCnt, equals(origCnt));
   });
 
   test("$name keys", () {
-    expect(wrapped.keys, orderedEquals(original.keys));
+    expect(wrapped.keys, equals(original.keys));
   });
 
   test("$name values", () {
-    expect(wrapped.values, orderedEquals(original.values));
+    expect(wrapped.values, equals(original.values));
   });
 }
 
 testNoChangeMap(Map original, Map wrapped, String name) {
   Map copy = new Map.from(original);
 
   testThrows(name, thunk) {
     test(name, () {
       expect(thunk, throwsUnsupportedError);
       // No modifications happened.
@@ skipping 18 matching lines @@
  });
 
  testThrows("$name remove throws", () {
    wrapped.remove(0);
  });
 
  testThrows("$name clear throws", () {
    wrapped.clear();
  });
 }