Search for direct and indirect subclasses.

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

Index: pkg/analysis_server/test/services/search/search_engine2_test.dart
diff --git a/pkg/analysis_server/test/services/search/search_engine2_test.dart b/pkg/analysis_server/test/services/search/search_engine2_test.dart
index 230c0d7d51aff09c47c11bff12182830817c079e..b8ceda02395ca799a1ae211b3b0c652802285f12 100644
--- a/pkg/analysis_server/test/services/search/search_engine2_test.dart
+++ b/pkg/analysis_server/test/services/search/search_engine2_test.dart
@@ -73,27 +73,26 @@ class SearchEngineImpl2Test extends AbstractSingleUnitTest {
     searchEngine = new SearchEngineImpl2(context, index);
   }
 
-//  Future test_searchAllSubtypes() {
-//    _indexTestUnit('''
-//class T {}
-//class A extends T {}
-//class B extends A {}
-//class C implements B {}
-//''');
-//    ClassElement element = findElement('T');
-//    ClassElement elementA = findElement('A');
-//    ClassElement elementB = findElement('B');
-//    ClassElement elementC = findElement('C');
-//    var expected = [
-//      _expectId(elementA, MatchKind.DECLARATION, 'A extends T'),
-//      _expectId(elementB, MatchKind.DECLARATION, 'B extends A'),
-//      _expectId(elementC, MatchKind.DECLARATION, 'C implements B')
-//    ];
-//    return searchEngine.searchAllSubtypes(element).then((matches) {
-//      _assertMatches(matches, expected);
-//    });
-//  }
-//
+  test_searchAllSubtypes() async {
+    _indexTestUnit('''
+class T {}
+class A extends T {}
+class B extends A {}
+class C implements B {}
+''');
+    ClassElement element = findElement('T');
+    ClassElement elementA = findElement('A');
+    ClassElement elementB = findElement('B');
+    ClassElement elementC = findElement('C');
+    var expected = [
+      _expectId(elementA, MatchKind.DECLARATION, 'A extends T'),
+      _expectId(elementB, MatchKind.DECLARATION, 'B extends A'),
+      _expectId(elementC, MatchKind.DECLARATION, 'C implements B')
+    ];
+    List<SearchMatch> matches = await searchEngine.searchAllSubtypes(element);
+    _assertMatches(matches, expected);
+  }
+
 //  Future test_searchMemberDeclarations() {
 //    _indexTestUnit('''
 //class A {
@@ -640,27 +639,26 @@ class A<T> {
     await _verifyReferences(element, expected);
   }
 
-//  Future test_searchSubtypes() {
-//    _indexTestUnit('''
-//class T {}
-//class A extends T {} // A
-//class B = Object with T; // B
-//class C implements T {} // C
-//''');
-//    ClassElement element = findElement('T');
-//    ClassElement elementA = findElement('A');
-//    ClassElement elementB = findElement('B');
-//    ClassElement elementC = findElement('C');
-//    var expected = [
-//      _expectId(elementA, MatchKind.REFERENCE, 'T {} // A'),
-//      _expectId(elementB, MatchKind.REFERENCE, 'T; // B'),
-//      _expectId(elementC, MatchKind.REFERENCE, 'T {} // C')
-//    ];
-//    return searchEngine.searchSubtypes(element).then((matches) {
-//      _assertMatches(matches, expected);
-//    });
-//  }
-//
+  test_searchSubtypes() async {
+    _indexTestUnit('''
+class T {}
+class A extends T {} // A
+class B = Object with T; // B
+class C implements T {} // C
+''');
+    ClassElement element = findElement('T');
+    ClassElement elementA = findElement('A');
+    ClassElement elementB = findElement('B');
+    ClassElement elementC = findElement('C');
+    var expected = [
+      _expectId(elementA, MatchKind.REFERENCE, 'T {} // A'),
+      _expectId(elementB, MatchKind.REFERENCE, 'T; // B'),
+      _expectId(elementC, MatchKind.REFERENCE, 'T {} // C')
+    ];
+    List<SearchMatch> matches = await searchEngine.searchSubtypes(element);
+    _assertMatches(matches, expected);
+  }
+
 //  Future test_searchTopLevelDeclarations() {
 //    _indexTestUnit('''
 //class A {} // A