| Index: tests/compiler/dart2js/serialization/model_test.dart
|
| diff --git a/tests/compiler/dart2js/serialization/model_test.dart b/tests/compiler/dart2js/serialization/model_test.dart
|
| index d7eeed63e329c2fd4f8395d35329183b1a80c4ee..5dab06eed9c6550f81532aaae30ee426839f29c0 100644
|
| --- a/tests/compiler/dart2js/serialization/model_test.dart
|
| +++ b/tests/compiler/dart2js/serialization/model_test.dart
|
| @@ -3,7 +3,6 @@
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| library dart2js.serialization_model_test;
|
| -
|
| import 'dart:async';
|
| import 'dart:io';
|
| import 'package:async_helper/async_helper.dart';
|
| @@ -240,128 +239,6 @@ void checkClassHierarchyNodes(
|
| checkMixinUses(compiler1, compiler2, node1.cls, node2.cls, verbose: verbose);
|
| }
|
|
|
| -void checkSets(
|
| - Iterable set1,
|
| - Iterable set2,
|
| - String messagePrefix,
|
| - bool sameElement(a, b),
|
| - {bool failOnUnfound: true,
|
| - bool verbose: false,
|
| - void onSameElement(a, b)}) {
|
| - List common = [];
|
| - List unfound = [];
|
| - Set remaining = computeSetDifference(
|
| - set1, set2, common, unfound,
|
| - sameElement: sameElement,
|
| - checkElements: onSameElement);
|
| - StringBuffer sb = new StringBuffer();
|
| - sb.write("$messagePrefix:");
|
| - if (verbose) {
|
| - sb.write("\n Common:\n ${common.join('\n ')}");
|
| - }
|
| - if (unfound.isNotEmpty || verbose) {
|
| - sb.write("\n Unfound:\n ${unfound.join('\n ')}");
|
| - }
|
| - if (remaining.isNotEmpty || verbose) {
|
| - sb.write("\n Extra: \n ${remaining.join('\n ')}");
|
| - }
|
| - String message = sb.toString();
|
| - if (unfound.isNotEmpty || remaining.isNotEmpty) {
|
| -
|
| - if (failOnUnfound || remaining.isNotEmpty) {
|
| - Expect.fail(message);
|
| - } else {
|
| - print(message);
|
| - }
|
| - } else if (verbose) {
|
| - print(message);
|
| - }
|
| -}
|
| -
|
| -String defaultToString(obj) => '$obj';
|
| -
|
| -void checkMaps(
|
| - Map map1,
|
| - Map map2,
|
| - String messagePrefix,
|
| - bool sameKey(a, b),
|
| - bool sameValue(a, b),
|
| - {bool failOnUnfound: true,
|
| - bool failOnMismatch: true,
|
| - bool verbose: false,
|
| - String keyToString(key): defaultToString,
|
| - String valueToString(key): defaultToString}) {
|
| - List common = [];
|
| - List unfound = [];
|
| - List<List> mismatch = <List>[];
|
| - Set remaining = computeSetDifference(
|
| - map1.keys, map2.keys, common, unfound,
|
| - sameElement: sameKey,
|
| - checkElements: (k1, k2) {
|
| - var v1 = map1[k1];
|
| - var v2 = map2[k2];
|
| - if (!sameValue(v1, v2)) {
|
| - mismatch.add([k1, k2]);
|
| - }
|
| - });
|
| - StringBuffer sb = new StringBuffer();
|
| - sb.write("$messagePrefix:");
|
| - if (verbose) {
|
| - sb.write("\n Common: \n");
|
| - for (List pair in common) {
|
| - var k1 = pair[0];
|
| - var k2 = pair[1];
|
| - var v1 = map1[k1];
|
| - var v2 = map2[k2];
|
| - sb.write(" key1 =${keyToString(k1)}\n");
|
| - sb.write(" key2 =${keyToString(k2)}\n");
|
| - sb.write(" value1=${valueToString(v1)}\n");
|
| - sb.write(" value2=${valueToString(v2)}\n");
|
| - }
|
| - }
|
| - if (unfound.isNotEmpty || verbose) {
|
| - sb.write("\n Unfound: \n");
|
| - for (var k1 in unfound) {
|
| - var v1 = map1[k1];
|
| - sb.write(" key1 =${keyToString(k1)}\n");
|
| - sb.write(" value1=${valueToString(v1)}\n");
|
| - }
|
| - }
|
| - if (remaining.isNotEmpty || verbose) {
|
| - sb.write("\n Extra: \n");
|
| - for (var k2 in remaining) {
|
| - var v2 = map2[k2];
|
| - sb.write(" key2 =${keyToString(k2)}\n");
|
| - sb.write(" value2=${valueToString(v2)}\n");
|
| - }
|
| - }
|
| - if (mismatch.isNotEmpty || verbose) {
|
| - sb.write("\n Mismatch: \n");
|
| - for (List pair in mismatch) {
|
| - var k1 = pair[0];
|
| - var k2 = pair[1];
|
| - var v1 = map1[k1];
|
| - var v2 = map2[k2];
|
| - sb.write(" key1 =${keyToString(k1)}\n");
|
| - sb.write(" key2 =${keyToString(k2)}\n");
|
| - sb.write(" value1=${valueToString(v1)}\n");
|
| - sb.write(" value2=${valueToString(v2)}\n");
|
| - }
|
| - }
|
| - String message = sb.toString();
|
| - if (unfound.isNotEmpty || mismatch.isNotEmpty || remaining.isNotEmpty) {
|
| - if ((unfound.isNotEmpty && failOnUnfound) ||
|
| - (mismatch.isNotEmpty && failOnMismatch) ||
|
| - remaining.isNotEmpty) {
|
| - Expect.fail(message);
|
| - } else {
|
| - print(message);
|
| - }
|
| - } else if (verbose) {
|
| - print(message);
|
| - }
|
| -}
|
| -
|
| bool areLocalsEquivalent(Local a, Local b) {
|
| if (a == b) return true;
|
| if (a == null || b == null) return false;
|
|
|