Change ServerControllerTest to use a method for expected Response creation.

Author: Potherca

solid/tests/Unit/Controller/ServerControllerTest.php

@@ -193,17 +193,8 @@ public function testAuthorizeWithInvalidRedirectUri()
 
 		$response = $controller->authorize();
 
-		$expected = [
-			'data' => vsprintf($controller::ERROR_UNREGISTERED_URI, [$_GET['redirect_uri']]),
-			'headers' => [
-				'Cache-Control' => 'no-cache, no-store, must-revalidate',
-				'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
-				'Content-Type' => 'application/json; charset=utf-8',
-				'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
-				'X-Robots-Tag' => 'noindex, nofollow',
-			],
-			'status' => Http::STATUS_BAD_REQUEST,
-		];
+		$data = vsprintf($controller::ERROR_UNREGISTERED_URI, [$_GET['redirect_uri']]);
+		$expected = $this->createExpectedResponse(Http::STATUS_BAD_REQUEST, $data);
 
 		$actual = [
 			'data' => $response->getData(),
@@ -248,17 +239,7 @@ public function testAuthorize()
 
         $response = $controller->authorize();
 
-        $expected = [
-            'data' => 'ok',
-            'headers' => [
-                'Cache-Control' => 'no-cache, no-store, must-revalidate',
-                'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
-                'Content-Type' => 'application/json; charset=utf-8',
-                'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
-                'X-Robots-Tag' => 'noindex, nofollow',
-            ],
-            'status' => Http::STATUS_FOUND,
-        ];
+        $expected = $this->createExpectedResponse();
 
         $actual = [
             'data' => $response->getData(),
@@ -328,6 +309,20 @@ public function testRegisterWithRedirectUris()
 
 		$response = $controller->register();
 
+		$data = [
+			'application_type' => 'web',
+			'client_id' => 'f4a2d00f7602948a97ff409d7a581ec2',
+			'client_secret' => '3b5798fddd49e23662ee6fe801085100',
+			'grant_types' => ['implicit'],
+			'id_token_signed_response_alg' => 'RS256',
+			'redirect_uris' => ['https://mock.client/redirect'],
+			'registration_access_token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL21vY2suc2VydmVyIiwiYXVkIjoiZjRhMmQwMGY3NjAyOTQ4YTk3ZmY0MDlkN2E1ODFlYzIiLCJzdWIiOiJmNGEyZDAwZjc2MDI5NDhhOTdmZjQwOWQ3YTU4MWVjMiJ9.AfOi9YW70rL0EKn4_dvhkyu02iI4yGYV-Xh8hQ9RbHBUnvcXROFfQzn-OL-R3kV3nn8tknmpG-r_8Ouoo7O_Sjo8Hx1QSFfeqjJGOgB8HbXV7WN2spOMicSB-68EyftqfTGH0ksyPyJaNSTbkdIqtawsDaSKUVqTmziEo4IrE5anwDLZrtSUcS0A4KVrOAkJmgYGiC4MC0NMYXeBRxgkr1_h7GN4hekAXs9-5XwRH1mwswUVRL-6prx0IYpPNURFNqkS2NU83xNf-vONThOdLVkADVy-l3PCHT3E1sRdkklCHLjhWiZo7NcMlB0WdS-APnZYCi5hLEr5-jwNI2sxoA',
+			'registration_client_uri' => '',
+			'response_types' => ['id_token token'],
+			'token_endpoint_auth_method' => 'client_secret_basic',
+		];
+		$expected = $this->createExpectedResponse(Http::STATUS_OK, $data);
+
 		$actual = [
 			'data' => $response->getData(),
 			'headers' => $response->getHeaders(),
@@ -337,27 +332,7 @@ public function testRegisterWithRedirectUris()
 		// Not comparing time-sensitive data
 		unset($actual['data']['client_id_issued_at'], $actual['headers']['X-Request-Id']);
 
-		$this->assertEquals([
-			'data' => [
-				'application_type' => 'web',
-				'client_id' => 'f4a2d00f7602948a97ff409d7a581ec2',
-				'grant_types' => ['implicit'],
-				'id_token_signed_response_alg' => 'RS256',
-				'redirect_uris' => ['https://mock.client/redirect'],
-				'registration_access_token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL21vY2suc2VydmVyIiwiYXVkIjoiZjRhMmQwMGY3NjAyOTQ4YTk3ZmY0MDlkN2E1ODFlYzIiLCJzdWIiOiJmNGEyZDAwZjc2MDI5NDhhOTdmZjQwOWQ3YTU4MWVjMiJ9.AfOi9YW70rL0EKn4_dvhkyu02iI4yGYV-Xh8hQ9RbHBUnvcXROFfQzn-OL-R3kV3nn8tknmpG-r_8Ouoo7O_Sjo8Hx1QSFfeqjJGOgB8HbXV7WN2spOMicSB-68EyftqfTGH0ksyPyJaNSTbkdIqtawsDaSKUVqTmziEo4IrE5anwDLZrtSUcS0A4KVrOAkJmgYGiC4MC0NMYXeBRxgkr1_h7GN4hekAXs9-5XwRH1mwswUVRL-6prx0IYpPNURFNqkS2NU83xNf-vONThOdLVkADVy-l3PCHT3E1sRdkklCHLjhWiZo7NcMlB0WdS-APnZYCi5hLEr5-jwNI2sxoA',
-				'registration_client_uri' => '',
-				'response_types' => ['id_token token'],
-				'token_endpoint_auth_method' => 'client_secret_basic',
-			],
-			'headers' => [
-				'Cache-Control' => 'no-cache, no-store, must-revalidate',
-				'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
-				'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
-				'X-Robots-Tag' => 'noindex, nofollow',
-				'Content-Type' => 'application/json; charset=utf-8',
-			],
-			'status' => Http::STATUS_OK,
-		], $actual);
+		$this->assertEquals($expected, $actual);
 	}
 
 	/**
@@ -400,17 +375,7 @@ public function testToken()
 
 		$tokenResponse = $controller->token();
 
-		$expected = [
-			'data' => "I'm a teapot",
-			'headers' => [
-				'Cache-Control' => 'no-cache, no-store, must-revalidate',
-				'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
-				'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
-				'X-Robots-Tag' => 'noindex, nofollow',
-				'Content-Type' => 'application/json; charset=utf-8',
-			],
-			'status' => Http::STATUS_IM_A_TEAPOT,
-		];
+		$expected = $this->createExpectedResponse(Http::STATUS_IM_A_TEAPOT, "I'm a teapot");
 
 		$actual = [
 			'data' => $tokenResponse->getData(),
@@ -474,6 +439,25 @@ public function createMockUserManager(): IUserManager|MockObject
 		return $this->mockUserManager;
 	}
 
+	public function createExpectedResponse($status = Http::STATUS_FOUND, $data = 'ok', $headers = []): array
+	{
+		if (empty($headers)) {
+			$headers = [
+				'Cache-Control' => 'no-cache, no-store, must-revalidate',
+				'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
+				'Content-Type' => 'application/json; charset=utf-8',
+				'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
+				'X-Robots-Tag' => 'noindex, nofollow',
+			];
+		}
+
+		return [
+			'data' => $data,
+			'headers' => $headers,
+			'status' => $status,
+		];
+	}
+
 	/////////////////////////////// DATAPROVIDERS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
 	public static function provideConstructorParameterIndex()