#85995 fix review

Author: MsNatali

tests/GenerateServerTest.php

@@ -5,17 +5,13 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Config;
 use function Pest\Laravel\artisan;
-use function PHPUnit\Framework\assertEquals;
+use function PHPUnit\Framework\assertEqualsCanonicalizing;
 
-function makeFilePath(string $path): string
-{
-    return str_replace('/', DIRECTORY_SEPARATOR, $path);
-}
 test("Command GenerateServer success", function () {
     /** @var TestCase $this */
     $mapping = Config::get('openapi-server-generator.api_docs_mappings');
     $mappingValue = current($mapping);
-    $mapping = [makeFilePath(__DIR__ . '/resources/index.yaml') => $mappingValue];
+    $mapping = [$this->makeFilePath(__DIR__ . '/resources/index.yaml') => $mappingValue];
     Config::set('openapi-server-generator.api_docs_mappings', $mapping);
 
     $filesystem = $this->mock(Filesystem::class);
@@ -26,34 +22,31 @@ function makeFilePath(string $path): string
         return file_get_contents($path);
     });
     $filesystem->shouldReceive('cleanDirectory', 'ensureDirectoryExists');
-    $appRoot = realpath(makeFilePath(__DIR__ . '/../vendor/orchestra/testbench-core/laravel/'));
+    $appRoot = realpath($this->makeFilePath(__DIR__ . '/../vendor/orchestra/testbench-core/laravel/'));
     $putFiles = [];
     $filesystem->shouldReceive('put')->withArgs(function ($path, $content) use (&$putFiles, $appRoot) {
-        $putFiles[] = makeFilePath(str_replace($appRoot, '', $path));
+        $putFiles[] = $this->makeFilePath(str_replace($appRoot, '', $path));
 
         return true;
     });
 
     artisan(GenerateServer::class);
 
-    $needFiles = [
-        makeFilePath('/app/Http/ApiV1/OpenApiGenerated/routes.php'),
+    assertEqualsCanonicalizing([
+        $this->makeFilePath('/app/Http/ApiV1/OpenApiGenerated/routes.php'),
 
-        makeFilePath('/app/Http/Controllers/ResourcesController.php'),
-        makeFilePath('/app/Http/Requests/TestFullGenerateRequest.php'),
-        makeFilePath('/app/Http/Tests/ResourcesComponentTest.php'),
-        makeFilePath('/app/Http/Requests/TestFooRenameRequest.php'),
+        $this->makeFilePath('/app/Http/Controllers/ResourcesController.php'),
+        $this->makeFilePath('/app/Http/Requests/TestFullGenerateRequest.php'),
+        $this->makeFilePath('/app/Http/Tests/ResourcesComponentTest.php'),
+        $this->makeFilePath('/app/Http/Requests/TestFooRenameRequest.php'),
 
-        makeFilePath('/app/Http/Controllers/WithoutResponsesController.php'),
+        $this->makeFilePath('/app/Http/Controllers/WithoutResponsesController.php'),
 
-        makeFilePath('/WithoutNamespaceController.php'),
-        makeFilePath('/WithoutNamespaceRequest.php'),
-        makeFilePath('/WithoutNamespaceComponentTest.php'),
+        $this->makeFilePath('/WithoutNamespaceController.php'),
+        $this->makeFilePath('/WithoutNamespaceRequest.php'),
+        $this->makeFilePath('/WithoutNamespaceComponentTest.php'),
 
-        makeFilePath('/app/Http/ApiV1/OpenApiGenerated/Enums/TestIntegerEnum.php'),
-        makeFilePath('/app/Http/ApiV1/OpenApiGenerated/Enums/TestStringEnum.php'),
-    ];
-    sort($needFiles);
-    sort($putFiles);
-    assertEquals($needFiles, $putFiles);
+        $this->makeFilePath('/app/Http/ApiV1/OpenApiGenerated/Enums/TestIntegerEnum.php'),
+        $this->makeFilePath('/app/Http/ApiV1/OpenApiGenerated/Enums/TestStringEnum.php'),
+    ], $putFiles);
 });

tests/TestCase.php

@@ -14,6 +14,11 @@ protected function getPackageProviders($app)
         ];
     }
 
+    public function makeFilePath(string $path): string
+    {
+        return str_replace('/', DIRECTORY_SEPARATOR, $path);
+    }
+
     public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');