| Index: packages/dart_style/test/formatter_test.dart
|
| diff --git a/packages/dart_style/test/formatter_test.dart b/packages/dart_style/test/formatter_test.dart
|
| index b50271f0683d70707950008a2acee6f16392aa8f..deb725cd7a8be35cb9fad8ee91c4553b9f97ee6f 100644
|
| --- a/packages/dart_style/test/formatter_test.dart
|
| +++ b/packages/dart_style/test/formatter_test.dart
|
| @@ -81,11 +81,9 @@ void main() {
|
| new DartFormatter().formatStatement("var x = 1;;");
|
|
|
| fail("Should throw.");
|
| - } catch (err) {
|
| - expect(err, new isInstanceOf<FormatterException>());
|
| - var message = err.message();
|
| - expect(message, contains("Unexpected token"));
|
| - expect(message, contains("column 11"));
|
| + } on FormatterException catch (ex) {
|
| + expect(ex.errors.length, equals(1));
|
| + expect(ex.errors.first.offset, equals(10));
|
| }
|
| });
|
|
|
| @@ -139,7 +137,7 @@ void testDirectory(String name) {
|
| var testDir = p.dirname(currentMirrorSystem()
|
| .findLibrary(#dart_style.test.formatter_test)
|
| .uri
|
| - .path);
|
| + .toFilePath());
|
|
|
| var entries = new Directory(p.join(testDir, name))
|
| .listSync(recursive: true, followLinks: false);
|
| @@ -188,6 +186,12 @@ void testDirectory(String name) {
|
| expectedOutput += lines[i] + "\n";
|
| }
|
|
|
| + // TODO(rnystrom): Stop skipping these tests when possible.
|
| + if (description.contains("(skip:")) {
|
| + print("skipping $description");
|
| + continue;
|
| + }
|
| +
|
| test(description, () {
|
| var isCompilationUnit = p.extension(entry.path) == ".unit";
|
|
|
|
|