Fix tests to be compatible with randomized testing

Author: paulbalandan

tests/Commands/UserModelGeneratorTest.php

@@ -12,88 +12,95 @@
  */
 final class UserModelGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
         parent::setUp();
 
         CITestStreamFilter::$buffer = '';
-        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->deleteTestFiles();
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
 
         stream_filter_remove($this->streamFilter);
-        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-
-        $filepath = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        if (is_file($filepath)) {
-            unlink($filepath);
-        }
+        $this->deleteTestFiles();
     }
 
-    protected function getFileContents(string $filepath): string
+    private function deleteTestFiles(): void
     {
-        if (! file_exists($filepath)) {
-            return '';
+        $possibleFiles = [
+            APPPATH . 'Models/MyUserModel.php',
+            HOMEPATH . 'src/Models/MyUserModel.php',
+        ];
+
+        foreach ($possibleFiles as $file) {
+            clearstatcache(true, $file);
+
+            if (is_file($file)) {
+                unlink($file);
+            }
         }
+    }
 
-        return file_get_contents($filepath) ?: '';
+    private function getFileContents(string $filepath): string
+    {
+        return (string) @file_get_contents($filepath);
     }
 
     public function testGenerateUserModel(): void
     {
         command('shield:model MyUserModel');
-        $filepath = APPPATH . 'Models/MyUserModel.php';
 
+        $filepath = APPPATH . 'Models/MyUserModel.php';
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $this->assertFileExists($filepath);
 
-        $this->assertStringContainsString('namespace App\Models;', $this->getFileContents($filepath));
-        $this->assertStringContainsString('class MyUserModel extends UserModel', $this->getFileContents($filepath));
-        $this->assertStringContainsString('use CodeIgniter\Shield\Models\UserModel;', $this->getFileContents($filepath));
-        $this->assertStringContainsString('protected function initialize(): void', $this->getFileContents($filepath));
+        $contents = $this->getFileContents($filepath);
+        $this->assertStringContainsString('namespace App\Models;', $contents);
+        $this->assertStringContainsString('class MyUserModel extends UserModel', $contents);
+        $this->assertStringContainsString('use CodeIgniter\Shield\Models\UserModel;', $contents);
+        $this->assertStringContainsString('protected function initialize(): void', $contents);
     }
 
     public function testGenerateUserModelCustomNamespace(): void
     {
         command('shield:model MyUserModel --namespace CodeIgniter\\\\Shield');
-        $filepath = HOMEPATH . 'src/Models/MyUserModel.php';
 
+        $filepath = HOMEPATH . 'src/Models/MyUserModel.php';
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $this->assertFileExists($filepath);
 
-        $this->assertStringContainsString('namespace CodeIgniter\Shield\Models;', $this->getFileContents($filepath));
-        $this->assertStringContainsString('class MyUserModel extends UserModel', $this->getFileContents($filepath));
-        $this->assertStringContainsString('use CodeIgniter\Shield\Models\UserModel;', $this->getFileContents($filepath));
-        $this->assertStringContainsString('protected function initialize(): void', $this->getFileContents($filepath));
-
-        if (is_file($filepath)) {
-            unlink($filepath);
-        }
+        $contents = $this->getFileContents($filepath);
+        $this->assertStringContainsString('namespace CodeIgniter\Shield\Models;', $contents);
+        $this->assertStringContainsString('class MyUserModel extends UserModel', $contents);
+        $this->assertStringContainsString('use CodeIgniter\Shield\Models\UserModel;', $contents);
+        $this->assertStringContainsString('protected function initialize(): void', $contents);
     }
 
     public function testGenerateUserModelWithForce(): void
     {
         command('shield:model MyUserModel');
-
         command('shield:model MyUserModel --force');
-        $this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
 
-        $filepath = APPPATH . 'Models/MyUserModel.php';
-        $this->assertFileExists($filepath);
+        $this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Models/MyUserModel.php');
     }
 
     public function testGenerateUserModelWithSuffix(): void
     {
         command('shield:model MyUser --suffix');
-        $filepath = APPPATH . 'Models/MyUserModel.php';
 
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+
+        $filepath = APPPATH . 'Models/MyUserModel.php';
         $this->assertFileExists($filepath);
         $this->assertStringContainsString('class MyUserModel extends UserModel', $this->getFileContents($filepath));
     }