-

pkgs/leak_tracker/lib/leak_tracker.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 export 'src/leak_tracking/helpers.dart';
-export 'src/leak_tracking/leak_testing.dart';
 export 'src/leak_tracking/leak_tracking.dart';
 export 'src/leak_tracking/primitives/model.dart';
 export 'src/shared/shared_model.dart';

pkgs/leak_tracker/test/tests/leak_tracking/leak_testing_test.dart

@@ -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:leak_tracker/src/leak_tracking/leak_testing.dart';
+import '../../../../leak_tracker_testing/lib/src/leak_testing.dart';
 import 'package:leak_tracker/src/leak_tracking/primitives/model.dart';
 import 'package:test/test.dart';
 

pkgs/leak_tracker_flutter_testing/lib/src/testing.dart

@@ -5,7 +5,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:leak_tracker/leak_tracker.dart';
 import 'package:leak_tracker_testing/leak_tracker_testing.dart';
-import 'package:matcher/expect.dart';
 
 /// Makes sure leak tracking is set up for a test.
 ///
@@ -58,19 +57,9 @@ Future<void> maybeTearDownLeakTrackingForAll() async {
   final Leaks leaks = await LeakTracking.collectLeaks();
   LeakTracking.stop();
 
-  collectedLeaksReporter(leaks);
+  LeakTesting.collectedLeaksReporter(leaks);
 }
 
-/// Handler for memory leaks found in tests.
-///
-/// Set it to analyse the leaks programmatically.
-/// The handler is invoked on tear down of the test run.
-/// The default reporter fails in case of found leaks.
-///
-/// Used to test leak tracking functionality.
-LeaksCallback collectedLeaksReporter =
-    (Leaks leaks) => expect(leaks, isLeakFree);
-
 void _dispatchFlutterEventToLeakTracker(ObjectEvent event) {
   return LeakTracking.dispatchObjectEvent(event.toMap());
 }

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/baselining_test.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker/leak_tracker.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 void main() {
   testWidgetsWithLeakTracking(

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/failing_tests/flutter_test_config.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 import 'failure_test.dart';
 

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/no_config_test.dart

@@ -4,6 +4,7 @@
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 import '../../test_infra/flutter_classes.dart';
 

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/per_test_config_test/flutter_test_config.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 import '../../../test_infra/dart_classes.dart';
 import 'per_test_config_test.dart';

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/per_test_config_test/per_test_config_test.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 import '../../../test_infra/flutter_classes.dart';
 

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/settings_not_disposed_off_test/flutter_test_config.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 /// Test configuration for each test library in this directory.
 ///

pkgs/leak_tracker_flutter_testing/test/tests/end_to_end/settings_not_gced_off_test/flutter_test_config.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 /// Test configuration for each test library in this directory.
 ///

pkgs/leak_tracker_flutter_testing/test/tests/leak_tracking_for_tests_test.dart

@@ -4,6 +4,7 @@
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker/leak_tracker.dart';
+import 'package:leak_tracker_testing/leak_tracker_testing.dart';
 
 class _Classes {
   static const anyLeak1 = 'anyLeak1';

pkgs/leak_tracker_testing/lib/leak_tracker_testing.dart

@@ -3,3 +3,4 @@
 // BSD-style license that can be found in the LICENSE file.
 
 export 'src/matchers.dart';
+export 'src/leak_testing.dart';

pkgs/leak_tracker/lib/src/leak_tracking/leak_testing.dart → pkgs/leak_tracker_testing/lib/src/leak_testing.dart

@@ -2,10 +2,11 @@
 // 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:leak_tracker/leak_tracker.dart';
+import 'package:matcher/expect.dart';
 import 'package:meta/meta.dart';
 
-import '../shared/shared_model.dart';
-import 'primitives/model.dart';
+import 'matchers.dart';
 
 void _emptyLeakHandler(Leaks leaks) {}
 
@@ -43,6 +44,16 @@ class LeakTesting {
     this.baselining = const MemoryBaselining.none(),
   });
 
+  /// Handler for memory leaks found in tests.
+  ///
+  /// Set it to analyse the leaks programmatically.
+  /// The handler is invoked on tear down of the test run.
+  /// The default reporter fails in case of found leaks.
+  ///
+  /// Used to test leak tracking functionality.
+  static LeaksCallback collectedLeaksReporter =
+      (Leaks leaks) => expect(leaks, isLeakFree);
+
   /// Current configuration for leak tracking.
   ///
   /// Is used by `testWidgets` if configuration is not provided for a test.