Change ServerController and BaseServerConfig unit test code to be cleaner.

Author: Potherca

solid/tests/Unit/BaseServerConfigTest.php

@@ -3,7 +3,6 @@
 namespace OCA\Solid;
 
 use OCA\Solid\AppInfo\Application;
-use OCA\Solid\BaseServerConfig;
 use OCP\IConfig;
 use PHPUnit\Framework\TestCase;
 use TypeError;
@@ -20,13 +19,15 @@ function random_bytes()
  */
 class BaseServerConfigTest extends TestCase
 {
-	/////////////////////////////////// TESTS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+	////////////////////////////////// FIXTURES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
 	public const MOCK_RANDOM_BYTES = 'mock random bytes';
-	const MOCK_REDIRECT_URI = 'mock redirect uri';
+	private const MOCK_REDIRECT_URI = 'mock redirect uri';
 	private const MOCK_CLIENT_ID = 'mock-client-id';
 	private const MOCK_ORIGIN = 'mock origin';
 
+	/////////////////////////////////// TESTS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
 	/**
 	 * @testdox BaseServerConfig should complain when called before given a Configuration
 	 * @covers ::__construct

solid/tests/Unit/Controller/ServerControllerTest.php

@@ -113,7 +113,7 @@ public function testAuthorizeWithoutUser()
 
 		$controller = new ServerController(...$parameters);
 
-		$expected = new JSONResponse('Authorization required', 401);
+		$expected = new JSONResponse('Authorization required', Http::STATUS_UNAUTHORIZED);
 		$actual = $controller->authorize();
 
 		$this->assertEquals($expected, $actual);
@@ -135,7 +135,7 @@ public function testAuthorizeWithoutValidToken()
 		$controller = new ServerController(...$parameters);
 
 		$actual = $controller->authorize();
-		$expected = new JSONResponse('Bad request, does not contain valid token', 400);
+		$expected = new JSONResponse('Bad request, does not contain valid token', Http::STATUS_BAD_REQUEST);
 
 		$this->assertEquals($expected, $actual);
 	}
@@ -164,7 +164,7 @@ public function testAuthorizeWithoutApprovedClient()
 		$controller = new ServerController(...$parameters);
 
 		$actual = $controller->authorize();
-		$expected = new JSONResponse('Approval required', 302, ['Location' => '']);
+		$expected = new JSONResponse('Approval required', Http::STATUS_FOUND, ['Location' => '']);
 
 		$this->assertEquals($expected, $actual);
 	}
@@ -203,25 +203,24 @@ public function testAuthorizeWithApprovedClient()
 			'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',
-				'Content-Type' => 'application/json; charset=utf-8',
-
 			],
-			'status' => 302,
+			'status' => Http::STATUS_FOUND,
 		];
 
-		$headers = $response->getHeaders();
-		$location = $headers['Location'];
-		// Not comparing time-sensitive data
-		unset($headers['X-Request-Id'], $headers['Location']);
-
 		$actual = [
 			'data' => $response->getData(),
-			'headers' => $headers,
+			'headers' => $response->getHeaders(),
 			'status' => $response->getStatus(),
 		];
 
+		$location = $actual['headers']['Location'];
+
+		// Not comparing time-sensitive data
+		unset($actual['headers']['X-Request-Id'], $actual['headers']['Location']);
+
 		$this->assertEquals($expected, $actual);
 
 		// @TODO: Move $location assert to a separate test
@@ -236,8 +235,8 @@ public function testAuthorizeWithApprovedClient()
 			'host' => 'mock.client',
 			'path' => '/redirect',
 			'fragment' => [
-				'token_type'=>'Bearer',
-				'expires_in'=>'3600',
+				'token_type' => 'Bearer',
+				'expires_in' => '3600',
 			],
 		], $url);
 	}