Migrated test block 218 to Dart 2.0.

tests/lib_2/mirrors/class_declarations_test.dart

Index: tests/lib_2/mirrors/class_declarations_test.dart
diff --git a/tests/lib/mirrors/class_declarations_test.dart b/tests/lib_2/mirrors/class_declarations_test.dart
similarity index 81%
rename from tests/lib/mirrors/class_declarations_test.dart
rename to tests/lib_2/mirrors/class_declarations_test.dart
index 3ce42ea144c12639f76c51efe7bb980185a970a0..8b532df3f69a35fc7201afdbabb0fb09c3f34939 100644
--- a/tests/lib/mirrors/class_declarations_test.dart
+++ b/tests/lib_2/mirrors/class_declarations_test.dart
@@ -10,6 +10,13 @@ import 'package:expect/expect.dart';
 import 'stringify.dart';
 import 'declarations_model.dart' as declarations_model;
 
+castMirror(Mirror m) {
+  if (m is DeclarationMirror) return m as DeclarationMirror;
+  if (m is VariableMirror) return m as VariableMirror;
+  if (m is TypeVariableMirror) return m as TypeVariableMirror;
+  return m;
+}

[Bob Nystrom, 2017/08/23 22:10:06]

The "as" expressions aren't accomplishing anything here. It's the dynamic return
type that shuts up the type checker below...

