Make sure that filesystem scans are returning files in proper order (#…

…1051)
flow-php · Apr 17, 2024 · 0c1747d · 0c1747d
1 parent d44880d
commit 0c1747d
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/...dapter-filesystem/tests/Flow/ETL/Adapter/Filesystem/Tests/Integration/FlysystemFSTest.php b/...dapter-filesystem/tests/Flow/ETL/Adapter/Filesystem/Tests/Integration/FlysystemFSTest.php
@@ -196,4 +196,30 @@ public function test_remove_pattern() : void
         self::assertFalse($fs->exists($stream->path()));
         $fs->rm($dirPath);
     }
+
+    public function test_that_scan_sort_files_by_path_names() : void
+    {
+        $paths = \iterator_to_array(
+            (new FlysystemFS())
+                ->scan(
+                    new Path(__DIR__ . '/Fixtures/multi_partitions/**/*.txt'),
+                )
+        );
+
+        self::assertEquals(
+            [
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-01/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-01/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-02/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-02/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-03/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-03/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-04/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-04/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-05/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-05/country=pl/file.txt'),
+            ],
+            $paths
+        );
+    }
 }
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Integration/Filesystem/LocalFilesystemTest.php b/src/core/etl/tests/Flow/ETL/Tests/Integration/Filesystem/LocalFilesystemTest.php
@@ -195,4 +195,30 @@ public function test_remove_pattern() : void
         self::assertFalse($fs->exists($stream->path()));
         $fs->rm($dirPath);
     }
+
+    public function test_that_scan_sort_files_by_path_names() : void
+    {
+        $paths = \iterator_to_array(
+            (new LocalFilesystem())
+                ->scan(
+                    new Path(__DIR__ . '/Fixtures/multi_partitions/**/*.txt'),
+                )
+        );
+
+        self::assertEquals(
+            [
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-01/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-01/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-02/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-02/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-03/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-03/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-04/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-04/country=pl/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-05/country=de/file.txt'),
+                new Path(__DIR__ . '/Fixtures/multi_partitions/date=2022-01-05/country=pl/file.txt'),
+            ],
+            $paths
+        );
+    }
 }