Add EnumSet.

tests/compiler/dart2js/class_set_test.dart

 // Copyright (c) 2015, 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.
 
 // Test for iterators on for [SubclassNode].
 
 library class_set_test;
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'type_test_helper.dart';
 import 'package:compiler/src/elements/elements.dart'
        show Element, ClassElement;
 import 'package:compiler/src/universe/class_set.dart';
+import 'package:compiler/src/util/enumset.dart';
 import 'package:compiler/src/util/util.dart';
 import 'package:compiler/src/world.dart';
 
 void main() {
   asyncTest(() => TypeEnvironment.create(r"""
       ///        A
       ///       / \
       ///      B   C
       ///     /   /|\
       ///    D   E F G
@@ skipping 99 matching lines @@
       } else {
         Expect.isNotNull(foundStack,
             "Expected non-null stack ${stack} in $sb.");
         Expect.listEquals(stack, foundStack,
             "Expected stack ${stack}, "
             "found ${foundStack} in $sb.");
       }
     }
 
     iterator = new ClassHierarchyNodeIterable(
-        world.getClassHierarchyNode(G)).iterator;
+        world.getClassHierarchyNode(G),
+        ClassHierarchyNode.ALL).iterator;
     checkState(G, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(G, currentNode: G, stack: []);
     Expect.equals(G, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(G, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
         world.getClassHierarchyNode(G),
+        ClassHierarchyNode.ALL,
         includeRoot: false).iterator;
     checkState(G, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(G, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
-        world.getClassHierarchyNode(C)).iterator;
+        world.getClassHierarchyNode(C),
+        ClassHierarchyNode.ALL).iterator;
     checkState(C, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(C, currentNode: C, stack: [E, F, G]);
     Expect.equals(C, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(C, currentNode: E, stack: [F, G]);
     Expect.equals(E, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(C, currentNode: F, stack: [G]);
     Expect.equals(F, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(C, currentNode: G, stack: []);
     Expect.equals(G, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(C, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
-        world.getClassHierarchyNode(D)).iterator;
+        world.getClassHierarchyNode(D),
+        ClassHierarchyNode.ALL).iterator;
     checkState(D, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(D, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(D, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
-        world.getClassHierarchyNode(B)).iterator;
+        world.getClassHierarchyNode(B),
+        ClassHierarchyNode.ALL).iterator;
     checkState(B, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(B, currentNode: B, stack: [D]);
     Expect.equals(B, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(B, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(B, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
         world.getClassHierarchyNode(B),
+        ClassHierarchyNode.ALL,
         includeRoot: false).iterator;
     checkState(B, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(B, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(B, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
         world.getClassHierarchyNode(B),
-        includeIndirectlyInstantiated: false).iterator;
+        new EnumSet<Instantiation>.fromValues(<Instantiation>[
+            Instantiation.DIRECTLY_INSTANTIATED,
+            Instantiation.UNINSTANTIATED])).iterator;
     checkState(B, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(B, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(B, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
-        world.getClassHierarchyNode(A)).iterator;
+        world.getClassHierarchyNode(A),
+        ClassHierarchyNode.ALL).iterator;
     checkState(A, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: A, stack: [C, B]);
     Expect.equals(A, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: C, stack: [E, F, G, B]);
     Expect.equals(C, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: E, stack: [F, G, B]);
     Expect.equals(E, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: F, stack: [G, B]);
     Expect.equals(F, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: G, stack: [B]);
     Expect.equals(G, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: B, stack: [D]);
     Expect.equals(B, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(A, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
         world.getClassHierarchyNode(A),
+        ClassHierarchyNode.ALL,
         includeRoot: false).iterator;
     checkState(A, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: C, stack: [E, F, G, B]);
     Expect.equals(C, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: E, stack: [F, G, B]);
     Expect.equals(E, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: F, stack: [G, B]);
     Expect.equals(F, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: G, stack: [B]);
     Expect.equals(G, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: B, stack: [D]);
     Expect.equals(B, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(A, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
         world.getClassHierarchyNode(A),
-        includeIndirectlyInstantiated: false).iterator;
+        new EnumSet<Instantiation>.fromValues(<Instantiation>[
+            Instantiation.DIRECTLY_INSTANTIATED,
+            Instantiation.UNINSTANTIATED])).iterator;
     checkState(A, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: A, stack: [C, B]);
     Expect.equals(A, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: C, stack: [E, F, G, B]);
     Expect.equals(C, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: E, stack: [F, G, B]);
     Expect.equals(E, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: F, stack: [G, B]);
     Expect.equals(F, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: G, stack: [B]);
     Expect.equals(G, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(A, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
 
     iterator = new ClassHierarchyNodeIterable(
         world.getClassHierarchyNode(A),
-        includeRoot: false,
-        includeIndirectlyInstantiated: false).iterator;
+        new EnumSet<Instantiation>.fromValues(<Instantiation>[
+            Instantiation.DIRECTLY_INSTANTIATED,
+            Instantiation.UNINSTANTIATED]),
+        includeRoot: false).iterator;
     checkState(A, currentNode: null, stack: null);
     Expect.isNull(iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: C, stack: [E, F, G, B]);
     Expect.equals(C, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: E, stack: [F, G, B]);
     Expect.equals(E, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: F, stack: [G, B]);
     Expect.equals(F, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: G, stack: [B]);
     Expect.equals(G, iterator.current);
     Expect.isTrue(iterator.moveNext());
     checkState(A, currentNode: D, stack: []);
     Expect.equals(D, iterator.current);
     Expect.isFalse(iterator.moveNext());
     checkState(A, currentNode: null, stack: []);
     Expect.isNull(iterator.current);
   }));
 }
+