Improve HttpRequestTrait for tests. (#3602)

module/VuFind/src/VuFindTest/Feature/HttpRequestTrait.php

@@ -29,6 +29,8 @@
 
 namespace VuFindTest\Feature;
 
+use VuFindHttp\HttpService;
+
 /**
  * HTTP request helper methods for integration tests.
  *
@@ -43,16 +45,20 @@ trait HttpRequestTrait
     use RemoteCoverageTrait;
 
     /**
-     * Perform an HTTP get operation with coverage awareness.
+     * HTTP service
      *
-     * @param string $url URL to retrieve
+     * @var ?HttpService
+     */
+    protected $httpService = null;
+
+    /**
+     * Get extra HTTP headers to support testing.
      *
-     * @return \Laminas\Http\Response
+     * @return array
      */
-    protected function httpGet(string $url): \Laminas\Http\Response
+    protected function getExtraVuFindHttpRequestHeaders(): array
     {
-        $http = new \VuFindHttp\HttpService();
-        $headers = ($coverageDir = $this->getRemoteCoverageDirectory())
+        return ($coverageDir = $this->getRemoteCoverageDirectory())
             ? [
                 'X-VuFind-Remote-Coverage' => json_encode(
                     [
@@ -62,6 +68,69 @@ protected function httpGet(string $url): \Laminas\Http\Response
                     ]
                 ),
             ] : [];
-        return $http->get($url, headers: $headers);
+    }
+
+    /**
+     * Get HTTP service.
+     *
+     * @return HttpService
+     */
+    protected function getHttpService(): HttpService
+    {
+        if (!$this->httpService) {
+            $this->httpService = new HttpService();
+        }
+        return $this->httpService;
+    }
+
+    /**
+     * Perform an HTTP GET operation with coverage awareness.
+     *
+     * @param string $url     Request URL
+     * @param array  $params  Request parameters
+     * @param float  $timeout Request timeout in seconds
+     * @param array  $headers Request headers
+     *
+     * @return \Laminas\Http\Response
+     */
+    protected function httpGet(
+        $url,
+        array $params = [],
+        $timeout = null,
+        array $headers = []
+    ): \Laminas\Http\Response {
+        return $this->getHttpService()->get(
+            $url,
+            $params,
+            $timeout,
+            array_merge($headers, $this->getExtraVuFindHttpRequestHeaders())
+        );
+    }
+
+    /**
+     * Perform an HTTP POST operation with coverage awareness.
+     *
+     * @param string $url     Request URL
+     * @param mixed  $body    Request body document
+     * @param string $type    Request body content type
+     * @param float  $timeout Request timeout in seconds
+     * @param array  $headers Request http-headers
+     *
+     * @return \Laminas\Http\Response
+     */
+    protected function httpPost(
+        $url,
+        $body = null,
+        $type = 'application/octet-stream',
+        $timeout = null,
+        array $headers = []
+    ): \Laminas\Http\Response {
+        return $this->getHttpService()->post(
+            $url,
+            $body,
+            $type,
+            $timeout,
+            array_merge($headers, $this->getExtraVuFindHttpRequestHeaders())
+        );
     }
 }

module/VuFind/tests/integration-tests/src/VuFindTest/Mink/OAuth2Test.php

@@ -45,6 +45,7 @@
 final class OAuth2Test extends \VuFindTest\Integration\MinkTestCase
 {
     use \VuFindTest\Feature\DemoDriverTestTrait;
+    use \VuFindTest\Feature\HttpRequestTrait;
     use \VuFindTest\Feature\LiveDatabaseTrait;
     use \VuFindTest\Feature\UserCreationTrait;
 
@@ -215,8 +216,7 @@ public function testOAuth2Authorization(): void
             'client_id' => 'test',
             'client_secret' => 'mysecret',
         ];
-        $http = new \VuFindHttp\HttpService();
-        $response = $http->post(
+        $response = $this->httpPost(
             $this->getVuFindUrl() . '/OAuth2/token',
             http_build_query($tokenParams),
             'application/x-www-form-urlencoded'
@@ -228,7 +228,7 @@ public function testOAuth2Authorization(): void
         $this->assertArrayHasKey('token_type', $tokenResult);
 
         // Fetch public key to verify idToken:
-        $response = $http->get($this->getVuFindUrl() . '/OAuth2/jwks');
+        $response = $this->httpGet($this->getVuFindUrl() . '/OAuth2/jwks');
         $this->assertEquals(
             200,
             $response->getStatusCode(),
@@ -260,7 +260,7 @@ public function testOAuth2Authorization(): void
         );
 
         // Test the userinfo endpoint:
-        $response = $http->get(
+        $response = $this->httpGet(
             $this->getVuFindUrl() . '/OAuth2/userinfo',
             [],
             '',
@@ -288,7 +288,7 @@ public function testOAuth2Authorization(): void
 
         // Test token request with bad credentials:
         $tokenParams['client_secret'] = 'badsecret';
-        $response = $http->post(
+        $response = $this->httpPost(
             $this->getVuFindUrl() . '/OAuth2/token',
             http_build_query($tokenParams),
             'application/x-www-form-urlencoded'
@@ -460,8 +460,7 @@ public function testOIDCDiscovery(): void
             'service_documentation' => 'https://vufind.org/wiki/configuration:oauth2_oidc',
         ];
 
-        $http = new \VuFindHttp\HttpService();
-        $response = $http->get($this->getVuFindUrl() . '/.well-known/openid-configuration');
+        $response = $this->httpGet($this->getVuFindUrl() . '/.well-known/openid-configuration');
         $this->assertEquals(
             'application/json',
             $response->getHeaders()->get('Content-Type')->getFieldValue()

module/VuFind/tests/integration-tests/src/VuFindTest/Mink/ShibbolethLogoutNotificationTest.php

@@ -45,6 +45,7 @@
 final class ShibbolethLogoutNotificationTest extends \VuFindTest\Integration\MinkTestCase
 {
     use \VuFindTest\Feature\FixtureTrait;
+    use \VuFindTest\Feature\HttpRequestTrait;
     use \VuFindTest\Feature\LiveDatabaseTrait;
     use \VuFindTest\Feature\LiveDetectionTrait;
 
@@ -82,8 +83,7 @@ public function testLogoutNotification()
         $table->addSessionMapping($sessionId, 'EXTERNAL_SESSION_ID');
 
         // Call the notification endpoint:
-        $http = new \VuFindHttp\HttpService();
-        $result = $http->post(
+        $result = $this->httpPost(
             $this->getVuFindUrl() . '/soap/shiblogout',
             $this->getFixture('shibboleth/logout_notification.xml'),
             'application/xml'