+
 Set<DeclarationMirror> inheritedDeclarations(ClassMirror cm) {
   var decls = new Set<DeclarationMirror>();
   while (cm != null) {
@@ -55,7 +62,7 @@ main() {
       'setters');
 
   // dart2js stops testing here.
-  return; // //# 01: ok
+  return; //# 01: ok
 
   Expect.setEquals(
       [
@@ -89,62 +96,74 @@ main() {
           .map(stringify),
       'constructors and factories');
 
-  Expect.setEquals([
-    'Method(s(Class._normalFactory) in s(Class), private, static, constructor)',
-    'Method(s(Class._redirectingFactory)'
-        ' in s(Class), private, static, constructor)',
-    'Method(s(Class.normalFactory) in s(Class), static, constructor)',
-    'Method(s(Class.redirectingFactory) in s(Class), static, constructor)',
-    'Method(s(_staticGetter) in s(Class), private, static, getter)',
-    'Method(s(_staticMethod) in s(Class), private, static)',
-    'Method(s(_staticSetter=) in s(Class), private, static, setter)',
-    'Variable(s(_staticVariable) in s(Class), private, static)',
-    'Method(s(staticGetter) in s(Class), static, getter)',
-    'Method(s(staticMethod) in s(Class), static)',
-    'Method(s(staticSetter=) in s(Class), static, setter)',
-    'Variable(s(staticVariable) in s(Class), static)'
-  ], cm.declarations.values.where((dm) => dm.isStatic).map(stringify),
+  Expect.setEquals(
+      [
+        'Method(s(Class._normalFactory) in s(Class), private, static, constructor)',
+        'Method(s(Class._redirectingFactory)'
+            ' in s(Class), private, static, constructor)',
+        'Method(s(Class.normalFactory) in s(Class), static, constructor)',
+        'Method(s(Class.redirectingFactory) in s(Class), static, constructor)',
+        'Method(s(_staticGetter) in s(Class), private, static, getter)',
+        'Method(s(_staticMethod) in s(Class), private, static)',
+        'Method(s(_staticSetter=) in s(Class), private, static, setter)',
+        'Variable(s(_staticVariable) in s(Class), private, static)',
+        'Method(s(staticGetter) in s(Class), static, getter)',
+        'Method(s(staticMethod) in s(Class), static)',
+        'Method(s(staticSetter=) in s(Class), static, setter)',
+        'Variable(s(staticVariable) in s(Class), static)'
+      ],
+      cm.declarations.values
+          .where((dm) => castMirror(dm).isStatic)

[Bob Nystrom, 2017/08/23 22:10:05]

You can just do:

(dm) => (dm as dynamic).isStatic

Likewise below.

+          .map(stringify),
       'statics');
 
-  Expect.setEquals([
-    'Method(s(+) in s(Class))',
-    'TypeVariable(s(C) in s(Class),'
-        ' upperBound = Class(s(Object) in s(dart.core), top-level))',
-    'Method(s(Class._generativeConstructor) in s(Class), private, constructor)',
-    'Method(s(Class._redirectingConstructor)'
-        ' in s(Class), private, constructor)',
-    'Method(s(Class.generativeConstructor) in s(Class), constructor)',
-    'Method(s(Class.redirectingConstructor) in s(Class), constructor)',
-    'Method(s(_instanceGetter) in s(Class), private, getter)',
-    'Method(s(_instanceMethod) in s(Class), private)',
-    'Method(s(_instanceSetter=) in s(Class), private, setter)',
-    'Variable(s(_instanceVariable) in s(Class), private)',
-    'Method(s(abstractMethod) in s(Class), abstract)',
-    'Method(s(instanceGetter) in s(Class), getter)',
-    'Method(s(instanceMethod) in s(Class))',
-    'Method(s(instanceSetter=) in s(Class), setter)',
-    'Variable(s(instanceVariable) in s(Class))'
-  ], cm.declarations.values.where((dm) => !dm.isStatic).map(stringify),
+  Expect.setEquals(
+      [
+        'Method(s(+) in s(Class))',
+        'TypeVariable(s(C) in s(Class),'
+            ' upperBound = Class(s(Object) in s(dart.core), top-level))',
+        'Method(s(Class._generativeConstructor) in s(Class), private, constructor)',
+        'Method(s(Class._redirectingConstructor)'
+            ' in s(Class), private, constructor)',
+        'Method(s(Class.generativeConstructor) in s(Class), constructor)',
+        'Method(s(Class.redirectingConstructor) in s(Class), constructor)',
+        'Method(s(_instanceGetter) in s(Class), private, getter)',
+        'Method(s(_instanceMethod) in s(Class), private)',
+        'Method(s(_instanceSetter=) in s(Class), private, setter)',
+        'Variable(s(_instanceVariable) in s(Class), private)',
+        'Method(s(abstractMethod) in s(Class), abstract)',
+        'Method(s(instanceGetter) in s(Class), getter)',
+        'Method(s(instanceMethod) in s(Class))',
+        'Method(s(instanceSetter=) in s(Class), setter)',
+        'Variable(s(instanceVariable) in s(Class))'
+      ],
+      cm.declarations.values
+          .where((dm) => !castMirror(dm).isStatic)
+          .map(stringify),
       'non-statics');
 
-  Expect.setEquals([
-    'Method(s(+) in s(Class))',
-    'TypeVariable(s(C) in s(Class),'
-        ' upperBound = Class(s(Object) in s(dart.core), top-level))',
-    'Method(s(Class.generativeConstructor) in s(Class), constructor)',
-    'Method(s(Class.normalFactory) in s(Class), static, constructor)',
-    'Method(s(Class.redirectingConstructor) in s(Class), constructor)',
-    'Method(s(Class.redirectingFactory) in s(Class), static, constructor)',
-    'Method(s(abstractMethod) in s(Class), abstract)',
-    'Method(s(instanceGetter) in s(Class), getter)',
-    'Method(s(instanceMethod) in s(Class))',
-    'Method(s(instanceSetter=) in s(Class), setter)',
-    'Variable(s(instanceVariable) in s(Class))',
-    'Method(s(staticGetter) in s(Class), static, getter)',
-    'Method(s(staticMethod) in s(Class), static)',
-    'Method(s(staticSetter=) in s(Class), static, setter)',
-    'Variable(s(staticVariable) in s(Class), static)'
-  ], cm.declarations.values.where((dm) => !dm.isPrivate).map(stringify),
+  Expect.setEquals(
+      [
+        'Method(s(+) in s(Class))',
+        'TypeVariable(s(C) in s(Class),'
+            ' upperBound = Class(s(Object) in s(dart.core), top-level))',
+        'Method(s(Class.generativeConstructor) in s(Class), constructor)',
+        'Method(s(Class.normalFactory) in s(Class), static, constructor)',
+        'Method(s(Class.redirectingConstructor) in s(Class), constructor)',
+        'Method(s(Class.redirectingFactory) in s(Class), static, constructor)',
+        'Method(s(abstractMethod) in s(Class), abstract)',
+        'Method(s(instanceGetter) in s(Class), getter)',
+        'Method(s(instanceMethod) in s(Class))',
+        'Method(s(instanceSetter=) in s(Class), setter)',
+        'Variable(s(instanceVariable) in s(Class))',
+        'Method(s(staticGetter) in s(Class), static, getter)',
+        'Method(s(staticMethod) in s(Class), static)',
+        'Method(s(staticSetter=) in s(Class), static, setter)',
+        'Variable(s(staticVariable) in s(Class), static)'
+      ],
+      cm.declarations.values
+          .where((dm) => !castMirror(dm).isPrivate)
+          .map(stringify),
       'public');
 
   Expect.setEquals([