Migrate off deprecated isInstanceOf (#40)
- Bump `package:test` to `1.6.0` which introduce `isA`.
- Use `2.1.0` SDK on travis since it's the minimum supported by `test`.
- Bump min SDK in the pubspec to `2.1.0` to match what is tested.
- Replace `new isInstanceOf` with `isA`.
diff --git a/.travis.yml b/.travis.yml
index 18267fc..ace10ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
dart:
- dev
- - 2.0.0
+ - 2.1.0
dart_task:
- test: --platform vm,chrome
diff --git a/pubspec.yaml b/pubspec.yaml
index 813dd3b..71e10f6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@
homepage: https://github.com/dart-lang/source_span
environment:
- sdk: '>=2.0.0 <3.0.0'
+ sdk: '>=2.1.0 <3.0.0'
dependencies:
charcode: ^1.0.0
@@ -14,4 +14,4 @@
term_glyph: ^1.0.0
dev_dependencies:
- test: ^1.0.0
+ test: ^1.6.0
diff --git a/test/file_test.dart b/test/file_test.dart
index e043ac3..9a103c4 100644
--- a/test/file_test.dart
+++ b/test/file_test.dart
@@ -241,7 +241,7 @@
test("pointSpan() returns a FileSpan", () {
var location = file.location(15);
var span = location.pointSpan();
- expect(span, new isInstanceOf<FileSpan>());
+ expect(span, isA<FileSpan>());
expect(span.start, equals(location));
expect(span.end, equals(location));
expect(span.text, isEmpty);
@@ -344,14 +344,14 @@
});
test("returns a FileSpan for a FileSpan input", () {
- expect(span.union(file.span(0, 5)), new isInstanceOf<FileSpan>());
+ expect(span.union(file.span(0, 5)), isA<FileSpan>());
});
test("returns a base SourceSpan for a SourceSpan input", () {
var other = new SourceSpan(new SourceLocation(0, sourceUrl: "foo.dart"),
new SourceLocation(5, sourceUrl: "foo.dart"), "hey, ");
var result = span.union(other);
- expect(result, isNot(new isInstanceOf<FileSpan>()));
+ expect(result, isNot(isA<FileSpan>()));
expect(result.start, equals(other.start));
expect(result.end, equals(span.end));
expect(result.text, equals("hey, ar baz\n"));
