Change integration test send...() methods to return structured objects.

pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart

Index: pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
diff --git a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart b/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
index 3ec72cdb50afa8de86db1a7a5330cb6a98a937f0..1793c6f834268948effe3daf8323598e67c62cc8 100644
--- a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
+++ b/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
@@ -19,13 +19,13 @@ class HierarchyResults {
   /**
    * The list of hierarchy items from the result.
    */
-  List<Map> items;
+  List<TypeHierarchyItem> items;
 
   /**
    * The first hierarchy item from the result, which represents the pivot
    * class.
    */
-  Map pivot;
+  TypeHierarchyItem pivot;
 
   /**
    * A map from element name to item index.
@@ -36,19 +36,18 @@ class HierarchyResults {
    * Create a [HierarchyResults] object based on the result from a
    * getTypeHierarchy request.
    */
-  HierarchyResults(result) {
-    items = result['hierarchyItems'];
+  HierarchyResults(this.items) {
     pivot = items[0];
     nameToIndex = <String, int> {};
     for (int i = 0; i < items.length; i++) {
-      nameToIndex[items[i]['classElement']['name']] = i;
+      nameToIndex[items[i].classElement.name] = i;
     }
   }
 
   /**
    * Get an item by class name.
    */
-  Map getItem(String name) {
+  TypeHierarchyItem getItem(String name) {
     if (nameToIndex.containsKey(name)) {
       return items[nameToIndex[name]];
     } else {
@@ -96,11 +95,11 @@ class Derived extends Pivot {}
       void checkElement(String name) {
         // We don't check the full element data structure; just enough to make
         // sure that we're pointing to the correct element.
-        Map element = results.items[results.nameToIndex[name]]['classElement'];
-        expect(element['kind'], equals('CLASS'));
-        expect(element['name'], equals(name));
+        Element element = results.items[results.nameToIndex[name]].classElement;
+        expect(element.kind, equals(ElementKind.CLASS));
+        expect(element.name, equals(name));
         if (name != 'Object') {
-          expect(element['location']['offset'], equals(text.indexOf(
+          expect(element.location.offset, equals(text.indexOf(
               'class $name') + 'class '.length));
         }
       }
@@ -119,9 +118,9 @@ class Pivot /* target */ extends Base<int> {}
 ''';
     return typeHierarchyTest(text).then((HierarchyResults results) {
       expect(results.items, hasLength(3));
-      expect(results.getItem('Object')['displayName'], isNull);
-      expect(results.getItem('Base')['displayName'], equals('Base<int>'));
-      expect(results.getItem('Pivot')['displayName'], isNull);
+      expect(results.getItem('Object').displayName, isNull);
+      expect(results.getItem('Base').displayName, equals('Base<int>'));
+      expect(results.getItem('Pivot').displayName, isNull);
     });
   }
 
@@ -141,14 +140,14 @@ class Derived2 extends Derived1 {
 }''';
     return typeHierarchyTest(text).then((HierarchyResults results) {
       expect(results.items, hasLength(6));
-      expect(results.getItem('Object')['memberElement'], isNull);
-      expect(results.getItem('Base1')['memberElement']['location']['offset'],
+      expect(results.getItem('Object').memberElement, isNull);
+      expect(results.getItem('Base1').memberElement.location.offset,
           equals(text.indexOf('foo /* base1 */')));
-      expect(results.getItem('Base2')['memberElement'], isNull);
-      expect(results.getItem('Pivot')['memberElement']['location']['offset'],
+      expect(results.getItem('Base2').memberElement, isNull);
+      expect(results.getItem('Pivot').memberElement.location.offset,
           equals(text.indexOf('foo /* target */')));
-      expect(results.getItem('Derived1')['memberElement'], isNull);
-      expect(results.getItem('Derived2')['memberElement']['location']['offset'],
+      expect(results.getItem('Derived1').memberElement, isNull);
+      expect(results.getItem('Derived2').memberElement.location.offset,
           equals(text.indexOf('foo /* derived2 */')));
     });
   }
@@ -162,12 +161,12 @@ class Pivot /* target */ extends Base2 {}
 ''';
     return typeHierarchyTest(text).then((HierarchyResults results) {
       expect(results.items, hasLength(4));
-      expect(results.getItem('Object')['superclass'], isNull);
-      expect(results.getItem('Base1')['superclass'], equals(
+      expect(results.getItem('Object').superclass, isNull);
+      expect(results.getItem('Base1').superclass, equals(
           results.nameToIndex['Object']));
-      expect(results.getItem('Base2')['superclass'], equals(
+      expect(results.getItem('Base2').superclass, equals(
           results.nameToIndex['Base1']));
-      expect(results.getItem('Pivot')['superclass'], equals(
+      expect(results.getItem('Pivot').superclass, equals(
           results.nameToIndex['Base2']));
     });
   }
@@ -181,14 +180,14 @@ class Pivot /* target */ implements Interface1, Interface2 {}
 ''';
     return typeHierarchyTest(text).then((HierarchyResults results) {
       expect(results.items, hasLength(4));
-      expect(results.pivot['interfaces'], hasLength(2));
-      expect(results.pivot['interfaces'], contains(
+      expect(results.pivot.interfaces, hasLength(2));
+      expect(results.pivot.interfaces, contains(
           results.nameToIndex['Interface1']));
-      expect(results.pivot['interfaces'], contains(
+      expect(results.pivot.interfaces, contains(
           results.nameToIndex['Interface2']));
-      expect(results.getItem('Object')['interfaces'], isEmpty);
-      expect(results.getItem('Interface1')['interfaces'], isEmpty);
-      expect(results.getItem('Interface2')['interfaces'], isEmpty);
+      expect(results.getItem('Object').interfaces, isEmpty);
+      expect(results.getItem('Interface1').interfaces, isEmpty);
+      expect(results.getItem('Interface2').interfaces, isEmpty);
     });
   }
 
@@ -202,13 +201,13 @@ class Pivot /* target */ extends Base with Mixin1, Mixin2 {}
 ''';
     return typeHierarchyTest(text).then((HierarchyResults results) {
       expect(results.items, hasLength(5));
-      expect(results.pivot['mixins'], hasLength(2));
-      expect(results.pivot['mixins'], contains(results.nameToIndex['Mixin1']));
-      expect(results.pivot['mixins'], contains(results.nameToIndex['Mixin2']));
-      expect(results.getItem('Object')['mixins'], isEmpty);
-      expect(results.getItem('Base')['mixins'], isEmpty);
-      expect(results.getItem('Mixin1')['mixins'], isEmpty);
-      expect(results.getItem('Mixin2')['mixins'], isEmpty);
+      expect(results.pivot.mixins, hasLength(2));
+      expect(results.pivot.mixins, contains(results.nameToIndex['Mixin1']));
+      expect(results.pivot.mixins, contains(results.nameToIndex['Mixin2']));
+      expect(results.getItem('Object').mixins, isEmpty);
+      expect(results.getItem('Base').mixins, isEmpty);
+      expect(results.getItem('Mixin1').mixins, isEmpty);
+      expect(results.getItem('Mixin2').mixins, isEmpty);
     });
   }
 
@@ -223,17 +222,17 @@ class Sub2a extends Sub2 {}
 ''';
     return typeHierarchyTest(text).then((HierarchyResults results) {
       expect(results.items, hasLength(6));
-      expect(results.pivot['subclasses'], hasLength(2));
-      expect(results.pivot['subclasses'], contains(results.nameToIndex['Sub1'])
+      expect(results.pivot.subclasses, hasLength(2));
+      expect(results.pivot.subclasses, contains(results.nameToIndex['Sub1'])
           );
-      expect(results.pivot['subclasses'], contains(results.nameToIndex['Sub2'])
+      expect(results.pivot.subclasses, contains(results.nameToIndex['Sub2'])
           );
-      expect(results.getItem('Object')['subclasses'], isEmpty);
-      expect(results.getItem('Base')['subclasses'], isEmpty);
-      expect(results.getItem('Sub1')['subclasses'], isEmpty);
-      expect(results.getItem('Sub2')['subclasses'], equals(
+      expect(results.getItem('Object').subclasses, isEmpty);
+      expect(results.getItem('Base').subclasses, isEmpty);
+      expect(results.getItem('Sub1').subclasses, isEmpty);
+      expect(results.getItem('Sub2').subclasses, equals(
           [results.nameToIndex['Sub2a']]));
-      expect(results.getItem('Sub2a')['subclasses'], isEmpty);
+      expect(results.getItem('Sub2a').subclasses, isEmpty);
     });
   }
 
@@ -268,10 +267,18 @@ main /* target */ () {
     });
     return analysisFinished.then((_) => sendSearchGetTypeHierarchy(pathname,
         offset)).then((result) {
-      if (result.isEmpty) {
+      if (result.hierarchyItems == null) {
+        return null;
+      } else if (result.hierarchyItems.isEmpty) {
+        // TODO(paulberry): As a result of bug 21230, a type hierarchy result
+        // with no hierarchyItems field gets misinterpreted as a type hierarchy
+        // result with a hierarchyItems which is an empty list.  To work around
+        // that, treat an empty hierarchyItems list as equivalent to
+        // hierarchyItems being absent.  Once bug 21230 is fixed we should
+        // remove this.
         return null;
       } else {
-        return new HierarchyResults(result);
+        return new HierarchyResults(result.hierarchyItems);
       }
     });
   }