Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/executable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// 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.

import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
// ignore: implementation_imports
import 'package:test_core/src/executable.dart' as executable;
import 'package:test_core/src/runner/hack_register_platform.dart'; // ignore: implementation_imports
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/runner/browser/chrome.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'dart:io';
import 'package:collection/collection.dart';
import 'package:coverage/coverage.dart';
import 'package:path/path.dart' as p;
import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:test_core/src/runner/configuration.dart'; // ignore: implementation_imports
import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/runner/browser/chromium.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'dart:convert';
import 'dart:io';

import 'package:path/path.dart' as p;
import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:test_core/src/runner/configuration.dart'; // ignore: implementation_imports
import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports

Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/runner/browser/default_settings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'dart:collection';

import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import '../executable_settings.dart';

/// Default settings for starting browser executables.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/runner/browser/firefox.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'dart:convert';
import 'dart:io';

import 'package:path/path.dart' as p;
import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports

import '../executable_settings.dart';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/lib/src/runner/browser/safari.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';

import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:test_core/src/runner/application_exception.dart'; // ignore: implementation_imports
import 'package:test_core/src/util/errors.dart'; // ignore: implementation_imports
import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies:
stream_channel: ^2.1.0

# Use an exact version until the test_api and test_core package are stable.
test_api: 0.7.14
test_api: 0.7.15-wip
test_core: 0.6.21-wip

typed_data: ^1.3.0
Expand Down
3 changes: 1 addition & 2 deletions pkgs/test/test/runner/browser/loader_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ import 'dart:io';
import 'package:path/path.dart' as p;
import 'package:test/src/runner/browser/platform.dart';
import 'package:test/test.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_api/src/backend/test.dart';
import 'package:test_core/src/runner/hack_register_platform.dart';
import 'package:test_core/src/runner/loader.dart';
import 'package:test_core/src/runner/runner_suite.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'dart:io';

import 'package:test/src/runner/browser/default_settings.dart';
import 'package:test/test.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_core/src/util/exit_codes.dart' as exit_codes;
import 'package:test_descriptor/test_descriptor.dart' as d;
import 'package:test_process/test_process.dart';
Expand Down
3 changes: 1 addition & 2 deletions pkgs/test/test/runner/configuration/suite_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ library;

import 'package:boolean_selector/boolean_selector.dart';
import 'package:test/test.dart';
import 'package:test_api/src/backend/platform_selector.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_core/src/runner/compiler_selection.dart';
import 'package:test_core/src/runner/runtime_selection.dart';

Expand Down
3 changes: 1 addition & 2 deletions pkgs/test/test/runner/engine_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import 'dart:async';
import 'dart:math';

import 'package:test/test.dart';
import 'package:test_api/src/backend/group.dart';
import 'package:test_api/src/backend/group_entry.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_core/src/runner/engine.dart';
import 'package:test_core/src/runner/runner_suite.dart';
Expand Down
4 changes: 1 addition & 3 deletions pkgs/test/test/runner/load_suite_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ library;
import 'dart:async';

import 'package:test/test.dart';
import 'package:test_api/src/backend/group.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_api/src/backend/test.dart';
import 'package:test_core/src/runner/load_exception.dart';
import 'package:test_core/src/runner/load_suite.dart';
import 'package:test_core/src/runner/runner_suite.dart';
Expand Down
4 changes: 1 addition & 3 deletions pkgs/test/test/runner/loader_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ import 'dart:async';

import 'package:path/path.dart' as p;
import 'package:test/test.dart';
import 'package:test_api/src/backend/compiler.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_api/src/backend/test.dart';
import 'package:test_core/src/runner/compiler_selection.dart';
import 'package:test_core/src/runner/load_suite.dart';
import 'package:test_core/src/runner/loader.dart';
Expand Down
4 changes: 1 addition & 3 deletions pkgs/test/test/runner/parse_metadata_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
library;

import 'package:test/test.dart';
import 'package:test_api/src/backend/platform_selector.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/src/backend/suite_platform.dart';
import 'package:test_api/backend.dart';
import 'package:test_core/src/runner/parse_metadata.dart';

