Change DPOPTest to be cleaner

- Rename tests to mention subject under test
- Add separator comments between different method types
- Move helper funtion to end of class

Author: Potherca

tests/unit/Utils/DPOPTest.php

@@ -12,40 +12,12 @@
  */
 class DPOPTest extends TestCase
 {
+    ////////////////////////////////// FIXTURES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
     private $dpop;
     private $url;
     private $serverRequest;
 
-    protected function sign($dpop, $privateKey = null)
-    {
-        $keyPath = __DIR__ . '/../../fixtures/keys';
-        if (!$privateKey) {
-            $privateKey = file_get_contents($keyPath . '/private.key');
-        }
-
-        $signature = '';
-        $success = \openssl_sign(
-            Base64Url::encode(json_encode($dpop['header'])).'.'.
-            Base64Url::encode(json_encode($dpop['payload'])),
-            $signature,
-            $privateKey,
-            OPENSSL_ALGO_SHA256
-        );
-
-        if (!$success) {
-            throw new \Exception('unable to sign dpop');
-        }
-        $token = Base64Url::encode(json_encode($dpop['header'])).'.'.
-            Base64Url::encode(json_encode($dpop['payload'])).'.'.
-            Base64Url::encode($signature);
-
-        return array_merge($dpop, [
-            'signature' => $signature,
-            'token' => $token,
-        ]);
-    }
-
     protected function setUp(): void
     {
         $keyPath    = __DIR__ . '/../../fixtures/keys';
@@ -93,10 +65,12 @@ private function getWrongKey()
         return $keyInfo;
     }
 
+    /////////////////////////////////// TESTS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
     /**
      * @covers ::validateDpop
      */
-    public function testWrongTyp(): void
+    public function testValidateDpopWithWrongTyp(): void
     {
         $this->dpop['header']['typ'] = 'jwt';
         $token = $this->sign($this->dpop);
@@ -111,7 +85,7 @@ public function testWrongTyp(): void
     /**
      * @covers ::validateDpop
      */
-    public function testAlgNone(): void
+    public function testValidateDpopWithAlgNone(): void
     {
         $this->dpop['header']['alg'] = 'none';
         $token = $this->sign($this->dpop);
@@ -126,7 +100,7 @@ public function testAlgNone(): void
     /**
      * @covers ::validateDpop
      */
-    public function testWrongKey(): void
+    public function testValidateDpopWithWrongKey(): void
     {
         $theWrongKey = $this->getWrongKey();
         $this->dpop['header']['jwk'] = [
@@ -148,7 +122,7 @@ public function testWrongKey(): void
     /**
      * @covers ::validateDpop
      */
-    public function testCorrectToken(): void
+    public function testValidateDpopWithCorrectToken(): void
     {
         $token = $this->sign($this->dpop);
 
@@ -157,4 +131,34 @@ public function testCorrectToken(): void
         $this->assertTrue($result);
     }
 
+    ///////////////////////////// HELPER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+    protected function sign($dpop, $privateKey = null)
+    {
+        $keyPath = __DIR__ . '/../../fixtures/keys';
+        if (!$privateKey) {
+            $privateKey = file_get_contents($keyPath . '/private.key');
+        }
+
+        $signature = '';
+        $success = \openssl_sign(
+            Base64Url::encode(json_encode($dpop['header'])).'.'.
+            Base64Url::encode(json_encode($dpop['payload'])),
+            $signature,
+            $privateKey,
+            OPENSSL_ALGO_SHA256
+        );
+
+        if (!$success) {
+            throw new \Exception('unable to sign dpop');
+        }
+        $token = Base64Url::encode(json_encode($dpop['header'])).'.'.
+            Base64Url::encode(json_encode($dpop['payload'])).'.'.
+            Base64Url::encode($signature);
+
+        return array_merge($dpop, [
+            'signature' => $signature,
+            'token' => $token,
+        ]);
+    }
 }