From 455dd17828baa0e125ced540cbef4402f3032d58 Mon Sep 17 00:00:00 2001
From: Jesse Rushlow <jr@rushlow.dev>
Date: Wed, 15 May 2024 09:23:51 -0400
Subject: [PATCH] [make:*] generate test classes properly

---
 src/Generator.php      | 4 ++++
 src/Maker/MakeCrud.php | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Generator.php b/src/Generator.php
index f65726da6..baca5d291 100644
--- a/src/Generator.php
+++ b/src/Generator.php
@@ -153,6 +153,10 @@ public function createClassNameDetails(string $name, string $namespacePrefix, st
             }
         }
 
+        if (!str_ends_with($className, $suffix)) {
+            $className = sprintf('%s%s', $className, $suffix);
+        }
+
         Validator::validateClassName($className, $validationErrorMessage);
 
         // if this is a custom class, we may be completely different than the namespace prefix
diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php
index c20487b39..3e2b92600 100644
--- a/src/Maker/MakeCrud.php
+++ b/src/Maker/MakeCrud.php
@@ -243,8 +243,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         if ($this->shouldGenerateTests()) {
             $testClassDetails = $generator->createClassNameDetails(
-                $entityClassDetails->getRelativeNameWithoutSuffix(),
-                'Test\\Controller\\',
+                sprintf('\\App\\Tests\\Controller\\%s', $entityClassDetails->getRelativeNameWithoutSuffix()),
+                'Controller\\',
                 'ControllerTest'
             );
 
@@ -261,8 +261,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                 $useStatements->addUseStatement(EntityManagerInterface::class);
             }
 
-            $generator->generateFile(
-                'tests/Controller/'.$testClassDetails->getShortName().'.php',
+            $generator->generateClass(
+                $testClassDetails->getFullName(),
                 'crud/test/Test.EntityManager.tpl.php',
                 [
                     'use_statements' => $useStatements,