final _path = 'test.dart';
Expand Down
8 changes: 1 addition & 7 deletions pkgs/test/test/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@ import 'dart:collection';
import 'package:boolean_selector/boolean_selector.dart';
import 'package:glob/glob.dart';
import 'package:test/test.dart';
import 'package:test_api/src/backend/declarer.dart';
import 'package:test_api/src/backend/group.dart';
import 'package:test_api/src/backend/group_entry.dart';
import 'package:test_api/src/backend/live_test.dart';
import 'package:test_api/src/backend/platform_selector.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_api/src/backend/suite_platform.dart';
import 'package:test_core/src/runner/application_exception.dart';
import 'package:test_core/src/runner/compiler_selection.dart';
import 'package:test_core/src/runner/configuration.dart';
Expand Down
4 changes: 4 additions & 0 deletions pkgs/test_api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.7.15-wip

* export `LocalTest`, `MessageType`, `Status`, `Suite` from `backend.dart`.

## 0.7.14

* Allow the `vmAsan`, `vmMsan`, and `vmTsan` runtimes to use the native CLI
Expand Down
7 changes: 4 additions & 3 deletions pkgs/test_api/lib/backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ export 'src/backend/compiler.dart' show Compiler;
export 'src/backend/declarer.dart' show Declarer;
export 'src/backend/group.dart' show Group;
export 'src/backend/group_entry.dart' show GroupEntry;
export 'src/backend/invoker.dart' show Invoker;
export 'src/backend/invoker.dart' show Invoker, LocalTest;
export 'src/backend/live_test.dart' show LiveTest;
export 'src/backend/message.dart' show Message;
export 'src/backend/message.dart' show Message, MessageType;
export 'src/backend/metadata.dart' show Metadata;
export 'src/backend/platform_selector.dart' show PlatformSelector;
export 'src/backend/remote_exception.dart' show RemoteException;
export 'src/backend/remote_listener.dart' show RemoteListener;
export 'src/backend/runtime.dart' show Runtime;
export 'src/backend/stack_trace_formatter.dart' show StackTraceFormatter;
export 'src/backend/stack_trace_mapper.dart' show StackTraceMapper;
export 'src/backend/state.dart' show State;
export 'src/backend/state.dart' show State, Status;
export 'src/backend/suite.dart' show Suite;
export 'src/backend/suite_platform.dart' show SuitePlatform;
export 'src/backend/test.dart' show Test;
export 'src/backend/test_location.dart' show TestLocation;
2 changes: 1 addition & 1 deletion pkgs/test_api/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: test_api
version: 0.7.14
version: 0.7.15-wip
description: >-
The user facing API for structuring Dart tests and checking expectations.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test_api
Expand Down
5 changes: 1 addition & 4 deletions pkgs/test_api/test/backend/declarer_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
import 'dart:async';

import 'package:test/test.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/declarer.dart';
import 'package:test_api/src/backend/group.dart';
import 'package:test_api/src/backend/invoker.dart';
import 'package:test_api/src/backend/suite.dart';
import 'package:test_api/src/backend/test.dart';

import '../utils.dart';

Expand Down
7 changes: 1 addition & 6 deletions pkgs/test_api/test/backend/invoker_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@
import 'dart:async';

import 'package:test/test.dart';
import 'package:test_api/src/backend/group.dart';
import 'package:test_api/src/backend/invoker.dart';
import 'package:test_api/src/backend/live_test.dart';
import 'package:test_api/src/backend/message.dart';
import 'package:test_api/src/backend/metadata.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_api/src/backend/suite.dart';

import '../utils.dart';

Expand Down
5 changes: 1 addition & 4 deletions pkgs/test_api/test/backend/metadata_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@

import 'package:boolean_selector/boolean_selector.dart';
import 'package:test/test.dart';
import 'package:test_api/src/backend/metadata.dart';
import 'package:test_api/src/backend/platform_selector.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/src/backend/suite_platform.dart';
import 'package:test_api/backend.dart';

