diff --git a/pkgs/test/lib/src/executable.dart b/pkgs/test/lib/src/executable.dart
index 9132c8289dd363ffa4ebcc7dc16215720b822b76..75b2d5824cdc67c7bdac57a01863275c13b473c6 100644
--- a/pkgs/test/lib/src/executable.dart
+++ b/pkgs/test/lib/src/executable.dart
@@ -19,6 +19,5 @@ void main(List<String> args) async {
Runtime.internetExplorer
], () => BrowserPlatform.start());
- // TODO figure out if this await is necessary
- await (executable.main(args) as dynamic);
+ await executable.main(args);
}
diff --git a/pkgs/test/test/runner/json_reporter_test.dart b/pkgs/test/test/runner/json_reporter_test.dart
index 77a6fce494b8dcb779c0a52467ecce9119a39e9b..c5290733c32711d10ff013bdc6e3b33f181b6aa6 100644
--- a/pkgs/test/test/runner/json_reporter_test.dart
+++ b/pkgs/test/test/runner/json_reporter_test.dart
@@ -603,8 +603,6 @@ import 'package:test/test.dart';
expect(stdoutLines.length, equals(expected.fold(3, (a, m) => a + m.length)),
reason: 'Expected $stdoutLines to match $expected.');
- // TODO(nweiz): validate each event against the JSON schema when
- // patefacio/json_schema#4 is merged.
dynamic decodeLine(String l) =>
jsonDecode(l)..remove('time')..remove('stackTrace');
diff --git a/pkgs/test_api/CHANGELOG.md b/pkgs/test_api/CHANGELOG.md
index 070b9cdd15950d78c95b18b599c3cbe84b8c8b44..a35ae7e43f636ccb620998eeab4866985b5c55be 100644
--- a/pkgs/test_api/CHANGELOG.md
+++ b/pkgs/test_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.13-dev
+
+* Internal cleanup.
+
## 0.2.12
* Link to docs on setting timeout when a test times out with the default
diff --git a/pkgs/test_api/lib/src/frontend/spawn_hybrid.dart b/pkgs/test_api/lib/src/frontend/spawn_hybrid.dart
index 20684cb410878c86e666c558d7263b8c414ffc38..1b0cde2a15c782481672034d743e181d27fd54ce 100644
--- a/pkgs/test_api/lib/src/frontend/spawn_hybrid.dart
+++ b/pkgs/test_api/lib/src/frontend/spawn_hybrid.dart
@@ -192,8 +192,6 @@ StreamChannel spawnHybridCode(String dartCode,
StreamChannel _spawn(String uri, Object message, {bool stayAlive = false}) {
var channel = Zone.current[#test.runner.test_channel] as MultiChannel;
if (channel == null) {
- // TODO(nweiz): Link to an issue tracking support when running the test file
- // directly.
throw UnsupportedError("Can't connect to the test runner.\n"
'spawnHybridUri() is currently only supported within "pub run test".');
}
diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml
index 8027988c5a567adff9c52e01476ea51170293e07..d6627fb508f1a112e2141cdfe658b70e94817d3f 100644
--- a/pkgs/test_api/pubspec.yaml
+++ b/pkgs/test_api/pubspec.yaml
@@ -1,5 +1,5 @@
name: test_api
-version: 0.2.12
+version: 0.2.13-dev
author: Dart Team <misc@dartlang.org>
description: A library for writing Dart tests.
homepage: https://github.com/dart-lang/test/blob/master/pkgs/test_api
diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md
index fbd1e2d6ab40d01e34f3c2995176f753650d4661..656b2e8839c6346305cdc288df9b671a2452f71d 100644
--- a/pkgs/test_core/CHANGELOG.md
+++ b/pkgs/test_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.17-dev
+
+* Internal cleanup.
+
## 0.2.16
* Internal cleanup.
diff --git a/pkgs/test_core/lib/src/executable.dart b/pkgs/test_core/lib/src/executable.dart
index 5a3df21ca3dba3513fbf7b0ce7fa5d7185ecf113..f3749f0bfca6c96d94090cf451c5fd95e6086733 100644
--- a/pkgs/test_core/lib/src/executable.dart
+++ b/pkgs/test_core/lib/src/executable.dart
@@ -2,9 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// TODO(nweiz): This is under lib so that it can be used by the unittest dummy
-// package. Once that package is no longer being updated, move this back into
-// bin.
import 'dart:async';
import 'dart:io';
diff --git a/pkgs/test_core/lib/src/util/dart.dart b/pkgs/test_core/lib/src/util/dart.dart
index e142dca46c6938d0ba084886e93cc9771d9750e5..da17733065384ad7909b4096bf93173a17c514c2 100644
--- a/pkgs/test_core/lib/src/util/dart.dart
+++ b/pkgs/test_core/lib/src/util/dart.dart
@@ -34,8 +34,6 @@ Future<Isolate> runInIsolate(String code, message,
onExit: onExit);
}
-// TODO(nweiz): Move this into the analyzer once it starts using SourceSpan
-// (issue 22977).
/// Takes a span whose source is the value of a string that has been parsed from
/// a Dart file and returns the corresponding span from within that Dart file.
///
diff --git a/pkgs/test_core/lib/src/util/io.dart b/pkgs/test_core/lib/src/util/io.dart
index 98b2ad9812ce89c32dee4c58f89948a06ee2a217..c2cc3da7d88df83a6cfd1247edb01b671eb4ca96 100644
--- a/pkgs/test_core/lib/src/util/io.dart
+++ b/pkgs/test_core/lib/src/util/io.dart
@@ -48,9 +48,6 @@ final OperatingSystem currentOS = (() {
throw UnsupportedError('Unsupported operating system "$name".');
})();
-// TODO(nweiz): Make this `new SuitePlatform.current()` once we only support
-// Dart 2 and we can import `dart:io` from within cross-platform libraries. See
-// commit 4ffda6d2.
/// Returns a [SuitePlatform] with the given [runtime], and with [os] and
/// [inGoogle] determined automatically.
///
diff --git a/pkgs/test_core/lib/test_core.dart b/pkgs/test_core/lib/test_core.dart
index 7b44b0f4cd7698dae769b44dddf7af24914449c3..5209cc7d47ea560b5fdfa1aa3f9d2a1e76775e41 100644
--- a/pkgs/test_core/lib/test_core.dart
+++ b/pkgs/test_core/lib/test_core.dart
@@ -64,7 +64,6 @@ Declarer get _declarer {
var success = await runZoned(() => Invoker.guard(engine.run),
zoneValues: {#test.declarer: _globalDeclarer});
- // TODO(nweiz): Set the exit code on the VM when issue 6943 is fixed.
if (success) return null;
print('');
unawaited(Future.error('Dummy exception to set exit code.'));
diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml
index 1ca8e8711c4394e905de78e2eb20c0df2a9392ec..01234429b0845d881d92202744293d131a682f0c 100644
--- a/pkgs/test_core/pubspec.yaml
+++ b/pkgs/test_core/pubspec.yaml
@@ -1,5 +1,5 @@
name: test_core
-version: 0.2.16
+version: 0.2.17-dev
author: Dart Team <misc@dartlang.org>
description: A basic library for writing tests and running them on the VM.
homepage: https://github.com/dart-lang/test/blob/master/pkgs/test_core