Remove test_api copies of scaffolding functions

pkgs/test/pubspec.yaml

@@ -34,7 +34,7 @@ dependencies:
   stream_channel: ^2.1.0
 
   # Use an exact version until the test_api and test_core package are stable.
-  test_api: 0.6.1
+  test_api: 0.7.0
   test_core: 0.5.5
 
   typed_data: ^1.3.0

pkgs/test_api/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.0-wip
+
+* Remove the definitions of `group`, `test`, `setUp`, `tearDown`, `setUpAll`,
+  and `tearDownAll`. These methods are available in `package:test_core` and
+  re-exported in `package:test`.
+
 ## 0.6.1
 
 * Drop support for null unsafe Dart, bump SDK constraint to `3.0.0`.

pkgs/test_api/lib/scaffolding.dart

@@ -17,7 +17,10 @@ export 'src/backend/configuration/tags.dart' show Tags;
 export 'src/backend/configuration/test_on.dart' show TestOn;
 export 'src/backend/configuration/timeout.dart' show Timeout;
 export 'src/scaffolding/spawn_hybrid.dart' show spawnHybridCode, spawnHybridUri;
-export 'src/scaffolding/test_structure.dart'
-    show addTearDown, group, setUp, setUpAll, tearDown, tearDownAll, test;
 export 'src/scaffolding/utils.dart'
-    show markTestSkipped, printOnFailure, pumpEventQueue, registerException;
+    show
+        addTearDown,
+        markTestSkipped,
+        printOnFailure,
+        pumpEventQueue,
+        registerException;

pkgs/test_api/lib/src/scaffolding/spawn_hybrid.dart

@@ -10,7 +10,7 @@ import 'package:stream_channel/stream_channel.dart';
 
 import '../backend/remote_exception.dart';
 import '../utils.dart';
-import 'test_structure.dart' show addTearDown;
+import 'utils.dart' show addTearDown;
 
 /// A transformer that handles messages from the spawned isolate and ensures
 /// that messages sent to it are JSON-encodable.

pkgs/test_api/lib/src/scaffolding/utils.dart

@@ -37,6 +37,21 @@ void printOnFailure(String message) {
   _currentInvoker.printOnFailure(message);
 }
 
+/// Registers a function to be run after the current test.
+///
+/// This is called within a running test, and adds a tear-down only for the
+/// current test. It allows testing libraries to add cleanup logic as soon as
+/// there's something to clean up.
+///
+/// The [callback] is run before any callbacks registered with [tearDown]. Like
+/// [tearDown], the most recently registered callback is run first.
+///
+/// If this is called from within a [setUpAll] or [tearDownAll] callback, it
+/// instead runs the function after *all* tests in the current test suite.
+void addTearDown(dynamic Function() callback) {
+  _currentInvoker.addTearDown(callback);
+}
+
 /// Marks the current test as skipped.
 ///
 /// A skipped test may still fail if any exception is thrown, including uncaught

pkgs/test_api/pubspec.yaml

@@ -1,5 +1,5 @@
 name: test_api
-version: 0.6.1
+version: 0.7.0-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

pkgs/test_api/pubspec_overrides.yaml

@@ -3,3 +3,4 @@ dependency_overrides:
     path: ../test
   test_core:
     path: ../test_core
+  matcher: any

pkgs/test_core/lib/scaffolding.dart

@@ -28,7 +28,20 @@ import 'src/util/print_sink.dart';
 // This file is an almost direct copy of import below, but with the global
 // declarer added.
 export 'package:test_api/scaffolding.dart'
-    hide group, setUp, setUpAll, tearDown, tearDownAll, test;
+    show
+        OnPlatform,
+        Retry,
+        Skip,
+        Tags,
+        TestOn,
+        Timeout,
+        addTearDown,
+        markTestSkipped,
+        printOnFailure,
+        pumpEventQueue,
+        registerException,
+        spawnHybridCode,
+        spawnHybridUri;
 
 /// The global declarer.
 ///

pkgs/test_core/pubspec.yaml

@@ -26,7 +26,7 @@ dependencies:
   stack_trace: ^1.10.0
   stream_channel: ^2.1.0
   # Use an exact version until the test_api package is stable.
-  test_api: 0.6.1
+  test_api: 0.7.0
   vm_service: ">=6.0.0 <12.0.0"
   yaml: ^3.0.0