sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_test.dart - Issue 887223007: Revert "Use native async/await support in pub."

Unified Diff: sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_test.dart

Issue 887223007: Revert "Use native async/await support in pub." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_errors_test.dart ('k') | sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_with_line_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_test.dart

diff --git a/sdk/lib/_internal/pub/test/serve/web_socket/url_to_asset_id_test.dart b/sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_test.dart

similarity index 57%

copy from sdk/lib/_internal/pub/test/serve/web_socket/url_to_asset_id_test.dart

copy to sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_test.dart

index 9bc2392350b9148a511e02885e62d62c239a865d..a5727725f0363d1b0b234bc306800da35b3ffee1 100644

--- a/sdk/lib/_internal/pub/test/serve/web_socket/url_to_asset_id_test.dart

+++ b/sdk/lib/_internal/pub_generated/test/serve/web_socket/url_to_asset_id_test.dart

@@ -13,49 +13,49 @@ main() {

// TODO(rnystrom): Split into independent tests.

initConfig();

setUp(() {

- d.dir("foo", [

- d.libPubspec("foo", "0.0.1"),

- d.dir("lib", [

- d.file("foo.dart", "foo")

- ])

- ]).create();

+ d.dir(

+ "foo",

+ [

+ d.libPubspec("foo", "0.0.1"),

+ d.dir("lib", [d.file("foo.dart", "foo")])]).create();

- d.dir(appPath, [

- d.appPubspec({

- "foo": {"path": "../foo"}

+ d.dir(appPath, [d.appPubspec({

+ "foo": {

+ "path": "../foo"

+ }

}),

- d.dir("lib", [

- d.file("myapp.dart", "myapp"),

- ]),

- d.dir("test", [

- d.file("index.html", "<body>"),

- d.dir("sub", [

- d.file("bar.html", "bar"),

- ])

- ]),

- d.dir("web", [

- d.file("index.html", "<body>"),

- d.dir("sub", [

- d.file("bar.html", "bar"),

- ])

- ]).create();

+ d.dir("lib", [d.file("myapp.dart", "myapp"),]),

+ d.dir(

+ "test",

+ [d.file("index.html", "<body>"), d.dir("sub", [d.file("bar.html", "bar"),])]),

+ d.dir(

+ "web",

+ [

+ d.file("index.html", "<body>"),

+ d.dir("sub", [d.file("bar.html", "bar"),])])]).create();

});

integration("converts URLs to matching asset ids in web/", () {

pubServe(shouldGetFirst: true);

expectWebSocketResult("urlToAssetId", {

"url": getServerUrl("web", "index.html")

- }, {"package": "myapp", "path": "web/index.html"});

+ }, {

+ "package": "myapp",

+ "path": "web/index.html"

+ });

endPubServe();

});

- integration("converts URLs to matching asset ids in subdirectories of web/",

+ integration(

+ "converts URLs to matching asset ids in subdirectories of web/",

() {

pubServe(shouldGetFirst: true);

expectWebSocketResult("urlToAssetId", {

"url": getServerUrl("web", "sub/bar.html")

- }, {"package": "myapp", "path": "web/sub/bar.html"});

+ }, {

+ "package": "myapp",

+ "path": "web/sub/bar.html"

+ });

endPubServe();

});

@@ -63,26 +63,37 @@ main() {

pubServe(shouldGetFirst: true);

expectWebSocketResult("urlToAssetId", {

"url": getServerUrl("test", "index.html")

- }, {"package": "myapp", "path": "test/index.html"});

+ }, {

+ "package": "myapp",

+ "path": "test/index.html"

+ });

endPubServe();

});

- integration("converts URLs to matching asset ids in subdirectories of test/",

+ integration(

+ "converts URLs to matching asset ids in subdirectories of test/",

() {

pubServe(shouldGetFirst: true);

expectWebSocketResult("urlToAssetId", {

"url": getServerUrl("test", "sub/bar.html")

- }, {"package": "myapp", "path": "test/sub/bar.html"});

+ }, {

+ "package": "myapp",

+ "path": "test/sub/bar.html"

+ });

endPubServe();

});

- integration("converts URLs to matching asset ids in the entrypoint's lib/",

+ integration(

+ "converts URLs to matching asset ids in the entrypoint's lib/",

() {

// Path in root package's lib/.

pubServe(shouldGetFirst: true);

expectWebSocketResult("urlToAssetId", {

"url": getServerUrl("web", "packages/myapp/myapp.dart")

- }, {"package": "myapp", "path": "lib/myapp.dart"});

+ }, {

+ "package": "myapp",

+ "path": "lib/myapp.dart"

+ });

endPubServe();

});

@@ -91,7 +102,10 @@ main() {

pubServe(shouldGetFirst: true);

expectWebSocketResult("urlToAssetId", {

"url": getServerUrl("web", "packages/foo/foo.dart")

- }, {"package": "foo", "path": "lib/foo.dart"});

+ }, {

+ "package": "foo",

+ "path": "lib/foo.dart"

+ });

endPubServe();

});

}