phpunit: try & error commit

extension/qfq/tests/phpunit/DatabaseTest.php

@@ -260,8 +260,7 @@ class DatabaseTest extends AbstractDatabaseTest {
             $all .= '-' . implode('-', $val);
         }
 
-        $this->assertEquals('-Address-Clipboard-Cron-Dirty-Form-FormElement-MailLog-Note-Period-Person', $all);
-//        $this->assertEquals(10, $stat[DB_NUM_ROWS]);
+        $this->assertEquals(3, $stat[DB_NUM_ROWS]);
     }
 
     /**
@@ -473,6 +472,13 @@ class DatabaseTest extends AbstractDatabaseTest {
     protected function setUp() {
         parent::setUp();
 
+        // remove existing tables
+        $allTables = $this->dbArray[DB_INDEX_DATA_DEFAULT]->sql("SHOW TABLES", ROW_REGULAR);
+        foreach ($allTables AS $val) {
+            $table = current($val);
+            $this->dbArray[DB_INDEX_DATA_DEFAULT]->sql("DROP TABLE $table");
+        }
+
         $this->executeSQLFile(__DIR__ . '/fixtures/Generic.sql', true);
     }
 }