Next test.

Author: davidmorgan

pkgs/watcher/test/directory_watcher/file_tests.dart

@@ -8,6 +8,7 @@ import 'dart:isolate';
 import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
 import 'package:watcher/src/utils.dart';
+import 'package:watcher/watcher.dart';
 
 import '../utils.dart';
 
@@ -370,4 +371,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');
-  });
 }

pkgs/watcher/test/utils.dart

@@ -229,6 +229,7 @@ Future<List<WatchEvent>> takeEvents({required Duration duration}) async {
     }
   }
   return result;
+  return result;
 }
 
 /// Expects that the next event emitted will be for an add event for [path].