From 052fae4f7090121988bbb659bb05611e9665570a Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 24 Mar 2021 15:46:49 +0000
Subject: [PATCH] Issue #3205139 by longwave: Refactor away
ModuleTestBase::assertTableCount()
---
.../src/Functional/Module/DependencyTest.php | 4 ++--
.../src/Functional/Module/ModuleTestBase.php | 19 -------------------
2 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/core/modules/system/tests/src/Functional/Module/DependencyTest.php b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
index 7e997be5679b..0f7705eb57b8 100644
--- a/core/modules/system/tests/src/Functional/Module/DependencyTest.php
+++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
@@ -44,8 +44,8 @@ public function testEnableWithoutDependency() {
$this->assertModules(['content_translation', 'language'], FALSE);
- // Assert that the language tables weren't enabled.
- $this->assertTableCount('language', FALSE);
+ // Assert that the language module config was not installed.
+ $this->assertNoModuleConfig('language');
$this->submitForm([], 'Continue');
$this->assertText('2 modules have been enabled: Content Translation, Language.');
diff --git a/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php b/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
index a2fefcf1531f..6720b471152b 100644
--- a/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
+++ b/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
@@ -33,25 +33,6 @@ protected function setUp() {
$this->drupalLogin($this->adminUser);
}
- /**
- * Assert there are tables that begin with the specified base table name.
- *
- * @param $base_table
- * Beginning of table name to look for.
- * @param $count
- * (optional) Whether or not to assert that there are tables that match the
- * specified base table. Defaults to TRUE.
- */
- public function assertTableCount($base_table, $count = TRUE) {
- $connection = Database::getConnection();
- $tables = $connection->schema()->findTables($connection->prefixTables('{' . $base_table . '}') . '%');
-
- if ($count) {
- $this->assertNotEmpty($tables, new FormattableMarkup('Tables matching "@base_table" found.', ['@base_table' => $base_table]));
- }
- $this->assertEmpty($tables, new FormattableMarkup('Tables matching "@base_table" not found.', ['@base_table' => $base_table]));
- }
-
/**
* Assert that all tables defined in a module's hook_schema() exist.
*
--
GitLab