fix UrlTrait::validate call test for the different methods.

simplesamlphp · Jan 2, 2025 · 7a8e7bb · 7a8e7bb
1 parent 8c9a764
commit 7a8e7bb
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/tests/src/Controller/Cas20ControllerTest.php b/tests/src/Controller/Cas20ControllerTest.php
@@ -111,13 +111,28 @@ protected function setUp(): void
         ];
     }
 
-    public function testProxyValidatePassesTheCorrectMethodToValidate(): void
+    public static function validateMethods(): array
+    {
+        return [
+            'Call serviceValidate action' => [
+                'ST-',
+                'serviceValidate',
+            ],
+            'Call proxyValidate action' => [
+                'PT-',
+                'proxyValidate',
+            ],
+        ];
+    }
+
+    #[DataProvider('validateMethods')]
+    public function testProxyValidatePassesTheCorrectMethodToValidate(string $prefix, string $method): void
     {
         $casconfig = Configuration::loadFromArray($this->moduleConfig);
         $requestParameters = [
             'renew' => false,
             'service' => 'https://myservice.com/abcd',
-            'ticket' => 'ST-' . $this->sessionId,
+            'ticket' => $prefix . $this->sessionId,
         ];
 
         $request = Request::create(
@@ -127,10 +142,10 @@ public function testProxyValidatePassesTheCorrectMethodToValidate(): void
 
         $expectedArguments = [
             'request' => $request,
-            'method' => 'proxyValidate',
+            'method' => $method,
             'renew' => false,
             'target' => null,
-            'ticket' => 'ST-' . $this->sessionId,
+            'ticket' => $prefix . $this->sessionId,
             'service' => 'https://myservice.com/abcd',
             'pgtUrl' => null,
         ];
@@ -142,7 +157,7 @@ public function testProxyValidatePassesTheCorrectMethodToValidate(): void
 
         $controllerMock->expects($this->once())->method('validate')
             ->with(...$expectedArguments);
-        $controllerMock->proxyValidate($request, ...$requestParameters);
+        $controllerMock->$method($request, ...$requestParameters);
     }
 
     public static function queryParameterValues(): array