| Index: runtime/observatory/tests/service/type_arguments_test.dart
|
| diff --git a/runtime/observatory/tests/service/type_arguments_test.dart b/runtime/observatory/tests/service/type_arguments_test.dart
|
| index 28d00a5023cfcbf427d42e2864135a68bd09b75c..dd10523ddba37731b0453405021cceda42ee52c8 100644
|
| --- a/runtime/observatory/tests/service/type_arguments_test.dart
|
| +++ b/runtime/observatory/tests/service/type_arguments_test.dart
|
| @@ -8,39 +8,34 @@ import 'package:unittest/unittest.dart';
|
| import 'test_helper.dart';
|
|
|
| var tests = [
|
| - (Isolate isolate) =>
|
| - isolate.getTypeArgumentsList(false).then((ServiceMap allTypeArgs) {
|
| - var allTypeArgsTableSize =
|
| - allTypeArgs['canonicalTypeArgumentsTableSize'];
|
| - var allTypeArgsTableUsed =
|
| - allTypeArgs['canonicalTypeArgumentsTableUsed'];
|
| - var allTypeArgsList = allTypeArgs['typeArguments'];
|
| - expect(allTypeArgsList, isNotNull);
|
| - // Check size >= used.
|
| - expect(
|
| - allTypeArgsTableSize, greaterThanOrEqualTo(allTypeArgsTableUsed));
|
| - return isolate
|
| - .getTypeArgumentsList(true)
|
| - .then((ServiceMap instantiatedTypeARgs) {
|
| - var instantiatedTypeArgsTableSize =
|
| - instantiatedTypeARgs['canonicalTypeArgumentsTableSize'];
|
| - var instantiatedTypeArgsTableUsed =
|
| - instantiatedTypeARgs['canonicalTypeArgumentsTableUsed'];
|
| - // Check size >= used.
|
| - expect(instantiatedTypeArgsTableSize,
|
| - greaterThanOrEqualTo(instantiatedTypeArgsTableUsed));
|
| - // Check that |instantiated| <= |all|
|
| - var instantiatedTypeArgsList = instantiatedTypeARgs['typeArguments'];
|
| - expect(instantiatedTypeArgsList, isNotNull);
|
| - expect(allTypeArgsList.length,
|
| - greaterThanOrEqualTo(instantiatedTypeArgsList.length));
|
| - // Check that we can 'get' this object again.
|
| - var firstType = allTypeArgsList[0];
|
| - return isolate.getObject(firstType.id).then((TypeArguments type) {
|
| - expect(firstType.name, type.name);
|
| - });
|
| - });
|
| - }),
|
| +(Isolate isolate) =>
|
| + isolate.getTypeArgumentsList(false).then((ServiceMap allTypeArgs) {
|
| + var allTypeArgsTableSize = allTypeArgs['canonicalTypeArgumentsTableSize'];
|
| + var allTypeArgsTableUsed = allTypeArgs['canonicalTypeArgumentsTableUsed'];
|
| + var allTypeArgsList = allTypeArgs['typeArguments'];
|
| + expect(allTypeArgsList, isNotNull);
|
| + // Check size >= used.
|
| + expect(allTypeArgsTableSize, greaterThanOrEqualTo(allTypeArgsTableUsed));
|
| + return isolate.getTypeArgumentsList(true).then((ServiceMap instantiatedTypeARgs) {
|
| + var instantiatedTypeArgsTableSize =
|
| + instantiatedTypeARgs['canonicalTypeArgumentsTableSize'];
|
| + var instantiatedTypeArgsTableUsed =
|
| + instantiatedTypeARgs['canonicalTypeArgumentsTableUsed'];
|
| + // Check size >= used.
|
| + expect(instantiatedTypeArgsTableSize,
|
| + greaterThanOrEqualTo(instantiatedTypeArgsTableUsed));
|
| + // Check that |instantiated| <= |all|
|
| + var instantiatedTypeArgsList = instantiatedTypeARgs['typeArguments'];
|
| + expect(instantiatedTypeArgsList, isNotNull);
|
| + expect(allTypeArgsList.length,
|
| + greaterThanOrEqualTo(instantiatedTypeArgsList.length));
|
| + // Check that we can 'get' this object again.
|
| + var firstType = allTypeArgsList[0];
|
| + return isolate.getObject(firstType.id).then((TypeArguments type) {
|
| + expect(firstType.name, type.name);
|
| + });
|
| + });
|
| + }),
|
| ];
|
|
|
| main(args) => runIsolateTests(args, tests);
|
|
|