Unify watcher tests.

Author: davidmorgan

pkgs/watcher/test/directory_watcher/file_tests.dart

@@ -291,6 +291,23 @@ void fileTests() {
       })));
     });
 
+    test(
+        'emits events for many nested files moved out then immediately back in',
+        () async {
+      withPermutations(
+          (i, j, k) => writeFile('dir/sub/sub-$i/sub-$j/file-$k.txt'));
+
+      await startWatcher(path: 'dir');
+
+      renameDir('dir/sub', 'sub');
+      renameDir('sub', 'dir/sub');
+
+      await inAnyOrder(withPermutations(
+          (i, j, k) => isRemoveEvent('dir/sub/sub-$i/sub-$j/file-$k.txt')));
+      await inAnyOrder(withPermutations(
+          (i, j, k) => isAddEvent('dir/sub/sub-$i/sub-$j/file-$k.txt')));
+    });
+
     test(
         'emits events for many files added at once in a subdirectory with the '
         'same name as a removed file', () async {

pkgs/watcher/test/directory_watcher/linux_test.dart

@@ -22,19 +22,4 @@ void main() {
   test('DirectoryWatcher creates a LinuxDirectoryWatcher on Linux', () {
     expect(DirectoryWatcher('.'), const TypeMatcher<LinuxDirectoryWatcher>());
   });
-
-  test('emits events for many nested files moved out then immediately back in',
-      () async {
-    withPermutations(
-        (i, j, k) => writeFile('dir/sub/sub-$i/sub-$j/file-$k.txt'));
-    await startWatcher(path: 'dir');
-
-    renameDir('dir/sub', 'sub');
-    renameDir('sub', 'dir/sub');
-
-    await inAnyOrder(withPermutations(
-        (i, j, k) => isRemoveEvent('dir/sub/sub-$i/sub-$j/file-$k.txt')));
-    await inAnyOrder(withPermutations(
-        (i, j, k) => isAddEvent('dir/sub/sub-$i/sub-$j/file-$k.txt')));
-  });
 }

pkgs/watcher/test/directory_watcher/mac_os_test.dart

@@ -36,21 +36,6 @@ void main() {
     await expectAddEvent('dir/newer.txt');
   });
 
-  test('emits events for many nested files moved out then immediately back in',
-      () async {
-    withPermutations(
-        (i, j, k) => writeFile('dir/sub/sub-$i/sub-$j/file-$k.txt'));
-
-    await startWatcher(path: 'dir');
-
-    renameDir('dir/sub', 'sub');
-    renameDir('sub', 'dir/sub');
-
-    await inAnyOrder(withPermutations(
-        (i, j, k) => isRemoveEvent('dir/sub/sub-$i/sub-$j/file-$k.txt')));
-    await inAnyOrder(withPermutations(
-        (i, j, k) => isAddEvent('dir/sub/sub-$i/sub-$j/file-$k.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');