Fixed accessing not initialized values in tests

flow-php · Jul 3, 2024 · 34d38d0 · 34d38d0
1 parent ff32a09
commit 34d38d0
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 30 deletions.
diff --git a/...l/tests/Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/FilesystemStreamsTest.php b/...l/tests/Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/FilesystemStreamsTest.php
@@ -117,6 +117,6 @@ public function test_scan() : void
 
     protected function streams() : FilesystemStreams
     {
-        return new FilesystemStreams($this->fstab);
+        return new FilesystemStreams($this->fstab());
     }
 }
diff --git a/...Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/NotPartitioned/AppendModeTest.php b/...Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/NotPartitioned/AppendModeTest.php
@@ -32,7 +32,7 @@ public function test_open_stream_for_existing_file() : void
         $appendFileStream->append('new content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/*')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/*')));
 
         self::assertCount(2, $files);
 
@@ -55,15 +55,15 @@ public function test_open_stream_for_non_existing_file() : void
         $appendFileStream->append('new content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/*')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/*')));
 
         self::assertCount(1, $files);
         self::assertSame('non-existing-file.txt', $files[0]->path->basename());
     }
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(append());
 
         return $streams;

diff --git a/...sts/Integration/Filesystem/FilesystemStreams/NotPartitioned/ExceptionIfExistsModeTest.php b/...sts/Integration/Filesystem/FilesystemStreams/NotPartitioned/ExceptionIfExistsModeTest.php
@@ -50,7 +50,7 @@ public function test_open_stream_for_non_existing_file() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(exception_if_exists());
 
         return $streams;

diff --git a/...Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/NotPartitioned/IgnoreModeTest.php b/...Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/NotPartitioned/IgnoreModeTest.php
@@ -52,7 +52,7 @@ public function test_open_stream_for_non_existing_file() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(ignore());
 
         return $streams;

diff --git a/...w/ETL/Tests/Integration/Filesystem/FilesystemStreams/NotPartitioned/OverwriteModeTest.php b/...w/ETL/Tests/Integration/Filesystem/FilesystemStreams/NotPartitioned/OverwriteModeTest.php
@@ -35,7 +35,7 @@ public function test_open_stream_for_existing_file() : void
 
         self::assertSame('some other content', \file_get_contents($path->path()));
 
-        self::assertCount(1, $files = \iterator_to_array($this->fs->list(new Path($path->parentDirectory()->path() . '/*'))));
+        self::assertCount(1, $files = \iterator_to_array($this->fs()->list(new Path($path->parentDirectory()->path() . '/*'))));
         self::assertSame('existing-file.txt', $files[0]->path->basename());
     }
 
@@ -55,7 +55,7 @@ public function test_open_stream_for_non_existing_file() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(overwrite());
 
         return $streams;

diff --git a/...ts/Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/Partitioned/AppendModeTest.php b/...ts/Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/Partitioned/AppendModeTest.php
@@ -35,7 +35,7 @@ public function test_open_stream_for_existing_partition_with_existing_file() : v
         $fileStream->append('appended content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(2, $files);
 
@@ -60,7 +60,7 @@ public function test_open_stream_for_existing_partition_without_existing_file()
         $fileStream->append('appended content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(1, $files);
 
@@ -80,7 +80,7 @@ public function test_open_stream_for_non_existing_partition() : void
         $appendedFile = $streams->writeTo($file, partitions: [new Partition('partition', 'value')]);
         $appendedFile->append('appended content');
         $streams->closeWriters($file);
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
 
         self::assertCount(1, $files);
 
@@ -90,7 +90,7 @@ public function test_open_stream_for_non_existing_partition() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(append());
 
         return $streams;

diff --git a/.../Tests/Integration/Filesystem/FilesystemStreams/Partitioned/ExceptionIfExistsModeTest.php b/.../Tests/Integration/Filesystem/FilesystemStreams/Partitioned/ExceptionIfExistsModeTest.php
@@ -49,7 +49,7 @@ public function test_open_stream_for_existing_partition_without_existing_file()
         $fileStream->append('file content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(1, $files);
 
@@ -69,7 +69,7 @@ public function test_open_stream_for_non_existing_partition() : void
         $appendedFile = $streams->writeTo($file, partitions: [new Partition('partition', 'value')]);
         $appendedFile->append('file content');
         $streams->closeWriters($file);
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
 
         self::assertCount(1, $files);
 
@@ -79,7 +79,7 @@ public function test_open_stream_for_non_existing_partition() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(exception_if_exists());
 
         return $streams;

diff --git a/...ts/Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/Partitioned/IgnoreModeTest.php b/...ts/Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/Partitioned/IgnoreModeTest.php
@@ -34,7 +34,7 @@ public function test_open_stream_for_existing_partition_with_existing_file() : v
         $fileStream->append('new content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(1, $files);
 
@@ -57,7 +57,7 @@ public function test_open_stream_for_existing_partition_without_existing_file()
         $fileStream->append('appended content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(1, $files);
 
@@ -77,7 +77,7 @@ public function test_open_stream_for_non_existing_partition() : void
         $appendedFile = $streams->writeTo($file, partitions: [new Partition('partition', 'value')]);
         $appendedFile->append('appended content');
         $streams->closeWriters($file);
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
 
         self::assertCount(1, $files);
 
@@ -87,7 +87,7 @@ public function test_open_stream_for_non_existing_partition() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(ignore());
 
         return $streams;

diff --git a/...Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/Partitioned/OverwriteModeTest.php b/...Flow/ETL/Tests/Integration/Filesystem/FilesystemStreams/Partitioned/OverwriteModeTest.php
@@ -34,7 +34,7 @@ public function test_open_stream_for_existing_partition_with_existing_file() : v
         $fileStream->append('new content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(1, $files);
 
@@ -57,7 +57,7 @@ public function test_open_stream_for_existing_partition_without_existing_file()
         $fileStream->append('new content');
         $streams->closeWriters($file);
 
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/**/*.txt')));
 
         self::assertCount(1, $files);
 
