From a243b4c03203527c26c5de63c301a96e15d88034 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 18 May 2026 08:19:06 -0700
Subject: [PATCH] Update tests and code quality

---
 tests/controller/log_controller_test.php |  47 +++---
 tests/event/listener_test.php            |  63 +++-----
 tests/functional/frontend_test.php       |  58 +++----
 tests/javascript/consentmanager.test.js  |  35 +++--
 tests/service/acp_manager_test.php       | 189 +++++++++--------------
 tests/service/consent_cache_test.php     |  35 +----
 tests/service/consent_manager_test.php   | 122 ++++++---------
 tests/service/media_manager_test.php     |  50 +++---
 8 files changed, 236 insertions(+), 363 deletions(-)

diff --git a/tests/controller/log_controller_test.php b/tests/controller/log_controller_test.php
index 408d185..e798a9d 100644
--- a/tests/controller/log_controller_test.php
+++ b/tests/controller/log_controller_test.php
@@ -12,14 +12,30 @@
 
 class log_controller_test extends \phpbb_test_case
 {
-	public function test_log_rejects_invalid_json_payload()
+	/** @var \phpbb\consentmanager\service\log_manager|\PHPUnit\Framework\MockObject\MockObject */
+	protected $log_manager;
+
+	/** @var \phpbb\consentmanager\service\consent_manager_interface|\PHPUnit\Framework\MockObject\MockObject */
+	protected $consent_manager;
+
+	/** @var \phpbb\consentmanager\controller\log_controller */
+	protected $controller;
+
+	protected function setUp(): void
 	{
-		$controller = new \phpbb\consentmanager\controller\log_controller(
-			$this->createMock('\phpbb\consentmanager\service\log_manager'),
-			$this->createMock('\phpbb\consentmanager\service\consent_manager_interface')
+		parent::setUp();
+
+		$this->log_manager = $this->createMock('\phpbb\consentmanager\service\log_manager');
+		$this->consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
+		$this->controller = new \phpbb\consentmanager\controller\log_controller(
+			$this->log_manager,
+			$this->consent_manager
 		);
+	}
 
-		$response = $controller->log(\Symfony\Component\HttpFoundation\Request::create(
+	public function test_log_rejects_invalid_json_payload()
+	{
+		$response = $this->controller->log(\Symfony\Component\HttpFoundation\Request::create(
 			'/consent/log',
 			'POST',
 			array(),
@@ -41,12 +57,10 @@ public function test_log_rejects_invalid_json_payload()
 	 */
 	public function test_log_returns_service_validation_failure($submission_error, $expected_status)
 	{
-		$log_manager = $this->createMock('\phpbb\consentmanager\service\log_manager');
-		$log_manager->expects(self::never())
+		$this->log_manager->expects(self::never())
 			->method('log_consent');
 
-		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
-		$consent_manager->expects(self::once())
+		$this->consent_manager->expects(self::once())
 			->method('validate_log_payload')
 			->with(array('hash' => 'bad'))
 			->willReturn(array(
@@ -54,8 +68,7 @@ public function test_log_returns_service_validation_failure($submission_error, $
 				'error' => $submission_error,
 			));
 
-		$controller = new \phpbb\consentmanager\controller\log_controller($log_manager, $consent_manager);
-		$response = $controller->log(new \Symfony\Component\HttpFoundation\Request(array(), array(), array(), array(), array(), array(), json_encode(array(
+		$response = $this->controller->log(new \Symfony\Component\HttpFoundation\Request(array(), array(), array(), array(), array(), array(), json_encode(array(
 			'hash' => 'bad',
 		))));
 
@@ -65,14 +78,11 @@ public function test_log_returns_service_validation_failure($submission_error, $
 
 	public function test_log_persists_valid_submission()
 	{
-		$arguments = [['necessary', 'analytics'], 5];
-		$log_manager = $this->createMock('\phpbb\consentmanager\service\log_manager');
-		$log_manager->expects(self::once())
+		$this->log_manager->expects(self::once())
 			->method('log_consent')
-			->with(...$arguments);
+			->with(['necessary', 'analytics'], 5);
 
-		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
-		$consent_manager->expects(self::once())
+		$this->consent_manager->expects(self::once())
 			->method('validate_log_payload')
 			->willReturn(array(
 				'success' => true,
@@ -80,8 +90,7 @@ public function test_log_persists_valid_submission()
 				'version' => 5,
 			));
 
-		$controller = new \phpbb\consentmanager\controller\log_controller($log_manager, $consent_manager);
-		$response = $controller->log(new \Symfony\Component\HttpFoundation\Request(array(), array(), array(), array(), array(), array(), json_encode(array(
+		$response = $this->controller->log(new \Symfony\Component\HttpFoundation\Request(array(), array(), array(), array(), array(), array(), json_encode(array(
 			'hash' => 'good',
 			'version' => 5,
 			'categories' => array('analytics'),
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
index ac90d49..8a23bcd 100644
--- a/tests/event/listener_test.php
+++ b/tests/event/listener_test.php
@@ -12,9 +12,12 @@
 
 class listener_test extends \phpbb_test_case
 {
-	/** @var \phpbb\language\language */
+	/** @var \phpbb\language\language|\PHPUnit\Framework\MockObject\MockObject */
 	protected $language;
 
+	/** @var \phpbb\consentmanager\service\media_manager|\PHPUnit\Framework\MockObject\MockObject */
+	protected $media_manager;
+
 	protected function setUp(): void
 	{
 		parent::setUp();
@@ -22,6 +25,7 @@ protected function setUp(): void
 		global $user;
 
 		$this->language = $this->createMock('\phpbb\language\language');
+		$this->media_manager = $this->createMock('\phpbb\consentmanager\service\media_manager');
 
 		$user = new \phpbb\user($this->language, '\phpbb\datetime');
 		$user->data = [
@@ -30,6 +34,17 @@ protected function setUp(): void
 		];
 	}
 
+	protected function create_listener($helper = null, $consent_manager = null, $template = null, $media_manager = null)
+	{
+		return new \phpbb\consentmanager\event\listener(
+			$helper ?? $this->createMock('\phpbb\controller\helper'),
+			$this->language,
+			$consent_manager ?? $this->createMock('\phpbb\consentmanager\service\consent_manager_interface'),
+			$template ?? $this->createMock('\phpbb\template\template'),
+			$media_manager ?? $this->media_manager
+		);
+	}
+
 	public function test_get_subscribed_events()
 	{
 		self::assertSame([
@@ -43,22 +58,11 @@ public function test_configure_iframe_embeds_delegates_to_media_manager()
 	{
 		$configurator = new \s9e\TextFormatter\Configurator();
 
-		$args = [$configurator];
-
-		$media_manager = $this->createMock('\phpbb\consentmanager\service\media_manager');
-		$media_manager->expects(self::once())
+		$this->media_manager->expects(self::once())
 			->method('configure_iframe_embeds')
-			->with(...$args);
-
-		$listener = new \phpbb\consentmanager\event\listener(
-			$this->createMock('\phpbb\controller\helper'),
-			$this->language,
-			$this->createMock('\phpbb\consentmanager\service\consent_manager_interface'),
-			$this->createMock('\phpbb\template\template'),
-			$media_manager
-		);
+			->with($configurator);
 
-		$listener->configure_iframe_embeds(new \phpbb\event\data([
+		$this->create_listener()->configure_iframe_embeds(new \phpbb\event\data([
 			'configurator' => $configurator,
 		]));
 	}
@@ -69,22 +73,11 @@ public function test_configure_iframe_renderer_delegates_to_media_manager()
 			->disableOriginalConstructor()
 			->getMock();
 
-		$args = [$renderer];
-
-		$media_manager = $this->createMock('\phpbb\consentmanager\service\media_manager');
-		$media_manager->expects(self::once())
+		$this->media_manager->expects(self::once())
 			->method('configure_iframe_renderer')
-			->with(...$args);
-
-		$listener = new \phpbb\consentmanager\event\listener(
-			$this->createMock('\phpbb\controller\helper'),
-			$this->language,
-			$this->createMock('\phpbb\consentmanager\service\consent_manager_interface'),
-			$this->createMock('\phpbb\template\template'),
-			$media_manager
-		);
+			->with($renderer);
 
-		$listener->configure_iframe_renderer(new \phpbb\event\data([
+		$this->create_listener()->configure_iframe_renderer(new \phpbb\event\data([
 			'renderer' => $renderer,
 		]));
 	}
@@ -171,7 +164,7 @@ public function test_inject_frontend_assigns_template_payload($invoke)
 				]]
 			);
 
-		$listener = new class($helper, $this->language, $consent_manager, $template, $this->createMock('\phpbb\consentmanager\service\media_manager'), $invoke) extends \phpbb\consentmanager\event\listener {
+		$listener = new class($helper, $this->language, $consent_manager, $template, $this->media_manager, $invoke) extends \phpbb\consentmanager\event\listener {
 			/** @var bool */
 			protected $is_frontend_context;
 
@@ -214,14 +207,6 @@ public function test_inject_frontend_skips_category_blocks_when_frontend_disable
 		$template->expects(self::never())
 			->method('assign_block_vars');
 
-		$listener = new \phpbb\consentmanager\event\listener(
-			$helper,
-			$this->language,
-			$consent_manager,
-			$template,
-			$this->createMock('\phpbb\consentmanager\service\media_manager')
-		);
-
-		$listener->inject_frontend();
+		$this->create_listener($helper, $consent_manager, $template)->inject_frontend();
 	}
 }
diff --git a/tests/functional/frontend_test.php b/tests/functional/frontend_test.php
index 28e23e7..6457fb6 100644
--- a/tests/functional/frontend_test.php
+++ b/tests/functional/frontend_test.php
@@ -43,7 +43,7 @@ public function test_frontend_markup_is_injected_on_board_pages()
 
 	public function test_log_endpoint_rejects_invalid_json_payload()
 	{
-		$payload = $this->extract_payload(self::request('GET', 'index.php') ? self::get_content() : '');
+		$payload = $this->fetch_frontend_payload();
 
 		self::$client->request(
 			'POST',
@@ -63,22 +63,9 @@ public function test_log_endpoint_rejects_invalid_json_payload()
 
 	public function test_log_endpoint_accepts_valid_anonymous_submission_without_persisting_it()
 	{
-		$payload = $this->extract_payload(self::request('GET', 'index.php') ? self::get_content() : '');
+		$payload = $this->fetch_frontend_payload();
+		$response = $this->post_log_request($payload, array('analytics', 'analytics', 'unknown'));
 
-		self::$client->request(
-			'POST',
-			$payload['logEndpoint'],
-			array(),
-			array(),
-			array('CONTENT_TYPE' => 'application/json'),
-			json_encode(array(
-				'hash' => $payload['logHash'],
-				'version' => $payload['version'],
-				'categories' => array('analytics', 'analytics', 'unknown'),
-			))
-		);
-
-		$response = json_decode(self::$client->getResponse()->getContent(), true);
 		$this->assertSame(200, self::$client->getResponse()->getStatus());
 		$this->assertSame(array('necessary', 'analytics'), $response['categories']);
 		$this->assertSame($payload['version'], $response['version']);
@@ -97,22 +84,9 @@ public function test_log_endpoint_persists_valid_authenticated_submission()
 		$this->create_user('consentuser');
 		$this->login('consentuser');
 
-		$payload = $this->extract_payload(self::request('GET', 'index.php') ? self::get_content() : '');
-
-		self::$client->request(
-			'POST',
-			$payload['logEndpoint'],
-			array(),
-			array(),
-			array('CONTENT_TYPE' => 'application/json'),
-			json_encode(array(
-				'hash' => $payload['logHash'],
-				'version' => $payload['version'],
-				'categories' => array('analytics', 'analytics', 'unknown'),
-			))
-		);
+		$payload = $this->fetch_frontend_payload();
+		$response = $this->post_log_request($payload, array('analytics', 'analytics', 'unknown'));
 
-		$response = json_decode(self::$client->getResponse()->getContent(), true);
 		$this->assertSame(200, self::$client->getResponse()->getStatus());
 		$this->assertSame(array('necessary', 'analytics'), $response['categories']);
 		$this->assertSame($payload['version'], $response['version']);
@@ -130,8 +104,20 @@ public function test_log_endpoint_persists_valid_authenticated_submission()
 
 	public function test_log_endpoint_rejects_stale_version()
 	{
-		$payload = $this->extract_payload(self::request('GET', 'index.php') ? self::get_content() : '');
+		$payload = $this->fetch_frontend_payload();
+		$response = $this->post_log_request($payload, array('analytics'), $payload['version'] + 1);
+
+		$this->assertSame(409, self::$client->getResponse()->getStatus());
+		$this->assertSame('version_mismatch', $response['error']);
+	}
+
+	protected function fetch_frontend_payload()
+	{
+		return $this->extract_payload(self::request('GET', 'index.php') ? self::get_content() : '');
+	}
 
+	protected function post_log_request(array $payload, array $categories, $version = null)
+	{
 		self::$client->request(
 			'POST',
 			$payload['logEndpoint'],
@@ -140,14 +126,12 @@ public function test_log_endpoint_rejects_stale_version()
 			array('CONTENT_TYPE' => 'application/json'),
 			json_encode(array(
 				'hash' => $payload['logHash'],
-				'version' => $payload['version'] + 1,
-				'categories' => array('analytics'),
+				'version' => $version ?? $payload['version'],
+				'categories' => $categories,
 			))
 		);
 
-		$response = json_decode(self::$client->getResponse()->getContent(), true);
-		$this->assertSame(409, self::$client->getResponse()->getStatus());
-		$this->assertSame('version_mismatch', $response['error']);
+		return json_decode(self::$client->getResponse()->getContent(), true);
 	}
 
 	protected function extract_payload($content)
diff --git a/tests/javascript/consentmanager.test.js b/tests/javascript/consentmanager.test.js
index ec5856c..e434c18 100644
--- a/tests/javascript/consentmanager.test.js
+++ b/tests/javascript/consentmanager.test.js
@@ -1,3 +1,4 @@
+/* jshint ignore:start */
 const fs = require('fs');
 const path = require('path');
 const { JSDOM, VirtualConsole } = require('jsdom');
@@ -20,9 +21,9 @@ function createPayload(overrides) {
 			{ id: 'marketing', enabled: true, required: false },
 			{ id: 'media', enabled: true, required: false }
 		],
-		requiredCategories: ['necessary'],
-		enabledCategories: ['necessary', 'analytics', 'marketing', 'media'],
-		optionalCategories: ['analytics', 'marketing', 'media'],
+		requiredCategories: [ 'necessary' ],
+		enabledCategories: [ 'necessary', 'analytics', 'marketing', 'media' ],
+		optionalCategories: [ 'analytics', 'marketing', 'media' ],
 		scripts: []
 	}, overrides || {});
 }
@@ -180,8 +181,8 @@ afterEach(() => {
 });
 
 test('prefers the newest stored state and synchronizes cookie and local storage', () => {
-	const localState = createState(['necessary', 'marketing'], '2026-04-27T00:00:00.000Z');
-	const cookieState = createState(['necessary', 'analytics'], '2026-04-28T00:00:00.000Z');
+	const localState = createState([ 'necessary', 'marketing' ], '2026-04-27T00:00:00.000Z');
+	const cookieState = createState([ 'necessary', 'analytics' ], '2026-04-28T00:00:00.000Z');
 	const { window, document, payload } = setupConsentManager({
 		localState,
 		cookieState
@@ -195,7 +196,7 @@ test('prefers the newest stored state and synchronizes cookie and local storage'
 test('replays queued API calls and executes consented registered scripts', () => {
 	const ready = jest.fn();
 	const { window } = setupConsentManager({
-		localState: createState(['necessary', 'analytics'], '2026-04-28T00:00:00.000Z'),
+		localState: createState([ 'necessary', 'analytics' ], '2026-04-28T00:00:00.000Z'),
 		queue: {
 			_queue: [
 				[
@@ -206,7 +207,7 @@ test('replays queued API calls and executes consented registered scripts', () =>
 						inline: 'window.analyticsCounter = (window.analyticsCounter || 0) + 1;'
 					}
 				],
-				['ready', ready]
+				[ 'ready', ready ]
 			]
 		}
 	});
@@ -226,7 +227,7 @@ test('accept-all persists consent, logs the decision, and updates the UI state',
 	click(window, '[data-consent-action="accept-all"]');
 
 	expect(window.consentManager.getState()).toEqual({
-		categories: ['necessary', 'analytics', 'marketing', 'media'],
+		categories: [ 'necessary', 'analytics', 'marketing', 'media' ],
 		timestamp: expect.any(String),
 		version: payload.version
 	});
@@ -240,13 +241,13 @@ test('accept-all persists consent, logs the decision, and updates the UI state',
 	expect(JSON.parse(requests[0].body)).toEqual({
 		hash: payload.logHash,
 		version: payload.version,
-		categories: ['necessary', 'analytics', 'marketing', 'media']
+		categories: [ 'necessary', 'analytics', 'marketing', 'media' ]
 	});
 });
 
 test('reject-all logs the updated decision before reloading when consent is revoked', () => {
 	const { window, payload, requests, jsdomErrors } = setupConsentManager({
-		localState: createState(['necessary', 'analytics', 'marketing', 'media'], '2026-04-28T00:00:00.000Z')
+		localState: createState([ 'necessary', 'analytics', 'marketing', 'media' ], '2026-04-28T00:00:00.000Z')
 	});
 
 	click(window, '[data-consent-action="reject-all"]');
@@ -257,7 +258,7 @@ test('reject-all logs the updated decision before reloading when consent is revo
 	expect(JSON.parse(requests[0].body)).toEqual({
 		hash: payload.logHash,
 		version: payload.version,
-		categories: ['necessary']
+		categories: [ 'necessary' ]
 	});
 	expect(jsdomErrors).toHaveLength(1);
 	expect(jsdomErrors[0].message).toContain('Not implemented: navigation');
@@ -265,7 +266,7 @@ test('reject-all logs the updated decision before reloading when consent is revo
 
 test('registerScript blocks unsafe sources and executes safe inline scripts', () => {
 	const { window, document } = setupConsentManager({
-		localState: createState(['necessary', 'analytics'], '2026-04-28T00:00:00.000Z')
+		localState: createState([ 'necessary', 'analytics' ], '2026-04-28T00:00:00.000Z')
 	});
 
 	expect(window.consentManager.registerScript('unsafe', {
@@ -284,7 +285,7 @@ test('registerScript blocks unsafe sources and executes safe inline scripts', ()
 
 test('processes deferred consent scripts and copies only safe attributes', () => {
 	const { window, document } = setupConsentManager({
-		localState: createState(['necessary', 'analytics'], '2026-04-28T00:00:00.000Z'),
+		localState: createState([ 'necessary', 'analytics' ], '2026-04-28T00:00:00.000Z'),
 		extraMarkup: `
 			<script
 				type="text/plain"
@@ -307,7 +308,7 @@ test('processes deferred consent scripts and copies only safe attributes', () =>
 
 test('activates deferred media embeds after media consent is granted', () => {
 	const { window, document } = setupConsentManager({
-		localState: createState(['necessary', 'media'], '2026-04-28T00:00:00.000Z'),
+		localState: createState([ 'necessary', 'media' ], '2026-04-28T00:00:00.000Z'),
 		extraMarkup: `
 			<span data-consent-media-container="1" data-consent-category="media">
 				<span data-consent-media-placeholder="1"></span>
@@ -374,7 +375,7 @@ test('saving newly granted media consent activates blocked embeds immediately',
 
 test('activates deferred embeds when the media content element is the iframe itself', () => {
 	const { document } = setupConsentManager({
-		localState: createState(['necessary', 'media'], '2026-04-28T00:00:00.000Z'),
+		localState: createState([ 'necessary', 'media' ], '2026-04-28T00:00:00.000Z'),
 		extraMarkup: `
 			<span data-consent-media-container="1" data-consent-category="media">
 				<span data-consent-media-placeholder="1"></span>
@@ -435,7 +436,7 @@ test('saving consent activates deferred embeds when the media content element is
 
 test('revoking only media consent reloads the page', () => {
 	const { window, document, payload, requests, jsdomErrors } = setupConsentManager({
-		localState: createState(['necessary', 'analytics', 'marketing', 'media'], '2026-04-28T00:00:00.000Z')
+		localState: createState([ 'necessary', 'analytics', 'marketing', 'media' ], '2026-04-28T00:00:00.000Z')
 	});
 	const analyticsCheckbox = document.querySelector('[data-consent-toggle="analytics"]');
 	const marketingCheckbox = document.querySelector('[data-consent-toggle="marketing"]');
@@ -453,7 +454,7 @@ test('revoking only media consent reloads the page', () => {
 	expect(JSON.parse(requests[0].body)).toEqual({
 		hash: payload.logHash,
 		version: payload.version,
-		categories: ['necessary']
+		categories: [ 'necessary' ]
 	});
 	expect(jsdomErrors).toHaveLength(1);
 	expect(jsdomErrors[0].message).toContain('Not implemented: navigation');
diff --git a/tests/service/acp_manager_test.php b/tests/service/acp_manager_test.php
index ae0f1c9..8c00ec3 100644
--- a/tests/service/acp_manager_test.php
+++ b/tests/service/acp_manager_test.php
@@ -54,64 +54,30 @@ public function getDataSet()
 		return new \PHPUnit\DbUnit\DataSet\DefaultDataSet();
 	}
 
-	public function test_log_admin_settings_updated_delegates_to_phpbb_log()
-	{
-		$log_args = ['admin', 7, '127.0.0.1', 'LOG_CONSENTMANAGER_UPDATED'];
-		$log = $this->getMockBuilder('\phpbb\log\log')
-			->disableOriginalConstructor()
-			->setMethods(array('add'))
-			->getMock();
-		$log->expects(self::once())
-			->method('add')
-			->with(...$log_args);
-
-		$manager = $this->create_manager(7, 'admin-session', $log);
-		$manager->log_admin_action('LOG_CONSENTMANAGER_UPDATED');
-	}
-
-	public function test_log_admin_reprompt_delegates_to_phpbb_log()
-	{
-		$log_args = ['admin', 7, '127.0.0.1', 'LOG_CONSENTMANAGER_REPROMPT'];
-		$log = $this->getMockBuilder('\phpbb\log\log')
-			->disableOriginalConstructor()
-			->setMethods(array('add'))
-			->getMock();
-		$log->expects(self::once())
-			->method('add')
-			->with(...$log_args);
-
-		$manager = $this->create_manager(7, 'admin-session', $log);
-		$manager->log_admin_action('LOG_CONSENTMANAGER_REPROMPT');
-	}
-
-	public function test_log_admin_export_delegates_to_phpbb_log()
+	/**
+	 * @dataProvider log_admin_action_data
+	 */
+	public function test_log_admin_action_delegates_to_phpbb_log($log_action)
 	{
-		$log_args = ['admin', 7, '127.0.0.1', 'LOG_CONSENTMANAGER_EXPORT'];
 		$log = $this->getMockBuilder('\phpbb\log\log')
 			->disableOriginalConstructor()
 			->setMethods(array('add'))
 			->getMock();
 		$log->expects(self::once())
 			->method('add')
-			->with(...$log_args);
+			->with('admin', 7, '127.0.0.1', $log_action);
 
-		$manager = $this->create_manager(7, 'admin-session', $log);
-		$manager->log_admin_action('LOG_CONSENTMANAGER_EXPORT');
+		$this->create_manager(7, 'admin-session', $log)->log_admin_action($log_action);
 	}
 
-	public function test_log_admin_delete_delegates_to_phpbb_log()
+	public function log_admin_action_data()
 	{
-		$log_args = ['admin', 7, '127.0.0.1', 'LOG_CONSENTMANAGER_DELETE'];
-		$log = $this->getMockBuilder('\phpbb\log\log')
-			->disableOriginalConstructor()
-			->setMethods(array('add'))
-			->getMock();
-		$log->expects(self::once())
-			->method('add')
-			->with(...$log_args);
-
-		$manager = $this->create_manager(7, 'admin-session', $log);
-		$manager->log_admin_action('LOG_CONSENTMANAGER_DELETE');
+		return [
+			['LOG_CONSENTMANAGER_UPDATED'],
+			['LOG_CONSENTMANAGER_REPROMPT'],
+			['LOG_CONSENTMANAGER_EXPORT'],
+			['LOG_CONSENTMANAGER_DELETE'],
+		];
 	}
 
 	public function test_hash_user_id_returns_hmac_of_user_prefix()
@@ -239,25 +205,14 @@ public function test_normalize_integrations_json_reports_encoding_failure_for_ar
 
 	public function test_save_settings_updates_flags_and_integrations()
 	{
-		$config_set_args = ['consentmanager_integrations', trim($this->get_pretty_integrations_json())];
-		$config_text = $this->createMock('\phpbb\config\db_text');
-		$config_text->expects(self::once())
-			->method('set')
-			->with(...$config_set_args);
-
-		$normalize_args = [trim($this->get_pretty_integrations_json()), self::anything()];
-		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
+		[$config_text, $consent_manager, $consent_cache, $text_formatter_cache] = $this->create_save_settings_mocks(
+			trim($this->get_pretty_integrations_json()),
+			self::once(),
+			self::never()
+		);
 		$consent_manager->expects(self::once())
 			->method('normalize_integrations')
-			->with(...$normalize_args);
-
-		$consent_cache = $this->createMock('\phpbb\consentmanager\service\consent_cache');
-		$consent_cache->expects(self::once())
-			->method('invalidate');
-
-		$text_formatter_cache = $this->createMock('\phpbb\textformatter\cache_interface');
-		$text_formatter_cache->expects(self::never())
-			->method('invalidate');
+			->with(trim($this->get_pretty_integrations_json()), self::anything());
 
 		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager, $consent_cache, $text_formatter_cache);
 		$errors = [];
@@ -277,24 +232,14 @@ public function test_save_settings_updates_flags_and_integrations()
 
 	public function test_save_settings_invalidates_text_formatter_cache_when_media_setting_changes()
 	{
-		$config_set_args = ['consentmanager_integrations', ''];
-		$config_text = $this->createMock('\phpbb\config\db_text');
-		$config_text->expects(self::once())
-			->method('set')
-			->with(...$config_set_args);
-
-		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
+		[$config_text, $consent_manager, $consent_cache, $text_formatter_cache] = $this->create_save_settings_mocks(
+			'',
+			self::once(),
+			self::once()
+		);
 		$consent_manager->expects(self::never())
 			->method('normalize_integrations');
 
-		$consent_cache = $this->createMock('\phpbb\consentmanager\service\consent_cache');
-		$consent_cache->expects(self::once())
-			->method('invalidate');
-
-		$text_formatter_cache = $this->createMock('\phpbb\textformatter\cache_interface');
-		$text_formatter_cache->expects(self::once())
-			->method('invalidate');
-
 		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager, $consent_cache, $text_formatter_cache, [
 			'consentmanager_media_enabled' => 1,
 		]);
@@ -309,24 +254,14 @@ public function test_save_settings_invalidates_text_formatter_cache_when_media_s
 
 	public function test_save_settings_does_not_invalidate_text_formatter_cache_when_media_setting_is_unchanged()
 	{
-		$config_set_args = ['consentmanager_integrations', ''];
-		$config_text = $this->createMock('\phpbb\config\db_text');
-		$config_text->expects(self::once())
-			->method('set')
-			->with(...$config_set_args);
-
-		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
+		[$config_text, $consent_manager, $consent_cache, $text_formatter_cache] = $this->create_save_settings_mocks(
+			'',
+			self::once(),
+			self::never()
+		);
 		$consent_manager->expects(self::never())
 			->method('normalize_integrations');
 
-		$consent_cache = $this->createMock('\phpbb\consentmanager\service\consent_cache');
-		$consent_cache->expects(self::once())
-			->method('invalidate');
-
-		$text_formatter_cache = $this->createMock('\phpbb\textformatter\cache_interface');
-		$text_formatter_cache->expects(self::never())
-			->method('invalidate');
-
 		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager, $consent_cache, $text_formatter_cache, [
 			'consentmanager_media_enabled' => 1,
 		]);
@@ -352,22 +287,16 @@ public function test_save_settings_accepts_array_integrations()
 			],
 		];
 
-		$config_text = $this->createMock('\phpbb\config\db_text');
-		$config_set_args = [
-			'consentmanager_integrations',
-			json_encode($integrations, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-		];
-		$config_text->expects(self::once())
-			->method('set')
-			->with(...$config_set_args);
-
-		$normalize_args = [$integrations, self::anything()];
+		[$config_text, , $consent_cache, $text_formatter_cache] = $this->create_save_settings_mocks(
+			json_encode($integrations, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
+		);
 		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
 		$consent_manager->expects(self::once())
 			->method('normalize_integrations')
-			->with(...$normalize_args);
+			->with($integrations, self::anything())
+			->willReturn([]);
 
-		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager);
+		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager, $consent_cache, $text_formatter_cache);
 		$errors = [];
 
 		self::assertTrue($manager->save_settings([
@@ -384,10 +313,7 @@ public function test_save_settings_accepts_array_integrations()
 	 */
 	public function test_save_settings_rejects_invalid_integrations($json)
 	{
-		$config_text = $this->createMock('\phpbb\config\db_text');
-		$config_text->expects(self::never())
-			->method('set');
-
+		[$config_text, , $consent_cache] = $this->create_save_settings_mocks(null, self::never());
 		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
 		$consent_manager->expects(self::once())
 			->method('normalize_integrations')
@@ -396,7 +322,7 @@ public function test_save_settings_rejects_invalid_integrations($json)
 				return [];
 			});
 
-		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager);
+		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager, $consent_cache);
 		$errors = [];
 
 		self::assertFalse($manager->save_settings([
@@ -421,9 +347,7 @@ public function invalid_integrations_data()
 	 */
 	public function test_save_settings_rejects_invalid_array_integrations($integrations, array $expected_error_specs)
 	{
-		$config_text = $this->createMock('\phpbb\config\db_text');
-		$config_text->expects(self::never())
-			->method('set');
+		[$config_text, , $consent_cache] = $this->create_save_settings_mocks(null, self::never());
 
 		$expected_errors = $this->get_language_messages($expected_error_specs);
 		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
@@ -434,7 +358,7 @@ public function test_save_settings_rejects_invalid_array_integrations($integrati
 				return [];
 			});
 
-		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager);
+		$manager = $this->create_manager(1, 'session', null, $config_text, $consent_manager, $consent_cache);
 		$errors = [];
 
 		self::assertFalse($manager->save_settings([
@@ -582,6 +506,7 @@ public function test_stream_logs_csv_row_format_is_correct()
 		$content = stream_get_contents($handle);
 		fclose($handle);
 
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
 		$row = str_getcsv(trim($content), ',', '"', '\\');
 		self::assertCount(4, $row);
 
@@ -627,6 +552,7 @@ public function test_stream_logs_csv_sanitizes_formula_injection_in_categories()
 		$handle = fopen('php://memory', 'wb+');
 		$this->create_manager(1, 'session')->stream_logs_csv($handle);
 		rewind($handle);
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
 		$row = str_getcsv(trim(stream_get_contents($handle)), ',', '"', '\\');
 		fclose($handle);
 
@@ -777,6 +703,39 @@ protected function create_manager($user_id, $session_id, $log = null, $config_te
 		);
 	}
 
+	/**
+	 * Creates the four mocks common to all save_settings tests.
+	 *
+	 * @param string|null $expected_stored_value  Value expected to be passed to config_text->set(), or null to expect never.
+	 * @param mixed       $cache_invocation       Invocation rule for consent_cache->invalidate() (default: once).
+	 * @param mixed       $text_formatter_invocation Invocation rule for text_formatter_cache->invalidate() (default: never).
+	 */
+	protected function create_save_settings_mocks($expected_stored_value, $cache_invocation = null, $text_formatter_invocation = null)
+	{
+		$config_text = $this->createMock('\phpbb\config\db_text');
+		if ($expected_stored_value === null)
+		{
+			$config_text->expects(self::never())->method('set');
+		}
+		else
+		{
+			$config_text->expects(self::once())->method('set')
+				->with('consentmanager_integrations', $expected_stored_value);
+		}
+
+		$consent_manager = $this->createMock('\phpbb\consentmanager\service\consent_manager_interface');
+		$consent_manager->method('normalize_integrations')
+			->willReturn([]);
+
+		$consent_cache = $this->createMock('\phpbb\consentmanager\service\consent_cache');
+		$consent_cache->expects($cache_invocation ?? self::once())->method('invalidate');
+
+		$text_formatter_cache = $this->createMock('\phpbb\textformatter\cache_interface');
+		$text_formatter_cache->expects($text_formatter_invocation ?? self::never())->method('invalidate');
+
+		return [$config_text, $consent_manager, $consent_cache, $text_formatter_cache];
+	}
+
 	protected function get_config_text($stored_integrations = '')
 	{
 		$config_text = $this->createMock('\phpbb\config\db_text');
diff --git a/tests/service/consent_cache_test.php b/tests/service/consent_cache_test.php
index 5d86f78..b5eabac 100644
--- a/tests/service/consent_cache_test.php
+++ b/tests/service/consent_cache_test.php
@@ -10,7 +10,7 @@
 
 namespace phpbb\consentmanager\tests\service;
 
-class consent_cache_test extends \phpbb_test_case
+class consent_cache_test extends consent_manager_test
 {
 	public function test_invalidate_clears_cached_entries()
 	{
@@ -25,37 +25,4 @@ public function test_invalidate_clears_cached_entries()
 
 		self::assertNull($consent_cache->get_integrations('fingerprint'));
 	}
-
-	protected function get_consent_cache(array &$cache_store = [])
-	{
-		return new \phpbb\consentmanager\service\consent_cache($this->get_cache_service($cache_store));
-	}
-
-	protected function get_cache_service(array &$cache_store = [])
-	{
-		$driver = $this->createMock('\phpbb\cache\driver\driver_interface');
-		$driver->method('get')
-			->willReturnCallback(function ($key) use (&$cache_store) {
-				return array_key_exists($key, $cache_store) ? $cache_store[$key] : false;
-			});
-		$driver->method('put')
-			->willReturnCallback(function ($key, $value) use (&$cache_store) {
-				$cache_store[$key] = $value;
-				return true;
-			});
-		$driver->method('destroy')
-			->willReturnCallback(function ($key) use (&$cache_store) {
-				unset($cache_store[$key]);
-				return true;
-			});
-
-		return new \phpbb\cache\service(
-			$driver,
-			new \phpbb\config\config([]),
-			$this->createMock('\phpbb\db\driver\driver_interface'),
-			new \phpbb_mock_event_dispatcher(),
-			'',
-			'php'
-		);
-	}
 }
diff --git a/tests/service/consent_manager_test.php b/tests/service/consent_manager_test.php
index 552642f..a68b804 100644
--- a/tests/service/consent_manager_test.php
+++ b/tests/service/consent_manager_test.php
@@ -522,19 +522,11 @@ public function test_register_resolves_local_assets()
 
 	public function test_register_memoizes_template_assets_within_request()
 	{
-		$twig_environment = $this->getMockBuilder('\phpbb\template\twig\environment')
-			->disableOriginalConstructor()
-			->setMethods(array('get_phpbb_root_path', 'getNamespaceLookUpOrder', 'findTemplate'))
-			->getMock();
-		$twig_environment->method('get_phpbb_root_path')
-			->willReturn($this->phpbb_root_path);
-		$twig_environment->method('getNamespaceLookUpOrder')
-			->willReturn(['__main__']);
-		$find_template_args = ['styles/prosilver/template/consentmanager.js'];
-		$twig_environment->expects(self::once())
-			->method('findTemplate')
-			->with(...$find_template_args)
-			->willReturn($this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js');
+		$twig_environment = $this->create_twig_environment_mock(
+			'styles/prosilver/template/consentmanager.js',
+			$this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js',
+			self::once()
+		);
 
 		$manager = $this->get_manager([], '', null, null, $twig_environment);
 		self::assertTrue($manager->register('vendor.asset.first', array(
@@ -552,88 +544,47 @@ public function test_register_memoizes_template_assets_within_request()
 
 	public function test_register_re_resolves_template_assets_across_requests()
 	{
-		$first_twig_environment = $this->getMockBuilder('\phpbb\template\twig\environment')
-			->disableOriginalConstructor()
-			->setMethods(array('get_phpbb_root_path', 'getNamespaceLookUpOrder', 'findTemplate'))
-			->getMock();
-		$first_twig_environment->method('get_phpbb_root_path')
-			->willReturn($this->phpbb_root_path);
-		$first_twig_environment->method('getNamespaceLookUpOrder')
-			->willReturn(['__main__']);
-		$find_template_args = ['styles/prosilver/template/consentmanager.js'];
-		$first_twig_environment->expects(self::once())
-			->method('findTemplate')
-			->with(...$find_template_args)
-			->willReturn($this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js');
+		$asset = 'styles/prosilver/template/consentmanager.js';
+		$resolved = $this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js';
 
-		$first_manager = $this->get_manager([], '', null, null, $first_twig_environment);
+		$first_manager = $this->get_manager([], '', null, null, $this->create_twig_environment_mock($asset, $resolved, self::once()));
 		self::assertTrue($first_manager->register('vendor.asset.first', array(
 			'category' => 'analytics',
-			'asset' => 'styles/prosilver/template/consentmanager.js',
+			'asset' => $asset,
 		)));
 		self::assertNotSame('', $this->get_service('vendor.asset.first', $first_manager)['scripts'][0]['src']);
 
-		$second_twig_environment = $this->getMockBuilder('\phpbb\template\twig\environment')
-			->disableOriginalConstructor()
-			->setMethods(array('get_phpbb_root_path', 'getNamespaceLookUpOrder', 'findTemplate'))
-			->getMock();
-		$second_twig_environment->method('get_phpbb_root_path')
-			->willReturn($this->phpbb_root_path);
-		$second_twig_environment->method('getNamespaceLookUpOrder')
-			->willReturn(['__main__']);
-		$second_twig_environment->expects(self::once())
-			->method('findTemplate')
-			->with(...$find_template_args)
-			->willReturn($this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js');
-
-		$second_manager = $this->get_manager([], '', null, null, $second_twig_environment);
+		$second_manager = $this->get_manager([], '', null, null, $this->create_twig_environment_mock($asset, $resolved, self::once()));
 		self::assertTrue($second_manager->register('vendor.asset.second', array(
 			'category' => 'analytics',
-			'asset' => 'styles/prosilver/template/consentmanager.js',
+			'asset' => $asset,
 		)));
 		self::assertNotSame('', $this->get_service('vendor.asset.second', $second_manager)['scripts'][0]['src']);
 	}
 
 	public function test_register_does_not_persist_failed_asset_resolution_across_requests()
 	{
-		$failing_twig_environment = $this->getMockBuilder('\phpbb\template\twig\environment')
-			->disableOriginalConstructor()
-			->setMethods(array('get_phpbb_root_path', 'getNamespaceLookUpOrder', 'findTemplate'))
-			->getMock();
-		$failing_twig_environment->method('get_phpbb_root_path')
-			->willReturn($this->phpbb_root_path);
-		$failing_twig_environment->method('getNamespaceLookUpOrder')
-			->willReturn(['__main__']);
-		$find_template_args = ['styles/prosilver/template/missing-consentmanager.js'];
-		$failing_twig_environment->expects(self::once())
-			->method('findTemplate')
-			->with(...$find_template_args)
-			->willThrowException(new \Twig\Error\LoaderError('Missing template asset'));
-
+		$missing_asset = 'styles/prosilver/template/missing-consentmanager.js';
+		$resolved = $this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js';
+
+		$failing_twig_environment = $this->create_twig_environment_mock(
+			$missing_asset,
+			new \Twig\Error\LoaderError('Missing template asset'),
+			self::once(),
+			true
+		);
 		$failing_manager = $this->get_manager([], '', null, null, $failing_twig_environment);
 		self::assertTrue($failing_manager->register('vendor.asset.missing', array(
 			'category' => 'analytics',
-			'asset' => 'styles/prosilver/template/missing-consentmanager.js',
+			'asset' => $missing_asset,
 		)));
 		self::assertCount(0, $this->get_service('vendor.asset.missing', $failing_manager)['scripts']);
 
-		$working_twig_environment = $this->getMockBuilder('\phpbb\template\twig\environment')
-			->disableOriginalConstructor()
-			->setMethods(array('get_phpbb_root_path', 'getNamespaceLookUpOrder', 'findTemplate'))
-			->getMock();
-		$working_twig_environment->method('get_phpbb_root_path')
-			->willReturn($this->phpbb_root_path);
-		$working_twig_environment->method('getNamespaceLookUpOrder')
-			->willReturn(['__main__']);
-		$working_twig_environment->expects(self::once())
-			->method('findTemplate')
-			->with(...$find_template_args)
-			->willReturn($this->phpbb_root_path . 'ext/phpbb/consentmanager/styles/all/template/js/consentmanager.js');
-
+		$working_twig_environment = $this->create_twig_environment_mock($missing_asset, $resolved, self::once());
 		$working_manager = $this->get_manager([], '', null, null, $working_twig_environment);
 		self::assertTrue($working_manager->register('vendor.asset.fixed', array(
 			'category' => 'analytics',
-			'asset' => 'styles/prosilver/template/missing-consentmanager.js',
+			'asset' => $missing_asset,
 		)));
 		self::assertNotSame('', $this->get_service('vendor.asset.fixed', $working_manager)['scripts'][0]['src']);
 	}
@@ -1113,6 +1064,33 @@ public function test_register_discards_missing_template_assets()
 		self::assertSame(array(), $this->get_service('vendor.missing-template', $manager)['scripts']);
 	}
 
+	protected function create_twig_environment_mock($template_path, $result, $invocation_rule, $throws = false)
+	{
+		$twig_environment = $this->getMockBuilder('\phpbb\template\twig\environment')
+			->disableOriginalConstructor()
+			->setMethods(array('get_phpbb_root_path', 'getNamespaceLookUpOrder', 'findTemplate'))
+			->getMock();
+		$twig_environment->method('get_phpbb_root_path')
+			->willReturn($this->phpbb_root_path);
+		$twig_environment->method('getNamespaceLookUpOrder')
+			->willReturn(['__main__']);
+
+		$expectation = $twig_environment->expects($invocation_rule)
+			->method('findTemplate')
+			->with($template_path);
+
+		if ($throws)
+		{
+			$expectation->willThrowException($result);
+		}
+		else
+		{
+			$expectation->willReturn($result);
+		}
+
+		return $twig_environment;
+	}
+
 	protected function get_manager(array $config_values = array(), $stored_integrations = '', $dispatcher = null, $config_text = null, $twig_environment = null, $request = null, $language = null, $consent_cache = null)
 	{
 		return new \phpbb\consentmanager\service\consent_manager(...$this->get_manager_constructor_args(
diff --git a/tests/service/media_manager_test.php b/tests/service/media_manager_test.php
index 70704cb..c800755 100644
--- a/tests/service/media_manager_test.php
+++ b/tests/service/media_manager_test.php
@@ -167,42 +167,14 @@ public function test_configure_iframe_embeds_produces_consistent_results_for_ide
 
 	public function test_configure_iframe_renderer_sets_media_allowed_parameter()
 	{
-		$parameter_args = ['S_CONSENTMANAGER_MEDIA_ALLOWED', '1'];
-		$inner_renderer = $this->createMock('\s9e\TextFormatter\Renderer');
-		$inner_renderer->expects(self::once())
-			->method('setParameter')
-			->with(...$parameter_args);
-
-		$renderer = $this->getMockBuilder('\phpbb\textformatter\s9e\renderer')
-			->disableOriginalConstructor()
-			->setMethods(['get_renderer'])
-			->getMock();
-		$renderer->expects(self::once())
-			->method('get_renderer')
-			->willReturn($inner_renderer);
-
 		$this->expect_media_consent(true);
-		$this->manager->configure_iframe_renderer($renderer);
+		$this->manager->configure_iframe_renderer($this->create_renderer_mock('S_CONSENTMANAGER_MEDIA_ALLOWED', '1'));
 	}
 
 	public function test_configure_iframe_renderer_clears_media_allowed_parameter_without_consent()
 	{
-		$parameter_args = ['S_CONSENTMANAGER_MEDIA_ALLOWED', ''];
-		$inner_renderer = $this->createMock('\s9e\TextFormatter\Renderer');
-		$inner_renderer->expects(self::once())
-			->method('setParameter')
-			->with(...$parameter_args);
-
-		$renderer = $this->getMockBuilder('\phpbb\textformatter\s9e\renderer')
-			->disableOriginalConstructor()
-			->setMethods(['get_renderer'])
-			->getMock();
-		$renderer->expects(self::once())
-			->method('get_renderer')
-			->willReturn($inner_renderer);
-
 		$this->expect_media_consent(false);
-		$this->manager->configure_iframe_renderer($renderer);
+		$this->manager->configure_iframe_renderer($this->create_renderer_mock('S_CONSENTMANAGER_MEDIA_ALLOWED', ''));
 	}
 
 	/**
@@ -311,6 +283,24 @@ protected function assert_strip_internal_s9e_fixture(\DOMDocument $dom)
 		self::assertStringNotContainsString('data-s9e-test', $template);
 	}
 
+	protected function create_renderer_mock($parameter_name, $parameter_value)
+	{
+		$inner_renderer = $this->createMock('\s9e\TextFormatter\Renderer');
+		$inner_renderer->expects(self::once())
+			->method('setParameter')
+			->with($parameter_name, $parameter_value);
+
+		$renderer = $this->getMockBuilder('\phpbb\textformatter\s9e\renderer')
+			->disableOriginalConstructor()
+			->setMethods(['get_renderer'])
+			->getMock();
+		$renderer->expects(self::once())
+			->method('get_renderer')
+			->willReturn($inner_renderer);
+
+		return $renderer;
+	}
+
 	protected function expect_media_enabled($enabled)
 	{
 		$category_args = ['media'];