diff --git a/test/io.dart b/test/io.dart
index a783634ca4d9f15782304ca317b710ded04c804c..d9e419d3e11d975cf4c3b87389b721555bb04c36 100644
--- a/test/io.dart
+++ b/test/io.dart
@@ -19,7 +19,7 @@ final _pubPath = p.absolute(p.join(
Platform.isWindows ? 'pub.bat' : 'pub'));
/// Runs the test executable with the package root set properly.
-ProcessResult runUnittest(List<String> args, {String workingDirectory,
+ProcessResult runTest(List<String> args, {String workingDirectory,
Map<String, String> environment}) {
var allArgs = [
p.absolute(p.join(packageDir, 'bin/test.dart')),
@@ -59,7 +59,7 @@ ProcessResult runPub(List<String> args, {String workingDirectory,
}
/// Starts the test executable with the package root set properly.
-Future<Process> startUnittest(List<String> args, {String workingDirectory,
+Future<Process> startTest(List<String> args, {String workingDirectory,
Map<String, String> environment}) {
var allArgs = [
p.absolute(p.join(packageDir, 'bin/test.dart')),
diff --git a/test/runner/browser/compact_reporter_test.dart b/test/runner/browser/compact_reporter_test.dart
index 2784fc8cb1c905937acfd5a0628f6d8878b59766..70877d8f35f76c984f12244aff391f9e350ca49c 100644
--- a/test/runner/browser/compact_reporter_test.dart
+++ b/test/runner/browser/compact_reporter_test.dart
@@ -35,7 +35,7 @@ void main() {
}
""");
- var result = _runUnittest(
+ var result = _runTest(
["-p", "chrome", "-p", "vm", "-j", "1", "test.dart"]);
expect(result.stdout, contains("[VM]"));
expect(result.stdout, contains("[Chrome]"));
@@ -43,5 +43,5 @@ void main() {
});
}
-ProcessResult _runUnittest(List<String> args) =>
- runUnittest(args, workingDirectory: _sandbox);
+ProcessResult _runTest(List<String> args) =>
+ runTest(args, workingDirectory: _sandbox);
diff --git a/test/runner/browser/compiler_pool_test.dart b/test/runner/browser/compiler_pool_test.dart
index 744b1329b851e27054162b01a69ebfec14d1edf1..1ba74d2bbb18dd95cb191e1953ef85f359be7970 100644
--- a/test/runner/browser/compiler_pool_test.dart
+++ b/test/runner/browser/compiler_pool_test.dart
@@ -31,7 +31,7 @@ void main() {
var testPath2 = p.join(_sandbox, "test2.dart");
new File(testPath2).writeAsStringSync("int main() => 'foo';\n");
- var result = _runUnittest(["-p", "chrome", "test1.dart", "test2.dart"]);
+ var result = _runTest(["-p", "chrome", "test1.dart", "test2.dart"]);
expect(result.stdout, startsWith("""
Compiling test1.dart...
test1.dart:1:18:
@@ -51,11 +51,11 @@ int main() => 'foo';
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("String main() => 12;\n");
- var result = _runUnittest(["--color", "-p", "chrome", "test.dart"]);
+ var result = _runTest(["--color", "-p", "chrome", "test.dart"]);
expect(result.stdout, contains('\u001b[35m'));
expect(result.exitCode, equals(1));
});
}
-ProcessResult _runUnittest(List<String> args) =>
- runUnittest(args, workingDirectory: _sandbox);
+ProcessResult _runTest(List<String> args) =>
+ runTest(args, workingDirectory: _sandbox);
diff --git a/test/runner/browser/runner_test.dart b/test/runner/browser/runner_test.dart
index d4173215416cc380d6ba44c02390d330933190f3..f8691ca11d30ee7ab3cf7fbdddffeaf132c0d03d 100644
--- a/test/runner/browser/runner_test.dart
+++ b/test/runner/browser/runner_test.dart
@@ -47,7 +47,7 @@ void main() {
test("a test file fails to compile", () {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("invalid Dart file");
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout,
contains("Expected a declaration, but got 'invalid'"));
@@ -64,7 +64,7 @@ void main() {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("void main() => throw 'oh no';");
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -77,7 +77,7 @@ void main() {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("void foo() {}");
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -91,7 +91,7 @@ void main() {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("int main;");
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -105,7 +105,7 @@ void main() {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("void main(arg) {}");
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -128,7 +128,7 @@ void main() {
""");
var relativePath = p.relative(testPath, from: _sandbox);
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -151,7 +151,7 @@ void main() {
</html>
""");
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -176,7 +176,7 @@ void main() {
</html>
""");
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -200,7 +200,7 @@ void main() {
</html>
""");
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -224,7 +224,7 @@ void main() {
</html>
""");
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -241,52 +241,52 @@ void main() {
group("runs successful tests", () {
test("on Chrome", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.exitCode, equals(0));
});
test("on PhantomJS", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "phantomjs", "test.dart"]);
+ var result = _runTest(["-p", "phantomjs", "test.dart"]);
expect(result.exitCode, equals(0));
});
test("on Firefox", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "firefox", "test.dart"]);
+ var result = _runTest(["-p", "firefox", "test.dart"]);
expect(result.exitCode, equals(0));
});
test("on Safari", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "safari", "test.dart"]);
+ var result = _runTest(["-p", "safari", "test.dart"]);
expect(result.exitCode, equals(0));
}, testOn: "mac-os");
test("on Dartium", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.stdout, isNot(contains("Compiling")));
expect(result.exitCode, equals(0));
});
test("on content shell", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "content-shell", "test.dart"]);
+ var result = _runTest(["-p", "content-shell", "test.dart"]);
expect(result.stdout, isNot(contains("Compiling")));
expect(result.exitCode, equals(0));
});
test("on multiple browsers", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "firefox", "-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "firefox", "-p", "chrome", "test.dart"]);
expect("Compiling".allMatches(result.stdout), hasLength(1));
expect(result.exitCode, equals(0));
});
test("on a JS and non-JS browser", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(
+ var result = _runTest(
["-p", "content-shell", "-p", "chrome", "test.dart"]);
expect("Compiling".allMatches(result.stdout), hasLength(1));
expect(result.exitCode, equals(0));
@@ -294,7 +294,7 @@ void main() {
test("on the browser and the VM", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["-p", "chrome", "-p", "vm", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "-p", "vm", "test.dart"]);
expect(result.exitCode, equals(0));
});
@@ -303,7 +303,7 @@ void main() {
new Directory(p.join(_sandbox, "dir")).createSync();
new File(p.join(_sandbox, "dir", "test.dart"))
.writeAsStringSync(_success);
- var result = _runUnittest(["-p", "chrome", "dir/test.dart"]);
+ var result = _runTest(["-p", "chrome", "dir/test.dart"]);
expect(result.exitCode, equals(0));
});
@@ -335,12 +335,12 @@ void main() {
});
test("on content shell", () {
- var result = _runUnittest(["-p", "content-shell", "test.dart"]);
+ var result = _runTest(["-p", "content-shell", "test.dart"]);
expect(result.exitCode, equals(0));
});
test("on Chrome", () {
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.exitCode, equals(0));
});
@@ -360,7 +360,7 @@ void main() {
</html>
""");
- var result = _runUnittest(["-p", "content-shell", "test.dart"]);
+ var result = _runTest(["-p", "content-shell", "test.dart"]);
expect(result.exitCode, equals(0));
});
});
@@ -369,37 +369,37 @@ void main() {
group("runs failing tests", () {
test("on Chrome", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.exitCode, equals(1));
});
test("on PhantomJS", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["-p", "phantomjs", "test.dart"]);
+ var result = _runTest(["-p", "phantomjs", "test.dart"]);
expect(result.exitCode, equals(1));
});
test("on Firefox", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["-p", "firefox", "test.dart"]);
+ var result = _runTest(["-p", "firefox", "test.dart"]);
expect(result.exitCode, equals(1));
});
test("on Safari", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["-p", "safari", "test.dart"]);
+ var result = _runTest(["-p", "safari", "test.dart"]);
expect(result.exitCode, equals(1));
}, testOn: "mac-os");
test("on Dartium", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["-p", "dartium", "test.dart"]);
+ var result = _runTest(["-p", "dartium", "test.dart"]);
expect(result.exitCode, equals(1));
});
test("on content-shell", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["-p", "content-shell", "test.dart"]);
+ var result = _runTest(["-p", "content-shell", "test.dart"]);
expect(result.exitCode, equals(1));
});
@@ -416,7 +416,7 @@ void main() {
});
}
""");
- var result = _runUnittest(["-p", "chrome", "-p", "vm", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "-p", "vm", "test.dart"]);
expect(result.exitCode, equals(1));
});
@@ -433,7 +433,7 @@ void main() {
});
}
""");
- var result = _runUnittest(["-p", "chrome", "-p", "vm", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "-p", "vm", "test.dart"]);
expect(result.exitCode, equals(1));
});
@@ -466,12 +466,12 @@ void main() {
});
test("on content shell", () {
- var result = _runUnittest(["-p", "content-shell", "test.dart"]);
+ var result = _runTest(["-p", "content-shell", "test.dart"]);
expect(result.exitCode, equals(1));
});
test("on Chrome", () {
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.exitCode, equals(1));
});
});
@@ -491,7 +491,7 @@ void main() {
}
""");
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("Hello,\nworld!\n"));
expect(result.exitCode, equals(0));
});
@@ -509,7 +509,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("Test timed out after 0 seconds."));
expect(result.stdout, contains("-1: Some tests failed."));
});
@@ -526,7 +526,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("+0 ~1: All tests skipped."));
});
@@ -541,7 +541,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
@@ -558,7 +558,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("Test timed out after 0 seconds."));
expect(result.stdout, contains("-1: Some tests failed."));
});
@@ -576,7 +576,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
@@ -597,7 +597,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("Skip: fifth"));
expect(result.stdout, isNot(anyOf([
contains("Skip: first"),
@@ -622,7 +622,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("+0 ~1: All tests skipped."));
});
@@ -639,7 +639,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
@@ -658,7 +658,7 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("Test timed out after 0 seconds."));
expect(result.stdout, contains("-1: Some tests failed."));
});
@@ -678,11 +678,11 @@ void main() {
}
''');
- var result = _runUnittest(["-p", "chrome", "test.dart"]);
+ var result = _runTest(["-p", "chrome", "test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
});
}
-ProcessResult _runUnittest(List<String> args) =>
- runUnittest(args, workingDirectory: _sandbox);
+ProcessResult _runTest(List<String> args) =>
+ runTest(args, workingDirectory: _sandbox);
diff --git a/test/runner/compact_reporter_test.dart b/test/runner/compact_reporter_test.dart
index 88e74f550519e5773adef263203953e703cf05f5..4650b9fcc35e49382e7c40339ed2c42852a127d8 100644
--- a/test/runner/compact_reporter_test.dart
+++ b/test/runner/compact_reporter_test.dart
@@ -16,7 +16,7 @@ void main() {
test("reports when no tests are run", () {
return withTempDir((path) {
new File(p.join(path, "test.dart")).writeAsStringSync("void main() {}");
- var result = runUnittest(["test.dart"], workingDirectory: path);
+ var result = runTest(["test.dart"], workingDirectory: path);
expect(result.stdout, equals("No tests ran.\n"));
});
});
@@ -334,7 +334,7 @@ $tests
if (args == null) args = [];
args = args.toList()..add("test.dart");
args.add("--concurrency=$concurrency");
- var result = runUnittest(args, workingDirectory: path);
+ var result = runTest(args, workingDirectory: path);
// Convert CRs into newlines, remove excess trailing whitespace, and trim
// off timestamps.
diff --git a/test/runner/pub_serve_test.dart b/test/runner/pub_serve_test.dart
index e002244d440af473592c4395841e76680a8cca4e..cd0c7931b29e2ed44365cbd0eb9f05f7e65919be 100644
--- a/test/runner/pub_serve_test.dart
+++ b/test/runner/pub_serve_test.dart
@@ -86,7 +86,7 @@ class MyTransformer extends Transformer {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(['--pub-serve=${match[1]}'],
+ var result = runTest(['--pub-serve=${match[1]}'],
workingDirectory: _sandbox);
expect(result.exitCode, equals(0));
expect(result.stdout, contains('+1: All tests passed!'));
@@ -107,7 +107,7 @@ class MyTransformer extends Transformer {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(
+ var result = runTest(
['--pub-serve=${match[1]}', '-p', 'chrome'],
workingDirectory: _sandbox);
expect(result.exitCode, equals(0));
@@ -129,7 +129,7 @@ class MyTransformer extends Transformer {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(
+ var result = runTest(
['--pub-serve=${match[1]}', '-p', 'content-shell'],
workingDirectory: _sandbox);
expect(result.exitCode, equals(0));
@@ -154,7 +154,7 @@ class MyTransformer extends Transformer {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(['--pub-serve=${match[1]}'],
+ var result = runTest(['--pub-serve=${match[1]}'],
workingDirectory: _sandbox);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -183,7 +183,7 @@ class MyTransformer extends Transformer {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(
+ var result = runTest(
['--pub-serve=${match[1]}', '-p', 'chrome'],
workingDirectory: _sandbox);
expect(result.stdout, allOf([
@@ -217,7 +217,7 @@ dependencies:
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(['--pub-serve=${match[1]}'],
+ var result = runTest(['--pub-serve=${match[1]}'],
workingDirectory: _sandbox);
expect(result.exitCode, equals(exit_codes.data));
expect(result.stderr, equals('''
@@ -272,7 +272,7 @@ void main() {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(
+ var result = runTest(
['--pub-serve=${match[1]}', '-p', 'chrome'],
workingDirectory: _sandbox);
expect(result.exitCode, equals(0));
@@ -294,7 +294,7 @@ void main() {
var match = _servingRegExp.firstMatch(line);
try {
- var result = runUnittest(
+ var result = runTest(
['--pub-serve=${match[1]}', '-p', 'content-shell'],
workingDirectory: _sandbox);
expect(result.exitCode, equals(0));
@@ -308,7 +308,7 @@ void main() {
});
test("gracefully handles pub serve not running for VM tests", () {
- var result = runUnittest(['--pub-serve=54321'],
+ var result = runTest(['--pub-serve=54321'],
workingDirectory: _sandbox);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -321,7 +321,7 @@ void main() {
});
test("gracefully handles pub serve not running for browser tests", () {
- var result = runUnittest(['--pub-serve=54321', '-p', 'chrome'],
+ var result = runTest(['--pub-serve=54321', '-p', 'chrome'],
workingDirectory: _sandbox);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -337,7 +337,7 @@ void main() {
new File(p.join(_sandbox, 'test/my_test.dart'))
.copySync(p.join(_sandbox, 'my_test.dart'));
- var result = runUnittest(['--pub-serve=54321', 'my_test.dart'],
+ var result = runTest(['--pub-serve=54321', 'my_test.dart'],
workingDirectory: _sandbox);
expect(result.stdout, allOf([
contains('-1: load error'),
diff --git a/test/runner/runner_test.dart b/test/runner/runner_test.dart
index 963feaf3fa223b1bbf3c21c14e6358baf7cb32d6..aaec96670d9734a1a88db67c46792d2b9a12fd03 100644
--- a/test/runner/runner_test.dart
+++ b/test/runner/runner_test.dart
@@ -72,7 +72,7 @@ void main() {
});
test("prints help information", () {
- var result = _runUnittest(["--help"]);
+ var result = _runTest(["--help"]);
expect(result.stdout, equals("""
Runs tests in this package.
@@ -82,7 +82,7 @@ $_usage"""));
group("fails gracefully if", () {
test("an invalid option is passed", () {
- var result = _runUnittest(["--asdf"]);
+ var result = _runTest(["--asdf"]);
expect(result.stderr, equals("""
Could not find an option named "asdf".
@@ -91,7 +91,7 @@ $_usage"""));
});
test("a non-existent file is passed", () {
- var result = _runUnittest(["file"]);
+ var result = _runTest(["file"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains('Failed to load "file": Does not exist.')
@@ -100,7 +100,7 @@ $_usage"""));
});
test("the default directory doesn't exist", () {
- var result = _runUnittest([]);
+ var result = _runTest([]);
expect(result.stderr, equals("""
No test files were passed and the default "test/" directory doesn't exist.
@@ -111,7 +111,7 @@ $_usage"""));
test("a test file fails to load", () {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("invalid Dart file");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -129,7 +129,7 @@ $_usage"""));
test("a test file fails to parse", () {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("@TestOn)");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -145,7 +145,7 @@ $_usage"""));
test("an annotation's structure is invalid", () {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("@TestOn()\nlibrary foo;");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -161,7 +161,7 @@ $_usage"""));
test("an annotation's contents are invalid", () {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("@TestOn('zim')\nlibrary foo;");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
@@ -178,7 +178,7 @@ $_usage"""));
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("void main() => throw 'oh no';");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -191,7 +191,7 @@ $_usage"""));
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("void foo() {}");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -205,7 +205,7 @@ $_usage"""));
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("int main;");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -219,7 +219,7 @@ $_usage"""));
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("void main(arg) {}");
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains(
@@ -232,7 +232,7 @@ $_usage"""));
test("multiple load errors occur", () {
var testPath = p.join(_sandbox, "test.dart");
new File(testPath).writeAsStringSync("invalid Dart file");
- var result = _runUnittest(["test.dart", "nonexistent.dart"]);
+ var result = _runTest(["test.dart", "nonexistent.dart"]);
expect(result.stdout, allOf([
contains('test.dart: load error'),
@@ -253,7 +253,7 @@ $_usage"""));
group("runs successful tests", () {
test("defined in a single file", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.exitCode, equals(0));
});
@@ -263,7 +263,7 @@ $_usage"""));
.writeAsStringSync(_success);
}
- var result = _runUnittest(["."]);
+ var result = _runTest(["."]);
expect(result.exitCode, equals(0));
});
@@ -274,7 +274,7 @@ $_usage"""));
.writeAsStringSync(_success);
}
- var result = _runUnittest([]);
+ var result = _runTest([]);
expect(result.exitCode, equals(0));
});
@@ -293,7 +293,7 @@ $_usage"""));
new Directory(p.join(_sandbox, "dir")).createSync();
new File(p.join(_sandbox, "dir", "test.dart"))
.writeAsStringSync(_success);
- var result = _runUnittest(["dir/test.dart"]);
+ var result = _runTest(["dir/test.dart"]);
expect(result.exitCode, equals(0));
});
});
@@ -301,7 +301,7 @@ $_usage"""));
group("runs failing tests", () {
test("defined in a single file", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.exitCode, equals(1));
});
@@ -311,7 +311,7 @@ $_usage"""));
.writeAsStringSync(_failure);
}
- var result = _runUnittest(["."]);
+ var result = _runTest(["."]);
expect(result.exitCode, equals(1));
});
@@ -322,7 +322,7 @@ $_usage"""));
.writeAsStringSync(_failure);
}
- var result = _runUnittest([]);
+ var result = _runTest([]);
expect(result.exitCode, equals(1));
});
@@ -339,7 +339,7 @@ $_usage"""));
test("runs tests even when a file fails to load", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["test.dart", "nonexistent.dart"]);
+ var result = _runTest(["test.dart", "nonexistent.dart"]);
expect(result.stdout, contains("+1 -1: Some tests failed."));
expect(result.exitCode, equals(1));
});
@@ -357,7 +357,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("Test timed out after 0 seconds."));
expect(result.stdout, contains("-1: Some tests failed."));
});
@@ -375,7 +375,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+0 ~1: All tests skipped."));
});
@@ -391,7 +391,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+0 ~1: All tests skipped."));
});
@@ -406,7 +406,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
@@ -423,7 +423,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("Test timed out after 0 seconds."));
expect(result.stdout, contains("-1: Some tests failed."));
});
@@ -441,7 +441,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
@@ -462,7 +462,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("Skip: fifth"));
expect(result.stdout, isNot(anyOf([
contains("Skip: first"),
@@ -487,7 +487,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+0 ~1: All tests skipped."));
});
@@ -504,7 +504,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
@@ -523,7 +523,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("Test timed out after 0 seconds."));
expect(result.stdout, contains("-1: Some tests failed."));
});
@@ -543,7 +543,7 @@ void main() {
}
''');
- var result = _runUnittest(["test.dart"]);
+ var result = _runTest(["test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
});
});
@@ -551,7 +551,7 @@ void main() {
group("flags:", () {
test("with the --color flag, uses colors", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_failure);
- var result = _runUnittest(["--color", "test.dart"]);
+ var result = _runTest(["--color", "test.dart"]);
// This is the color code for red.
expect(result.stdout, contains("\u001b[31m"));
});
@@ -570,7 +570,7 @@ void main() {
}
""");
- var result = _runUnittest(["--name", "selected", "test.dart"]);
+ var result = _runTest(["--name", "selected", "test.dart"]);
expect(result.stdout, contains("+2: All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -588,7 +588,7 @@ void main() {
}
""");
- var result = _runUnittest(["--name", "test [13]", "test.dart"]);
+ var result = _runTest(["--name", "test [13]", "test.dart"]);
expect(result.stdout, contains("+2: All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -596,14 +596,14 @@ void main() {
test("produces an error when no tests match", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["--name", "no match", "test.dart"]);
+ var result = _runTest(["--name", "no match", "test.dart"]);
expect(result.stderr,
contains('No tests match regular expression "no match".'));
expect(result.exitCode, equals(exit_codes.data));
});
test("doesn't filter out load exceptions", () {
- var result = _runUnittest(["--name", "name", "file"]);
+ var result = _runTest(["--name", "name", "file"]);
expect(result.stdout, allOf([
contains('-1: load error'),
contains('Failed to load "file": Does not exist.')
@@ -626,7 +626,7 @@ void main() {
}
""");
- var result = _runUnittest(["--plain-name", "selected", "test.dart"]);
+ var result = _runTest(["--plain-name", "selected", "test.dart"]);
expect(result.stdout, contains("+2: All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -644,7 +644,7 @@ void main() {
}
""");
- var result = _runUnittest(["--plain-name", "test [12]", "test.dart"]);
+ var result = _runTest(["--plain-name", "test [12]", "test.dart"]);
expect(result.stdout, contains("+1: All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -652,7 +652,7 @@ void main() {
test("produces an error when no tests match", () {
new File(p.join(_sandbox, "test.dart")).writeAsStringSync(_success);
- var result = _runUnittest(["--plain-name", "no match", "test.dart"]);
+ var result = _runTest(["--plain-name", "no match", "test.dart"]);
expect(result.stderr,
contains('No tests match "no match".'));
expect(result.exitCode, equals(exit_codes.data));
@@ -661,8 +661,8 @@ void main() {
});
}
-ProcessResult _runUnittest(List<String> args) =>
- runUnittest(args, workingDirectory: _sandbox);
+ProcessResult _runTest(List<String> args) =>
+ runTest(args, workingDirectory: _sandbox);
ProcessResult _runDart(List<String> args) =>
runDart(args, workingDirectory: _sandbox);
diff --git a/test/runner/signal_test.dart b/test/runner/signal_test.dart
index d0e7520a49be2dc6a1aa7d373786249419360eb5..81fbbb5b4cd3dc12d4936f2aaa795d028bc7c278 100644
--- a/test/runner/signal_test.dart
+++ b/test/runner/signal_test.dart
@@ -43,7 +43,7 @@ void main() {
}
""");
- return _startUnittest(["test.dart"]).then((process) {
+ return _startTest(["test.dart"]).then((process) {
return _lines.bind(process.stdout).first.then((line) {
expect(line, equals("in test.dart"));
process.kill();
@@ -58,7 +58,7 @@ void main() {
new File(p.join(_sandbox, "test.dart"))
.writeAsStringSync("void main() {}");
- return _startUnittest(["-p", "chrome", "test.dart"]).then((process) {
+ return _startTest(["-p", "chrome", "test.dart"]).then((process) {
return _lines.bind(process.stdout).first.then((line) {
expect(line, equals("Compiling test.dart..."));
process.kill();
@@ -77,7 +77,7 @@ void main() {
}
""");
- return _startUnittest(["test.dart"]).then((process) {
+ return _startTest(["test.dart"]).then((process) {
return _lines.bind(process.stdout).first.then((line) {
expect(line, equals("in test.dart"));
process.kill();
@@ -114,7 +114,7 @@ void main() {
}
""");
- return _startUnittest(["test.dart"]).then((process) {
+ return _startTest(["test.dart"]).then((process) {
return _lines.bind(process.stdout).skip(2).first.then((line) {
expect(line, equals("running test"));
process.kill();
@@ -147,7 +147,7 @@ void main() {
}
""");
- return _startUnittest(["-p", "chrome", "test.dart"]).then((process) {
+ return _startTest(["-p", "chrome", "test.dart"]).then((process) {
return _lines.bind(process.stdout).skip(3).first.then((line) {
expect(line, equals("running test"));
process.kill();
@@ -170,7 +170,7 @@ void main() {
}
""");
- return _startUnittest(["test.dart"]).then((process) {
+ return _startTest(["test.dart"]).then((process) {
return _lines.bind(process.stdout).skip(2).first.then((line) {
expect(line, equals("running test"));
process.kill();
@@ -214,7 +214,7 @@ void main() {
}
""");
- return _startUnittest(["test.dart"]).then((process) {
+ return _startTest(["test.dart"]).then((process) {
return _lines.bind(process.stdout).skip(2).first.then((line) {
expect(line, equals("running test"));
process.kill();
@@ -255,7 +255,7 @@ void main() {
}
""");
- return _startUnittest(["test.dart"]).then((process) {
+ return _startTest(["test.dart"]).then((process) {
return _lines.bind(process.stdout).skip(2).first.then((line) {
expect(line, equals("running test"));
process.kill();
@@ -270,8 +270,8 @@ void main() {
});
}
-Future<Process> _startUnittest(List<String> args) {
+Future<Process> _startTest(List<String> args) {
new Directory(_tempDir).create();
- return startUnittest(args, workingDirectory: _sandbox,
+ return startTest(args, workingDirectory: _sandbox,
environment: {"_UNITTEST_TEMP_DIR": _tempDir});
}
diff --git a/test/runner/test_on_test.dart b/test/runner/test_on_test.dart
index 632f94c27afa6a3e276e8586ae48bb8b09005425..593e678e05e44bd48973b9091b9f0f172b44b4ad 100644
--- a/test/runner/test_on_test.dart
+++ b/test/runner/test_on_test.dart
@@ -29,7 +29,7 @@ void main() {
test("runs a test suite on a matching platform", () {
_writeTestFile("vm_test.dart", suiteTestOn: "vm");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -37,7 +37,7 @@ void main() {
test("doesn't run a test suite on a non-matching platform", () {
_writeTestFile("vm_test.dart", suiteTestOn: "vm");
- var result = _runUnittest(["--platform", "chrome", "vm_test.dart"]);
+ var result = _runTest(["--platform", "chrome", "vm_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -45,7 +45,7 @@ void main() {
test("runs a test suite on a matching operating system", () {
_writeTestFile("os_test.dart", suiteTestOn: currentOS.name);
- var result = _runUnittest(["os_test.dart"]);
+ var result = _runTest(["os_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -54,7 +54,7 @@ void main() {
_writeTestFile("os_test.dart", suiteTestOn: _otherOS,
loadable: false);
- var result = _runUnittest(["os_test.dart"]);
+ var result = _runTest(["os_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -67,7 +67,7 @@ void main() {
_writeTestFile("other_os_test.dart",
suiteTestOn: _otherOS, loadable: false);
- var result = _runUnittest(["."]);
+ var result = _runTest(["."]);
expect(result.stdout, contains("+2: All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -77,7 +77,7 @@ void main() {
test("runs a VM group on the VM", () {
_writeTestFile("vm_test.dart", groupTestOn: "vm");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -85,7 +85,7 @@ void main() {
test("doesn't run a Chrome group on the VM", () {
_writeTestFile("chrome_test.dart", groupTestOn: "chrome");
- var result = _runUnittest(["chrome_test.dart"]);
+ var result = _runTest(["chrome_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -93,7 +93,7 @@ void main() {
test("runs a Chrome group on Chrome", () {
_writeTestFile("chrome_test.dart", groupTestOn: "chrome");
- var result = _runUnittest(["--platform", "chrome", "chrome_test.dart"]);
+ var result = _runTest(["--platform", "chrome", "chrome_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -101,7 +101,7 @@ void main() {
test("doesn't run a VM group on Chrome", () {
_writeTestFile("vm_test.dart", groupTestOn: "vm");
- var result = _runUnittest(["--platform", "chrome", "vm_test.dart"]);
+ var result = _runTest(["--platform", "chrome", "vm_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -111,7 +111,7 @@ void main() {
test("runs a VM test on the VM", () {
_writeTestFile("vm_test.dart", testTestOn: "vm");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -119,7 +119,7 @@ void main() {
test("doesn't run a Chrome test on the VM", () {
_writeTestFile("chrome_test.dart", testTestOn: "chrome");
- var result = _runUnittest(["chrome_test.dart"]);
+ var result = _runTest(["chrome_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -127,7 +127,7 @@ void main() {
test("runs a Chrome test on Chrome", () {
_writeTestFile("chrome_test.dart", testTestOn: "chrome");
- var result = _runUnittest(["--platform", "chrome", "chrome_test.dart"]);
+ var result = _runTest(["--platform", "chrome", "chrome_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -135,7 +135,7 @@ void main() {
test("doesn't run a VM test on Chrome", () {
_writeTestFile("vm_test.dart", testTestOn: "vm");
- var result = _runUnittest(["--platform", "chrome", "vm_test.dart"]);
+ var result = _runTest(["--platform", "chrome", "vm_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -146,7 +146,7 @@ void main() {
_writeTestFile("vm_test.dart", suiteTestOn: "!browser",
groupTestOn: "!js", testTestOn: "vm");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("All tests passed!"));
expect(result.exitCode, equals(0));
});
@@ -155,7 +155,7 @@ void main() {
_writeTestFile("vm_test.dart", suiteTestOn: "chrome",
groupTestOn: "!js", testTestOn: "vm");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -164,7 +164,7 @@ void main() {
_writeTestFile("vm_test.dart", suiteTestOn: "!browser",
groupTestOn: "chrome", testTestOn: "vm");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -173,7 +173,7 @@ void main() {
_writeTestFile("vm_test.dart", suiteTestOn: "!browser",
groupTestOn: "!js", testTestOn: "chrome");
- var result = _runUnittest(["vm_test.dart"]);
+ var result = _runTest(["vm_test.dart"]);
expect(result.stdout, contains("No tests ran."));
expect(result.exitCode, equals(0));
});
@@ -213,5 +213,5 @@ void _writeTestFile(String filename, {String suiteTestOn, String groupTestOn,
new File(p.join(_sandbox, filename)).writeAsStringSync(buffer.toString());
}
-ProcessResult _runUnittest(List<String> args) =>
- runUnittest(args, workingDirectory: _sandbox);
+ProcessResult _runTest(List<String> args) =>
+ runTest(args, workingDirectory: _sandbox);