void main() {
group('tags', () {
Expand Down
6 changes: 1 addition & 5 deletions pkgs/test_api/test/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
import 'dart:collection';

import 'package:test/test.dart';
import 'package:test_api/src/backend/declarer.dart';
import 'package:test_api/src/backend/group_entry.dart';
import 'package:test_api/src/backend/live_test.dart';
import 'package:test_api/src/backend/runtime.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart';
import 'package:test_api/src/backend/suite_platform.dart';
import 'package:test_core/src/runner/engine.dart';
import 'package:test_core/src/runner/plugin/environment.dart';
import 'package:test_core/src/runner/runner_suite.dart';
Expand Down
13 changes: 8 additions & 5 deletions pkgs/test_core/lib/src/runner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ import 'package:boolean_selector/boolean_selector.dart';
import 'package:path/path.dart' as p;
import 'package:stack_trace/stack_trace.dart';
import 'package:test_api/backend.dart'
show PlatformSelector, Runtime, SuitePlatform;
import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/group_entry.dart'; // ignore: implementation_imports
show
Group,
GroupEntry,
PlatformSelector,
Runtime,
Suite,
SuitePlatform,
Test;
import 'package:test_api/src/backend/operating_system.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/suite.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/test.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/util/pretty_print.dart'; // ignore: implementation_imports

import 'runner/configuration.dart';
Expand Down
3 changes: 1 addition & 2 deletions pkgs/test_core/lib/src/runner/configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import 'package:collection/collection.dart';
import 'package:glob/glob.dart';
import 'package:path/path.dart' as p;
import 'package:source_span/source_span.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/scaffolding.dart' show Timeout;
import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports

import '../util/io.dart';
import 'compiler_selection.dart';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/src/runner/configuration/load.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import 'package:boolean_selector/boolean_selector.dart';
import 'package:glob/glob.dart';
import 'package:path/path.dart' as p;
import 'package:source_span/source_span.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/scaffolding.dart' show Timeout;
import 'package:test_api/src/backend/operating_system.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/util/identifier_regex.dart'; // ignore: implementation_imports
import 'package:yaml/yaml.dart';

Expand Down
6 changes: 1 addition & 5 deletions pkgs/test_core/lib/src/runner/engine.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ import 'dart:math';
import 'package:async/async.dart' hide Result;
import 'package:collection/collection.dart';
import 'package:pool/pool.dart';
import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/invoker.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/live_test.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/live_test_controller.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/message.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/state.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/test.dart'; // ignore: implementation_imports

import 'coverage_stub.dart' if (dart.library.io) 'coverage.dart';
import 'live_suite.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import 'dart:async';
import 'dart:collection';

import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'platform.dart';

/// The functions to use to load [_platformPlugins] in all loaders.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/src/runner/live_suite.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'package:collection/collection.dart';

import 'package:test_api/src/backend/live_test.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';

import 'runner_suite.dart';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/src/runner/live_suite_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:async';

import 'package:async/async.dart' hide Result;
import 'package:collection/collection.dart';
import 'package:test_api/src/backend/live_test.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:test_api/src/backend/state.dart'; // ignore: implementation_imports

import 'live_suite.dart';
Expand Down
8 changes: 1 addition & 7 deletions pkgs/test_core/lib/src/runner/load_suite.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
import 'dart:async';

import 'package:stack_trace/stack_trace.dart';
import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/invoker.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/metadata.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/suite.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/suite_platform.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/test.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';

import '../util/io_stub.dart' if (dart.library.io) '../util/io.dart';
import 'load_exception.dart';
Expand Down
6 changes: 1 addition & 5 deletions pkgs/test_core/lib/src/runner/loader.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ import 'package:async/async.dart';
import 'package:boolean_selector/boolean_selector.dart';
import 'package:path/path.dart' as p;
import 'package:source_span/source_span.dart';
import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/invoker.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/metadata.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/suite_platform.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:yaml/yaml.dart';

import '../util/io.dart';
Expand Down
3 changes: 1 addition & 2 deletions pkgs/test_core/lib/src/runner/parse_metadata.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import 'package:analyzer/dart/analysis/utilities.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:path/path.dart' as p;
import 'package:source_span/source_span.dart';
import 'package:test_api/backend.dart';
import 'package:test_api/scaffolding.dart' show Timeout;
import 'package:test_api/src/backend/metadata.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/util/identifier_regex.dart'; // ignore: implementation_imports

import '../util/dart.dart';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/src/runner/platform.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// 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.

import 'package:test_api/src/backend/suite_platform.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';

import 'environment.dart';
import 'runner_suite.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// 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.

import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports
import 'package:test_api/backend.dart';
import 'package:yaml/yaml.dart';

import './../platform.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import 'dart:io';
import 'package:stack_trace/stack_trace.dart';
import 'package:stream_channel/stream_channel.dart';
import 'package:test_api/backend.dart'
show Metadata, RemoteException, SuitePlatform, TestLocation;
import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/test.dart'; // ignore: implementation_imports
show Group, Metadata, RemoteException, SuitePlatform, Test, TestLocation;

import '../configuration.dart';
import '../environment.dart';
Expand Down
Loading
Loading