| Index: packages/barback/test/package_graph/add_remove_transform_test.dart
|
| diff --git a/packages/barback/test/package_graph/add_remove_transform_test.dart b/packages/barback/test/package_graph/add_remove_transform_test.dart
|
| index d3839ee1e7aad1b0f546d73d76665c444446f350..ba14614d1b38e8cd8e4b3158e52370eef8b47090 100644
|
| --- a/packages/barback/test/package_graph/add_remove_transform_test.dart
|
| +++ b/packages/barback/test/package_graph/add_remove_transform_test.dart
|
| @@ -18,7 +18,9 @@ main() {
|
| expectAsset("app|foo.blub", "foo");
|
| buildShouldSucceed();
|
|
|
| - updateTransformers("app", [[new RewriteTransformer("blub", "blab")]]);
|
| + updateTransformers("app", [
|
| + [new RewriteTransformer("blub", "blab")]
|
| + ]);
|
| expectAsset("app|foo.blab", "foo.blab");
|
| buildShouldSucceed();
|
| });
|
| @@ -30,7 +32,9 @@ main() {
|
| expectAsset("app|foo.blub", "foo");
|
| buildShouldSucceed();
|
|
|
| - updateTransformers("app", [[new RewriteTransformer("zip", "zap")]]);
|
| + updateTransformers("app", [
|
| + [new RewriteTransformer("zip", "zap")]
|
| + ]);
|
| expectAsset("app|foo.blub", "foo");
|
| expectNoAsset("app|foo.zap");
|
| buildShouldSucceed();
|
| @@ -38,13 +42,21 @@ main() {
|
|
|
| test("updateTransformers doesn't re-run an old transformer", () {
|
| var rewrite = new RewriteTransformer("blub", "blab");
|
| - initGraph(["app|foo.blub"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.blub"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.blub"]);
|
| expectAsset("app|foo.blab", "foo.blab");
|
| buildShouldSucceed();
|
|
|
| - updateTransformers("app", [[rewrite]]);
|
| + updateTransformers("app", [
|
| + [rewrite]
|
| + ]);
|
| expectAsset("app|foo.blab", "foo.blab");
|
| buildShouldSucceed();
|
|
|
| @@ -54,22 +66,40 @@ main() {
|
| test("updateTransformers re-runs old transformers in a new phase", () {
|
| var rewrite1 = new RewriteTransformer("txt", "blub");
|
| var rewrite2 = new RewriteTransformer("blub", "blab");
|
| - initGraph(["app|foo.txt"], {"app": [[rewrite1], [rewrite2]]});
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [rewrite1],
|
| + [rewrite2]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.txt"]);
|
| expectAsset("app|foo.blab", "foo.blub.blab");
|
| buildShouldSucceed();
|
|
|
| - updateTransformers("app", [[rewrite2], [rewrite1]]);
|
| + updateTransformers("app", [
|
| + [rewrite2],
|
| + [rewrite1]
|
| + ]);
|
| expectAsset("app|foo.blub", "foo.blub");
|
| expectNoAsset("app|foo.blab");
|
| buildShouldSucceed();
|
| });
|
|
|
| - test("updateTransformers re-runs an old transformer when a previous phase "
|
| + test(
|
| + "updateTransformers re-runs an old transformer when a previous phase "
|
| "changes", () {
|
| var rewrite = new RewriteTransformer("txt", "out");
|
| - initGraph(["app|foo.txt"], {"app": [[], [rewrite]]});
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [],
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.txt"]);
|
| expectAsset("app|foo.out", "foo.out");
|
| @@ -84,9 +114,13 @@ main() {
|
| });
|
|
|
| test("a removed transformer is no longer applied", () {
|
| - initGraph(["app|foo.blub"], {"app": [
|
| - [new RewriteTransformer("blub", "blab")]
|
| - ]});
|
| + initGraph([
|
| + "app|foo.blub"
|
| + ], {
|
| + "app": [
|
| + [new RewriteTransformer("blub", "blab")]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.blub"]);
|
| expectAsset("app|foo.blab", "foo.blab");
|
| @@ -101,10 +135,14 @@ main() {
|
| test("a new transformer is pipelined", () {
|
| var rewrite1 = new RewriteTransformer("source", "phase1");
|
| var rewrite3 = new RewriteTransformer("phase2", "phase3");
|
| - initGraph(["app|foo.source"], {"app": [
|
| - [rewrite1],
|
| - [rewrite3]
|
| - ]});
|
| + initGraph([
|
| + "app|foo.source"
|
| + ], {
|
| + "app": [
|
| + [rewrite1],
|
| + [rewrite3]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.source"]);
|
| expectNoAsset("app|foo.phase3");
|
| @@ -122,24 +160,37 @@ main() {
|
| test("a removed transformer is un-pipelined", () {
|
| var rewrite1 = new RewriteTransformer("source", "phase1");
|
| var rewrite3 = new RewriteTransformer("phase2", "phase3");
|
| - initGraph(["app|foo.source"], {"app": [
|
| - [rewrite1],
|
| - [new RewriteTransformer("phase1", "phase2")],
|
| - [rewrite3]
|
| - ]});
|
| + initGraph([
|
| + "app|foo.source"
|
| + ], {
|
| + "app": [
|
| + [rewrite1],
|
| + [new RewriteTransformer("phase1", "phase2")],
|
| + [rewrite3]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.source"]);
|
| expectAsset("app|foo.phase3", "foo.phase1.phase2.phase3");
|
| buildShouldSucceed();
|
|
|
| - updateTransformers("app", [[rewrite1], [rewrite3]]);
|
| + updateTransformers("app", [
|
| + [rewrite1],
|
| + [rewrite3]
|
| + ]);
|
| expectNoAsset("app|foo.phase3");
|
| buildShouldSucceed();
|
| });
|
|
|
| test("a transformer is removed during isPrimary", () {
|
| var rewrite = new RewriteTransformer("blub", "blab");
|
| - initGraph(["app|foo.blub"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.blub"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| rewrite.pauseIsPrimary("app|foo.blub");
|
| updateSources(["app|foo.blub"]);
|
| @@ -155,7 +206,13 @@ main() {
|
|
|
| test("a transformer is removed during apply", () {
|
| var rewrite = new RewriteTransformer("blub", "blab");
|
| - initGraph(["app|foo.blub"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.blub"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| rewrite.pauseApply();
|
| updateSources(["app|foo.blub"]);
|
| @@ -171,7 +228,14 @@ main() {
|
|
|
| test("a transformer is added to an existing phase during isPrimary", () {
|
| var rewrite = new RewriteTransformer("blub", "blab");
|
| - initGraph(["app|foo.blub", "app|bar.blib"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.blub",
|
| + "app|bar.blib"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| rewrite.pauseIsPrimary("app|foo.blub");
|
| updateSources(["app|foo.blub", "app|bar.blib"]);
|
| @@ -193,8 +257,12 @@ main() {
|
| "pkg1|foo.txt": "pkg2|foo.inc",
|
| "pkg2|foo.inc": "foo"
|
| }, {
|
| - "pkg1": [[new ManyToOneTransformer("txt")]],
|
| - "pkg2": [[rewrite]]
|
| + "pkg1": [
|
| + [new ManyToOneTransformer("txt")]
|
| + ],
|
| + "pkg2": [
|
| + [rewrite]
|
| + ]
|
| });
|
|
|
| updateSources(["pkg1|foo.txt", "pkg2|foo.inc"]);
|
| @@ -209,14 +277,17 @@ main() {
|
| buildShouldSucceed();
|
| });
|
|
|
| - test("a cross-package transform doesn't see a removed transformer in a "
|
| + test(
|
| + "a cross-package transform doesn't see a removed transformer in a "
|
| "removed phase", () {
|
| var rewrite = new RewriteTransformer("inc", "inc");
|
| initGraph({
|
| "pkg1|foo.txt": "pkg2|foo.inc",
|
| "pkg2|foo.inc": "foo"
|
| }, {
|
| - "pkg1": [[new ManyToOneTransformer("txt")]],
|
| + "pkg1": [
|
| + [new ManyToOneTransformer("txt")]
|
| + ],
|
| "pkg2": [
|
| [rewrite],
|
| [new RewriteTransformer("inc", "inc")]
|
| @@ -227,7 +298,9 @@ main() {
|
| expectAsset("pkg1|foo.out", "foo.inc.inc");
|
| buildShouldSucceed();
|
|
|
| - updateTransformers("pkg2", [[rewrite]]);
|
| + updateTransformers("pkg2", [
|
| + [rewrite]
|
| + ]);
|
| expectAsset("pkg1|foo.out", "foo.inc");
|
| buildShouldSucceed();
|
| });
|
| @@ -235,7 +308,13 @@ main() {
|
| group("pass-through", () {
|
| test("a new transformer can see pass-through assets", () {
|
| var rewrite = new RewriteTransformer("zip", "zap");
|
| - initGraph(["app|foo.blub"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.blub"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.blub"]);
|
| buildShouldSucceed();
|
| @@ -250,7 +329,13 @@ main() {
|
|
|
| test("a new transformer can overwrite an old asset", () {
|
| var rewrite = new RewriteTransformer("zip", "zap");
|
| - initGraph(["app|foo.txt"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.txt"]);
|
| expectAsset("app|foo.txt", "foo");
|
| @@ -268,8 +353,12 @@ main() {
|
|
|
| test("passes an asset through when an overwriting transform is removed",
|
| () {
|
| - initGraph(["app|foo.txt"], {
|
| - "app": [[new RewriteTransformer("txt", "txt")]]
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [new RewriteTransformer("txt", "txt")]
|
| + ]
|
| });
|
|
|
| updateSources(["app|foo.txt"]);
|
| @@ -281,10 +370,17 @@ main() {
|
| buildShouldSucceed();
|
| });
|
|
|
| - test("passes an asset through when its overwriting transform is removed "
|
| + test(
|
| + "passes an asset through when its overwriting transform is removed "
|
| "during apply", () {
|
| var rewrite = new RewriteTransformer("txt", "txt");
|
| - initGraph(["app|foo.txt"], {"app": [[rewrite]]});
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| + });
|
|
|
| rewrite.pauseApply();
|
| updateSources(["app|foo.txt"]);
|
| @@ -296,11 +392,18 @@ main() {
|
| buildShouldSucceed();
|
| });
|
|
|
| - test("doesn't pass an asset through when its overwriting transform is "
|
| + test(
|
| + "doesn't pass an asset through when its overwriting transform is "
|
| "removed during apply if another transform overwrites it", () {
|
| var rewrite1 = new RewriteTransformer("txt", "txt");
|
| var rewrite2 = new RewriteTransformer("txt", "txt");
|
| - initGraph(["app|foo.txt"], {"app": [[rewrite1, rewrite2]]});
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [rewrite1, rewrite2]
|
| + ]
|
| + });
|
|
|
| rewrite1.pauseApply();
|
| updateSources(["app|foo.txt"]);
|
| @@ -308,19 +411,25 @@ main() {
|
| // Ensure we're waiting on [rewrite1.apply]
|
| schedule(pumpEventQueue);
|
|
|
| - updateTransformers("app", [[rewrite2]]);
|
| + updateTransformers("app", [
|
| + [rewrite2]
|
| + ]);
|
| rewrite1.resumeApply();
|
| expectAsset("app|foo.txt", "foo.txt");
|
| buildShouldSucceed();
|
| });
|
|
|
| - test("doesn't pass an asset through when one overwriting transform is "
|
| + test(
|
| + "doesn't pass an asset through when one overwriting transform is "
|
| "removed if another transform still overwrites it", () {
|
| var rewrite = new RewriteTransformer("txt", "txt");
|
| - initGraph(["app|foo.txt"], {"app": [[
|
| - rewrite,
|
| - new RewriteTransformer("txt", "txt")
|
| - ]]});
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [rewrite, new RewriteTransformer("txt", "txt")]
|
| + ]
|
| + });
|
|
|
| updateSources(["app|foo.txt"]);
|
| // This could be either the output of [CheckContentTransformer] or
|
| @@ -328,7 +437,9 @@ main() {
|
| expectAsset("app|foo.txt", anything);
|
| buildShouldFail([isAssetCollisionException("app|foo.txt")]);
|
|
|
| - updateTransformers("app", [[rewrite]]);
|
| + updateTransformers("app", [
|
| + [rewrite]
|
| + ]);
|
| expectAsset("app|foo.txt", "foo.txt");
|
| buildShouldSucceed();
|
| });
|
| @@ -337,8 +448,12 @@ main() {
|
| // Regression test.
|
| test("a phase is added, then an input is removed and re-added", () {
|
| var rewrite = new RewriteTransformer("txt", "mid");
|
| - initGraph(["app|foo.txt"], {
|
| - "app": [[rewrite]]
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [rewrite]
|
| + ]
|
| });
|
|
|
| updateSources(["app|foo.txt"]);
|
| @@ -364,8 +479,13 @@ main() {
|
| // Regression test for issue 19540.
|
| test("a phase is removed and then one of its inputs is updated", () {
|
| // Have an empty first phase because the first phase is never removed.
|
| - initGraph(["app|foo.txt"], {
|
| - "app": [[], [new RewriteTransformer("txt", "out")]]
|
| + initGraph([
|
| + "app|foo.txt"
|
| + ], {
|
| + "app": [
|
| + [],
|
| + [new RewriteTransformer("txt", "out")]
|
| + ]
|
| });
|
|
|
| updateSources(["app|foo.txt"]);
|
| @@ -387,4 +507,4 @@ main() {
|
| updateSources(["app|foo.txt"]);
|
| buildShouldSucceed();
|
| });
|
| -}
|
| +}
|
|
|