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

Unified Diff: pkg/dev_compiler/test/worker/worker_test.dart

Issue 2833633002: Various DDC fixes for windows (Closed)
Patch Set: Fix formatting Created 3 years, 8 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 | « pkg/dev_compiler/test/testing.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/dev_compiler/test/worker/worker_test.dart
diff --git a/pkg/dev_compiler/test/worker/worker_test.dart b/pkg/dev_compiler/test/worker/worker_test.dart
index 91688d3227b8abb5cff82f77b7775f82fb71608f..3e017fc753fffb6b4a3ba65109224b186ff164bc 100644
--- a/pkg/dev_compiler/test/worker/worker_test.dart
+++ b/pkg/dev_compiler/test/worker/worker_test.dart
@@ -10,15 +10,19 @@ import 'package:bazel_worker/bazel_worker.dart';
// TODO(jakemac): Remove once this is a part of the testing library.
import 'package:bazel_worker/src/async_message_grouper.dart';
import 'package:bazel_worker/testing.dart';
+import 'package:path/path.dart' show join, joinAll, toUri;
import 'package:test/test.dart';
+File file(String path) => new File(joinAll(path.split('/'))).absolute;
+
main() {
+ var dartdevc = join('bin', 'dartdevc.dart');
group('Hello World', () {
- final argsFile = new File('test/worker/hello_world.args').absolute;
- final inputDartFile = new File('test/worker/hello_world.dart').absolute;
- final outputJsFile = new File('test/worker/out/hello_world.js').absolute;
- final dartSdkSummary = new File('lib/sdk/ddc_sdk.sum').absolute;
- final executableArgs = ['bin/dartdevc.dart'];
+ final argsFile = file('test/worker/hello_world.args');
+ final inputDartFile = file('test/worker/hello_world.dart');
+ final outputJsFile = file('test/worker/out/hello_world.js');
+ final dartSdkSummary = file('lib/sdk/ddc_sdk.sum');
+ final executableArgs = [dartdevc];
final compilerArgs = [
'--no-source-map',
'--no-summarize',
@@ -125,15 +129,15 @@ main() {
});
group('Hello World with Summaries', () {
- final greetingDart = new File('test/worker/greeting.dart').absolute;
- final helloDart = new File('test/worker/hello.dart').absolute;
+ final greetingDart = file('test/worker/greeting.dart');
+ final helloDart = file('test/worker/hello.dart');
- final greetingJS = new File('test/worker/greeting.js').absolute;
- final greetingSummary = new File('test/worker/greeting.api.ds').absolute;
- final helloJS = new File('test/worker/hello_world.js').absolute;
+ final greetingJS = file('test/worker/greeting.js');
+ final greetingSummary = file('test/worker/greeting.api.ds');
+ final helloJS = file('test/worker/hello_world.js');
- final greeting2JS = new File('test/worker/greeting2.js').absolute;
- final greeting2Summary = new File('test/worker/greeting2.api.ds').absolute;
+ final greeting2JS = file('test/worker/greeting2.js');
+ final greeting2Summary = file('test/worker/greeting2.api.ds');
setUp(() {
greetingDart.writeAsStringSync('String greeting = "hello";');
@@ -152,9 +156,9 @@ main() {
});
test('can compile in basic mode', () {
- final dartSdkSummary = new File('lib/sdk/ddc_sdk.sum').absolute;
+ final dartSdkSummary = file('lib/sdk/ddc_sdk.sum');
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--summary-extension=api.ds',
'--no-source-map',
'--dart-sdk-summary',
@@ -170,7 +174,7 @@ main() {
expect(greetingSummary.existsSync(), isTrue);
result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--no-source-map',
'--no-summarize',
'--dart-sdk-summary',
@@ -189,9 +193,9 @@ main() {
});
test('reports error on overlapping summaries', () {
- final dartSdkSummary = new File('lib/sdk/ddc_sdk.sum').absolute;
+ final dartSdkSummary = file('lib/sdk/ddc_sdk.sum');
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--summary-extension=api.ds',
'--no-source-map',
'--dart-sdk-summary',
@@ -207,7 +211,7 @@ main() {
expect(greetingSummary.existsSync(), isTrue);
result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--summary-extension=api.ds',
'--no-source-map',
'--dart-sdk-summary',
@@ -223,7 +227,7 @@ main() {
expect(greeting2Summary.existsSync(), isTrue);
result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--no-source-map',
'--no-summarize',
'--dart-sdk-summary',
@@ -239,15 +243,15 @@ main() {
]);
expect(result.exitCode, 65);
expect(result.stdout, contains("conflict"));
- expect(result.stdout, contains(greetingDart.path));
+ expect(result.stdout, contains('${toUri(greetingDart.path)}'));
expect(helloJS.existsSync(), isFalse);
});
});
group('Error handling', () {
- final dartSdkSummary = new File('lib/sdk/ddc_sdk.sum').absolute;
- final badFileDart = new File('test/worker/bad.dart').absolute;
- final badFileJs = new File('test/worker/bad.js').absolute;
+ final dartSdkSummary = file('lib/sdk/ddc_sdk.sum');
+ final badFileDart = file('test/worker/bad.dart');
+ final badFileJs = file('test/worker/bad.js');
tearDown(() {
if (badFileDart.existsSync()) badFileDart.deleteSync();
@@ -256,7 +260,7 @@ main() {
test('incorrect usage', () {
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--dart-sdk-summary',
dartSdkSummary.path,
'oops',
@@ -270,7 +274,7 @@ main() {
test('compile errors', () {
badFileDart.writeAsStringSync('main() => "hello world"');
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--no-source-map',
'--dart-sdk-summary',
dartSdkSummary.path,
@@ -284,11 +288,11 @@ main() {
});
group('Parts', () {
- final dartSdkSummary = new File('lib/sdk/ddc_sdk.sum').absolute;
- final partFile = new File('test/worker/greeting.dart').absolute;
- final libraryFile = new File('test/worker/hello.dart').absolute;
+ final dartSdkSummary = file('lib/sdk/ddc_sdk.sum');
+ final partFile = file('test/worker/greeting.dart');
+ final libraryFile = file('test/worker/hello.dart');
- final outJS = new File('test/worker/output.js').absolute;
+ final outJS = file('test/worker/output.js');
setUp(() {
partFile.writeAsStringSync('part of hello;\n'
@@ -306,7 +310,7 @@ main() {
test('works if part and library supplied', () {
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--no-summarize',
'--no-source-map',
'--dart-sdk-summary',
@@ -324,7 +328,7 @@ main() {
test('works if part is not supplied', () {
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--no-summarize',
'--no-source-map',
'--dart-sdk-summary',
@@ -341,7 +345,7 @@ main() {
test('part without library is silently ignored', () {
var result = Process.runSync(Platform.executable, [
- 'bin/dartdevc.dart',
+ dartdevc,
'--no-summarize',
'--no-source-map',
'--dart-sdk-summary',
« no previous file with comments | « pkg/dev_compiler/test/testing.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698