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

Unified Diff: tests/standalone/io/test_extension_test.dart

Issue 19967002: Remove uses of Path class from tests/standalone. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix windows error Created 7 years, 5 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 | « tests/standalone/io/test_extension_fail_test.dart ('k') | tests/standalone/io/web_socket_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/standalone/io/test_extension_test.dart
diff --git a/tests/standalone/io/test_extension_test.dart b/tests/standalone/io/test_extension_test.dart
index f4b73c8f6bc28099b831ffd01e3f42e1248b698a..c807e82bb85d4057fa3cc25ab025b690b8bed6c4 100644
--- a/tests/standalone/io/test_extension_test.dart
+++ b/tests/standalone/io/test_extension_test.dart
@@ -5,56 +5,55 @@
// Dart test program for testing native extensions.
import "package:expect/expect.dart";
+import "package:path/path.dart";
import 'dart:async';
import 'dart:io';
import 'dart:isolate';
-Future copyFileToDirectory(Path file, Path directory) {
- String src = file.toNativePath();
- String dst = directory.toNativePath();
+Future copyFileToDirectory(String file, String directory) {
switch (Platform.operatingSystem) {
case 'linux':
case 'macos':
- return Process.run('cp', [src, dst]);
+ return Process.run('cp', [file, directory]);
case 'windows':
- return Process.run('cmd.exe', ['/C', 'copy $src $dst']);
+ return Process.run('cmd.exe', ['/C', 'copy $file $directory']);
default:
Expect.fail('Unknown operating system ${Platform.operatingSystem}');
}
}
-Path getExtensionPath(Path buildDirectory) {
+String getExtensionPath(String buildDirectory) {
switch (Platform.operatingSystem) {
case 'linux':
- return buildDirectory.append('lib.target/libtest_extension.so');
+ return join(buildDirectory, 'lib.target', 'libtest_extension.so');
case 'macos':
- return buildDirectory.append('libtest_extension.dylib');
+ return join(buildDirectory, 'libtest_extension.dylib');
case 'windows':
- return buildDirectory.append('test_extension.dll');
+ return join(buildDirectory, 'test_extension.dll');
default:
Expect.fail('Unknown operating system ${Platform.operatingSystem}');
}
}
void main() {
- Path scriptDirectory = new Path(Platform.script).directoryPath;
- Path buildDirectory = new Path(Platform.executable).directoryPath;
+ String scriptDirectory = dirname(Platform.script);
+ String buildDirectory = dirname(Platform.executable);
Directory tempDirectory = new Directory('').createTempSync();
- Path testDirectory = new Path(tempDirectory.path);
+ String testDirectory = tempDirectory.path;
// Copy test_extension shared library, test_extension.dart and
// test_extension_tester.dart to the temporary test directory.
copyFileToDirectory(getExtensionPath(buildDirectory),
testDirectory).then((_) {
- Path extensionDartFile = scriptDirectory.append('test_extension.dart');
+ var extensionDartFile = join(scriptDirectory, 'test_extension.dart');
return copyFileToDirectory(extensionDartFile, testDirectory);
}).then((_) {
- Path testExtensionTesterFile =
- scriptDirectory.append('test_extension_tester.dart');
+ var testExtensionTesterFile =
+ join(scriptDirectory, 'test_extension_tester.dart');
return copyFileToDirectory(testExtensionTesterFile, testDirectory);
}).then((_) {
- Path script = testDirectory.append('test_extension_tester.dart');
- return Process.run(Platform.executable, [script.toNativePath()]);
+ var script = join(testDirectory, 'test_extension_tester.dart');
+ return Process.run(Platform.executable, [script]);
})..then((ProcessResult result) {
Expect.equals(0, result.exitCode);
tempDirectory.deleteSync(recursive: true);
« no previous file with comments | « tests/standalone/io/test_extension_fail_test.dart ('k') | tests/standalone/io/web_socket_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698