Index: utils/tests/pub/install/path/shared_dependency_test.dart |
diff --git a/utils/tests/pub/install/path/shared_dependency_test.dart b/utils/tests/pub/install/path/shared_dependency_test.dart |
index d42511273560c1a3d92581055730e2447f5c91e9..b7e159642ebd8546a7820ac46aef7cd756d852b7 100644 |
--- a/utils/tests/pub/install/path/shared_dependency_test.dart |
+++ b/utils/tests/pub/install/path/shared_dependency_test.dart |
@@ -1,131 +1,130 @@ |
-// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS d.file |
+// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
// for details. All rights reserved. Use of this source code is governed by a |
-// BSD-style license that can be found in the LICENSE d.file. |
+// BSD-style license that can be found in the LICENSE file. |
import '../../../../../pkg/pathos/lib/path.dart' as path; |
-import '../../descriptor.dart' as d; |
import '../../test_pub.dart'; |
main() { |
initConfig(); |
integration("shared dependency with same path", () { |
- d.dir("shared", [ |
- d.libDir("shared"), |
- d.libPubspec("shared", "0.0.1") |
- ]).create(); |
- |
- d.dir("foo", [ |
- d.libDir("foo"), |
- d.libPubspec("foo", "0.0.1", deps: [ |
+ dir("shared", [ |
+ libDir("shared"), |
+ libPubspec("shared", "0.0.1") |
+ ]).scheduleCreate(); |
+ |
+ dir("foo", [ |
+ libDir("foo"), |
+ libPubspec("foo", "0.0.1", deps: [ |
{"path": "../shared"} |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir("bar", [ |
- d.libDir("bar"), |
- d.libPubspec("bar", "0.0.1", deps: [ |
+ dir("bar", [ |
+ libDir("bar"), |
+ libPubspec("bar", "0.0.1", deps: [ |
{"path": "../shared"} |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir(appPath, [ |
- d.pubspec({ |
+ dir(appPath, [ |
+ pubspec({ |
"name": "myapp", |
"dependencies": { |
"foo": {"path": "../foo"}, |
"bar": {"path": "../bar"} |
} |
}) |
- ]).create(); |
+ ]).scheduleCreate(); |
schedulePub(args: ["install"], |
output: new RegExp(r"Dependencies installed!$")); |
- d.dir(packagesPath, [ |
- d.dir("foo", [d.file("foo.dart", 'main() => "foo";')]), |
- d.dir("bar", [d.file("bar.dart", 'main() => "bar";')]), |
- d.dir("shared", [d.file("shared.dart", 'main() => "shared";')]) |
- ]).validate(); |
+ dir(packagesPath, [ |
+ dir("foo", [file("foo.dart", 'main() => "foo";')]), |
+ dir("bar", [file("bar.dart", 'main() => "bar";')]), |
+ dir("shared", [file("shared.dart", 'main() => "shared";')]) |
+ ]).scheduleValidate(); |
}); |
integration("shared dependency with paths that normalize the same", () { |
- d.dir("shared", [ |
- d.libDir("shared"), |
- d.libPubspec("shared", "0.0.1") |
- ]).create(); |
- |
- d.dir("foo", [ |
- d.libDir("foo"), |
- d.libPubspec("foo", "0.0.1", deps: [ |
+ dir("shared", [ |
+ libDir("shared"), |
+ libPubspec("shared", "0.0.1") |
+ ]).scheduleCreate(); |
+ |
+ dir("foo", [ |
+ libDir("foo"), |
+ libPubspec("foo", "0.0.1", deps: [ |
{"path": "../shared"} |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir("bar", [ |
- d.libDir("bar"), |
- d.libPubspec("bar", "0.0.1", deps: [ |
+ dir("bar", [ |
+ libDir("bar"), |
+ libPubspec("bar", "0.0.1", deps: [ |
{"path": "../././shared"} |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir(appPath, [ |
- d.pubspec({ |
+ dir(appPath, [ |
+ pubspec({ |
"name": "myapp", |
"dependencies": { |
"foo": {"path": "../foo"}, |
"bar": {"path": "../bar"} |
} |
}) |
- ]).create(); |
+ ]).scheduleCreate(); |
schedulePub(args: ["install"], |
output: new RegExp(r"Dependencies installed!$")); |
- d.dir(packagesPath, [ |
- d.dir("foo", [d.file("foo.dart", 'main() => "foo";')]), |
- d.dir("bar", [d.file("bar.dart", 'main() => "bar";')]), |
- d.dir("shared", [d.file("shared.dart", 'main() => "shared";')]) |
- ]).validate(); |
+ dir(packagesPath, [ |
+ dir("foo", [file("foo.dart", 'main() => "foo";')]), |
+ dir("bar", [file("bar.dart", 'main() => "bar";')]), |
+ dir("shared", [file("shared.dart", 'main() => "shared";')]) |
+ ]).scheduleValidate(); |
}); |
integration("shared dependency with absolute and relative path", () { |
- d.dir("shared", [ |
- d.libDir("shared"), |
- d.libPubspec("shared", "0.0.1") |
- ]).create(); |
- |
- d.dir("foo", [ |
- d.libDir("foo"), |
- d.libPubspec("foo", "0.0.1", deps: [ |
+ dir("shared", [ |
+ libDir("shared"), |
+ libPubspec("shared", "0.0.1") |
+ ]).scheduleCreate(); |
+ |
+ dir("foo", [ |
+ libDir("foo"), |
+ libPubspec("foo", "0.0.1", deps: [ |
{"path": "../shared"} |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir("bar", [ |
- d.libDir("bar"), |
- d.libPubspec("bar", "0.0.1", deps: [ |
+ dir("bar", [ |
+ libDir("bar"), |
+ libPubspec("bar", "0.0.1", deps: [ |
{"path": path.join(sandboxDir, "shared")} |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir(appPath, [ |
- d.pubspec({ |
+ dir(appPath, [ |
+ pubspec({ |
"name": "myapp", |
"dependencies": { |
"foo": {"path": "../foo"}, |
"bar": {"path": "../bar"} |
} |
}) |
- ]).create(); |
+ ]).scheduleCreate(); |
schedulePub(args: ["install"], |
output: new RegExp(r"Dependencies installed!$")); |
- d.dir(packagesPath, [ |
- d.dir("foo", [d.file("foo.dart", 'main() => "foo";')]), |
- d.dir("bar", [d.file("bar.dart", 'main() => "bar";')]), |
- d.dir("shared", [d.file("shared.dart", 'main() => "shared";')]) |
- ]).validate(); |
+ dir(packagesPath, [ |
+ dir("foo", [file("foo.dart", 'main() => "foo";')]), |
+ dir("bar", [file("bar.dart", 'main() => "bar";')]), |
+ dir("shared", [file("shared.dart", 'main() => "shared";')]) |
+ ]).scheduleValidate(); |
}); |
} |