Rollback https://codereview.chromium.org/575613002

pkg/analysis_server/test/services/search/hierarchy_test.dart

 // Copyright (c) 2014, 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.
 
 library test.services.src.search.hierarchy;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine_internal.dart';
+import '../../abstract_single_unit.dart';
+import '../../reflective_tests.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:unittest/unittest.dart';
 
-import '../../abstract_single_unit.dart';
-import '../../reflective_tests.dart';
-
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(HierarchyTest);
 }
 
 
 @ReflectiveTestCase()
 class HierarchyTest extends AbstractSingleUnitTest {
   Index index;
@@ skipping 37 matching lines @@
   A() {}
 }
 class B extends A {
   B() {}
 }
 ''');
     ClassElement classA = findElement("A");
     ClassElement classB = findElement("B");
     ClassMemberElement memberA = classA.constructors[0];
     ClassMemberElement memberB = classB.constructors[0];
-    var futureA =
-        getHierarchyMembers(searchEngine, memberA, false).then((members) {
+    var futureA = getHierarchyMembers(searchEngine, memberA).then((members) {
       expect(members, unorderedEquals([memberA]));
     });
-    var futureB =
-        getHierarchyMembers(searchEngine, memberB, false).then((members) {
+    var futureB = getHierarchyMembers(searchEngine, memberB).then((members) {
       expect(members, unorderedEquals([memberB]));
     });
     return Future.wait([futureA, futureB]);
   }
 
   Future test_getHierarchyMembers_fields() {
     _indexTestUnit('''
 class A {
   int foo;
 }
 class B extends A {
   get foo => null;
 }
 class C extends B {
   set foo(x) {}
 }
 class D {
   int foo;
 }
 ''');
     ClassElement classA = findElement("A");
     ClassElement classB = findElement("B");
     ClassElement classC = findElement("C");
     ClassElement classD = findElement("D");
     ClassElement classE = findElement("E");
     ClassMemberElement memberA = classA.fields[0];
     ClassMemberElement memberB = classB.fields[0];
     ClassMemberElement memberC = classC.fields[0];
     ClassMemberElement memberD = classD.fields[0];
-    var futureA =
-        getHierarchyMembers(searchEngine, memberA, false).then((members) {
+    var futureA = getHierarchyMembers(searchEngine, memberA).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberC]));
     });
-    var futureB =
-        getHierarchyMembers(searchEngine, memberB, false).then((members) {
+    var futureB = getHierarchyMembers(searchEngine, memberB).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberC]));
     });
-    var futureC =
-        getHierarchyMembers(searchEngine, memberC, false).then((members) {
+    var futureC = getHierarchyMembers(searchEngine, memberC).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberC]));
     });
-    var futureD =
-        getHierarchyMembers(searchEngine, memberD, false).then((members) {
+    var futureD = getHierarchyMembers(searchEngine, memberD).then((members) {
       expect(members, unorderedEquals([memberD]));
     });
     return Future.wait([futureA, futureB, futureC, futureD]);
   }
 
   Future test_getHierarchyMembers_methods() {
     _indexTestUnit('''
 class A {
   foo() {}
 }
@@ skipping 13 matching lines @@
     ClassElement classA = findElement("A");
     ClassElement classB = findElement("B");
     ClassElement classC = findElement("C");
     ClassElement classD = findElement("D");
     ClassElement classE = findElement("E");
     ClassMemberElement memberA = classA.methods[0];
     ClassMemberElement memberB = classB.methods[0];
     ClassMemberElement memberC = classC.methods[0];
     ClassMemberElement memberD = classD.methods[0];
     ClassMemberElement memberE = classE.methods[0];
-    var futureA =
-        getHierarchyMembers(searchEngine, memberA, false).then((members) {
+    var futureA = getHierarchyMembers(searchEngine, memberA).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberC]));
     });
-    var futureB =
-        getHierarchyMembers(searchEngine, memberB, false).then((members) {
+    var futureB = getHierarchyMembers(searchEngine, memberB).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberC]));
     });
-    var futureC =
-        getHierarchyMembers(searchEngine, memberC, false).then((members) {
+    var futureC = getHierarchyMembers(searchEngine, memberC).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberC]));
     });
-    var futureD =
-        getHierarchyMembers(searchEngine, memberD, false).then((members) {
+    var futureD = getHierarchyMembers(searchEngine, memberD).then((members) {
       expect(members, unorderedEquals([memberD, memberE]));
     });
-    var futureE =
-        getHierarchyMembers(searchEngine, memberE, false).then((members) {
+    var futureE = getHierarchyMembers(searchEngine, memberE).then((members) {
       expect(members, unorderedEquals([memberD, memberE]));
     });
     return Future.wait([futureA, futureB, futureC, futureD, futureE]);
   }
 
-  Future test_getHierarchyMembers_methods_onlySuper() {
-    _indexTestUnit('''
-class A {
-  foo() {}
-}
-class B extends A {
-  foo() {}
-}
-class C extends B {
-  foo() {}
-}
-''');
-    ClassElement classA = findElement("A");
-    ClassElement classB = findElement("B");
-    ClassElement classC = findElement("C");
-    ClassMemberElement memberA = classA.methods[0];
-    ClassMemberElement memberB = classB.methods[0];
-    ClassMemberElement memberC = classC.methods[0];
-    var futureA =
-        getHierarchyMembers(searchEngine, memberA, true).then((members) {
-      expect(members, unorderedEquals([memberA]));
-    });
-    var futureB =
-        getHierarchyMembers(searchEngine, memberB, true).then((members) {
-      expect(members, unorderedEquals([memberA, memberB]));
-    });
-    var futureC =
-        getHierarchyMembers(searchEngine, memberC, true).then((members) {
-      expect(members, unorderedEquals([memberA, memberB, memberC]));
-    });
-    return Future.wait([futureA, futureB, futureC]);
-  }
-
   Future test_getHierarchyMembers_withInterfaces() {
     _indexTestUnit('''
 class A {
   foo() {}
 }
 class B implements A {
   foo() {}
 }
 abstract class C implements A {
 }
 class D extends C {
   foo() {}
 }
 class E {
   foo() {}
 }
 ''');
     ClassElement classA = findElement("A");
     ClassElement classB = findElement("B");
     ClassElement classC = findElement("C");
     ClassElement classD = findElement("D");
     ClassElement classE = findElement("E");
     ClassMemberElement memberA = classA.methods[0];
     ClassMemberElement memberB = classB.methods[0];
     ClassMemberElement memberD = classD.methods[0];
-    var futureA =
-        getHierarchyMembers(searchEngine, memberA, false).then((members) {
+    var futureA = getHierarchyMembers(searchEngine, memberA).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberD]));
     });
-    var futureB =
-        getHierarchyMembers(searchEngine, memberB, false).then((members) {
+    var futureB = getHierarchyMembers(searchEngine, memberB).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberD]));
     });
-    var futureD =
-        getHierarchyMembers(searchEngine, memberD, false).then((members) {
+    var futureD = getHierarchyMembers(searchEngine, memberD).then((members) {
       expect(members, unorderedEquals([memberA, memberB, memberD]));
     });
     return Future.wait([futureA, futureB, futureD]);
   }
 
   void test_getMembers() {
     _indexTestUnit('''
 class A {
   A() {}
   var ma1;
@@ skipping 102 matching lines @@
       Set<ClassElement> supers = getSuperClasses(classF);
       expect(supers, unorderedEquals([objectElement, classA]));
     }
   }
 
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(context, testUnit);
   }
 }