Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: pkg/analysis_server/test/search/type_hierarchy_test.dart

Issue 506433002: Finish modifying analysis server to make use of code generation. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/search/type_hierarchy_test.dart
diff --git a/pkg/analysis_server/test/search/type_hierarchy_test.dart b/pkg/analysis_server/test/search/type_hierarchy_test.dart
index 834e38a18c1faf3248b19961197149c9234fc642..87f88f3ef7b6b73e6ac8ec8f0cd2706c9ab564a3 100644
--- a/pkg/analysis_server/test/search/type_hierarchy_test.dart
+++ b/pkg/analysis_server/test/search/type_hierarchy_test.dart
@@ -7,11 +7,9 @@ library test.analysis.get_type_hierarhy;
import 'dart:async';
import 'package:analysis_server/src/protocol.dart';
-import 'package:analysis_server/src/protocol2.dart';
import 'package:analysis_server/src/search/search_domain.dart';
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/json.dart';
import 'package:analysis_testing/reflective_tests.dart';
import 'package:unittest/unittest.dart';
@@ -61,7 +59,7 @@ class B extends A {
''');
return waitForTasksFinished().then((_) {
return _getTypeHierarchy('B extends A').then((items) {
- expect(objectToJson(items), [{
+ expect(items.map((item) => item.toJson()).toList(), [{
'classElement': {
'kind': 'CLASS',
'name': 'B',
@@ -116,7 +114,7 @@ class C extends B {
''');
return waitForTasksFinished().then((_) {
return _getTypeHierarchy('A {}').then((items) {
- expect(objectToJson(items), [{
+ expect(items.map((item) => item.toJson()).toList(), [{
'classElement': {
'kind': 'CLASS',
'name': 'A',
@@ -175,7 +173,7 @@ class C extends B {
''');
return waitForTasksFinished().then((_) {
return _getTypeHierarchy('B extends').then((items) {
- expect(objectToJson(items), [{
+ expect(items.map((item) => item.toJson()).toList(), [{
'classElement': {
'kind': 'CLASS',
'name': 'B',
@@ -234,7 +232,7 @@ class C extends B {
''');
return waitForTasksFinished().then((_) {
return _getTypeHierarchy('C extends').then((items) {
- expect(objectToJson(items), [{
+ expect(items.map((item) => item.toJson()).toList(), [{
'classElement': {
'kind': 'CLASS',
'name': 'C',
@@ -293,7 +291,7 @@ class T implements MA, MB {
''');
return waitForTasksFinished().then((_) {
return _getTypeHierarchy('T implements').then((items) {
- expect(objectToJson(items), [{
+ expect(items.map((item) => item.toJson()).toList(), [{
'classElement': {
'kind': 'CLASS',
'name': 'T',
@@ -352,7 +350,7 @@ class T extends Object with MA, MB {
''');
return waitForTasksFinished().then((_) {
return _getTypeHierarchy('T extends Object').then((items) {
- expect(objectToJson(items), [{
+ expect(items.map((item) => item.toJson()).toList(), [{
'classElement': {
'kind': 'CLASS',
'name': 'T',

Powered by Google App Engine
This is Rietveld 408576698