test: address review feedbacks

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

system/Database/BaseConnection.php

@@ -1684,11 +1684,9 @@ protected function getDriverFunctionPrefix(): string
     public function listTables(bool $constrainByPrefix = false)
     {
         if (isset($this->dataCache['table_names']) && $this->dataCache['table_names']) {
-            $tables = $constrainByPrefix
+            return $constrainByPrefix
                 ? preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
                 : $this->dataCache['table_names'];
-
-            return array_values($tables);
         }
 
         $sql = $this->_listTables($constrainByPrefix);

tests/system/Commands/Database/MigrateStatusTest.php

@@ -83,8 +83,10 @@ public function testMigrateWithWithTwoNamespaces(): void
 
     private function assertMigrationStatusHasBothNamespaceMigrations(): void
     {
-        $result = str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
+        $result       = str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
+        $theadPattern = '/^\|[[:space:]]+Namespace[[:space:]]+\|[[:space:]]+Version[[:space:]]+\|[[:space:]]+Filename[[:space:]]+\|[[:space:]]+Group[[:space:]]+\|[[:space:]]+Migrated On[[:space:]]+\|[[:space:]]+Batch[[:space:]]+\|$/m';
 
+        $this->assertMatchesRegularExpression($theadPattern, $result);
         $this->assertStringContainsString($this->migrationNamespace, $result);
         $this->assertStringContainsString('2018-01-24-102301', $result);
         $this->assertStringContainsString('Some_migration', $result);

tests/system/Commands/Database/ShowTableInfoMockIOTest.php

@@ -34,6 +34,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->db->resetDataCache();
+
         CLI::reset();
 
         putenv('NO_COLOR=1');

tests/system/Commands/Database/ShowTableInfoTest.php

@@ -35,6 +35,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->db->resetDataCache();
+
         putenv('NO_COLOR=1');
         CLI::init();
     }

tests/system/Commands/MigrationIntegrationTest.php

@@ -68,22 +68,19 @@ public function testMigrationWithRollbackHasSameNameFormat(): void
 
     private function dropTestTables(): void
     {
-        $forge = Database::forge();
-
-        foreach ([
-            'user',
-            'job',
-            'misc',
-            'team_members',
-            'type_test',
-            'empty',
-            'secondary',
-            'stringifypkey',
-            'without_auto_increment',
-            'ip_table',
-            'ci_sessions',
-            'migrations_lock',
-        ] as $table) {
+        $db     = Database::connect();
+        $forge  = Database::forge();
+        $tables = $db->listTables();
+
+        if ($tables === false) {
+            return;
+        }
+
+        foreach ($tables as $table) {
+            if ($table === $db->DBPrefix . 'migrations') {
+                continue;
+            }
+
             $forge->dropTable($table, true);
         }
     }

tests/system/Database/Live/MetadataTest.php

@@ -78,7 +78,7 @@ private function dropExtraneousTable(): void
         $oldPrefix = $this->db->getPrefix();
         $this->db->setPrefix('tmp_');
 
-        Database::forge($this->DBGroup)->dropTable('widgets', true);
+        Database::forge($this->DBGroup)->dropTable('widgets');
 
         $this->db->setPrefix($oldPrefix);
     }
@@ -139,22 +139,4 @@ public function testListTablesConstrainedByExtraneousPrefixReturnsOnlyTheExtrane
             $this->dropExtraneousTable();
         }
     }
-
-    public function testListTablesReturnsListAfterCachedTableIsDropped(): void
-    {
-        try {
-            $this->createExtraneousTable();
-
-            $tables = $this->db->listTables();
-            $this->assertSame(array_values($tables), $tables);
-
-            $this->dropExtraneousTable();
-
-            $tables = $this->db->listTables();
-            $this->assertSame(array_values($tables), $tables);
-            $this->assertNotContains('tmp_widgets', $tables);
-        } finally {
-            $this->dropExtraneousTable();
-        }
-    }
 }