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

Unified Diff: tests/compiler/dart2js/type_mask_disjoint_test.dart

Issue 2345083003: dart2js: run dartfmt on tests (Closed)
Patch Set: revert another multipart test Created 4 years, 3 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
« no previous file with comments | « tests/compiler/dart2js/type_mask2_test.dart ('k') | tests/compiler/dart2js/type_mask_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/compiler/dart2js/type_mask_disjoint_test.dart
diff --git a/tests/compiler/dart2js/type_mask_disjoint_test.dart b/tests/compiler/dart2js/type_mask_disjoint_test.dart
index 90d3f53250ea1197f0748ea2591cb72c16db98c2..f27ac574527961ceb169d83528a20744715d61ec 100644
--- a/tests/compiler/dart2js/type_mask_disjoint_test.dart
+++ b/tests/compiler/dart2js/type_mask_disjoint_test.dart
@@ -40,79 +40,78 @@ var world = compiler.world;
main() {
asyncTest(() => compiler.run(uri).then((_) {
-
- // Empty
- check(' ! ', ' ! '); // both non-null
- check(' ! ', ' '); // one non-null
- check(' ', ' ! '); // one non-null
- check(' ', ' ', areDisjoint: false); // null is common
-
- // Exact
- check('A!=', 'A!=', areDisjoint: false);
- check('A!=', 'B!=');
- check('A!=', 'E!=');
- check('A =', 'E =', areDisjoint: false); // null is common
- check('M!=', 'K!=');
- check('M!=', 'A!=');
-
- // Exact with subclass
- check('A!=', 'A!<', areDisjoint: false);
- check('B!=', 'A!<', areDisjoint: false);
- check('A!=', 'B!<');
- check('A!=', 'E!<');
- check('A =', 'E!<');
- check('A =', 'E <', areDisjoint: false);
- check('M!=', 'K!<', areDisjoint: false);
- check('M!=', 'A!<');
-
- // Exact with subtype
- check('A!=', 'A!*', areDisjoint: false);
- check('B!=', 'A!*', areDisjoint: false);
- check('A!=', 'B!*');
- check('A!=', 'E!*');
- check('A!=', 'I!*');
- check('J!=', 'H!*', areDisjoint: false);
- check('M!=', 'K!*', areDisjoint: false);
- check('M!=', 'A!*', areDisjoint: false);
-
- // Subclass with subclass
- check('A!<', 'A!<', areDisjoint: false);
- check('A!<', 'B!<', areDisjoint: false);
- check('A!<', 'E!<');
- check('A!<', 'H!<');
- check('D!<', 'I!<');
- check('H!<', 'I!*', areDisjoint: false);
-
- // Subclass with subtype
- check('A!<', 'A!*', areDisjoint: false);
- check('A!<', 'B!*', areDisjoint: false);
- check('A!<', 'E!*');
- check('A!<', 'H!*');
- check('D!<', 'I!*', areDisjoint: false);
-
- // Subtype with subtype
- check('A!*', 'A!*', areDisjoint: false);
- check('A!*', 'B!*', areDisjoint: false);
- check('A!*', 'E!*');
- check('A!*', 'H!*', areDisjoint: false);
- check('D!*', 'I!*', areDisjoint: false);
-
- // Unions!
- checkUnions(['B!=', 'C!='], ['A!=']);
- checkUnions(['B!=', 'C!='], ['A =']);
- checkUnions(['B!=', 'C ='], ['A ='], areDisjoint: false);
-
- checkUnions(['B!=', 'C!='], ['A!<'], areDisjoint: false);
- checkUnions(['B!=', 'C!='], ['B!='], areDisjoint: false);
- checkUnions(['A!<', 'E!<'], ['C!='], areDisjoint: false);
- checkUnions(['A!<', 'E!<'], ['F!='], areDisjoint: false);
-
- checkUnions(['A!=', 'E!='], ['C!=', 'F!=']);
- checkUnions(['A!=', 'E!='], ['A!=', 'F!='], areDisjoint: false);
- checkUnions(['B!=', 'E!='], ['A!<', 'F!='], areDisjoint: false);
- checkUnions(['A!<', 'E!<'], ['C!=', 'F!='], areDisjoint: false);
- checkUnions(['A!=', 'E!='], ['C!=', 'F!=']);
- }));
+ // Empty
+ check(' ! ', ' ! '); // both non-null
+ check(' ! ', ' '); // one non-null
+ check(' ', ' ! '); // one non-null
+ check(' ', ' ', areDisjoint: false); // null is common
+
+ // Exact
+ check('A!=', 'A!=', areDisjoint: false);
+ check('A!=', 'B!=');
+ check('A!=', 'E!=');
+ check('A =', 'E =', areDisjoint: false); // null is common
+ check('M!=', 'K!=');
+ check('M!=', 'A!=');
+
+ // Exact with subclass
+ check('A!=', 'A!<', areDisjoint: false);
+ check('B!=', 'A!<', areDisjoint: false);
+ check('A!=', 'B!<');
+ check('A!=', 'E!<');
+ check('A =', 'E!<');
+ check('A =', 'E <', areDisjoint: false);
+ check('M!=', 'K!<', areDisjoint: false);
+ check('M!=', 'A!<');
+
+ // Exact with subtype
+ check('A!=', 'A!*', areDisjoint: false);
+ check('B!=', 'A!*', areDisjoint: false);
+ check('A!=', 'B!*');
+ check('A!=', 'E!*');
+ check('A!=', 'I!*');
+ check('J!=', 'H!*', areDisjoint: false);
+ check('M!=', 'K!*', areDisjoint: false);
+ check('M!=', 'A!*', areDisjoint: false);
+
+ // Subclass with subclass
+ check('A!<', 'A!<', areDisjoint: false);
+ check('A!<', 'B!<', areDisjoint: false);
+ check('A!<', 'E!<');
+ check('A!<', 'H!<');
+ check('D!<', 'I!<');
+ check('H!<', 'I!*', areDisjoint: false);
+
+ // Subclass with subtype
+ check('A!<', 'A!*', areDisjoint: false);
+ check('A!<', 'B!*', areDisjoint: false);
+ check('A!<', 'E!*');
+ check('A!<', 'H!*');
+ check('D!<', 'I!*', areDisjoint: false);
+
+ // Subtype with subtype
+ check('A!*', 'A!*', areDisjoint: false);
+ check('A!*', 'B!*', areDisjoint: false);
+ check('A!*', 'E!*');
+ check('A!*', 'H!*', areDisjoint: false);
+ check('D!*', 'I!*', areDisjoint: false);
+
+ // Unions!
+ checkUnions(['B!=', 'C!='], ['A!=']);
+ checkUnions(['B!=', 'C!='], ['A =']);
+ checkUnions(['B!=', 'C ='], ['A ='], areDisjoint: false);
+
+ checkUnions(['B!=', 'C!='], ['A!<'], areDisjoint: false);
+ checkUnions(['B!=', 'C!='], ['B!='], areDisjoint: false);
+ checkUnions(['A!<', 'E!<'], ['C!='], areDisjoint: false);
+ checkUnions(['A!<', 'E!<'], ['F!='], areDisjoint: false);
+
+ checkUnions(['A!=', 'E!='], ['C!=', 'F!=']);
+ checkUnions(['A!=', 'E!='], ['A!=', 'F!='], areDisjoint: false);
+ checkUnions(['B!=', 'E!='], ['A!<', 'F!='], areDisjoint: false);
+ checkUnions(['A!<', 'E!<'], ['C!=', 'F!='], areDisjoint: false);
+ checkUnions(['A!=', 'E!='], ['C!=', 'F!=']);
+ }));
}
/// Checks the expectation of `isDisjoint` for two mask. Also checks that the
@@ -137,7 +136,6 @@ check(String typeMaskDescriptor1, String typeMaskDescriptor2,
areDisjoint: areDisjoint);
}
-
checkUnions(List descriptors1, List descriptors2, {areDisjoint: true}) {
print('[$descriptors1] & [$descriptors2]');
var m1 = new TypeMask.unionOf(descriptors1.map(maskOf).toList(), world);
@@ -160,28 +158,27 @@ Map _elementCache = {};
/// "Type =" - nullable exact Type
/// "Type!<" - non-null subclass of Type
/// "Type!*" - non-null subtype of Type
-TypeMask maskOf(String descriptor) =>
- _maskCache.putIfAbsent(descriptor, () {
- Expect.isTrue(descriptor.length >= 3);
- var type = descriptor.substring(0, descriptor.length - 2);
- bool isNullable = descriptor[descriptor.length - 2] != '!';
- bool isExact = descriptor[descriptor.length - 1] == '=';
- bool isSubclass = descriptor[descriptor.length - 1] == '<';
- bool isSubtype = descriptor[descriptor.length - 1] == '*';
-
- if (type == " ") {
- Expect.isFalse(isExact || isSubclass || isSubtype);
- return isNullable ? new TypeMask.empty() : new TypeMask.nonNullEmpty();
- }
-
- Expect.isTrue(isExact || isSubclass || isSubtype);
- var element = _elementCache.putIfAbsent(type,
- () => type == " " ? null : findElement(compiler, type));
-
- var mask = isExact
- ? new TypeMask.nonNullExact(element, world)
- : (isSubclass
- ? new TypeMask.nonNullSubclass(element, world)
- : new TypeMask.nonNullSubtype(element, world));
- return isNullable ? mask.nullable() : mask;
- });
+TypeMask maskOf(String descriptor) => _maskCache.putIfAbsent(descriptor, () {
+ Expect.isTrue(descriptor.length >= 3);
+ var type = descriptor.substring(0, descriptor.length - 2);
+ bool isNullable = descriptor[descriptor.length - 2] != '!';
+ bool isExact = descriptor[descriptor.length - 1] == '=';
+ bool isSubclass = descriptor[descriptor.length - 1] == '<';
+ bool isSubtype = descriptor[descriptor.length - 1] == '*';
+
+ if (type == " ") {
+ Expect.isFalse(isExact || isSubclass || isSubtype);
+ return isNullable ? new TypeMask.empty() : new TypeMask.nonNullEmpty();
+ }
+
+ Expect.isTrue(isExact || isSubclass || isSubtype);
+ var element = _elementCache.putIfAbsent(
+ type, () => type == " " ? null : findElement(compiler, type));
+
+ var mask = isExact
+ ? new TypeMask.nonNullExact(element, world)
+ : (isSubclass
+ ? new TypeMask.nonNullSubclass(element, world)
+ : new TypeMask.nonNullSubtype(element, world));
+ return isNullable ? mask.nullable() : mask;
+ });
« no previous file with comments | « tests/compiler/dart2js/type_mask2_test.dart ('k') | tests/compiler/dart2js/type_mask_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698