Next test.

Author: davidmorgan

pkgs/watcher/test/directory_watcher/file_tests.dart

@@ -13,11 +13,11 @@ import '../utils.dart';
 
 void fileTests({required bool isNative}) {
   for (var i = 0; i != runsPerTest; ++i) {
-    _fileTests();
+    _fileTests(isNative: isNative);
   }
 }
 
-void _fileTests() {
+void _fileTests({required bool isNative}) {
   test('does not notify for files that already exist when started', () async {
     // Make some pre-existing files.
     writeFile('a.txt');
@@ -370,4 +370,19 @@ void _fileTests() {
     writeFile('dir/newer.txt');
     await expectAddEvent('dir/newer.txt');
   });
+
+  test('does not suppress files with the same prefix as a directory', () async {
+    // Regression test for https://github.com/dart-lang/watcher/issues/83
+    writeFile('some_name.txt');
+
+    await startWatcher();
+
+    writeFile('some_name/some_name.txt');
+    deleteFile('some_name.txt');
+
+    await inAnyOrder([
+      isAddEvent('some_name/some_name.txt'),
+      isRemoveEvent('some_name.txt')
+    ]);
+  });
 }

pkgs/watcher/test/directory_watcher/mac_os_test.dart

@@ -22,16 +22,4 @@ void main() {
   test('DirectoryWatcher creates a MacOSDirectoryWatcher on Mac OS', () {
     expect(DirectoryWatcher('.'), const TypeMatcher<MacOSDirectoryWatcher>());
   });
-
-  test('does not suppress files with the same prefix as a directory', () async {
-    // Regression test for https://github.com/dart-lang/watcher/issues/83
-    writeFile('some_name.txt');
-
-    await startWatcher();
-
-    writeFile('some_name/some_name.txt');
-    deleteFile('some_name.txt');
-
-    await expectRemoveEvent('some_name.txt');
-  });
 }