Move the validation and preparation of the name to the RoomService

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 11 insertions, 17 deletions

diff --git a/tests/php/Command/Room/CreateTest.php b/tests/php/Command/Room/CreateTest.php
index 7c126c47f..22868f054 100644
--- a/tests/php/Command/Room/CreateTest.php
+++ b/tests/php/Command/Room/CreateTest.php
@@ -287,11 +287,17 @@ class CreateTest extends TestCase {
 	 * @dataProvider invalidProvider
 	 */
 	public function testInvalid(array $input, string $expectedOutput): void {
-		$this->roomService
-			->method('createConversation')
-			->willReturnCallback(function (int $type, string $name): Room {
-				return $this->roomMockContainer->create(['name' => $name, 'type' => $type]);
-			});
+		if ($input['name'] !== 'PHPUnit Test Room') {
+			$this->roomService
+				->method('createConversation')
+				->willThrowException(new \InvalidArgumentException('name'));
+		} else {
+			$this->roomService
+				->method('createConversation')
+				->willReturnCallback(function (int $type, string $name): Room {
+					return $this->roomMockContainer->create(['name' => $name, 'type' => $type]);
+				});
+		}
 
 		$this->roomMockContainer->registerCallback(function (object $room) {
 			/** @var Room|MockObject $room */
@@ -315,18 +321,6 @@ class CreateTest extends TestCase {
 			],
 			[
 				[
-					'name' => '  ',
-				],
-				"Invalid room name.\n",
-			],
-			[
-				[
-					'name' => str_repeat('x', 256),
-				],
-				"Invalid room name.\n",
-			],
-			[
-				[
 					'name' => 'PHPUnit Test Room',
 					'--password' => 'my-secret-password',
 				],