Fix tests

Author: iMattPro

tests/event/listener_test.php

@@ -59,7 +59,7 @@ protected function setUp(): void
 
 		global $phpbb_root_path, $phpEx, $user;
 
-		$db = $this->new_dbal();
+		$this->db = $this->new_dbal();
 
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$lang_loader->set_extension_manager(new \phpbb_mock_extension_manager($phpbb_root_path));
@@ -73,7 +73,7 @@ protected function setUp(): void
 		$this->user->data['user_form_salt'] = '';
 		$this->user->data['is_bot'] = false;
 		$this->user->data['user_type'] = USER_NORMAL;
-		$user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, 'phpbb_users');
+		$user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 
 		$this->controller_helper = $this->getMockBuilder('\phpbb\controller\helper')
 			->disableOriginalConstructor()
@@ -109,7 +109,7 @@ protected function setUp(): void
 
 		$this->notification_method_webpush = new \phpbb\webpushnotifications\notification\method\webpush(
 			$this->config,
-			$db,
+			$this->db,
 			new \phpbb\log\dummy(),
 			$user_loader,
 			$this->user,
@@ -123,6 +123,29 @@ protected function setUp(): void
 		$this->root_path = $phpbb_root_path;
 	}
 
+	/**
+	 * Remove entries from subscriptions table to avoid conflicts with other tests
+	 * that have fixtures with the same table name
+	 *
+	 * @return void
+	 */
+	protected function tearDown(): void
+	{
+		$sql_layer = $this->db->get_sql_layer();
+		$query = ($sql_layer === 'sqlite3')
+			? 'DELETE FROM phpbb_wpn_push_subscriptions'
+			: 'TRUNCATE TABLE phpbb_wpn_push_subscriptions';
+
+		$this->db->sql_query($query);
+
+		if ($sql_layer === 'postgres')
+		{
+			$this->db->sql_query('ALTER SEQUENCE phpbb_wpn_push_subscriptions_seq RESTART WITH 1');
+		}
+
+		parent::tearDown();
+	}
+
 	protected function set_listener()
 	{
 		$this->listener = new \phpbb\webpushnotifications\event\listener(

tests/notification/controller_webpush_test.php

@@ -402,37 +402,32 @@ public function test_sub_unsubscribe_success()
 		$this->assertInstanceOf(JsonResponse::class, $response);
 		$this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true));
 
-		// Get subscription data from database
-		$sql = 'SELECT *
-				FROM phpbb_wpn_push_subscriptions
-				WHERE user_id = 2';
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
 		$this->assertEquals([
 			'user_id' => '2',
 			'endpoint' => 'test_endpoint',
 			'p256dh' => 'test_p256dh',
 			'auth' => 'test_auth',
-			'expiration_time' => 0,
+			'expiration_time' => '0',
 			'subscription_id' => '1',
-		], $row);
+		], $this->get_subscription_data());
 
 		// Now unsubscribe
 		$response = $this->controller->unsubscribe($symfony_request);
 
 		$this->assertInstanceOf(JsonResponse::class, $response);
 		$this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true));
 
-		// Get subscription data from database
+		$this->assertEmpty($this->get_subscription_data());
+	}
+
+	private function get_subscription_data()
+	{
 		$sql = 'SELECT *
 			FROM phpbb_wpn_push_subscriptions
 			WHERE user_id = 2';
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
-
-		$this->assertEmpty($row);
+		return $row;
 	}
 }