| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS d.file | |
| 2 // for details. All rights reserved. Use of this source code is governed by a | |
| 3 // BSD-style license that can be found in the LICENSE file. | |
| 4 | |
| 5 library pub_tests; | 1 library pub_tests; |
| 6 | |
| 7 import 'dart:convert'; | 2 import 'dart:convert'; |
| 8 | |
| 9 import 'package:scheduled_test/scheduled_stream.dart'; | 3 import 'package:scheduled_test/scheduled_stream.dart'; |
| 10 | |
| 11 import '../descriptor.dart' as d; | 4 import '../descriptor.dart' as d; |
| 12 import '../test_pub.dart'; | 5 import '../test_pub.dart'; |
| 13 import '../serve/utils.dart'; | 6 import '../serve/utils.dart'; |
| 14 | |
| 15 final transformer = """ | 7 final transformer = """ |
| 16 import 'dart:async'; | 8 import 'dart:async'; |
| 17 import 'dart:convert'; | 9 import 'dart:convert'; |
| 18 | 10 |
| 19 import 'package:barback/barback.dart'; | 11 import 'package:barback/barback.dart'; |
| 20 | 12 |
| 21 class GetInputTransformer extends Transformer { | 13 class GetInputTransformer extends Transformer { |
| 22 GetInputTransformer.asPlugin(); | 14 GetInputTransformer.asPlugin(); |
| 23 | 15 |
| 24 String get allowedExtensions => '.txt'; | 16 String get allowedExtensions => '.txt'; |
| 25 | 17 |
| 26 Future apply(Transform transform) { | 18 Future apply(Transform transform) { |
| 27 return transform.readInputAsString(new AssetId('myapp', 'nonexistent')) | 19 return transform.readInputAsString(new AssetId('myapp', 'nonexistent')) |
| 28 .catchError((error) { | 20 .catchError((error) { |
| 29 if (error is! AssetNotFoundException) throw error; | 21 if (error is! AssetNotFoundException) throw error; |
| 30 transform.addOutput(new Asset.fromString(transform.primaryInput.id, | 22 transform.addOutput(new Asset.fromString(transform.primaryInput.id, |
| 31 JSON.encode({ | 23 JSON.encode({ |
| 32 'package': error.id.package, | 24 'package': error.id.package, |
| 33 'path': error.id.path | 25 'path': error.id.path |
| 34 }))); | 26 }))); |
| 35 }); | 27 }); |
| 36 } | 28 } |
| 37 } | 29 } |
| 38 """; | 30 """; |
| 39 | |
| 40 main() { | 31 main() { |
| 41 initConfig(); | 32 initConfig(); |
| 42 withBarbackVersions("any", () { | 33 withBarbackVersions("any", () { |
| 43 integration("AssetNotFoundExceptions are detectable", () { | 34 integration("AssetNotFoundExceptions are detectable", () { |
| 44 d.dir(appPath, [ | 35 d.dir(appPath, [d.pubspec({ |
| 45 d.pubspec({ | |
| 46 "name": "myapp", | 36 "name": "myapp", |
| 47 "transformers": ["myapp/src/transformer"] | 37 "transformers": ["myapp/src/transformer"] |
| 48 }), | 38 }), |
| 49 d.dir("lib", [d.dir("src", [ | 39 d.dir("lib", [d.dir("src", [d.file("transformer.dart", transformer)]
)]), |
| 50 d.file("transformer.dart", transformer) | 40 d.dir("web", [d.file("foo.txt", "foo")])]).create(); |
| 51 ])]), | |
| 52 d.dir("web", [ | |
| 53 d.file("foo.txt", "foo") | |
| 54 ]) | |
| 55 ]).create(); | |
| 56 | |
| 57 createLockFile('myapp', pkg: ['barback']); | 41 createLockFile('myapp', pkg: ['barback']); |
| 58 | |
| 59 var server = pubServe(); | 42 var server = pubServe(); |
| 60 requestShouldSucceed("foo.txt", JSON.encode({ | 43 requestShouldSucceed("foo.txt", JSON.encode({ |
| 61 "package": "myapp", | 44 "package": "myapp", |
| 62 "path": "nonexistent" | 45 "path": "nonexistent" |
| 63 })); | 46 })); |
| 64 endPubServe(); | 47 endPubServe(); |
| 65 | |
| 66 // Since the AssetNotFoundException was caught and handled, the server | |
| 67 // shouldn't print any error information for it. | |
| 68 server.stderr.expect(isDone); | 48 server.stderr.expect(isDone); |
| 69 }); | 49 }); |
| 70 }); | 50 }); |
| 71 } | 51 } |
| OLD | NEW |