@@ -77,7 +77,7 @@ public function test_open_stream_for_non_existing_partition() : void
         $appendedFile = $streams->writeTo($file, partitions: [new Partition('partition', 'value')]);
         $appendedFile->append('new content');
         $streams->closeWriters($file);
-        $files = \iterator_to_array($this->fs->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
+        $files = \iterator_to_array($this->fs()->list(new Path($file->parentDirectory()->path() . '/partition=value/*')));
 
         self::assertCount(1, $files);
 
@@ -87,7 +87,7 @@ public function test_open_stream_for_non_existing_partition() : void
 
     protected function streams() : FilesystemStreams
     {
-        $streams = new FilesystemStreams($this->fstab);
+        $streams = new FilesystemStreams($this->fstab());
         $streams->setSaveMode(overwrite());
 
         return $streams;

diff --git a/src/core/etl/tests/Flow/ETL/Tests/Integration/IntegrationTestCase.php b/src/core/etl/tests/Flow/ETL/Tests/Integration/IntegrationTestCase.php
@@ -24,12 +24,9 @@ protected function setUp() : void
         $this->baseMemoryLimit = \ini_get('memory_limit');
         $this->cacheDir = Path::realpath(\getenv(Config::CACHE_DIR_ENV))->path();
 
-        $this->fs = new NativeLocalFilesystem();
-        $this->fstab = new FilesystemTable($this->fs);
-
         $this->cleanupCacheDir($this->cacheDir);
 
-        if (!$this->fs->status(Path::realpath($this->cacheDir))?->isDirectory()) {
+        if (!$this->fs()->status(Path::realpath($this->cacheDir))?->isDirectory()) {
             \mkdir($this->cacheDir, recursive: true);
         }
     }
@@ -50,7 +47,7 @@ protected function cleanFiles() : void
                 continue;
             }
 
-            $this->fs->rm(Path::realpath($this->filesDirectory() . DIRECTORY_SEPARATOR . $file));
+            $this->fs()->rm(Path::realpath($this->filesDirectory() . DIRECTORY_SEPARATOR . $file));
         }
     }
 
@@ -59,6 +56,24 @@ protected function filesDirectory() : string
         throw new \RuntimeException('You need to implement filesDirectory method to point to your test files directory.');
     }
 
+    protected function fs() : Filesystem
+    {
+        if ($this->fs === null) {
+            $this->fs = new NativeLocalFilesystem();
+        }
+
+        return $this->fs;
+    }
+
+    protected function fstab() : FilesystemTable
+    {
+        if ($this->fstab === null) {
+            $this->fstab = new FilesystemTable($this->fs());
+        }
+
+        return $this->fstab;
+    }
+
     protected function getPath(string $relativePath) : Path
     {
         return new Path($this->filesDirectory() . DIRECTORY_SEPARATOR . $relativePath);
@@ -91,8 +106,8 @@ protected function setupFiles(array $datasets, $path = '') : void
 
     private function cleanupCacheDir(string $directory) : void
     {
-        if ($this->fs->status($path = Path::realpath($directory))?->isDirectory()) {
-            $this->fs->rm($path);
+        if ($this->fs()->status($path = Path::realpath($directory))?->isDirectory()) {
+            $this->fs()->rm($path);
         }
     }
 }