diff --git a/pkg/dev_compiler/lib/src/compiler/code_generator.dart b/pkg/dev_compiler/lib/src/compiler/code_generator.dart index 72e053a27c39..d6e8a5d91e68 100644 --- a/pkg/dev_compiler/lib/src/compiler/code_generator.dart +++ b/pkg/dev_compiler/lib/src/compiler/code_generator.dart @@ -113,6 +113,8 @@ class CodeGenerator extends GeneralizingAstVisitor BuildUnit _buildUnit; + String _buildRoot; + CodeGenerator(AnalysisContext c, this.options, this._extensionTypes) : context = c, types = c.typeProvider, @@ -131,6 +133,10 @@ class CodeGenerator extends GeneralizingAstVisitor JSModuleFile compile(BuildUnit unit, List compilationUnits, List errors) { _buildUnit = unit; + _buildRoot = _buildUnit.buildRoot; + if (!_buildRoot.endsWith('/')) { + _buildRoot = '$_buildRoot/'; + } var jsTree = _emitModule(compilationUnits); var codeAndSourceMap = _writeJSText(unit, jsTree); @@ -190,7 +196,7 @@ class CodeGenerator extends GeneralizingAstVisitor var libraryTemp = _isDartRuntime(library) ? _runtimeLibVar - : new JS.TemporaryId(jsLibraryName(library)); + : new JS.TemporaryId(jsLibraryName(_buildRoot, library)); _libraries[library] = libraryTemp; items.add(new JS.ExportDeclaration( js.call('const # = Object.create(null)', [libraryTemp]))); @@ -3760,8 +3766,8 @@ class CodeGenerator extends GeneralizingAstVisitor JS.Identifier emitLibraryName(LibraryElement library) { // It's either one of the libraries in this module, or it's an import. return _libraries[library] ?? - _imports.putIfAbsent( - library, () => new JS.TemporaryId(jsLibraryName(library))); + _imports.putIfAbsent(library, + () => new JS.TemporaryId(jsLibraryName(_buildRoot, library))); } JS.Node annotate(JS.Node node, AstNode original, [Element element]) { @@ -3837,8 +3843,27 @@ class CodeGenerator extends GeneralizingAstVisitor /// Choose a canonical name from the library element. /// This never uses the library's name (the identifier in the `library` /// declaration) as it doesn't have any meaningful rules enforced. -String jsLibraryName(LibraryElement library) { - return pathToJSIdentifier(library.source.uri.pathSegments.last); +String jsLibraryName(String buildRoot, LibraryElement library) { + var uri = library.source.uri; + if (uri.scheme == 'dart') { + return uri.path; + } + // TODO(vsm): This is not necessarily unique if '__' appears in a file name. + var separator = '__'; + String qualifiedPath; + if (uri.scheme == 'package') { + // Strip the package name. + // TODO(vsm): This is not unique if an escaped '/'appears in a filename. + // E.g., "foo/bar.dart" and "foo$47bar.dart" would collide. + qualifiedPath = uri.pathSegments.skip(1).join(separator); + } else if (uri.path.startsWith(buildRoot)) { + qualifiedPath = + uri.path.substring(buildRoot.length).replaceAll('/', separator); + } else { + // We don't have a unique name. + throw 'Invalid build root. $buildRoot does not contain ${uri.path}'; + } + return pathToJSIdentifier(qualifiedPath); } /// Shorthand for identifier-like property names. diff --git a/pkg/dev_compiler/lib/src/compiler/command.dart b/pkg/dev_compiler/lib/src/compiler/command.dart index 6cb95da11657..29264fbb82bf 100644 --- a/pkg/dev_compiler/lib/src/compiler/command.dart +++ b/pkg/dev_compiler/lib/src/compiler/command.dart @@ -24,6 +24,10 @@ class CompileCommand extends Command { CompileCommand({MessageHandler messageHandler}) : this.messageHandler = messageHandler ?? print { argParser.addOption('out', abbr: 'o', help: 'Output file (required)'); + argParser.addOption('build-root', + help: ''' +Root of source files. Generated library names are relative to this root. +'''); CompilerOptions.addArguments(argParser); AnalyzerOptions.addArguments(argParser); } @@ -39,7 +43,14 @@ class CompileCommand extends Command { usageException('Please include the output file location. For example:\n' ' -o PATH/TO/OUTPUT_FILE.js'); } - var unit = new BuildUnit(path.basenameWithoutExtension(outPath), + + var buildRoot = argResults['build-root'] as String; + if (buildRoot != null) { + buildRoot = path.absolute(buildRoot); + } else { + buildRoot = Directory.current.path; + } + var unit = new BuildUnit(path.basenameWithoutExtension(outPath), buildRoot, argResults.rest, _moduleForLibrary); JSModuleFile module = compiler.compile(unit, compilerOptions); diff --git a/pkg/dev_compiler/lib/src/compiler/compiler.dart b/pkg/dev_compiler/lib/src/compiler/compiler.dart index 41a05f72b392..969cd6d3418f 100644 --- a/pkg/dev_compiler/lib/src/compiler/compiler.dart +++ b/pkg/dev_compiler/lib/src/compiler/compiler.dart @@ -196,6 +196,9 @@ class BuildUnit { /// The name of this module. final String name; + /// Build root. All library names are relative to this path/prefix. + final String buildRoot; + /// The list of sources in this module. /// /// The set of Dart files can be arbitrarily large, but it must contain @@ -209,7 +212,7 @@ class BuildUnit { // build units. final Func1 libraryToModule; - BuildUnit(this.name, this.sources, this.libraryToModule); + BuildUnit(this.name, this.buildRoot, this.sources, this.libraryToModule); } /// The output of Dart->JS compilation. diff --git a/pkg/dev_compiler/test/codegen/expect/language-all.js b/pkg/dev_compiler/test/codegen/expect/language-all.js index 7767f7c231c1..af8ddd61b117 100644 --- a/pkg/dev_compiler/test/codegen/expect/language-all.js +++ b/pkg/dev_compiler/test/codegen/expect/language-all.js @@ -4465,7 +4465,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; + const src__core_matchers = matcher.src__core_matchers; const async_await_test_02_multi = Object.create(null); async_await_test_02_multi.main = function() { let checkedMode = false; @@ -4493,7 +4493,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ let future = f(); result[dartx.add](0); return dart.dsend(future, 'whenComplete', dart.fn(() => { - unittest$.expect(result, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(result, src__core_matchers.equals(dart.list([0, 1], core.int))); })); })); unittest$.test("async throws", dart.fn(() => { @@ -4532,7 +4532,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ function f() { return dart.async(function*() { let v = (yield null); - unittest$.expect(v, core_matchers.equals(null)); + unittest$.expect(v, src__core_matchers.equals(null)); }, dart.dynamic); } dart.fn(f); @@ -4574,7 +4574,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ x = true; }, dart.void, [])); let y = (yield true); - unittest$.expect(x, core_matchers.equals(y)); + unittest$.expect(x, src__core_matchers.equals(y)); }, dart.dynamic); } dart.fn(f); @@ -4613,7 +4613,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(42), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); unittest$.test("assert after await", dart.fn(() => { @@ -4628,7 +4628,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(42), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); } @@ -4651,7 +4651,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ dart.fn(f); ; return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); + unittest$.expect(v, src__core_matchers.equals(42)); })); })); unittest$.test("async flattens futures, error", dart.fn(() => { @@ -4682,7 +4682,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f, dart.dynamic, [async$.Stream$(core.int)]); return dart.dsend(f(async_await_test_02_multi.mkStream()), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(45)); + unittest$.expect(v, src__core_matchers.equals(45)); })); })); unittest$.test("await for w/ await", dart.fn(() => { @@ -4703,7 +4703,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f, dart.dynamic, [async$.Stream$(core.int)]); return dart.dsend(f(async_await_test_02_multi.mkStream()), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(45)); + unittest$.expect(v, src__core_matchers.equals(45)); })); })); unittest$.test("await for empty", dart.fn(() => { @@ -4729,7 +4729,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return _; })().stream; return dart.dsend(f(s), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); if (checkedMode) { @@ -4754,7 +4754,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(async_await_test_02_multi.mkStream()), 'then', dart.fn(v => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); } @@ -4772,7 +4772,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_02_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_02_multi.id(42), core.num)))); })); })); unittest$.test("await in for-init", dart.fn(() => { @@ -4787,7 +4787,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await in for-test", dart.fn(() => { @@ -4802,7 +4802,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await in for-incr", dart.fn(() => { @@ -4817,7 +4817,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 3)); + unittest$.expect(v, src__core_matchers.equals(10 * 3)); })); })); unittest$.test("await err in for-loop", dart.fn(() => { @@ -4884,7 +4884,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("await in empty for-loop 2", dart.fn(() => { @@ -4899,7 +4899,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("break before await in for-loop", dart.fn(() => { @@ -4915,7 +4915,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break before await in for-loop 2", dart.fn(() => { @@ -4931,7 +4931,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -4947,7 +4947,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -4964,7 +4964,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -4983,7 +4983,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_02_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_02_multi.id(42), core.num)))); })); })); unittest$.test("await in while-test", dart.fn(() => { @@ -5000,7 +5000,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await err in loop", dart.fn(() => { @@ -5048,7 +5048,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break after await", dart.fn(() => { @@ -5066,7 +5066,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 3)); + unittest$.expect(v, src__core_matchers.equals(42 * 3)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -5084,7 +5084,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -5103,7 +5103,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -5122,7 +5122,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_02_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_02_multi.id(42), core.num)))); })); })); unittest$.test("await in test", dart.fn(() => { @@ -5139,7 +5139,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await err in loop", dart.fn(() => { @@ -5158,7 +5158,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in test", dart.fn(() => { @@ -5177,7 +5177,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("break before await", dart.fn(() => { @@ -5195,7 +5195,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break after await", dart.fn(() => { @@ -5213,7 +5213,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 3)); + unittest$.expect(v, src__core_matchers.equals(42 * 3)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -5231,7 +5231,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -5250,7 +5250,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -5267,7 +5267,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(6)); + unittest$.expect(v, src__core_matchers.equals(6)); })); })); unittest$.test("await in for-in iterable", dart.fn(() => { @@ -5282,7 +5282,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(6)); + unittest$.expect(v, src__core_matchers.equals(6)); })); })); unittest$.test("await err in for-in", dart.fn(() => { @@ -5299,7 +5299,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in for-in iterable", dart.fn(() => { @@ -5316,7 +5316,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("break before await in for-in", dart.fn(() => { @@ -5332,7 +5332,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); + unittest$.expect(v, src__core_matchers.equals(3)); })); })); }, dart.void, [])); @@ -5410,7 +5410,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("try-catch-rethrow", dart.fn(() => { @@ -5429,7 +5429,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); }, dart.void, [])); @@ -5459,8 +5459,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("await err in body", dart.fn(() => { @@ -5476,7 +5476,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in finally", dart.fn(() => { @@ -5493,7 +5493,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in both", dart.fn(() => { @@ -5510,7 +5510,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in body, override in finally", dart.fn(() => { @@ -5557,8 +5557,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("throw in body, await, override in finally 3", dart.fn(() => { @@ -5577,8 +5577,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("await err in body, override in finally 2", dart.fn(() => { @@ -5629,7 +5629,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("exit after continue, await in finally", dart.fn(() => { @@ -5649,7 +5649,7 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("no-exit before await in finally 2", dart.fn(() => { @@ -5703,8 +5703,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(74)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(74)); })); })); unittest$.test("nested finallies 2", dart.fn(() => { @@ -5726,8 +5726,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(74)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(74)); })); })); unittest$.test("nested finallies 3", dart.fn(() => { @@ -5769,8 +5769,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); - unittest$.expect(x, core_matchers.equals(2 * 37)); + unittest$.expect(e, src__core_matchers.equals("err")); + unittest$.expect(x, src__core_matchers.equals(2 * 37)); })}); })); }, dart.void, [])); @@ -5840,8 +5840,8 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); }, dart.void, [])); @@ -6180,9 +6180,9 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ unittest$.test("sync in async", dart.fn(() => async_await_test_02_multi.expect42(async_await_test_02_multi.syncInAsync(f42)), async$.Future, [])); unittest$.test("async in sync", dart.fn(() => async_await_test_02_multi.expect42(async_await_test_02_multi.asyncInSync(f42)), async$.Future, [])); unittest$.test("Identical and equals", dart.fn(() => { - unittest$.expect(dart.bind(async, 'instanceMethod'), core_matchers.equals(dart.bind(async, 'instanceMethod'))); - unittest$.expect(async_await_test_02_multi.Async.staticMethod, core_matchers.same(async_await_test_02_multi.Async.staticMethod)); - unittest$.expect(async_await_test_02_multi.topMethod, core_matchers.same(async_await_test_02_multi.topMethod)); + unittest$.expect(dart.bind(async, 'instanceMethod'), src__core_matchers.equals(dart.bind(async, 'instanceMethod'))); + unittest$.expect(async_await_test_02_multi.Async.staticMethod, src__core_matchers.same(async_await_test_02_multi.Async.staticMethod)); + unittest$.expect(async_await_test_02_multi.topMethod, src__core_matchers.same(async_await_test_02_multi.topMethod)); }), {skip: 'https://github.com/dart-lang/dev_compiler/issues/265'}); }, dart.void, [])); unittest$.group("await expression", dart.fn(() => { @@ -6432,15 +6432,15 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ unittest$.group("syntax", dart.fn(() => { unittest$.test("async as variable", dart.fn(() => { let async = 42; - unittest$.expect(async, core_matchers.equals(42)); + unittest$.expect(async, src__core_matchers.equals(42)); })); unittest$.test("await as variable", dart.fn(() => { let await$ = 42; - unittest$.expect(await$, core_matchers.equals(42)); + unittest$.expect(await$, src__core_matchers.equals(42)); })); unittest$.test("yield as variable", dart.fn(() => { let yield$ = 42; - unittest$.expect(yield$, core_matchers.equals(42)); + unittest$.expect(yield$, src__core_matchers.equals(42)); })); }, dart.void, [])); }; @@ -6477,13 +6477,13 @@ dart_library.library('async_await_test_02_multi', null, /* Imports */[ return future.then(dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); }; dart.fn(async_await_test_02_multi.throwsErr, async$.Future, [async$.Future]); async_await_test_02_multi.expect42 = function(future) { return future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); + unittest$.expect(v, src__core_matchers.equals(42)); })); }; dart.fn(async_await_test_02_multi.expect42, async$.Future, [async$.Future]); @@ -6873,7 +6873,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; + const src__core_matchers = matcher.src__core_matchers; const async_await_test_03_multi = Object.create(null); async_await_test_03_multi.main = function() { let checkedMode = false; @@ -6901,7 +6901,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ let future = f(); result[dartx.add](0); return dart.dsend(future, 'whenComplete', dart.fn(() => { - unittest$.expect(result, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(result, src__core_matchers.equals(dart.list([0, 1], core.int))); })); })); unittest$.test("async throws", dart.fn(() => { @@ -6940,7 +6940,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ function f() { return dart.async(function*() { let v = (yield null); - unittest$.expect(v, core_matchers.equals(null)); + unittest$.expect(v, src__core_matchers.equals(null)); }, dart.dynamic); } dart.fn(f); @@ -6982,7 +6982,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ x = true; }, dart.void, [])); let y = (yield true); - unittest$.expect(x, core_matchers.equals(y)); + unittest$.expect(x, src__core_matchers.equals(y)); }, dart.dynamic); } dart.fn(f); @@ -7021,7 +7021,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(42), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); unittest$.test("assert after await", dart.fn(() => { @@ -7036,7 +7036,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(42), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); } @@ -7059,7 +7059,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ dart.fn(f); ; return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); + unittest$.expect(v, src__core_matchers.equals(42)); })); })); unittest$.test("async flattens futures, error", dart.fn(() => { @@ -7090,7 +7090,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f, dart.dynamic, [async$.Stream$(core.int)]); return dart.dsend(f(async_await_test_03_multi.mkStream()), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(45)); + unittest$.expect(v, src__core_matchers.equals(45)); })); })); unittest$.test("await for w/ await", dart.fn(() => { @@ -7111,7 +7111,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f, dart.dynamic, [async$.Stream$(core.int)]); return dart.dsend(f(async_await_test_03_multi.mkStream()), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(45)); + unittest$.expect(v, src__core_matchers.equals(45)); })); })); unittest$.test("await for empty", dart.fn(() => { @@ -7137,7 +7137,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return _; })().stream; return dart.dsend(f(s), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); if (checkedMode) { @@ -7162,7 +7162,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(async_await_test_03_multi.mkStream()), 'then', dart.fn(v => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); } @@ -7180,7 +7180,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_03_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_03_multi.id(42), core.num)))); })); })); unittest$.test("await in for-init", dart.fn(() => { @@ -7195,7 +7195,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await in for-test", dart.fn(() => { @@ -7210,7 +7210,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await in for-incr", dart.fn(() => { @@ -7225,7 +7225,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 3)); + unittest$.expect(v, src__core_matchers.equals(10 * 3)); })); })); unittest$.test("await err in for-loop", dart.fn(() => { @@ -7292,7 +7292,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("await in empty for-loop 2", dart.fn(() => { @@ -7307,7 +7307,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("break before await in for-loop", dart.fn(() => { @@ -7323,7 +7323,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break before await in for-loop 2", dart.fn(() => { @@ -7339,7 +7339,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -7355,7 +7355,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -7372,7 +7372,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -7391,7 +7391,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_03_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_03_multi.id(42), core.num)))); })); })); unittest$.test("await in while-test", dart.fn(() => { @@ -7408,7 +7408,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await err in loop", dart.fn(() => { @@ -7456,7 +7456,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break after await", dart.fn(() => { @@ -7474,7 +7474,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 3)); + unittest$.expect(v, src__core_matchers.equals(42 * 3)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -7492,7 +7492,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -7511,7 +7511,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -7530,7 +7530,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_03_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_03_multi.id(42), core.num)))); })); })); unittest$.test("await in test", dart.fn(() => { @@ -7547,7 +7547,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await err in loop", dart.fn(() => { @@ -7566,7 +7566,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in test", dart.fn(() => { @@ -7585,7 +7585,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("break before await", dart.fn(() => { @@ -7603,7 +7603,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break after await", dart.fn(() => { @@ -7621,7 +7621,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 3)); + unittest$.expect(v, src__core_matchers.equals(42 * 3)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -7639,7 +7639,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -7658,7 +7658,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -7675,7 +7675,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(6)); + unittest$.expect(v, src__core_matchers.equals(6)); })); })); unittest$.test("await in for-in iterable", dart.fn(() => { @@ -7690,7 +7690,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(6)); + unittest$.expect(v, src__core_matchers.equals(6)); })); })); unittest$.test("await err in for-in", dart.fn(() => { @@ -7707,7 +7707,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in for-in iterable", dart.fn(() => { @@ -7724,7 +7724,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("break before await in for-in", dart.fn(() => { @@ -7740,7 +7740,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); + unittest$.expect(v, src__core_matchers.equals(3)); })); })); }, dart.void, [])); @@ -7818,7 +7818,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("try-catch-rethrow", dart.fn(() => { @@ -7837,7 +7837,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); }, dart.void, [])); @@ -7867,8 +7867,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("await err in body", dart.fn(() => { @@ -7884,7 +7884,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in finally", dart.fn(() => { @@ -7901,7 +7901,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in both", dart.fn(() => { @@ -7918,7 +7918,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in body, override in finally", dart.fn(() => { @@ -7965,8 +7965,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("throw in body, await, override in finally 3", dart.fn(() => { @@ -7985,8 +7985,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("await err in body, override in finally 2", dart.fn(() => { @@ -8037,7 +8037,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("exit after continue, await in finally", dart.fn(() => { @@ -8057,7 +8057,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("no-exit before await in finally 2", dart.fn(() => { @@ -8111,8 +8111,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(74)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(74)); })); })); unittest$.test("nested finallies 2", dart.fn(() => { @@ -8134,8 +8134,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(74)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(74)); })); })); unittest$.test("nested finallies 3", dart.fn(() => { @@ -8177,8 +8177,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); - unittest$.expect(x, core_matchers.equals(2 * 37)); + unittest$.expect(e, src__core_matchers.equals("err")); + unittest$.expect(x, src__core_matchers.equals(2 * 37)); })}); })); }, dart.void, [])); @@ -8248,8 +8248,8 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); }, dart.void, [])); @@ -8588,9 +8588,9 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ unittest$.test("sync in async", dart.fn(() => async_await_test_03_multi.expect42(async_await_test_03_multi.syncInAsync(f42)), async$.Future, [])); unittest$.test("async in sync", dart.fn(() => async_await_test_03_multi.expect42(async_await_test_03_multi.asyncInSync(f42)), async$.Future, [])); unittest$.test("Identical and equals", dart.fn(() => { - unittest$.expect(dart.bind(async, 'instanceMethod'), core_matchers.equals(dart.bind(async, 'instanceMethod'))); - unittest$.expect(async_await_test_03_multi.Async.staticMethod, core_matchers.same(async_await_test_03_multi.Async.staticMethod)); - unittest$.expect(async_await_test_03_multi.topMethod, core_matchers.same(async_await_test_03_multi.topMethod)); + unittest$.expect(dart.bind(async, 'instanceMethod'), src__core_matchers.equals(dart.bind(async, 'instanceMethod'))); + unittest$.expect(async_await_test_03_multi.Async.staticMethod, src__core_matchers.same(async_await_test_03_multi.Async.staticMethod)); + unittest$.expect(async_await_test_03_multi.topMethod, src__core_matchers.same(async_await_test_03_multi.topMethod)); }), {skip: 'https://github.com/dart-lang/dev_compiler/issues/265'}); }, dart.void, [])); unittest$.group("await expression", dart.fn(() => { @@ -8857,7 +8857,7 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); unittest$.test("inside assert, function -> false", dart.fn(() => { @@ -8871,18 +8871,18 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); }, dart.void, [])); unittest$.group("syntax", dart.fn(() => { unittest$.test("async as variable", dart.fn(() => { let async = 42; - unittest$.expect(async, core_matchers.equals(42)); + unittest$.expect(async, src__core_matchers.equals(42)); })); unittest$.test("yield as variable", dart.fn(() => { let yield$ = 42; - unittest$.expect(yield$, core_matchers.equals(42)); + unittest$.expect(yield$, src__core_matchers.equals(42)); })); }, dart.void, [])); }; @@ -8919,13 +8919,13 @@ dart_library.library('async_await_test_03_multi', null, /* Imports */[ return future.then(dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); }; dart.fn(async_await_test_03_multi.throwsErr, async$.Future, [async$.Future]); async_await_test_03_multi.expect42 = function(future) { return future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); + unittest$.expect(v, src__core_matchers.equals(42)); })); }; dart.fn(async_await_test_03_multi.expect42, async$.Future, [async$.Future]); @@ -9315,7 +9315,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; + const src__core_matchers = matcher.src__core_matchers; const async_await_test_none_multi = Object.create(null); async_await_test_none_multi.main = function() { let checkedMode = false; @@ -9343,7 +9343,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ let future = f(); result[dartx.add](0); return dart.dsend(future, 'whenComplete', dart.fn(() => { - unittest$.expect(result, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(result, src__core_matchers.equals(dart.list([0, 1], core.int))); })); })); unittest$.test("async throws", dart.fn(() => { @@ -9382,7 +9382,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ function f() { return dart.async(function*() { let v = (yield null); - unittest$.expect(v, core_matchers.equals(null)); + unittest$.expect(v, src__core_matchers.equals(null)); }, dart.dynamic); } dart.fn(f); @@ -9424,7 +9424,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ x = true; }, dart.void, [])); let y = (yield true); - unittest$.expect(x, core_matchers.equals(y)); + unittest$.expect(x, src__core_matchers.equals(y)); }, dart.dynamic); } dart.fn(f); @@ -9463,7 +9463,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(42), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); unittest$.test("assert after await", dart.fn(() => { @@ -9478,7 +9478,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(42), 'then', dart.fn(_ => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); } @@ -9501,7 +9501,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ dart.fn(f); ; return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); + unittest$.expect(v, src__core_matchers.equals(42)); })); })); unittest$.test("async flattens futures, error", dart.fn(() => { @@ -9532,7 +9532,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f, dart.dynamic, [async$.Stream$(core.int)]); return dart.dsend(f(async_await_test_none_multi.mkStream()), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(45)); + unittest$.expect(v, src__core_matchers.equals(45)); })); })); unittest$.test("await for w/ await", dart.fn(() => { @@ -9553,7 +9553,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f, dart.dynamic, [async$.Stream$(core.int)]); return dart.dsend(f(async_await_test_none_multi.mkStream()), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(45)); + unittest$.expect(v, src__core_matchers.equals(45)); })); })); unittest$.test("await for empty", dart.fn(() => { @@ -9579,7 +9579,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return _; })().stream; return dart.dsend(f(s), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); if (checkedMode) { @@ -9604,7 +9604,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(async_await_test_none_multi.mkStream()), 'then', dart.fn(v => { unittest$.fail("assert didn't throw"); }), {onError: dart.fn((e, s) => { - unittest$.expect(dart.is(e, core.AssertionError), core_matchers.isTrue); + unittest$.expect(dart.is(e, core.AssertionError), src__core_matchers.isTrue); })}); })); } @@ -9622,7 +9622,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_none_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_none_multi.id(42), core.num)))); })); })); unittest$.test("await in for-init", dart.fn(() => { @@ -9637,7 +9637,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await in for-test", dart.fn(() => { @@ -9652,7 +9652,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await in for-incr", dart.fn(() => { @@ -9667,7 +9667,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 3)); + unittest$.expect(v, src__core_matchers.equals(10 * 3)); })); })); unittest$.test("await err in for-loop", dart.fn(() => { @@ -9734,7 +9734,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("await in empty for-loop 2", dart.fn(() => { @@ -9749,7 +9749,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("break before await in for-loop", dart.fn(() => { @@ -9765,7 +9765,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break before await in for-loop 2", dart.fn(() => { @@ -9781,7 +9781,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -9797,7 +9797,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -9814,7 +9814,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -9833,7 +9833,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_none_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_none_multi.id(42), core.num)))); })); })); unittest$.test("await in while-test", dart.fn(() => { @@ -9850,7 +9850,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await err in loop", dart.fn(() => { @@ -9898,7 +9898,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break after await", dart.fn(() => { @@ -9916,7 +9916,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 3)); + unittest$.expect(v, src__core_matchers.equals(42 * 3)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -9934,7 +9934,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -9953,7 +9953,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -9972,7 +9972,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_none_multi.id(42), core.num)))); + unittest$.expect(v, src__core_matchers.equals(10 * dart.notNull(dart.as(async_await_test_none_multi.id(42), core.num)))); })); })); unittest$.test("await in test", dart.fn(() => { @@ -9989,7 +9989,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10 * 5)); + unittest$.expect(v, src__core_matchers.equals(10 * 5)); })); })); unittest$.test("await err in loop", dart.fn(() => { @@ -10008,7 +10008,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in test", dart.fn(() => { @@ -10027,7 +10027,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("break before await", dart.fn(() => { @@ -10045,7 +10045,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 2)); + unittest$.expect(v, src__core_matchers.equals(42 * 2)); })); })); unittest$.test("break after await", dart.fn(() => { @@ -10063,7 +10063,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 3)); + unittest$.expect(v, src__core_matchers.equals(42 * 3)); })); })); unittest$.test("continue before await", dart.fn(() => { @@ -10081,7 +10081,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); unittest$.test("continue after await", dart.fn(() => { @@ -10100,7 +10100,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42 * 9)); + unittest$.expect(v, src__core_matchers.equals(42 * 9)); })); })); }, dart.void, [])); @@ -10117,7 +10117,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(6)); + unittest$.expect(v, src__core_matchers.equals(6)); })); })); unittest$.test("await in for-in iterable", dart.fn(() => { @@ -10132,7 +10132,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(6)); + unittest$.expect(v, src__core_matchers.equals(6)); })); })); unittest$.test("await err in for-in", dart.fn(() => { @@ -10149,7 +10149,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in for-in iterable", dart.fn(() => { @@ -10166,7 +10166,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("break before await in for-in", dart.fn(() => { @@ -10182,7 +10182,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); + unittest$.expect(v, src__core_matchers.equals(3)); })); })); }, dart.void, [])); @@ -10260,7 +10260,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("try-catch-rethrow", dart.fn(() => { @@ -10279,7 +10279,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); }, dart.void, [])); @@ -10309,8 +10309,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("await err in body", dart.fn(() => { @@ -10326,7 +10326,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in finally", dart.fn(() => { @@ -10343,7 +10343,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in both", dart.fn(() => { @@ -10360,7 +10360,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); })); unittest$.test("await err in body, override in finally", dart.fn(() => { @@ -10407,8 +10407,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("throw in body, await, override in finally 3", dart.fn(() => { @@ -10427,8 +10427,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); unittest$.test("await err in body, override in finally 2", dart.fn(() => { @@ -10479,7 +10479,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("exit after continue, await in finally", dart.fn(() => { @@ -10499,7 +10499,7 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(0)); + unittest$.expect(v, src__core_matchers.equals(0)); })); })); unittest$.test("no-exit before await in finally 2", dart.fn(() => { @@ -10553,8 +10553,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(74)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(74)); })); })); unittest$.test("nested finallies 2", dart.fn(() => { @@ -10576,8 +10576,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(74)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(74)); })); })); unittest$.test("nested finallies 3", dart.fn(() => { @@ -10619,8 +10619,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return dart.dsend(f(), 'then', dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); - unittest$.expect(x, core_matchers.equals(2 * 37)); + unittest$.expect(e, src__core_matchers.equals("err")); + unittest$.expect(x, src__core_matchers.equals(2 * 37)); })}); })); }, dart.void, [])); @@ -10690,8 +10690,8 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); - unittest$.expect(x, core_matchers.equals(37)); + unittest$.expect(v, src__core_matchers.equals(42)); + unittest$.expect(x, src__core_matchers.equals(37)); })); })); }, dart.void, [])); @@ -11030,9 +11030,9 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ unittest$.test("sync in async", dart.fn(() => async_await_test_none_multi.expect42(async_await_test_none_multi.syncInAsync(f42)), async$.Future, [])); unittest$.test("async in sync", dart.fn(() => async_await_test_none_multi.expect42(async_await_test_none_multi.asyncInSync(f42)), async$.Future, [])); unittest$.test("Identical and equals", dart.fn(() => { - unittest$.expect(dart.bind(async, 'instanceMethod'), core_matchers.equals(dart.bind(async, 'instanceMethod'))); - unittest$.expect(async_await_test_none_multi.Async.staticMethod, core_matchers.same(async_await_test_none_multi.Async.staticMethod)); - unittest$.expect(async_await_test_none_multi.topMethod, core_matchers.same(async_await_test_none_multi.topMethod)); + unittest$.expect(dart.bind(async, 'instanceMethod'), src__core_matchers.equals(dart.bind(async, 'instanceMethod'))); + unittest$.expect(async_await_test_none_multi.Async.staticMethod, src__core_matchers.same(async_await_test_none_multi.Async.staticMethod)); + unittest$.expect(async_await_test_none_multi.topMethod, src__core_matchers.same(async_await_test_none_multi.topMethod)); }), {skip: 'https://github.com/dart-lang/dev_compiler/issues/265'}); }, dart.void, [])); unittest$.group("await expression", dart.fn(() => { @@ -11282,11 +11282,11 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ unittest$.group("syntax", dart.fn(() => { unittest$.test("async as variable", dart.fn(() => { let async = 42; - unittest$.expect(async, core_matchers.equals(42)); + unittest$.expect(async, src__core_matchers.equals(42)); })); unittest$.test("yield as variable", dart.fn(() => { let yield$ = 42; - unittest$.expect(yield$, core_matchers.equals(42)); + unittest$.expect(yield$, src__core_matchers.equals(42)); })); }, dart.void, [])); }; @@ -11323,13 +11323,13 @@ dart_library.library('async_await_test_none_multi', null, /* Imports */[ return future.then(dart.fn(v => { unittest$.fail("didn't throw"); }), {onError: dart.fn(e => { - unittest$.expect(e, core_matchers.equals("err")); + unittest$.expect(e, src__core_matchers.equals("err")); })}); }; dart.fn(async_await_test_none_multi.throwsErr, async$.Future, [async$.Future]); async_await_test_none_multi.expect42 = function(future) { return future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(42)); + unittest$.expect(v, src__core_matchers.equals(42)); })); }; dart.fn(async_await_test_none_multi.expect42, async$.Future, [async$.Future]); @@ -13152,8 +13152,8 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; - const numeric_matchers = matcher.numeric_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__numeric_matchers = matcher.src__numeric_matchers; const async_star_test_01_multi = Object.create(null); async_star_test_01_multi.main = function() { unittest$.group("basic", dart.fn(() => { @@ -13164,7 +13164,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals([])); + unittest$.expect(v, src__core_matchers.equals([])); })); })); unittest$.test("single", dart.fn(() => { @@ -13176,7 +13176,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(dart.list([42], core.int))); + unittest$.expect(v, src__core_matchers.equals(dart.list([42], core.int))); })); })); unittest$.test("call delays", dart.fn(() => { @@ -13192,7 +13192,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ let res = dart.dsend(f(), 'forEach', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); list[dartx.add](0); return dart.dsend(res, 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([0, 1, 2], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1, 2], core.int))); })); })); unittest$.test("throws", dart.fn(() => { @@ -13208,7 +13208,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ let list = []; dart.dsend(f(), 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic]), {onError: dart.fn(v => list[dartx.add](`${v}`), dart.void, [dart.dynamic]), onDone: dart.bind(completer, 'complete')}); return completer.future.whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, "2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, "2"], core.Object))); })); }, async.Future, [])); unittest$.test("multiple", dart.fn(() => { @@ -13281,7 +13281,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(42), 'transform', async_star_test_01_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); unittest$.test("Cannot yield* non-stream", dart.fn(() => { @@ -13293,7 +13293,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(new async_star_test_01_multi.NotAStream()), 'transform', async_star_test_01_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); }, dart.void, [])); @@ -13683,7 +13683,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow", dart.fn(() => { @@ -13696,7 +13696,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression block async", dart.fn(() => { @@ -13711,7 +13711,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow async", dart.fn(() => { @@ -13726,7 +13726,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression block async*", dart.fn(() => { @@ -13742,7 +13742,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dload(dart.dcall(v), 'first'))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); }, dart.void, [])); @@ -13789,7 +13789,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_01_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in catch", dart.fn(() => { @@ -13811,7 +13811,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_01_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in finally", dart.fn(() => { @@ -13832,7 +13832,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_01_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("keep yielding after cancel", dart.fn(() => { @@ -13876,8 +13876,8 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ })}); dart.dsend(subscription, 'cancel'); return exits.future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); - unittest$.expect(list, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(v, src__core_matchers.equals(3)); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1], core.int))); })); }, async.Future, [])); unittest$.test("does cancel eventually", dart.fn(() => { @@ -13899,7 +13899,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(async_star_test_01_multi.expectList(dart.dsend(f(), 'take', 5), dart.list([0, 1, 2, 3, 4], core.int)), 'then', dart.fn(_ => exits.future, async.Future, [dart.dynamic])), 'then', dart.fn(v => { - unittest$.expect(v, numeric_matchers.greaterThan(4)); + unittest$.expect(v, src__numeric_matchers.greaterThan(4)); unittest$.expect(list, dart.list(["a"], core.String)); })); })); @@ -13947,14 +13947,14 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -13977,19 +13977,19 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); dart.dsend(sub, 'pause'); async.Timer.new(async_star_test_01_multi.MS['*'](300), dart.fn(() => { - unittest$.expect(list[dartx.length], numeric_matchers.lessThan(3)); + unittest$.expect(list[dartx.length], src__numeric_matchers.lessThan(3)); dart.dsend(sub, 'resume'); }, dart.void, [])); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -14012,7 +14012,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(expected++)); + unittest$.expect(v, src__core_matchers.equals(expected++)); if (dart.equals(dart.dsend(v, '%', 5), 0)) { dart.dsend(sub, 'pause', async.Future.delayed(async_star_test_01_multi.MS['*'](300))); } else if (dart.equals(v, 17)) { @@ -14023,7 +14023,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ unittest$.fail("Unexpected done!"); })}); return done.future.whenComplete(dart.fn(() => { - unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, core_matchers.isTrue); + unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, src__core_matchers.isTrue); })); }, async.Future, [])); }, dart.void, [])); @@ -14055,7 +14055,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream, await", dart.fn(() => { @@ -14076,7 +14076,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream reyield", dart.fn(() => { @@ -14143,7 +14143,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await", dart.fn(() => { @@ -14172,7 +14172,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await * 2", dart.fn(() => { @@ -14202,7 +14202,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); }, dart.void, [])); @@ -14220,7 +14220,7 @@ dart_library.library('async_star_test_01_multi', null, /* Imports */[ dart.fn(async_star_test_01_multi.id); async_star_test_01_multi.expectList = function(stream, list) { return dart.dsend(dart.dsend(stream, 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(list)); + unittest$.expect(v, src__core_matchers.equals(list)); })); }; dart.fn(async_star_test_01_multi.expectList); @@ -14287,8 +14287,8 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; - const numeric_matchers = matcher.numeric_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__numeric_matchers = matcher.src__numeric_matchers; const async_star_test_02_multi = Object.create(null); async_star_test_02_multi.main = function() { unittest$.group("basic", dart.fn(() => { @@ -14299,7 +14299,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals([])); + unittest$.expect(v, src__core_matchers.equals([])); })); })); unittest$.test("single", dart.fn(() => { @@ -14311,7 +14311,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(dart.list([42], core.int))); + unittest$.expect(v, src__core_matchers.equals(dart.list([42], core.int))); })); })); unittest$.test("call delays", dart.fn(() => { @@ -14327,7 +14327,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ let res = dart.dsend(f(), 'forEach', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); list[dartx.add](0); return dart.dsend(res, 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([0, 1, 2], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1, 2], core.int))); })); })); unittest$.test("throws", dart.fn(() => { @@ -14343,7 +14343,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ let list = []; dart.dsend(f(), 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic]), {onError: dart.fn(v => list[dartx.add](`${v}`), dart.void, [dart.dynamic]), onDone: dart.bind(completer, 'complete')}); return completer.future.whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, "2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, "2"], core.Object))); })); }, async.Future, [])); unittest$.test("multiple", dart.fn(() => { @@ -14416,7 +14416,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(42), 'transform', async_star_test_02_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); unittest$.test("Cannot yield* non-stream", dart.fn(() => { @@ -14428,7 +14428,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(new async_star_test_02_multi.NotAStream()), 'transform', async_star_test_02_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); }, dart.void, [])); @@ -14805,7 +14805,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow", dart.fn(() => { @@ -14818,7 +14818,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression block async", dart.fn(() => { @@ -14833,7 +14833,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow async", dart.fn(() => { @@ -14848,7 +14848,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression block async*", dart.fn(() => { @@ -14864,7 +14864,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dload(dart.dcall(v), 'first'))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); }, dart.void, [])); @@ -14911,7 +14911,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_02_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in catch", dart.fn(() => { @@ -14933,7 +14933,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_02_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in finally", dart.fn(() => { @@ -14954,7 +14954,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_02_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("keep yielding after cancel", dart.fn(() => { @@ -14998,8 +14998,8 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ })}); dart.dsend(subscription, 'cancel'); return exits.future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); - unittest$.expect(list, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(v, src__core_matchers.equals(3)); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1], core.int))); })); }, async.Future, [])); unittest$.test("does cancel eventually", dart.fn(() => { @@ -15021,7 +15021,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(async_star_test_02_multi.expectList(dart.dsend(f(), 'take', 5), dart.list([0, 1, 2, 3, 4], core.int)), 'then', dart.fn(_ => exits.future, async.Future, [dart.dynamic])), 'then', dart.fn(v => { - unittest$.expect(v, numeric_matchers.greaterThan(4)); + unittest$.expect(v, src__numeric_matchers.greaterThan(4)); unittest$.expect(list, dart.list(["a"], core.String)); })); })); @@ -15069,14 +15069,14 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -15099,19 +15099,19 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); dart.dsend(sub, 'pause'); async.Timer.new(async_star_test_02_multi.MS['*'](300), dart.fn(() => { - unittest$.expect(list[dartx.length], numeric_matchers.lessThan(3)); + unittest$.expect(list[dartx.length], src__numeric_matchers.lessThan(3)); dart.dsend(sub, 'resume'); }, dart.void, [])); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -15134,7 +15134,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(expected++)); + unittest$.expect(v, src__core_matchers.equals(expected++)); if (dart.equals(dart.dsend(v, '%', 5), 0)) { dart.dsend(sub, 'pause', async.Future.delayed(async_star_test_02_multi.MS['*'](300))); } else if (dart.equals(v, 17)) { @@ -15145,7 +15145,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ unittest$.fail("Unexpected done!"); })}); return done.future.whenComplete(dart.fn(() => { - unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, core_matchers.isTrue); + unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, src__core_matchers.isTrue); })); }, async.Future, [])); unittest$.test("canceling while paused at yield", dart.fn(() => { @@ -15169,14 +15169,14 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ let stream = f(); let sub = dart.dsend(stream, 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); return sync.wait().whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["*1", 1], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["*1", 1], core.Object))); dart.dsend(sub, 'pause'); return sync.wait(); }, async.Future, [])).whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["*1", 1, "*2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["*1", 1, "*2"], core.Object))); dart.dsend(sub, 'cancel'); return async.Future.delayed(async_star_test_02_multi.MS['*'](200), dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["*1", 1, "*2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["*1", 1, "*2"], core.Object))); })); }, async.Future, [])); }, async.Future, [])); @@ -15209,7 +15209,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream, await", dart.fn(() => { @@ -15230,7 +15230,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream reyield", dart.fn(() => { @@ -15297,7 +15297,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await", dart.fn(() => { @@ -15326,7 +15326,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await * 2", dart.fn(() => { @@ -15356,7 +15356,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); }, dart.void, [])); @@ -15374,7 +15374,7 @@ dart_library.library('async_star_test_02_multi', null, /* Imports */[ dart.fn(async_star_test_02_multi.id); async_star_test_02_multi.expectList = function(stream, list) { return dart.dsend(dart.dsend(stream, 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(list)); + unittest$.expect(v, src__core_matchers.equals(list)); })); }; dart.fn(async_star_test_02_multi.expectList); @@ -15441,8 +15441,8 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; - const numeric_matchers = matcher.numeric_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__numeric_matchers = matcher.src__numeric_matchers; const async_star_test_03_multi = Object.create(null); async_star_test_03_multi.main = function() { unittest$.group("basic", dart.fn(() => { @@ -15453,7 +15453,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals([])); + unittest$.expect(v, src__core_matchers.equals([])); })); })); unittest$.test("single", dart.fn(() => { @@ -15465,7 +15465,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(dart.list([42], core.int))); + unittest$.expect(v, src__core_matchers.equals(dart.list([42], core.int))); })); })); unittest$.test("call delays", dart.fn(() => { @@ -15481,7 +15481,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ let res = dart.dsend(f(), 'forEach', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); list[dartx.add](0); return dart.dsend(res, 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([0, 1, 2], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1, 2], core.int))); })); })); unittest$.test("throws", dart.fn(() => { @@ -15497,7 +15497,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ let list = []; dart.dsend(f(), 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic]), {onError: dart.fn(v => list[dartx.add](`${v}`), dart.void, [dart.dynamic]), onDone: dart.bind(completer, 'complete')}); return completer.future.whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, "2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, "2"], core.Object))); })); }, async.Future, [])); unittest$.test("multiple", dart.fn(() => { @@ -15570,7 +15570,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(42), 'transform', async_star_test_03_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); unittest$.test("Cannot yield* non-stream", dart.fn(() => { @@ -15582,7 +15582,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(new async_star_test_03_multi.NotAStream()), 'transform', async_star_test_03_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); }, dart.void, [])); @@ -15959,7 +15959,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow", dart.fn(() => { @@ -15972,7 +15972,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression block async", dart.fn(() => { @@ -15987,7 +15987,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow async", dart.fn(() => { @@ -16002,7 +16002,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression block async*", dart.fn(() => { @@ -16018,7 +16018,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dload(dart.dcall(v), 'first'))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); }, dart.void, [])); @@ -16065,7 +16065,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_03_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in catch", dart.fn(() => { @@ -16087,7 +16087,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_03_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in finally", dart.fn(() => { @@ -16108,7 +16108,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_03_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("keep yielding after cancel", dart.fn(() => { @@ -16152,8 +16152,8 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ })}); dart.dsend(subscription, 'cancel'); return exits.future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); - unittest$.expect(list, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(v, src__core_matchers.equals(3)); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1], core.int))); })); }, async.Future, [])); unittest$.test("does cancel eventually", dart.fn(() => { @@ -16175,7 +16175,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(async_star_test_03_multi.expectList(dart.dsend(f(), 'take', 5), dart.list([0, 1, 2, 3, 4], core.int)), 'then', dart.fn(_ => exits.future, async.Future, [dart.dynamic])), 'then', dart.fn(v => { - unittest$.expect(v, numeric_matchers.greaterThan(4)); + unittest$.expect(v, src__numeric_matchers.greaterThan(4)); unittest$.expect(list, dart.list(["a"], core.String)); })); })); @@ -16223,14 +16223,14 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -16253,19 +16253,19 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); dart.dsend(sub, 'pause'); async.Timer.new(async_star_test_03_multi.MS['*'](300), dart.fn(() => { - unittest$.expect(list[dartx.length], numeric_matchers.lessThan(3)); + unittest$.expect(list[dartx.length], src__numeric_matchers.lessThan(3)); dart.dsend(sub, 'resume'); }, dart.void, [])); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -16288,7 +16288,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(expected++)); + unittest$.expect(v, src__core_matchers.equals(expected++)); if (dart.equals(dart.dsend(v, '%', 5), 0)) { dart.dsend(sub, 'pause', async.Future.delayed(async_star_test_03_multi.MS['*'](300))); } else if (dart.equals(v, 17)) { @@ -16299,7 +16299,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ unittest$.fail("Unexpected done!"); })}); return done.future.whenComplete(dart.fn(() => { - unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, core_matchers.isTrue); + unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, src__core_matchers.isTrue); })); }, async.Future, [])); }, dart.void, [])); @@ -16331,7 +16331,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream, await", dart.fn(() => { @@ -16352,7 +16352,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream - take", dart.fn(() => { @@ -16373,7 +16373,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(10)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream reyield", dart.fn(() => { @@ -16440,7 +16440,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await", dart.fn(() => { @@ -16469,7 +16469,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await * 2", dart.fn(() => { @@ -16499,7 +16499,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); }, dart.void, [])); @@ -16517,7 +16517,7 @@ dart_library.library('async_star_test_03_multi', null, /* Imports */[ dart.fn(async_star_test_03_multi.id); async_star_test_03_multi.expectList = function(stream, list) { return dart.dsend(dart.dsend(stream, 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(list)); + unittest$.expect(v, src__core_matchers.equals(list)); })); }; dart.fn(async_star_test_03_multi.expectList); @@ -16584,8 +16584,8 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; - const numeric_matchers = matcher.numeric_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__numeric_matchers = matcher.src__numeric_matchers; const async_star_test_04_multi = Object.create(null); async_star_test_04_multi.main = function() { unittest$.group("basic", dart.fn(() => { @@ -16596,7 +16596,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals([])); + unittest$.expect(v, src__core_matchers.equals([])); })); })); unittest$.test("single", dart.fn(() => { @@ -16608,7 +16608,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(dart.list([42], core.int))); + unittest$.expect(v, src__core_matchers.equals(dart.list([42], core.int))); })); })); unittest$.test("call delays", dart.fn(() => { @@ -16624,7 +16624,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ let res = dart.dsend(f(), 'forEach', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); list[dartx.add](0); return dart.dsend(res, 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([0, 1, 2], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1, 2], core.int))); })); })); unittest$.test("throws", dart.fn(() => { @@ -16640,7 +16640,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ let list = []; dart.dsend(f(), 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic]), {onError: dart.fn(v => list[dartx.add](`${v}`), dart.void, [dart.dynamic]), onDone: dart.bind(completer, 'complete')}); return completer.future.whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, "2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, "2"], core.Object))); })); }, async.Future, [])); unittest$.test("multiple", dart.fn(() => { @@ -16713,7 +16713,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(42), 'transform', async_star_test_04_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); unittest$.test("Cannot yield* non-stream", dart.fn(() => { @@ -16725,7 +16725,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(new async_star_test_04_multi.NotAStream()), 'transform', async_star_test_04_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); }, dart.void, [])); @@ -17102,7 +17102,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow", dart.fn(() => { @@ -17115,7 +17115,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression block async", dart.fn(() => { @@ -17130,7 +17130,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow async", dart.fn(() => { @@ -17145,7 +17145,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression block async*", dart.fn(() => { @@ -17161,7 +17161,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dload(dart.dcall(v), 'first'))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); }, dart.void, [])); @@ -17208,7 +17208,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_04_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in catch", dart.fn(() => { @@ -17230,7 +17230,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_04_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in finally", dart.fn(() => { @@ -17251,7 +17251,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_04_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("keep yielding after cancel", dart.fn(() => { @@ -17295,8 +17295,8 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ })}); dart.dsend(subscription, 'cancel'); return exits.future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); - unittest$.expect(list, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(v, src__core_matchers.equals(3)); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1], core.int))); })); }, async.Future, [])); unittest$.test("does cancel eventually", dart.fn(() => { @@ -17318,7 +17318,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(async_star_test_04_multi.expectList(dart.dsend(f(), 'take', 5), dart.list([0, 1, 2, 3, 4], core.int)), 'then', dart.fn(_ => exits.future, async.Future, [dart.dynamic])), 'then', dart.fn(v => { - unittest$.expect(v, numeric_matchers.greaterThan(4)); + unittest$.expect(v, src__numeric_matchers.greaterThan(4)); unittest$.expect(list, dart.list(["a"], core.String)); })); })); @@ -17366,14 +17366,14 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -17396,19 +17396,19 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); dart.dsend(sub, 'pause'); async.Timer.new(async_star_test_04_multi.MS['*'](300), dart.fn(() => { - unittest$.expect(list[dartx.length], numeric_matchers.lessThan(3)); + unittest$.expect(list[dartx.length], src__numeric_matchers.lessThan(3)); dart.dsend(sub, 'resume'); }, dart.void, [])); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -17431,7 +17431,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(expected++)); + unittest$.expect(v, src__core_matchers.equals(expected++)); if (dart.equals(dart.dsend(v, '%', 5), 0)) { dart.dsend(sub, 'pause', async.Future.delayed(async_star_test_04_multi.MS['*'](300))); } else if (dart.equals(v, 17)) { @@ -17442,7 +17442,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ unittest$.fail("Unexpected done!"); })}); return done.future.whenComplete(dart.fn(() => { - unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, core_matchers.isTrue); + unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, src__core_matchers.isTrue); })); }, async.Future, [])); }, dart.void, [])); @@ -17474,7 +17474,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream, await", dart.fn(() => { @@ -17495,7 +17495,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream reyield", dart.fn(() => { @@ -17581,7 +17581,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await", dart.fn(() => { @@ -17610,7 +17610,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await * 2", dart.fn(() => { @@ -17640,7 +17640,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); }, dart.void, [])); @@ -17658,7 +17658,7 @@ dart_library.library('async_star_test_04_multi', null, /* Imports */[ dart.fn(async_star_test_04_multi.id); async_star_test_04_multi.expectList = function(stream, list) { return dart.dsend(dart.dsend(stream, 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(list)); + unittest$.expect(v, src__core_matchers.equals(list)); })); }; dart.fn(async_star_test_04_multi.expectList); @@ -17725,8 +17725,8 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; - const numeric_matchers = matcher.numeric_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__numeric_matchers = matcher.src__numeric_matchers; const async_star_test_05_multi = Object.create(null); async_star_test_05_multi.main = function() { unittest$.group("basic", dart.fn(() => { @@ -17737,7 +17737,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals([])); + unittest$.expect(v, src__core_matchers.equals([])); })); })); unittest$.test("single", dart.fn(() => { @@ -17749,7 +17749,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(dart.list([42], core.int))); + unittest$.expect(v, src__core_matchers.equals(dart.list([42], core.int))); })); })); unittest$.test("call delays", dart.fn(() => { @@ -17765,7 +17765,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ let res = dart.dsend(f(), 'forEach', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); list[dartx.add](0); return dart.dsend(res, 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([0, 1, 2], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1, 2], core.int))); })); })); unittest$.test("throws", dart.fn(() => { @@ -17781,7 +17781,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ let list = []; dart.dsend(f(), 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic]), {onError: dart.fn(v => list[dartx.add](`${v}`), dart.void, [dart.dynamic]), onDone: dart.bind(completer, 'complete')}); return completer.future.whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, "2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, "2"], core.Object))); })); }, async.Future, [])); unittest$.test("multiple", dart.fn(() => { @@ -17854,7 +17854,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(42), 'transform', async_star_test_05_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); unittest$.test("Cannot yield* non-stream", dart.fn(() => { @@ -17866,7 +17866,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(new async_star_test_05_multi.NotAStream()), 'transform', async_star_test_05_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); }, dart.void, [])); @@ -18243,7 +18243,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow", dart.fn(() => { @@ -18256,7 +18256,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression block async", dart.fn(() => { @@ -18271,7 +18271,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow async", dart.fn(() => { @@ -18286,7 +18286,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression block async*", dart.fn(() => { @@ -18302,7 +18302,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dload(dart.dcall(v), 'first'))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); }, dart.void, [])); @@ -18349,7 +18349,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_05_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in catch", dart.fn(() => { @@ -18371,7 +18371,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_05_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in finally", dart.fn(() => { @@ -18392,7 +18392,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_05_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("keep yielding after cancel", dart.fn(() => { @@ -18436,8 +18436,8 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ })}); dart.dsend(subscription, 'cancel'); return exits.future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); - unittest$.expect(list, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(v, src__core_matchers.equals(3)); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1], core.int))); })); }, async.Future, [])); unittest$.test("does cancel eventually", dart.fn(() => { @@ -18459,7 +18459,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(async_star_test_05_multi.expectList(dart.dsend(f(), 'take', 5), dart.list([0, 1, 2, 3, 4], core.int)), 'then', dart.fn(_ => exits.future, async.Future, [dart.dynamic])), 'then', dart.fn(v => { - unittest$.expect(v, numeric_matchers.greaterThan(4)); + unittest$.expect(v, src__numeric_matchers.greaterThan(4)); unittest$.expect(list, dart.list(["a"], core.String)); })); })); @@ -18507,14 +18507,14 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -18537,19 +18537,19 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); dart.dsend(sub, 'pause'); async.Timer.new(async_star_test_05_multi.MS['*'](300), dart.fn(() => { - unittest$.expect(list[dartx.length], numeric_matchers.lessThan(3)); + unittest$.expect(list[dartx.length], src__numeric_matchers.lessThan(3)); dart.dsend(sub, 'resume'); }, dart.void, [])); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -18572,7 +18572,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(expected++)); + unittest$.expect(v, src__core_matchers.equals(expected++)); if (dart.equals(dart.dsend(v, '%', 5), 0)) { dart.dsend(sub, 'pause', async.Future.delayed(async_star_test_05_multi.MS['*'](300))); } else if (dart.equals(v, 17)) { @@ -18583,7 +18583,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ unittest$.fail("Unexpected done!"); })}); return done.future.whenComplete(dart.fn(() => { - unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, core_matchers.isTrue); + unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, src__core_matchers.isTrue); })); }, async.Future, [])); }, dart.void, [])); @@ -18615,7 +18615,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream, await", dart.fn(() => { @@ -18636,7 +18636,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream reyield", dart.fn(() => { @@ -18703,7 +18703,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await", dart.fn(() => { @@ -18732,7 +18732,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await * 2", dart.fn(() => { @@ -18762,7 +18762,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("await pauses loop", dart.fn(() => { @@ -18794,7 +18794,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(dart.dload(sc, 'stream')), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); }, dart.void, [])); @@ -18812,7 +18812,7 @@ dart_library.library('async_star_test_05_multi', null, /* Imports */[ dart.fn(async_star_test_05_multi.id); async_star_test_05_multi.expectList = function(stream, list) { return dart.dsend(dart.dsend(stream, 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(list)); + unittest$.expect(v, src__core_matchers.equals(list)); })); }; dart.fn(async_star_test_05_multi.expectList); @@ -18879,8 +18879,8 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; const unittest$ = unittest.unittest; - const core_matchers = matcher.core_matchers; - const numeric_matchers = matcher.numeric_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__numeric_matchers = matcher.src__numeric_matchers; const async_star_test_none_multi = Object.create(null); async_star_test_none_multi.main = function() { unittest$.group("basic", dart.fn(() => { @@ -18891,7 +18891,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals([])); + unittest$.expect(v, src__core_matchers.equals([])); })); })); unittest$.test("single", dart.fn(() => { @@ -18903,7 +18903,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(f(), 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(dart.list([42], core.int))); + unittest$.expect(v, src__core_matchers.equals(dart.list([42], core.int))); })); })); unittest$.test("call delays", dart.fn(() => { @@ -18919,7 +18919,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ let res = dart.dsend(f(), 'forEach', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic])); list[dartx.add](0); return dart.dsend(res, 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([0, 1, 2], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1, 2], core.int))); })); })); unittest$.test("throws", dart.fn(() => { @@ -18935,7 +18935,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ let list = []; dart.dsend(f(), 'listen', dart.fn(x => list[dartx.add](x), dart.void, [dart.dynamic]), {onError: dart.fn(v => list[dartx.add](`${v}`), dart.void, [dart.dynamic]), onDone: dart.bind(completer, 'complete')}); return completer.future.whenComplete(dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, "2"], core.Object))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, "2"], core.Object))); })); }, async.Future, [])); unittest$.test("multiple", dart.fn(() => { @@ -19008,7 +19008,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(42), 'transform', async_star_test_none_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); unittest$.test("Cannot yield* non-stream", dart.fn(() => { @@ -19020,7 +19020,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(dart.dsend(f(new async_star_test_none_multi.NotAStream()), 'transform', async_star_test_none_multi.getErrors), 'single'), 'then', dart.fn(v => { - unittest$.expect(dart.is(v, core.Error), core_matchers.isTrue); + unittest$.expect(dart.is(v, core.Error), src__core_matchers.isTrue); })); })); }, dart.void, [])); @@ -19397,7 +19397,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow", dart.fn(() => { @@ -19410,7 +19410,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => { - unittest$.expect(dart.dcall(v), core_matchers.same(o)); + unittest$.expect(dart.dcall(v), src__core_matchers.same(o)); })); })); unittest$.test("function expression block async", dart.fn(() => { @@ -19425,7 +19425,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression arrow async", dart.fn(() => { @@ -19440,7 +19440,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dcall(v))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); unittest$.test("function expression block async*", dart.fn(() => { @@ -19456,7 +19456,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(dart.dload(f(), 'first'), 'then', dart.fn(v => dart.dload(dart.dcall(v), 'first'))), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.same(o)); + unittest$.expect(v, src__core_matchers.same(o)); })); })); }, dart.void, [])); @@ -19503,7 +19503,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_none_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in catch", dart.fn(() => { @@ -19525,7 +19525,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_none_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("yield in finally", dart.fn(() => { @@ -19546,7 +19546,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(async_star_test_none_multi.expectList(f(), dart.list([0, 1, 2], core.int)), 'whenComplete', dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list(["0", "1", "2"], core.String))); + unittest$.expect(list, src__core_matchers.equals(dart.list(["0", "1", "2"], core.String))); })); })); unittest$.test("keep yielding after cancel", dart.fn(() => { @@ -19590,8 +19590,8 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ })}); dart.dsend(subscription, 'cancel'); return exits.future.then(dart.fn(v => { - unittest$.expect(v, core_matchers.equals(3)); - unittest$.expect(list, core_matchers.equals(dart.list([0, 1], core.int))); + unittest$.expect(v, src__core_matchers.equals(3)); + unittest$.expect(list, src__core_matchers.equals(dart.list([0, 1], core.int))); })); }, async.Future, [])); unittest$.test("does cancel eventually", dart.fn(() => { @@ -19613,7 +19613,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(dart.dsend(async_star_test_none_multi.expectList(dart.dsend(f(), 'take', 5), dart.list([0, 1, 2, 3, 4], core.int)), 'then', dart.fn(_ => exits.future, async.Future, [dart.dynamic])), 'then', dart.fn(v => { - unittest$.expect(v, numeric_matchers.greaterThan(4)); + unittest$.expect(v, src__numeric_matchers.greaterThan(4)); unittest$.expect(list, dart.list(["a"], core.String)); })); })); @@ -19661,14 +19661,14 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -19691,19 +19691,19 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { if (dart.equals(v, 2)) { - unittest$.expect(list, core_matchers.equals(dart.list([1], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1], core.int))); dart.dsend(sub, 'pause'); async.Timer.new(async_star_test_none_multi.MS['*'](300), dart.fn(() => { - unittest$.expect(list[dartx.length], numeric_matchers.lessThan(3)); + unittest$.expect(list[dartx.length], src__numeric_matchers.lessThan(3)); dart.dsend(sub, 'resume'); }, dart.void, [])); } else if (dart.equals(v, 4)) { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3], core.int))); } else { unittest$.fail(`Unexpected value ${v}`); } }), {onDone: dart.fn(() => { - unittest$.expect(list, core_matchers.equals(dart.list([1, 3, 5], core.int))); + unittest$.expect(list, src__core_matchers.equals(dart.list([1, 3, 5], core.int))); done.complete(); })}); return done.future; @@ -19726,7 +19726,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ let done = async.Completer.new(); let sub = null; sub = dart.dsend(f(), 'listen', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(expected++)); + unittest$.expect(v, src__core_matchers.equals(expected++)); if (dart.equals(dart.dsend(v, '%', 5), 0)) { dart.dsend(sub, 'pause', async.Future.delayed(async_star_test_none_multi.MS['*'](300))); } else if (dart.equals(v, 17)) { @@ -19737,7 +19737,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ unittest$.fail("Unexpected done!"); })}); return done.future.whenComplete(dart.fn(() => { - unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, core_matchers.isTrue); + unittest$.expect(list[dartx.length] == 18 || list[dartx.length] == 19, src__core_matchers.isTrue); })); }, async.Future, [])); }, dart.void, [])); @@ -19769,7 +19769,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream, await", dart.fn(() => { @@ -19790,7 +19790,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(mkStream(5)), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(10)); + unittest$.expect(v, src__core_matchers.equals(10)); })); })); unittest$.test("simple stream reyield", dart.fn(() => { @@ -19857,7 +19857,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await", dart.fn(() => { @@ -19886,7 +19886,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); unittest$.test("nested, await * 2", dart.fn(() => { @@ -19916,7 +19916,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ } dart.fn(f); return dart.dsend(f(), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); + unittest$.expect(v, src__core_matchers.equals((1 + 2 + 3 + 4) * (1 + 2))); })); })); }, dart.void, [])); @@ -19934,7 +19934,7 @@ dart_library.library('async_star_test_none_multi', null, /* Imports */[ dart.fn(async_star_test_none_multi.id); async_star_test_none_multi.expectList = function(stream, list) { return dart.dsend(dart.dsend(stream, 'toList'), 'then', dart.fn(v => { - unittest$.expect(v, core_matchers.equals(list)); + unittest$.expect(v, src__core_matchers.equals(list)); })); }; dart.fn(async_star_test_none_multi.expectList); @@ -45651,555 +45651,567 @@ dart_library.library('cyclic_import_test', null, /* Imports */[ const dartx = dart_sdk.dartx; const expect$ = expect.expect; const cyclic_import_test = Object.create(null); - const sub = Object.create(null); + const sub__sub = Object.create(null); const cyclic_import_test$ = Object.create(null); - const sub$ = Object.create(null); + const sub__sub$ = Object.create(null); const cyclic_import_test$0 = Object.create(null); - const sub$0 = Object.create(null); + const sub__sub$0 = Object.create(null); const cyclic_import_test$1 = Object.create(null); - const sub$1 = Object.create(null); + const sub__sub$1 = Object.create(null); const cyclic_import_test$2 = Object.create(null); - const sub$2 = Object.create(null); + const sub__sub$2 = Object.create(null); const cyclic_import_test$3 = Object.create(null); - const sub$3 = Object.create(null); + const sub__sub$3 = Object.create(null); const cyclic_import_test$4 = Object.create(null); - const sub$4 = Object.create(null); + const sub__sub$4 = Object.create(null); const cyclic_import_test$5 = Object.create(null); - const sub$5 = Object.create(null); + const sub__sub$5 = Object.create(null); const cyclic_import_test$6 = Object.create(null); - const sub$6 = Object.create(null); + const sub__sub$6 = Object.create(null); const cyclic_import_test$7 = Object.create(null); - const sub$7 = Object.create(null); + const sub__sub$7 = Object.create(null); const cyclic_import_test$8 = Object.create(null); - const sub$8 = Object.create(null); + const sub__sub$8 = Object.create(null); const cyclic_import_test$9 = Object.create(null); - const sub$9 = Object.create(null); + const sub__sub$9 = Object.create(null); const cyclic_import_test$10 = Object.create(null); - const sub$10 = Object.create(null); + const sub__sub$10 = Object.create(null); const cyclic_import_test$11 = Object.create(null); - const sub$11 = Object.create(null); + const sub__sub$11 = Object.create(null); const cyclic_import_test$12 = Object.create(null); - const sub$12 = Object.create(null); + const sub__sub$12 = Object.create(null); const cyclic_import_test$13 = Object.create(null); - const sub$13 = Object.create(null); + const sub__sub$13 = Object.create(null); const cyclic_import_test$14 = Object.create(null); - const sub$14 = Object.create(null); + const sub__sub$14 = Object.create(null); const cyclic_import_test$15 = Object.create(null); - const sub$15 = Object.create(null); + const sub__sub$15 = Object.create(null); const cyclic_import_test$16 = Object.create(null); - const sub$16 = Object.create(null); + const sub__sub$16 = Object.create(null); const cyclic_import_test$17 = Object.create(null); - const sub$17 = Object.create(null); + const sub__sub$17 = Object.create(null); const cyclic_import_test$18 = Object.create(null); - const sub$18 = Object.create(null); + const sub__sub$18 = Object.create(null); const cyclic_import_test$19 = Object.create(null); - const sub$19 = Object.create(null); + const sub__sub$19 = Object.create(null); const cyclic_import_test$20 = Object.create(null); - const sub$20 = Object.create(null); + const sub__sub$20 = Object.create(null); const cyclic_import_test$21 = Object.create(null); - const sub$21 = Object.create(null); + const sub__sub$21 = Object.create(null); const cyclic_import_test$22 = Object.create(null); - const sub$22 = Object.create(null); + const sub__sub$22 = Object.create(null); const cyclic_import_test$23 = Object.create(null); - const sub$23 = Object.create(null); + const sub__sub$23 = Object.create(null); const cyclic_import_test$24 = Object.create(null); - const sub$24 = Object.create(null); + const sub__sub$24 = Object.create(null); const cyclic_import_test$25 = Object.create(null); - const sub$25 = Object.create(null); + const sub__sub$25 = Object.create(null); const cyclic_import_test$26 = Object.create(null); - const sub$26 = Object.create(null); + const sub__sub$26 = Object.create(null); const cyclic_import_test$27 = Object.create(null); - const sub$27 = Object.create(null); + const sub__sub$27 = Object.create(null); const cyclic_import_test$28 = Object.create(null); - const sub$28 = Object.create(null); + const sub__sub$28 = Object.create(null); const cyclic_import_test$29 = Object.create(null); - const sub$29 = Object.create(null); + const sub__sub$29 = Object.create(null); const cyclic_import_test$30 = Object.create(null); - const sub$30 = Object.create(null); + const sub__sub$30 = Object.create(null); const cyclic_import_test$31 = Object.create(null); - const sub$31 = Object.create(null); + const sub__sub$31 = Object.create(null); const cyclic_import_test$32 = Object.create(null); - const sub$32 = Object.create(null); + const sub__sub$32 = Object.create(null); const cyclic_import_test$33 = Object.create(null); - const sub$33 = Object.create(null); + const sub__sub$33 = Object.create(null); const cyclic_import_test$34 = Object.create(null); - const sub$34 = Object.create(null); + const sub__sub$34 = Object.create(null); const cyclic_import_test$35 = Object.create(null); - const sub$35 = Object.create(null); + const sub__sub$35 = Object.create(null); const cyclic_import_test$36 = Object.create(null); - const sub$36 = Object.create(null); + const sub__sub$36 = Object.create(null); const cyclic_import_test$37 = Object.create(null); - const sub$37 = Object.create(null); + const sub__sub$37 = Object.create(null); const cyclic_import_test$38 = Object.create(null); - const sub$38 = Object.create(null); + const sub__sub$38 = Object.create(null); const cyclic_import_test$39 = Object.create(null); - const sub$39 = Object.create(null); + const sub__sub$39 = Object.create(null); const cyclic_import_test$40 = Object.create(null); - const sub$40 = Object.create(null); + const sub__sub$40 = Object.create(null); const cyclic_import_test$41 = Object.create(null); - const sub$41 = Object.create(null); + const sub__sub$41 = Object.create(null); const cyclic_import_test$42 = Object.create(null); - const sub$42 = Object.create(null); + const sub__sub$42 = Object.create(null); const cyclic_import_test$43 = Object.create(null); - const sub$43 = Object.create(null); + const sub__sub$43 = Object.create(null); const cyclic_import_test$44 = Object.create(null); - const sub$44 = Object.create(null); + const sub__sub$44 = Object.create(null); const cyclic_import_test$45 = Object.create(null); - const sub$45 = Object.create(null); + const sub__sub$45 = Object.create(null); const cyclic_import_test$46 = Object.create(null); - const sub$46 = Object.create(null); + const sub__sub$46 = Object.create(null); const cyclic_import_test$47 = Object.create(null); - const sub$47 = Object.create(null); + const sub__sub$47 = Object.create(null); const cyclic_import_test$48 = Object.create(null); - const sub$48 = Object.create(null); + const sub__sub$48 = Object.create(null); const cyclic_import_test$49 = Object.create(null); - const sub$49 = Object.create(null); + const sub__sub$49 = Object.create(null); const cyclic_import_test$50 = Object.create(null); - const sub$50 = Object.create(null); + const sub__sub$50 = Object.create(null); const cyclic_import_test$51 = Object.create(null); - const sub$51 = Object.create(null); + const sub__sub$51 = Object.create(null); const cyclic_import_test$52 = Object.create(null); - const sub$52 = Object.create(null); + const sub__sub$52 = Object.create(null); const cyclic_import_test$53 = Object.create(null); - const sub$53 = Object.create(null); + const sub__sub$53 = Object.create(null); const cyclic_import_test$54 = Object.create(null); - const sub$54 = Object.create(null); + const sub__sub$54 = Object.create(null); const cyclic_import_test$55 = Object.create(null); - const sub$55 = Object.create(null); + const sub__sub$55 = Object.create(null); const cyclic_import_test$56 = Object.create(null); - const sub$56 = Object.create(null); + const sub__sub$56 = Object.create(null); const cyclic_import_test$57 = Object.create(null); - const sub$57 = Object.create(null); + const sub__sub$57 = Object.create(null); const cyclic_import_test$58 = Object.create(null); - const sub$58 = Object.create(null); + const sub__sub$58 = Object.create(null); const cyclic_import_test$59 = Object.create(null); - const sub$59 = Object.create(null); + const sub__sub$59 = Object.create(null); const cyclic_import_test$60 = Object.create(null); - const sub$60 = Object.create(null); + const sub__sub$60 = Object.create(null); const cyclic_import_test$61 = Object.create(null); - const sub$61 = Object.create(null); + const sub__sub$61 = Object.create(null); const cyclic_import_test$62 = Object.create(null); - const sub$62 = Object.create(null); + const sub__sub$62 = Object.create(null); const cyclic_import_test$63 = Object.create(null); - const sub$63 = Object.create(null); + const sub__sub$63 = Object.create(null); const cyclic_import_test$64 = Object.create(null); - const sub$64 = Object.create(null); + const sub__sub$64 = Object.create(null); const cyclic_import_test$65 = Object.create(null); - const sub$65 = Object.create(null); + const sub__sub$65 = Object.create(null); const cyclic_import_test$66 = Object.create(null); - const sub$66 = Object.create(null); + const sub__sub$66 = Object.create(null); const cyclic_import_test$67 = Object.create(null); - const sub$67 = Object.create(null); + const sub__sub$67 = Object.create(null); const cyclic_import_test$68 = Object.create(null); - const sub$68 = Object.create(null); + const sub__sub$68 = Object.create(null); const cyclic_import_test$69 = Object.create(null); - const sub$69 = Object.create(null); + const sub__sub$69 = Object.create(null); const cyclic_import_test$70 = Object.create(null); - const sub$70 = Object.create(null); + const sub__sub$70 = Object.create(null); const cyclic_import_test$71 = Object.create(null); - const sub$71 = Object.create(null); + const sub__sub$71 = Object.create(null); const cyclic_import_test$72 = Object.create(null); - const sub$72 = Object.create(null); + const sub__sub$72 = Object.create(null); const cyclic_import_test$73 = Object.create(null); - const sub$73 = Object.create(null); + const sub__sub$73 = Object.create(null); const cyclic_import_test$74 = Object.create(null); - const sub$74 = Object.create(null); + const sub__sub$74 = Object.create(null); const cyclic_import_test$75 = Object.create(null); - const sub$75 = Object.create(null); + const sub__sub$75 = Object.create(null); const cyclic_import_test$76 = Object.create(null); - const sub$76 = Object.create(null); + const sub__sub$76 = Object.create(null); const cyclic_import_test$77 = Object.create(null); - const sub$77 = Object.create(null); + const sub__sub$77 = Object.create(null); const cyclic_import_test$78 = Object.create(null); - const sub$78 = Object.create(null); + const sub__sub$78 = Object.create(null); const cyclic_import_test$79 = Object.create(null); - const sub$79 = Object.create(null); + const sub__sub$79 = Object.create(null); const cyclic_import_test$80 = Object.create(null); - const sub$80 = Object.create(null); + const sub__sub$80 = Object.create(null); const cyclic_import_test$81 = Object.create(null); - const sub$81 = Object.create(null); + const sub__sub$81 = Object.create(null); const cyclic_import_test$82 = Object.create(null); - const sub$82 = Object.create(null); + const sub__sub$82 = Object.create(null); const cyclic_import_test$83 = Object.create(null); - const sub$83 = Object.create(null); + const sub__sub$83 = Object.create(null); const cyclic_import_test$84 = Object.create(null); - const sub$84 = Object.create(null); + const sub__sub$84 = Object.create(null); const cyclic_import_test$85 = Object.create(null); - const sub$85 = Object.create(null); + const sub__sub$85 = Object.create(null); const cyclic_import_test$86 = Object.create(null); - const sub$86 = Object.create(null); + const sub__sub$86 = Object.create(null); const cyclic_import_test$87 = Object.create(null); - const sub$87 = Object.create(null); + const sub__sub$87 = Object.create(null); const cyclic_import_test$88 = Object.create(null); - const sub$88 = Object.create(null); + const sub__sub$88 = Object.create(null); const cyclic_import_test$89 = Object.create(null); - const sub$89 = Object.create(null); + const sub__sub$89 = Object.create(null); const cyclic_import_test$90 = Object.create(null); - const sub$90 = Object.create(null); + const sub__sub$90 = Object.create(null); const cyclic_import_test$91 = Object.create(null); - const sub$91 = Object.create(null); + const sub__sub$91 = Object.create(null); const cyclic_import_test$92 = Object.create(null); - const sub$92 = Object.create(null); + const sub__sub$92 = Object.create(null); const cyclic_import_test$93 = Object.create(null); - const sub$93 = Object.create(null); + const sub__sub$93 = Object.create(null); const cyclic_import_test$94 = Object.create(null); - const sub$94 = Object.create(null); + const sub__sub$94 = Object.create(null); const cyclic_import_test$95 = Object.create(null); - const sub$95 = Object.create(null); + const sub__sub$95 = Object.create(null); const cyclic_import_test$96 = Object.create(null); - const sub$96 = Object.create(null); + const sub__sub$96 = Object.create(null); const cyclic_import_test$97 = Object.create(null); - const sub$97 = Object.create(null); + const sub__sub$97 = Object.create(null); const cyclic_import_test$98 = Object.create(null); - const sub$98 = Object.create(null); + const sub__sub$98 = Object.create(null); const cyclic_import_test$99 = Object.create(null); - const sub$99 = Object.create(null); + const sub__sub$99 = Object.create(null); const cyclic_import_test$100 = Object.create(null); - const sub$100 = Object.create(null); + const sub__sub$100 = Object.create(null); const cyclic_import_test$101 = Object.create(null); - const sub$101 = Object.create(null); + const sub__sub$101 = Object.create(null); const cyclic_import_test$102 = Object.create(null); - const sub$102 = Object.create(null); + const sub__sub$102 = Object.create(null); const cyclic_import_test$103 = Object.create(null); - const sub$103 = Object.create(null); + const sub__sub$103 = Object.create(null); const cyclic_import_test$104 = Object.create(null); - const sub$104 = Object.create(null); + const sub__sub$104 = Object.create(null); const cyclic_import_test$105 = Object.create(null); - const sub$105 = Object.create(null); + const sub__sub$105 = Object.create(null); const cyclic_import_test$106 = Object.create(null); - const sub$106 = Object.create(null); + const sub__sub$106 = Object.create(null); const cyclic_import_test$107 = Object.create(null); - const sub$107 = Object.create(null); + const sub__sub$107 = Object.create(null); const cyclic_import_test$108 = Object.create(null); - const sub$108 = Object.create(null); + const sub__sub$108 = Object.create(null); const cyclic_import_test$109 = Object.create(null); - const sub$109 = Object.create(null); + const sub__sub$109 = Object.create(null); const cyclic_import_test$110 = Object.create(null); - const sub$110 = Object.create(null); + const sub__sub$110 = Object.create(null); const cyclic_import_test$111 = Object.create(null); - const sub$111 = Object.create(null); + const sub__sub$111 = Object.create(null); const cyclic_import_test$112 = Object.create(null); - const sub$112 = Object.create(null); + const sub__sub$112 = Object.create(null); const cyclic_import_test$113 = Object.create(null); - const sub$113 = Object.create(null); + const sub__sub$113 = Object.create(null); const cyclic_import_test$114 = Object.create(null); - const sub$114 = Object.create(null); + const sub__sub$114 = Object.create(null); const cyclic_import_test$115 = Object.create(null); - const sub$115 = Object.create(null); + const sub__sub$115 = Object.create(null); const cyclic_import_test$116 = Object.create(null); - const sub$116 = Object.create(null); + const sub__sub$116 = Object.create(null); const cyclic_import_test$117 = Object.create(null); - const sub$117 = Object.create(null); + const sub__sub$117 = Object.create(null); const cyclic_import_test$118 = Object.create(null); - const sub$118 = Object.create(null); + const sub__sub$118 = Object.create(null); const cyclic_import_test$119 = Object.create(null); - const sub$119 = Object.create(null); + const sub__sub$119 = Object.create(null); const cyclic_import_test$120 = Object.create(null); - const sub$120 = Object.create(null); + const sub__sub$120 = Object.create(null); const cyclic_import_test$121 = Object.create(null); - const sub$121 = Object.create(null); + const sub__sub$121 = Object.create(null); const cyclic_import_test$122 = Object.create(null); - const sub$122 = Object.create(null); + const sub__sub$122 = Object.create(null); const cyclic_import_test$123 = Object.create(null); - const sub$123 = Object.create(null); + const sub__sub$123 = Object.create(null); const cyclic_import_test$124 = Object.create(null); - const sub$124 = Object.create(null); + const sub__sub$124 = Object.create(null); const cyclic_import_test$125 = Object.create(null); - const sub$125 = Object.create(null); + const sub__sub$125 = Object.create(null); const cyclic_import_test$126 = Object.create(null); - const sub$126 = Object.create(null); + const sub__sub$126 = Object.create(null); const cyclic_import_test$127 = Object.create(null); - const sub$127 = Object.create(null); + const sub__sub$127 = Object.create(null); const cyclic_import_test$128 = Object.create(null); - const sub$128 = Object.create(null); + const sub__sub$128 = Object.create(null); const cyclic_import_test$129 = Object.create(null); - const sub$129 = Object.create(null); + const sub__sub$129 = Object.create(null); const cyclic_import_test$130 = Object.create(null); - const sub$130 = Object.create(null); + const sub__sub$130 = Object.create(null); const cyclic_import_test$131 = Object.create(null); - const sub$131 = Object.create(null); + const sub__sub$131 = Object.create(null); const cyclic_import_test$132 = Object.create(null); - const sub$132 = Object.create(null); - cyclic_import_test$132.value = 42; - cyclic_import_test$132.main = function() { - sub$132.subMain(); - }; - dart.fn(cyclic_import_test$132.main); - sub$132.subMain = function() { - expect$.Expect.equals(42, cyclic_import_test$132.value); - }; - dart.fn(sub$132.subMain); + const sub__sub$132 = Object.create(null); + const cyclic_import_test$133 = Object.create(null); + const sub__sub$133 = Object.create(null); + const cyclic_import_test$134 = Object.create(null); + const sub__sub$134 = Object.create(null); + const cyclic_import_test$135 = Object.create(null); + const sub__sub$135 = Object.create(null); + cyclic_import_test$135.value = 42; + cyclic_import_test$135.main = function() { + sub__sub$135.subMain(); + }; + dart.fn(cyclic_import_test$135.main); + sub__sub$135.subMain = function() { + expect$.Expect.equals(42, cyclic_import_test$135.value); + }; + dart.fn(sub__sub$135.subMain); // Exports: exports.cyclic_import_test = cyclic_import_test; - exports.sub = sub; + exports.sub__sub = sub__sub; exports.cyclic_import_test = cyclic_import_test$; - exports.sub = sub$; + exports.sub__sub = sub__sub$; exports.cyclic_import_test = cyclic_import_test$0; - exports.sub = sub$0; + exports.sub__sub = sub__sub$0; exports.cyclic_import_test = cyclic_import_test$1; - exports.sub = sub$1; + exports.sub__sub = sub__sub$1; exports.cyclic_import_test = cyclic_import_test$2; - exports.sub = sub$2; + exports.sub__sub = sub__sub$2; exports.cyclic_import_test = cyclic_import_test$3; - exports.sub = sub$3; + exports.sub__sub = sub__sub$3; exports.cyclic_import_test = cyclic_import_test$4; - exports.sub = sub$4; + exports.sub__sub = sub__sub$4; exports.cyclic_import_test = cyclic_import_test$5; - exports.sub = sub$5; + exports.sub__sub = sub__sub$5; exports.cyclic_import_test = cyclic_import_test$6; - exports.sub = sub$6; + exports.sub__sub = sub__sub$6; exports.cyclic_import_test = cyclic_import_test$7; - exports.sub = sub$7; + exports.sub__sub = sub__sub$7; exports.cyclic_import_test = cyclic_import_test$8; - exports.sub = sub$8; + exports.sub__sub = sub__sub$8; exports.cyclic_import_test = cyclic_import_test$9; - exports.sub = sub$9; + exports.sub__sub = sub__sub$9; exports.cyclic_import_test = cyclic_import_test$10; - exports.sub = sub$10; + exports.sub__sub = sub__sub$10; exports.cyclic_import_test = cyclic_import_test$11; - exports.sub = sub$11; + exports.sub__sub = sub__sub$11; exports.cyclic_import_test = cyclic_import_test$12; - exports.sub = sub$12; + exports.sub__sub = sub__sub$12; exports.cyclic_import_test = cyclic_import_test$13; - exports.sub = sub$13; + exports.sub__sub = sub__sub$13; exports.cyclic_import_test = cyclic_import_test$14; - exports.sub = sub$14; + exports.sub__sub = sub__sub$14; exports.cyclic_import_test = cyclic_import_test$15; - exports.sub = sub$15; + exports.sub__sub = sub__sub$15; exports.cyclic_import_test = cyclic_import_test$16; - exports.sub = sub$16; + exports.sub__sub = sub__sub$16; exports.cyclic_import_test = cyclic_import_test$17; - exports.sub = sub$17; + exports.sub__sub = sub__sub$17; exports.cyclic_import_test = cyclic_import_test$18; - exports.sub = sub$18; + exports.sub__sub = sub__sub$18; exports.cyclic_import_test = cyclic_import_test$19; - exports.sub = sub$19; + exports.sub__sub = sub__sub$19; exports.cyclic_import_test = cyclic_import_test$20; - exports.sub = sub$20; + exports.sub__sub = sub__sub$20; exports.cyclic_import_test = cyclic_import_test$21; - exports.sub = sub$21; + exports.sub__sub = sub__sub$21; exports.cyclic_import_test = cyclic_import_test$22; - exports.sub = sub$22; + exports.sub__sub = sub__sub$22; exports.cyclic_import_test = cyclic_import_test$23; - exports.sub = sub$23; + exports.sub__sub = sub__sub$23; exports.cyclic_import_test = cyclic_import_test$24; - exports.sub = sub$24; + exports.sub__sub = sub__sub$24; exports.cyclic_import_test = cyclic_import_test$25; - exports.sub = sub$25; + exports.sub__sub = sub__sub$25; exports.cyclic_import_test = cyclic_import_test$26; - exports.sub = sub$26; + exports.sub__sub = sub__sub$26; exports.cyclic_import_test = cyclic_import_test$27; - exports.sub = sub$27; + exports.sub__sub = sub__sub$27; exports.cyclic_import_test = cyclic_import_test$28; - exports.sub = sub$28; + exports.sub__sub = sub__sub$28; exports.cyclic_import_test = cyclic_import_test$29; - exports.sub = sub$29; + exports.sub__sub = sub__sub$29; exports.cyclic_import_test = cyclic_import_test$30; - exports.sub = sub$30; + exports.sub__sub = sub__sub$30; exports.cyclic_import_test = cyclic_import_test$31; - exports.sub = sub$31; + exports.sub__sub = sub__sub$31; exports.cyclic_import_test = cyclic_import_test$32; - exports.sub = sub$32; + exports.sub__sub = sub__sub$32; exports.cyclic_import_test = cyclic_import_test$33; - exports.sub = sub$33; + exports.sub__sub = sub__sub$33; exports.cyclic_import_test = cyclic_import_test$34; - exports.sub = sub$34; + exports.sub__sub = sub__sub$34; exports.cyclic_import_test = cyclic_import_test$35; - exports.sub = sub$35; + exports.sub__sub = sub__sub$35; exports.cyclic_import_test = cyclic_import_test$36; - exports.sub = sub$36; + exports.sub__sub = sub__sub$36; exports.cyclic_import_test = cyclic_import_test$37; - exports.sub = sub$37; + exports.sub__sub = sub__sub$37; exports.cyclic_import_test = cyclic_import_test$38; - exports.sub = sub$38; + exports.sub__sub = sub__sub$38; exports.cyclic_import_test = cyclic_import_test$39; - exports.sub = sub$39; + exports.sub__sub = sub__sub$39; exports.cyclic_import_test = cyclic_import_test$40; - exports.sub = sub$40; + exports.sub__sub = sub__sub$40; exports.cyclic_import_test = cyclic_import_test$41; - exports.sub = sub$41; + exports.sub__sub = sub__sub$41; exports.cyclic_import_test = cyclic_import_test$42; - exports.sub = sub$42; + exports.sub__sub = sub__sub$42; exports.cyclic_import_test = cyclic_import_test$43; - exports.sub = sub$43; + exports.sub__sub = sub__sub$43; exports.cyclic_import_test = cyclic_import_test$44; - exports.sub = sub$44; + exports.sub__sub = sub__sub$44; exports.cyclic_import_test = cyclic_import_test$45; - exports.sub = sub$45; + exports.sub__sub = sub__sub$45; exports.cyclic_import_test = cyclic_import_test$46; - exports.sub = sub$46; + exports.sub__sub = sub__sub$46; exports.cyclic_import_test = cyclic_import_test$47; - exports.sub = sub$47; + exports.sub__sub = sub__sub$47; exports.cyclic_import_test = cyclic_import_test$48; - exports.sub = sub$48; + exports.sub__sub = sub__sub$48; exports.cyclic_import_test = cyclic_import_test$49; - exports.sub = sub$49; + exports.sub__sub = sub__sub$49; exports.cyclic_import_test = cyclic_import_test$50; - exports.sub = sub$50; + exports.sub__sub = sub__sub$50; exports.cyclic_import_test = cyclic_import_test$51; - exports.sub = sub$51; + exports.sub__sub = sub__sub$51; exports.cyclic_import_test = cyclic_import_test$52; - exports.sub = sub$52; + exports.sub__sub = sub__sub$52; exports.cyclic_import_test = cyclic_import_test$53; - exports.sub = sub$53; + exports.sub__sub = sub__sub$53; exports.cyclic_import_test = cyclic_import_test$54; - exports.sub = sub$54; + exports.sub__sub = sub__sub$54; exports.cyclic_import_test = cyclic_import_test$55; - exports.sub = sub$55; + exports.sub__sub = sub__sub$55; exports.cyclic_import_test = cyclic_import_test$56; - exports.sub = sub$56; + exports.sub__sub = sub__sub$56; exports.cyclic_import_test = cyclic_import_test$57; - exports.sub = sub$57; + exports.sub__sub = sub__sub$57; exports.cyclic_import_test = cyclic_import_test$58; - exports.sub = sub$58; + exports.sub__sub = sub__sub$58; exports.cyclic_import_test = cyclic_import_test$59; - exports.sub = sub$59; + exports.sub__sub = sub__sub$59; exports.cyclic_import_test = cyclic_import_test$60; - exports.sub = sub$60; + exports.sub__sub = sub__sub$60; exports.cyclic_import_test = cyclic_import_test$61; - exports.sub = sub$61; + exports.sub__sub = sub__sub$61; exports.cyclic_import_test = cyclic_import_test$62; - exports.sub = sub$62; + exports.sub__sub = sub__sub$62; exports.cyclic_import_test = cyclic_import_test$63; - exports.sub = sub$63; + exports.sub__sub = sub__sub$63; exports.cyclic_import_test = cyclic_import_test$64; - exports.sub = sub$64; + exports.sub__sub = sub__sub$64; exports.cyclic_import_test = cyclic_import_test$65; - exports.sub = sub$65; + exports.sub__sub = sub__sub$65; exports.cyclic_import_test = cyclic_import_test$66; - exports.sub = sub$66; + exports.sub__sub = sub__sub$66; exports.cyclic_import_test = cyclic_import_test$67; - exports.sub = sub$67; + exports.sub__sub = sub__sub$67; exports.cyclic_import_test = cyclic_import_test$68; - exports.sub = sub$68; + exports.sub__sub = sub__sub$68; exports.cyclic_import_test = cyclic_import_test$69; - exports.sub = sub$69; + exports.sub__sub = sub__sub$69; exports.cyclic_import_test = cyclic_import_test$70; - exports.sub = sub$70; + exports.sub__sub = sub__sub$70; exports.cyclic_import_test = cyclic_import_test$71; - exports.sub = sub$71; + exports.sub__sub = sub__sub$71; exports.cyclic_import_test = cyclic_import_test$72; - exports.sub = sub$72; + exports.sub__sub = sub__sub$72; exports.cyclic_import_test = cyclic_import_test$73; - exports.sub = sub$73; + exports.sub__sub = sub__sub$73; exports.cyclic_import_test = cyclic_import_test$74; - exports.sub = sub$74; + exports.sub__sub = sub__sub$74; exports.cyclic_import_test = cyclic_import_test$75; - exports.sub = sub$75; + exports.sub__sub = sub__sub$75; exports.cyclic_import_test = cyclic_import_test$76; - exports.sub = sub$76; + exports.sub__sub = sub__sub$76; exports.cyclic_import_test = cyclic_import_test$77; - exports.sub = sub$77; + exports.sub__sub = sub__sub$77; exports.cyclic_import_test = cyclic_import_test$78; - exports.sub = sub$78; + exports.sub__sub = sub__sub$78; exports.cyclic_import_test = cyclic_import_test$79; - exports.sub = sub$79; + exports.sub__sub = sub__sub$79; exports.cyclic_import_test = cyclic_import_test$80; - exports.sub = sub$80; + exports.sub__sub = sub__sub$80; exports.cyclic_import_test = cyclic_import_test$81; - exports.sub = sub$81; + exports.sub__sub = sub__sub$81; exports.cyclic_import_test = cyclic_import_test$82; - exports.sub = sub$82; + exports.sub__sub = sub__sub$82; exports.cyclic_import_test = cyclic_import_test$83; - exports.sub = sub$83; + exports.sub__sub = sub__sub$83; exports.cyclic_import_test = cyclic_import_test$84; - exports.sub = sub$84; + exports.sub__sub = sub__sub$84; exports.cyclic_import_test = cyclic_import_test$85; - exports.sub = sub$85; + exports.sub__sub = sub__sub$85; exports.cyclic_import_test = cyclic_import_test$86; - exports.sub = sub$86; + exports.sub__sub = sub__sub$86; exports.cyclic_import_test = cyclic_import_test$87; - exports.sub = sub$87; + exports.sub__sub = sub__sub$87; exports.cyclic_import_test = cyclic_import_test$88; - exports.sub = sub$88; + exports.sub__sub = sub__sub$88; exports.cyclic_import_test = cyclic_import_test$89; - exports.sub = sub$89; + exports.sub__sub = sub__sub$89; exports.cyclic_import_test = cyclic_import_test$90; - exports.sub = sub$90; + exports.sub__sub = sub__sub$90; exports.cyclic_import_test = cyclic_import_test$91; - exports.sub = sub$91; + exports.sub__sub = sub__sub$91; exports.cyclic_import_test = cyclic_import_test$92; - exports.sub = sub$92; + exports.sub__sub = sub__sub$92; exports.cyclic_import_test = cyclic_import_test$93; - exports.sub = sub$93; + exports.sub__sub = sub__sub$93; exports.cyclic_import_test = cyclic_import_test$94; - exports.sub = sub$94; + exports.sub__sub = sub__sub$94; exports.cyclic_import_test = cyclic_import_test$95; - exports.sub = sub$95; + exports.sub__sub = sub__sub$95; exports.cyclic_import_test = cyclic_import_test$96; - exports.sub = sub$96; + exports.sub__sub = sub__sub$96; exports.cyclic_import_test = cyclic_import_test$97; - exports.sub = sub$97; + exports.sub__sub = sub__sub$97; exports.cyclic_import_test = cyclic_import_test$98; - exports.sub = sub$98; + exports.sub__sub = sub__sub$98; exports.cyclic_import_test = cyclic_import_test$99; - exports.sub = sub$99; + exports.sub__sub = sub__sub$99; exports.cyclic_import_test = cyclic_import_test$100; - exports.sub = sub$100; + exports.sub__sub = sub__sub$100; exports.cyclic_import_test = cyclic_import_test$101; - exports.sub = sub$101; + exports.sub__sub = sub__sub$101; exports.cyclic_import_test = cyclic_import_test$102; - exports.sub = sub$102; + exports.sub__sub = sub__sub$102; exports.cyclic_import_test = cyclic_import_test$103; - exports.sub = sub$103; + exports.sub__sub = sub__sub$103; exports.cyclic_import_test = cyclic_import_test$104; - exports.sub = sub$104; + exports.sub__sub = sub__sub$104; exports.cyclic_import_test = cyclic_import_test$105; - exports.sub = sub$105; + exports.sub__sub = sub__sub$105; exports.cyclic_import_test = cyclic_import_test$106; - exports.sub = sub$106; + exports.sub__sub = sub__sub$106; exports.cyclic_import_test = cyclic_import_test$107; - exports.sub = sub$107; + exports.sub__sub = sub__sub$107; exports.cyclic_import_test = cyclic_import_test$108; - exports.sub = sub$108; + exports.sub__sub = sub__sub$108; exports.cyclic_import_test = cyclic_import_test$109; - exports.sub = sub$109; + exports.sub__sub = sub__sub$109; exports.cyclic_import_test = cyclic_import_test$110; - exports.sub = sub$110; + exports.sub__sub = sub__sub$110; exports.cyclic_import_test = cyclic_import_test$111; - exports.sub = sub$111; + exports.sub__sub = sub__sub$111; exports.cyclic_import_test = cyclic_import_test$112; - exports.sub = sub$112; + exports.sub__sub = sub__sub$112; exports.cyclic_import_test = cyclic_import_test$113; - exports.sub = sub$113; + exports.sub__sub = sub__sub$113; exports.cyclic_import_test = cyclic_import_test$114; - exports.sub = sub$114; + exports.sub__sub = sub__sub$114; exports.cyclic_import_test = cyclic_import_test$115; - exports.sub = sub$115; + exports.sub__sub = sub__sub$115; exports.cyclic_import_test = cyclic_import_test$116; - exports.sub = sub$116; + exports.sub__sub = sub__sub$116; exports.cyclic_import_test = cyclic_import_test$117; - exports.sub = sub$117; + exports.sub__sub = sub__sub$117; exports.cyclic_import_test = cyclic_import_test$118; - exports.sub = sub$118; + exports.sub__sub = sub__sub$118; exports.cyclic_import_test = cyclic_import_test$119; - exports.sub = sub$119; + exports.sub__sub = sub__sub$119; exports.cyclic_import_test = cyclic_import_test$120; - exports.sub = sub$120; + exports.sub__sub = sub__sub$120; exports.cyclic_import_test = cyclic_import_test$121; - exports.sub = sub$121; + exports.sub__sub = sub__sub$121; exports.cyclic_import_test = cyclic_import_test$122; - exports.sub = sub$122; + exports.sub__sub = sub__sub$122; exports.cyclic_import_test = cyclic_import_test$123; - exports.sub = sub$123; + exports.sub__sub = sub__sub$123; exports.cyclic_import_test = cyclic_import_test$124; - exports.sub = sub$124; + exports.sub__sub = sub__sub$124; exports.cyclic_import_test = cyclic_import_test$125; - exports.sub = sub$125; + exports.sub__sub = sub__sub$125; exports.cyclic_import_test = cyclic_import_test$126; - exports.sub = sub$126; + exports.sub__sub = sub__sub$126; exports.cyclic_import_test = cyclic_import_test$127; - exports.sub = sub$127; + exports.sub__sub = sub__sub$127; exports.cyclic_import_test = cyclic_import_test$128; - exports.sub = sub$128; + exports.sub__sub = sub__sub$128; exports.cyclic_import_test = cyclic_import_test$129; - exports.sub = sub$129; + exports.sub__sub = sub__sub$129; exports.cyclic_import_test = cyclic_import_test$130; - exports.sub = sub$130; + exports.sub__sub = sub__sub$130; exports.cyclic_import_test = cyclic_import_test$131; - exports.sub = sub$131; + exports.sub__sub = sub__sub$131; exports.cyclic_import_test = cyclic_import_test$132; - exports.sub = sub$132; + exports.sub__sub = sub__sub$132; + exports.cyclic_import_test = cyclic_import_test$133; + exports.sub__sub = sub__sub$133; + exports.cyclic_import_test = cyclic_import_test$134; + exports.sub__sub = sub__sub$134; + exports.cyclic_import_test = cyclic_import_test$135; + exports.sub__sub = sub__sub$135; }); dart_library.library('cyclic_metadata_test_01_multi', null, /* Imports */[ 'dart_sdk' diff --git a/pkg/dev_compiler/test/codegen/expect/unittest.js b/pkg/dev_compiler/test/codegen/expect/unittest.js index 5ad9ad4bc540..7c1ba3bcfddf 100644 --- a/pkg/dev_compiler/test/codegen/expect/unittest.js +++ b/pkg/dev_compiler/test/codegen/expect/unittest.js @@ -8,16 +8,16 @@ dart_library.library('unittest', null, /* Imports */[ const async = dart_sdk.async; const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; - const interfaces = matcher.interfaces; - const util = matcher.util; - const description$ = matcher.description; - const numeric_matchers = matcher.numeric_matchers; - const error_matchers = matcher.error_matchers; - const core_matchers = matcher.core_matchers; - const iterable_matchers = matcher.iterable_matchers; - const string_matchers = matcher.string_matchers; - const operator_matchers = matcher.operator_matchers; - const map_matchers = matcher.map_matchers; + const src__interfaces = matcher.src__interfaces; + const src__util = matcher.src__util; + const src__description = matcher.src__description; + const src__numeric_matchers = matcher.src__numeric_matchers; + const src__error_matchers = matcher.src__error_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__iterable_matchers = matcher.src__iterable_matchers; + const src__string_matchers = matcher.src__string_matchers; + const src__operator_matchers = matcher.src__operator_matchers; + const src__map_matchers = matcher.src__map_matchers; const unittest = Object.create(null); unittest.group = function(name, body) { return js.context.callMethod('suite', dart.list([name, body], core.Object)); @@ -54,12 +54,12 @@ dart_library.library('unittest', null, /* Imports */[ dart.setSignature(unittest.TestFailure, { constructors: () => ({TestFailure: [unittest.TestFailure, [core.String]]}) }); - unittest.ErrorFormatter = dart.typedef('ErrorFormatter', () => dart.functionType(core.String, [dart.dynamic, interfaces.Matcher, core.String, core.Map, core.bool])); + unittest.ErrorFormatter = dart.typedef('ErrorFormatter', () => dart.functionType(core.String, [dart.dynamic, src__interfaces.Matcher, core.String, core.Map, core.bool])); unittest.expect = function(actual, matcher, opts) { let reason = opts && 'reason' in opts ? opts.reason : null; let verbose = opts && 'verbose' in opts ? opts.verbose : false; let formatter = opts && 'formatter' in opts ? opts.formatter : null; - matcher = util.wrapMatcher(matcher); + matcher = src__util.wrapMatcher(matcher); let matchState = dart.map(); try { if (dart.notNull(dart.as(dart.dsend(matcher, 'matches', actual, matchState), core.bool))) return; @@ -79,10 +79,10 @@ dart_library.library('unittest', null, /* Imports */[ }; dart.fn(unittest.fail, dart.void, [core.String]); unittest._defaultFailFormatter = function(actual, matcher, reason, matchState, verbose) { - let description = new description$.StringDescription(); + let description = new src__description.StringDescription(); description.add('Expected: ').addDescriptionOf(matcher).add('\n'); description.add(' Actual: ').addDescriptionOf(actual).add('\n'); - let mismatchDescription = new description$.StringDescription(); + let mismatchDescription = new src__description.StringDescription(); matcher.describeMismatch(actual, mismatchDescription, matchState, verbose); if (dart.notNull(mismatchDescription.length) > 0) { description.add(` Which: ${mismatchDescription}\n`); @@ -90,79 +90,79 @@ dart_library.library('unittest', null, /* Imports */[ if (reason != null) description.add(reason).add('\n'); return description.toString(); }; - dart.fn(unittest._defaultFailFormatter, core.String, [dart.dynamic, interfaces.Matcher, core.String, core.Map, core.bool]); - unittest.isPositive = numeric_matchers.isPositive; - unittest.isRangeError = error_matchers.isRangeError; - unittest.isStateError = error_matchers.isStateError; - unittest.equals = core_matchers.equals; - unittest.CustomMatcher = core_matchers.CustomMatcher; - unittest.inOpenClosedRange = numeric_matchers.inOpenClosedRange; - unittest.pairwiseCompare = iterable_matchers.pairwiseCompare; - unittest.equalsIgnoringCase = string_matchers.equalsIgnoringCase; - unittest.isUnimplementedError = error_matchers.isUnimplementedError; - unittest.hasLength = core_matchers.hasLength; - unittest.StringDescription = description$.StringDescription; - unittest.allOf = operator_matchers.allOf; - unittest.isNegative = numeric_matchers.isNegative; - unittest.isInstanceOf$ = core_matchers.isInstanceOf$; - unittest.isInstanceOf = core_matchers.isInstanceOf; - unittest.isNaN = core_matchers.isNaN; - unittest.lessThan = numeric_matchers.lessThan; - unittest.isNotEmpty = core_matchers.isNotEmpty; - unittest.greaterThanOrEqualTo = numeric_matchers.greaterThanOrEqualTo; - unittest.endsWith = string_matchers.endsWith; - unittest.isConcurrentModificationError = error_matchers.isConcurrentModificationError; - unittest.containsValue = map_matchers.containsValue; - unittest.isFalse = core_matchers.isFalse; - unittest.isTrue = core_matchers.isTrue; - unittest.Matcher = interfaces.Matcher; - unittest.lessThanOrEqualTo = numeric_matchers.lessThanOrEqualTo; - unittest.matches = string_matchers.matches; - unittest.returnsNormally = core_matchers.returnsNormally; - unittest.TypeMatcher = core_matchers.TypeMatcher; - unittest.inExclusiveRange = numeric_matchers.inExclusiveRange; - unittest.equalsIgnoringWhitespace = string_matchers.equalsIgnoringWhitespace; - unittest.isIn = core_matchers.isIn; - unittest.isNotNaN = core_matchers.isNotNaN; - unittest.isNonZero = numeric_matchers.isNonZero; - unittest.startsWith = string_matchers.startsWith; - unittest.isNullThrownError = error_matchers.isNullThrownError; - unittest.isEmpty = core_matchers.isEmpty; - unittest.anyOf = operator_matchers.anyOf; - unittest.unorderedMatches = iterable_matchers.unorderedMatches; - unittest.isZero = numeric_matchers.isZero; - unittest.isList = core_matchers.isList; - unittest.escape = util.escape; - unittest.isCyclicInitializationError = error_matchers.isCyclicInitializationError; - unittest.anyElement = iterable_matchers.anyElement; - unittest.anything = core_matchers.anything; - unittest.contains = core_matchers.contains; - unittest.isUnsupportedError = error_matchers.isUnsupportedError; - unittest.isNonPositive = numeric_matchers.isNonPositive; - unittest.isNot = operator_matchers.isNot; - unittest.same = core_matchers.same; - unittest.inClosedOpenRange = numeric_matchers.inClosedOpenRange; - unittest.predicate = core_matchers.predicate; - unittest.isNotNull = core_matchers.isNotNull; - unittest.wrapMatcher = util.wrapMatcher; - unittest.isNoSuchMethodError = error_matchers.isNoSuchMethodError; - unittest.unorderedEquals = iterable_matchers.unorderedEquals; - unittest.everyElement = iterable_matchers.everyElement; - unittest.addStateInfo = util.addStateInfo; - unittest.isArgumentError = error_matchers.isArgumentError; - unittest.isException = error_matchers.isException; - unittest.inInclusiveRange = numeric_matchers.inInclusiveRange; - unittest.containsPair = map_matchers.containsPair; - unittest.isFormatException = error_matchers.isFormatException; - unittest.orderedEquals = iterable_matchers.orderedEquals; - unittest.collapseWhitespace = string_matchers.collapseWhitespace; - unittest.greaterThan = numeric_matchers.greaterThan; - unittest.isNonNegative = numeric_matchers.isNonNegative; - unittest.isNull = core_matchers.isNull; - unittest.isMap = core_matchers.isMap; - unittest.stringContainsInOrder = string_matchers.stringContainsInOrder; - unittest.closeTo = numeric_matchers.closeTo; - unittest.Description = interfaces.Description; + dart.fn(unittest._defaultFailFormatter, core.String, [dart.dynamic, src__interfaces.Matcher, core.String, core.Map, core.bool]); + unittest.isPositive = src__numeric_matchers.isPositive; + unittest.isRangeError = src__error_matchers.isRangeError; + unittest.isStateError = src__error_matchers.isStateError; + unittest.equals = src__core_matchers.equals; + unittest.CustomMatcher = src__core_matchers.CustomMatcher; + unittest.inOpenClosedRange = src__numeric_matchers.inOpenClosedRange; + unittest.pairwiseCompare = src__iterable_matchers.pairwiseCompare; + unittest.equalsIgnoringCase = src__string_matchers.equalsIgnoringCase; + unittest.isUnimplementedError = src__error_matchers.isUnimplementedError; + unittest.hasLength = src__core_matchers.hasLength; + unittest.StringDescription = src__description.StringDescription; + unittest.allOf = src__operator_matchers.allOf; + unittest.isNegative = src__numeric_matchers.isNegative; + unittest.isInstanceOf$ = src__core_matchers.isInstanceOf$; + unittest.isInstanceOf = src__core_matchers.isInstanceOf; + unittest.isNaN = src__core_matchers.isNaN; + unittest.lessThan = src__numeric_matchers.lessThan; + unittest.isNotEmpty = src__core_matchers.isNotEmpty; + unittest.greaterThanOrEqualTo = src__numeric_matchers.greaterThanOrEqualTo; + unittest.endsWith = src__string_matchers.endsWith; + unittest.isConcurrentModificationError = src__error_matchers.isConcurrentModificationError; + unittest.containsValue = src__map_matchers.containsValue; + unittest.isFalse = src__core_matchers.isFalse; + unittest.isTrue = src__core_matchers.isTrue; + unittest.Matcher = src__interfaces.Matcher; + unittest.lessThanOrEqualTo = src__numeric_matchers.lessThanOrEqualTo; + unittest.matches = src__string_matchers.matches; + unittest.returnsNormally = src__core_matchers.returnsNormally; + unittest.TypeMatcher = src__core_matchers.TypeMatcher; + unittest.inExclusiveRange = src__numeric_matchers.inExclusiveRange; + unittest.equalsIgnoringWhitespace = src__string_matchers.equalsIgnoringWhitespace; + unittest.isIn = src__core_matchers.isIn; + unittest.isNotNaN = src__core_matchers.isNotNaN; + unittest.isNonZero = src__numeric_matchers.isNonZero; + unittest.startsWith = src__string_matchers.startsWith; + unittest.isNullThrownError = src__error_matchers.isNullThrownError; + unittest.isEmpty = src__core_matchers.isEmpty; + unittest.anyOf = src__operator_matchers.anyOf; + unittest.unorderedMatches = src__iterable_matchers.unorderedMatches; + unittest.isZero = src__numeric_matchers.isZero; + unittest.isList = src__core_matchers.isList; + unittest.escape = src__util.escape; + unittest.isCyclicInitializationError = src__error_matchers.isCyclicInitializationError; + unittest.anyElement = src__iterable_matchers.anyElement; + unittest.anything = src__core_matchers.anything; + unittest.contains = src__core_matchers.contains; + unittest.isUnsupportedError = src__error_matchers.isUnsupportedError; + unittest.isNonPositive = src__numeric_matchers.isNonPositive; + unittest.isNot = src__operator_matchers.isNot; + unittest.same = src__core_matchers.same; + unittest.inClosedOpenRange = src__numeric_matchers.inClosedOpenRange; + unittest.predicate = src__core_matchers.predicate; + unittest.isNotNull = src__core_matchers.isNotNull; + unittest.wrapMatcher = src__util.wrapMatcher; + unittest.isNoSuchMethodError = src__error_matchers.isNoSuchMethodError; + unittest.unorderedEquals = src__iterable_matchers.unorderedEquals; + unittest.everyElement = src__iterable_matchers.everyElement; + unittest.addStateInfo = src__util.addStateInfo; + unittest.isArgumentError = src__error_matchers.isArgumentError; + unittest.isException = src__error_matchers.isException; + unittest.inInclusiveRange = src__numeric_matchers.inInclusiveRange; + unittest.containsPair = src__map_matchers.containsPair; + unittest.isFormatException = src__error_matchers.isFormatException; + unittest.orderedEquals = src__iterable_matchers.orderedEquals; + unittest.collapseWhitespace = src__string_matchers.collapseWhitespace; + unittest.greaterThan = src__numeric_matchers.greaterThan; + unittest.isNonNegative = src__numeric_matchers.isNonNegative; + unittest.isNull = src__core_matchers.isNull; + unittest.isMap = src__core_matchers.isMap; + unittest.stringContainsInOrder = src__string_matchers.stringContainsInOrder; + unittest.closeTo = src__numeric_matchers.closeTo; + unittest.Description = src__interfaces.Description; // Exports: exports.unittest = unittest; }); diff --git a/pkg/dev_compiler/test/codegen/expect/unittest/unittest.js b/pkg/dev_compiler/test/codegen/expect/unittest/unittest.js index 5ad9ad4bc540..7c1ba3bcfddf 100644 --- a/pkg/dev_compiler/test/codegen/expect/unittest/unittest.js +++ b/pkg/dev_compiler/test/codegen/expect/unittest/unittest.js @@ -8,16 +8,16 @@ dart_library.library('unittest', null, /* Imports */[ const async = dart_sdk.async; const dart = dart_sdk.dart; const dartx = dart_sdk.dartx; - const interfaces = matcher.interfaces; - const util = matcher.util; - const description$ = matcher.description; - const numeric_matchers = matcher.numeric_matchers; - const error_matchers = matcher.error_matchers; - const core_matchers = matcher.core_matchers; - const iterable_matchers = matcher.iterable_matchers; - const string_matchers = matcher.string_matchers; - const operator_matchers = matcher.operator_matchers; - const map_matchers = matcher.map_matchers; + const src__interfaces = matcher.src__interfaces; + const src__util = matcher.src__util; + const src__description = matcher.src__description; + const src__numeric_matchers = matcher.src__numeric_matchers; + const src__error_matchers = matcher.src__error_matchers; + const src__core_matchers = matcher.src__core_matchers; + const src__iterable_matchers = matcher.src__iterable_matchers; + const src__string_matchers = matcher.src__string_matchers; + const src__operator_matchers = matcher.src__operator_matchers; + const src__map_matchers = matcher.src__map_matchers; const unittest = Object.create(null); unittest.group = function(name, body) { return js.context.callMethod('suite', dart.list([name, body], core.Object)); @@ -54,12 +54,12 @@ dart_library.library('unittest', null, /* Imports */[ dart.setSignature(unittest.TestFailure, { constructors: () => ({TestFailure: [unittest.TestFailure, [core.String]]}) }); - unittest.ErrorFormatter = dart.typedef('ErrorFormatter', () => dart.functionType(core.String, [dart.dynamic, interfaces.Matcher, core.String, core.Map, core.bool])); + unittest.ErrorFormatter = dart.typedef('ErrorFormatter', () => dart.functionType(core.String, [dart.dynamic, src__interfaces.Matcher, core.String, core.Map, core.bool])); unittest.expect = function(actual, matcher, opts) { let reason = opts && 'reason' in opts ? opts.reason : null; let verbose = opts && 'verbose' in opts ? opts.verbose : false; let formatter = opts && 'formatter' in opts ? opts.formatter : null; - matcher = util.wrapMatcher(matcher); + matcher = src__util.wrapMatcher(matcher); let matchState = dart.map(); try { if (dart.notNull(dart.as(dart.dsend(matcher, 'matches', actual, matchState), core.bool))) return; @@ -79,10 +79,10 @@ dart_library.library('unittest', null, /* Imports */[ }; dart.fn(unittest.fail, dart.void, [core.String]); unittest._defaultFailFormatter = function(actual, matcher, reason, matchState, verbose) { - let description = new description$.StringDescription(); + let description = new src__description.StringDescription(); description.add('Expected: ').addDescriptionOf(matcher).add('\n'); description.add(' Actual: ').addDescriptionOf(actual).add('\n'); - let mismatchDescription = new description$.StringDescription(); + let mismatchDescription = new src__description.StringDescription(); matcher.describeMismatch(actual, mismatchDescription, matchState, verbose); if (dart.notNull(mismatchDescription.length) > 0) { description.add(` Which: ${mismatchDescription}\n`); @@ -90,79 +90,79 @@ dart_library.library('unittest', null, /* Imports */[ if (reason != null) description.add(reason).add('\n'); return description.toString(); }; - dart.fn(unittest._defaultFailFormatter, core.String, [dart.dynamic, interfaces.Matcher, core.String, core.Map, core.bool]); - unittest.isPositive = numeric_matchers.isPositive; - unittest.isRangeError = error_matchers.isRangeError; - unittest.isStateError = error_matchers.isStateError; - unittest.equals = core_matchers.equals; - unittest.CustomMatcher = core_matchers.CustomMatcher; - unittest.inOpenClosedRange = numeric_matchers.inOpenClosedRange; - unittest.pairwiseCompare = iterable_matchers.pairwiseCompare; - unittest.equalsIgnoringCase = string_matchers.equalsIgnoringCase; - unittest.isUnimplementedError = error_matchers.isUnimplementedError; - unittest.hasLength = core_matchers.hasLength; - unittest.StringDescription = description$.StringDescription; - unittest.allOf = operator_matchers.allOf; - unittest.isNegative = numeric_matchers.isNegative; - unittest.isInstanceOf$ = core_matchers.isInstanceOf$; - unittest.isInstanceOf = core_matchers.isInstanceOf; - unittest.isNaN = core_matchers.isNaN; - unittest.lessThan = numeric_matchers.lessThan; - unittest.isNotEmpty = core_matchers.isNotEmpty; - unittest.greaterThanOrEqualTo = numeric_matchers.greaterThanOrEqualTo; - unittest.endsWith = string_matchers.endsWith; - unittest.isConcurrentModificationError = error_matchers.isConcurrentModificationError; - unittest.containsValue = map_matchers.containsValue; - unittest.isFalse = core_matchers.isFalse; - unittest.isTrue = core_matchers.isTrue; - unittest.Matcher = interfaces.Matcher; - unittest.lessThanOrEqualTo = numeric_matchers.lessThanOrEqualTo; - unittest.matches = string_matchers.matches; - unittest.returnsNormally = core_matchers.returnsNormally; - unittest.TypeMatcher = core_matchers.TypeMatcher; - unittest.inExclusiveRange = numeric_matchers.inExclusiveRange; - unittest.equalsIgnoringWhitespace = string_matchers.equalsIgnoringWhitespace; - unittest.isIn = core_matchers.isIn; - unittest.isNotNaN = core_matchers.isNotNaN; - unittest.isNonZero = numeric_matchers.isNonZero; - unittest.startsWith = string_matchers.startsWith; - unittest.isNullThrownError = error_matchers.isNullThrownError; - unittest.isEmpty = core_matchers.isEmpty; - unittest.anyOf = operator_matchers.anyOf; - unittest.unorderedMatches = iterable_matchers.unorderedMatches; - unittest.isZero = numeric_matchers.isZero; - unittest.isList = core_matchers.isList; - unittest.escape = util.escape; - unittest.isCyclicInitializationError = error_matchers.isCyclicInitializationError; - unittest.anyElement = iterable_matchers.anyElement; - unittest.anything = core_matchers.anything; - unittest.contains = core_matchers.contains; - unittest.isUnsupportedError = error_matchers.isUnsupportedError; - unittest.isNonPositive = numeric_matchers.isNonPositive; - unittest.isNot = operator_matchers.isNot; - unittest.same = core_matchers.same; - unittest.inClosedOpenRange = numeric_matchers.inClosedOpenRange; - unittest.predicate = core_matchers.predicate; - unittest.isNotNull = core_matchers.isNotNull; - unittest.wrapMatcher = util.wrapMatcher; - unittest.isNoSuchMethodError = error_matchers.isNoSuchMethodError; - unittest.unorderedEquals = iterable_matchers.unorderedEquals; - unittest.everyElement = iterable_matchers.everyElement; - unittest.addStateInfo = util.addStateInfo; - unittest.isArgumentError = error_matchers.isArgumentError; - unittest.isException = error_matchers.isException; - unittest.inInclusiveRange = numeric_matchers.inInclusiveRange; - unittest.containsPair = map_matchers.containsPair; - unittest.isFormatException = error_matchers.isFormatException; - unittest.orderedEquals = iterable_matchers.orderedEquals; - unittest.collapseWhitespace = string_matchers.collapseWhitespace; - unittest.greaterThan = numeric_matchers.greaterThan; - unittest.isNonNegative = numeric_matchers.isNonNegative; - unittest.isNull = core_matchers.isNull; - unittest.isMap = core_matchers.isMap; - unittest.stringContainsInOrder = string_matchers.stringContainsInOrder; - unittest.closeTo = numeric_matchers.closeTo; - unittest.Description = interfaces.Description; + dart.fn(unittest._defaultFailFormatter, core.String, [dart.dynamic, src__interfaces.Matcher, core.String, core.Map, core.bool]); + unittest.isPositive = src__numeric_matchers.isPositive; + unittest.isRangeError = src__error_matchers.isRangeError; + unittest.isStateError = src__error_matchers.isStateError; + unittest.equals = src__core_matchers.equals; + unittest.CustomMatcher = src__core_matchers.CustomMatcher; + unittest.inOpenClosedRange = src__numeric_matchers.inOpenClosedRange; + unittest.pairwiseCompare = src__iterable_matchers.pairwiseCompare; + unittest.equalsIgnoringCase = src__string_matchers.equalsIgnoringCase; + unittest.isUnimplementedError = src__error_matchers.isUnimplementedError; + unittest.hasLength = src__core_matchers.hasLength; + unittest.StringDescription = src__description.StringDescription; + unittest.allOf = src__operator_matchers.allOf; + unittest.isNegative = src__numeric_matchers.isNegative; + unittest.isInstanceOf$ = src__core_matchers.isInstanceOf$; + unittest.isInstanceOf = src__core_matchers.isInstanceOf; + unittest.isNaN = src__core_matchers.isNaN; + unittest.lessThan = src__numeric_matchers.lessThan; + unittest.isNotEmpty = src__core_matchers.isNotEmpty; + unittest.greaterThanOrEqualTo = src__numeric_matchers.greaterThanOrEqualTo; + unittest.endsWith = src__string_matchers.endsWith; + unittest.isConcurrentModificationError = src__error_matchers.isConcurrentModificationError; + unittest.containsValue = src__map_matchers.containsValue; + unittest.isFalse = src__core_matchers.isFalse; + unittest.isTrue = src__core_matchers.isTrue; + unittest.Matcher = src__interfaces.Matcher; + unittest.lessThanOrEqualTo = src__numeric_matchers.lessThanOrEqualTo; + unittest.matches = src__string_matchers.matches; + unittest.returnsNormally = src__core_matchers.returnsNormally; + unittest.TypeMatcher = src__core_matchers.TypeMatcher; + unittest.inExclusiveRange = src__numeric_matchers.inExclusiveRange; + unittest.equalsIgnoringWhitespace = src__string_matchers.equalsIgnoringWhitespace; + unittest.isIn = src__core_matchers.isIn; + unittest.isNotNaN = src__core_matchers.isNotNaN; + unittest.isNonZero = src__numeric_matchers.isNonZero; + unittest.startsWith = src__string_matchers.startsWith; + unittest.isNullThrownError = src__error_matchers.isNullThrownError; + unittest.isEmpty = src__core_matchers.isEmpty; + unittest.anyOf = src__operator_matchers.anyOf; + unittest.unorderedMatches = src__iterable_matchers.unorderedMatches; + unittest.isZero = src__numeric_matchers.isZero; + unittest.isList = src__core_matchers.isList; + unittest.escape = src__util.escape; + unittest.isCyclicInitializationError = src__error_matchers.isCyclicInitializationError; + unittest.anyElement = src__iterable_matchers.anyElement; + unittest.anything = src__core_matchers.anything; + unittest.contains = src__core_matchers.contains; + unittest.isUnsupportedError = src__error_matchers.isUnsupportedError; + unittest.isNonPositive = src__numeric_matchers.isNonPositive; + unittest.isNot = src__operator_matchers.isNot; + unittest.same = src__core_matchers.same; + unittest.inClosedOpenRange = src__numeric_matchers.inClosedOpenRange; + unittest.predicate = src__core_matchers.predicate; + unittest.isNotNull = src__core_matchers.isNotNull; + unittest.wrapMatcher = src__util.wrapMatcher; + unittest.isNoSuchMethodError = src__error_matchers.isNoSuchMethodError; + unittest.unorderedEquals = src__iterable_matchers.unorderedEquals; + unittest.everyElement = src__iterable_matchers.everyElement; + unittest.addStateInfo = src__util.addStateInfo; + unittest.isArgumentError = src__error_matchers.isArgumentError; + unittest.isException = src__error_matchers.isException; + unittest.inInclusiveRange = src__numeric_matchers.inInclusiveRange; + unittest.containsPair = src__map_matchers.containsPair; + unittest.isFormatException = src__error_matchers.isFormatException; + unittest.orderedEquals = src__iterable_matchers.orderedEquals; + unittest.collapseWhitespace = src__string_matchers.collapseWhitespace; + unittest.greaterThan = src__numeric_matchers.greaterThan; + unittest.isNonNegative = src__numeric_matchers.isNonNegative; + unittest.isNull = src__core_matchers.isNull; + unittest.isMap = src__core_matchers.isMap; + unittest.stringContainsInOrder = src__string_matchers.stringContainsInOrder; + unittest.closeTo = src__numeric_matchers.closeTo; + unittest.Description = src__interfaces.Description; // Exports: exports.unittest = unittest; }); diff --git a/pkg/dev_compiler/test/codegen_test.dart b/pkg/dev_compiler/test/codegen_test.dart index d16305e9b6d4..53e306c8fc73 100644 --- a/pkg/dev_compiler/test/codegen_test.dart +++ b/pkg/dev_compiler/test/codegen_test.dart @@ -71,7 +71,8 @@ main(arguments) { var outDir = new Directory(path.join(expectDir, dir)); if (!outDir.existsSync()) outDir.createSync(recursive: true); - var testFiles = _findTests(path.join(inputDir, dir), filePattern); + var baseDir = path.join(inputDir, dir); + var testFiles = _findTests(baseDir, filePattern); for (var filePath in testFiles) { if (multitests.contains(filePath)) continue; @@ -94,7 +95,8 @@ main(arguments) { var files = new Set(); _collectTransitiveImports(contents, files, from: filePath); - var unit = new BuildUnit(filename, files.toList(), _moduleForLibrary); + var unit = new BuildUnit( + filename, baseDir, files.toList(), _moduleForLibrary); var module = compiler.compile(unit, options); _writeModule(path.join(outDir.path, filename), module); }); @@ -128,10 +130,11 @@ void _writeModule(String outPath, JSModuleFile result) { } void _buildSunflower(ModuleCompiler compiler, String expectDir) { + var baseDir = path.join(inputDir, 'sunflower'); var files = ['sunflower', 'circle', 'painter'] - .map((f) => path.join(inputDir, 'sunflower', '$f.dart')) + .map((f) => path.join(baseDir, '$f.dart')) .toList(); - var input = new BuildUnit('sunflower', files, _moduleForLibrary); + var input = new BuildUnit('sunflower', baseDir, files, _moduleForLibrary); var options = new CompilerOptions(summarizeApi: false); var built = compiler.compile(input, options); @@ -149,7 +152,7 @@ void _buildPackages(ModuleCompiler compiler, String expectDir) { var uriPath = uri.substring('package:'.length); var name = path.basenameWithoutExtension(uriPath); test(name, () { - var input = new BuildUnit(name, [uri], _moduleForLibrary); + var input = new BuildUnit(name, inputDir, [uri], _moduleForLibrary); var built = compiler.compile(input, options); var outPath = path.join(expectDir, path.withoutExtension(uriPath)); @@ -161,14 +164,17 @@ void _buildPackages(ModuleCompiler compiler, String expectDir) { void _buildMatcher(ModuleCompiler compiler, String expectDir) { var options = new CompilerOptions(sourceMap: false, summarizeApi: false); - var filePath = path.join(inputDir, 'packages', 'matcher', 'matcher.dart'); + var packageRoot = path.join(inputDir, 'packages'); + var filePath = path.join(packageRoot, 'matcher', 'matcher.dart'); var contents = new File(filePath).readAsStringSync(); // Collect any other files we've imported. var files = new Set(); - _collectTransitiveImports(contents, files, from: filePath); + _collectTransitiveImports(contents, files, + packageRoot: packageRoot, from: filePath); - var unit = new BuildUnit('matcher', files.toList(), _moduleForLibrary); + var unit = + new BuildUnit('matcher', inputDir, files.toList(), _moduleForLibrary); var module = compiler.compile(unit, options); var outPath = path.join(expectDir, 'matcher', 'matcher'); @@ -247,8 +253,12 @@ Iterable _findTests(String dir, RegExp filePattern) { /// /// This will not include dart:* libraries, as those are implicitly available. void _collectTransitiveImports(String contents, Set libraries, - {String from}) { - if (!libraries.add(from)) return; + {String packageRoot, String from}) { + var uri = from; + if (packageRoot != null && path.isWithin(packageRoot, from)) { + uri = 'package:${path.relative(from, from: packageRoot)}'; + } + if (!libraries.add(uri)) return; var unit = parseDirectives(contents, name: from, suppressErrors: true); for (var d in unit.directives) { @@ -263,7 +273,7 @@ void _collectTransitiveImports(String contents, Set libraries, var f = new File(path.join(path.dirname(from), uri)); if (f.existsSync()) { _collectTransitiveImports(f.readAsStringSync(), libraries, - from: f.path); + packageRoot: packageRoot, from: f.path); } } }