DB tests: truncate test table on test setup

OXID-eSales · Feb 22, 2019 · 0bb80cf · 0bb80cf
1 parent 73a8e0b
commit 0bb80cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/tests/Integration/Core/Database/Adapter/DatabaseInterfaceImplementationBaseTest.php b/tests/Integration/Core/Database/Adapter/DatabaseInterfaceImplementationBaseTest.php
@@ -101,6 +101,7 @@ public function setUp()
         parent::setUp();
 
         $this->initializeDatabase();
+        $this->truncateTestTable();
         $this->assureTestTableIsEmpty();
     }
 
@@ -264,16 +265,7 @@ protected function assertObjectHasAttributeWithValue($object, $attributeName, $a
 
     protected function assureTestTableIsEmpty()
     {
-        if (!$this->isEmptyTestTable()) {
-            $this->truncateTestTable();
-        }
-
-        $this->assertEmpty($this->fetchAllTestTableRows(), "Problem while truncating the table '" . self::TABLE_NAME . "'!");
-    }
-
-    protected function isEmptyTestTable()
-    {
-        return empty($this->fetchAllTestTableRows());
+        $this->assertEmpty($this->fetchAllTestTableRows(), "Table '" . self::TABLE_NAME . "' is empty");
     }
 
     protected function fetchAllTestTableRows()

diff --git a/tests/Integration/Core/Database/Adapter/DatabaseInterfaceImplementationTest.php b/tests/Integration/Core/Database/Adapter/DatabaseInterfaceImplementationTest.php
@@ -1413,17 +1413,6 @@ protected function isEmptyTestTable()
         return empty($this->fetchAllTestTableRows());
     }
 
-    /**
-     * Helper methods to be used in all tests extending this class
-     */
-    /**
-     * Assure, that the table oxdoctrinetest is empty. If it is not empty, the test will fail.
-     */
-    protected function assureTestTableIsEmpty()
-    {
-        $this->assertEmpty($this->fetchAllTestTableRows(), "Table '" . self::TABLE_NAME . "' is empty");
-    }
-
     /**
      * Get an instance of ConfigFile based on a empty file.
      *