Using container to get the database for kernel tests.

chapter-three · Aug 6, 2024 · 3617c0e · 3617c0e
1 parent 71616c3
commit 3617c0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/modules/next/tests/modules/next_tests/next_tests.info.yml b/modules/next/tests/modules/next_tests/next_tests.info.yml
@@ -1,7 +1,6 @@
 name: Next.js tests
 description: Configures testing for Next.js
 type: module
-core_version_requirement: ^10 || ^11
-package: testing
+package: Testing
 dependencies:
  - next:next
diff --git a/modules/next/tests/src/Kernel/Event/EntityActionEventTest.php b/modules/next/tests/src/Kernel/Event/EntityActionEventTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\next\Kernel\Event;
 
-use Drupal\Core\Database\Database;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
@@ -84,7 +83,7 @@ protected function assertLogMessage(string $action) {
  '@action' => $action,
  ];
 
- $this->assertNotEmpty(Database::getConnection()->select('watchdog', 'w')
+ $this->assertNotEmpty($this->container->get('database')->select('watchdog', 'w')
  ->condition('type', 'system')
  ->condition('message', $message)
  ->condition('variables', serialize($variables))

diff --git a/modules/next/tests/src/Kernel/Event/EntityRevalidatedEventTest.php b/modules/next/tests/src/Kernel/Event/EntityRevalidatedEventTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\next\Kernel\Event;
 
-use Drupal\Core\Database\Database;
 use Drupal\dblog\Controller\DbLogController;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\next\Entity\NextEntityTypeConfig;
@@ -96,7 +95,7 @@ public function testEntityRevalidatedEvents() {
  * The message to assert in the logs.
  */
  protected function assertLogsContains(string $message) {
- $logs = Database::getConnection()
+ $logs = $this->container->get('database')
  ->select('watchdog', 'wd')
  ->fields('wd', ['message', 'variables'])
  ->condition('type', 'system')