Use the new test runner on the bots.
R=kevmoo@google.com
Review URL: https://codereview.chromium.org//1241953007 .
diff --git a/.gitignore b/.gitignore
index 89f7747..25a1df3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
.settings/
build/
packages
+.packages
pubspec.lock
diff --git a/.status b/.status
deleted file mode 100644
index 0788ce1..0000000
--- a/.status
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
-# 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.
-
-# Skip non-test files ending with "_test".
-packages/*: SkipByDesign
-*/packages/*: SkipByDesign
-*/*/packages/*: SkipByDesign
-*/*/*/packages/*: SkipByDesign
-*/*/*/*packages/*: SkipByDesign
-*/*/*/*/*packages/*: SkipByDesign
-
-# Only run tests from the test directory, since we don't care about the
-# difference between transformed an untransformed code.
-build/test/*: SkipByDesign
-build/test/*/*: SkipByDesign
-build/test/*/*/*: SkipByDesign
-build/test/*/*/*/*: SkipByDesign
-
-# Don't run library files as tests
-lib/*: SkipByDesign
-lib/*/*: SkipByDesign
-lib/*/*/*: SkipByDesign
-lib/*/*/*/*: SkipByDesign
diff --git a/.test_config b/.test_config
new file mode 100644
index 0000000..412fc5c
--- /dev/null
+++ b/.test_config
@@ -0,0 +1,3 @@
+{
+ "test_package": true
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 0933aa2..90c5937 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@
source_maps: "^0.10.0"
dev_dependencies:
- test: "^0.12.0-dev.1"
+ test: "^0.12.0"
environment:
sdk: '>=1.8.0 <2.0.0'
diff --git a/test/source_map_stack_trace_test.dart b/test/source_map_stack_trace_test.dart
index ffaaaee..411bf29 100644
--- a/test/source_map_stack_trace_test.dart
+++ b/test/source_map_stack_trace_test.dart
@@ -25,7 +25,7 @@
void main() {
test("maps a JS line and column to a Dart line and span", () {
var trace = new Trace.parse("foo.dart.js 10:11 foo");
- var frame = mapStackTrace(_simpleMapping, trace).frames.first;
+ var frame = _mapTrace(_simpleMapping, trace).frames.first;
expect(frame.uri, equals(Uri.parse("foo.dart")));
// These are +1 because stack_trace is 1-based whereas source_span is
@@ -40,7 +40,7 @@
foo.dart.js bar
foo.dart.js 10:11 baz
""");
- var frames = mapStackTrace(_simpleMapping, trace).frames;
+ var frames = _mapTrace(_simpleMapping, trace).frames;
expect(frames.length, equals(2));
expect(frames.first.member, equals("foo"));
@@ -54,7 +54,7 @@
foo.dart.js 10:11 baz
""");
- var frames = mapStackTrace(_simpleMapping, trace).frames;
+ var frames = _mapTrace(_simpleMapping, trace).frames;
expect(frames.length, equals(2));
expect(frames.first.member, equals("foo"));
@@ -75,7 +75,7 @@
"\n" * 4));
var mapping = parseJson(builder.build("foo.dart.js.map"));
- var frame = mapStackTrace(mapping, trace).frames.first;
+ var frame = _mapTrace(mapping, trace).frames.first;
expect(frame.uri, equals(Uri.parse("foo.dart")));
expect(frame.line, equals(2));
expect(frame.column, equals(4));
@@ -95,7 +95,7 @@
"\n" * 4));
var mapping = parseJson(builder.build("foo.dart.js.map"));
- var frame = mapStackTrace(mapping, trace, packageRoot: "packages/")
+ var frame = _mapTrace(mapping, trace, packageRoot: "packages/")
.frames.first;
expect(frame.uri, equals(Uri.parse("package:foo/foo.dart")));
expect(frame.line, equals(2));
@@ -116,7 +116,7 @@
"\n" * 4));
var mapping = parseJson(builder.build("foo.dart.js.map"));
- var frame = mapStackTrace(mapping, trace, sdkRoot: "sdk/").frames.first;
+ var frame = _mapTrace(mapping, trace, sdkRoot: "sdk/").frames.first;
expect(frame.uri, equals(Uri.parse("dart:async/foo.dart")));
expect(frame.line, equals(2));
expect(frame.column, equals(4));
@@ -127,7 +127,7 @@
new Trace.parse("foo.dart.js 10:11 foo"),
new Trace.parse("foo.dart.js 10:11 bar")
]);
- var traces = mapStackTrace(_simpleMapping, trace).traces;
+ var traces = _mapChain(_simpleMapping, trace).traces;
var frame = traces.first.frames.single;
expect(frame.uri, equals(Uri.parse("foo.dart")));
@@ -190,8 +190,24 @@
});
}
+/// Like [mapStackTrace], but is guaranteed to return a [Trace] so it can be
+/// inspected.
+Trace _mapTrace(Mapping sourceMap, StackTrace stackTrace,
+ {bool minified: false, packageRoot, sdkRoot}) {
+ return new Trace.from(mapStackTrace(sourceMap, stackTrace,
+ minified: minified, packageRoot: packageRoot, sdkRoot: sdkRoot));
+}
+
+/// Like [mapStackTrace], but is guaranteed to return a [Chain] so it can be
+/// inspected.
+Chain _mapChain(Mapping sourceMap, StackTrace stackTrace,
+ {bool minified: false, packageRoot, sdkRoot}) {
+ return new Chain.forTrace(mapStackTrace(sourceMap, stackTrace,
+ minified: minified, packageRoot: packageRoot, sdkRoot: sdkRoot));
+}
+
/// Runs the mapper's prettification logic on [member] and returns the result.
String _prettify(String member) {
var trace = new Trace([new Frame(Uri.parse("foo.dart.js"), 10, 11, member)]);
- return mapStackTrace(_simpleMapping, trace).frames.first.member;
+ return _mapTrace(_simpleMapping, trace).frames.first.member;
}
