fix tear down of some test cases

doctrine · Sep 10, 2015 · c5b7757 · c5b7757
1 parent a46556f
commit c5b7757
Showing 1 changed file with 49 additions and 25 deletions.
diff --git a/tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php b/tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php
@@ -64,14 +64,20 @@ public function testForeignKeyConstraintViolationExceptionOnInsert()
 
         $this->setUpForeignKeyConstraintViolationExceptionTest();
 
-        $this->_conn->insert("constraint_error_table", array('id' => 1));
-        $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
+        try {
+            $this->_conn->insert("constraint_error_table", array('id' => 1));
+            $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
 
-        $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
+            $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
 
-        try {
-            $this->_conn->insert('owning_table', array('id' => 2, 'constraint_id' => 2));
-        } catch (ForeignKeyConstraintViolationException $exception) {
+            try {
+                $this->_conn->insert('owning_table', array('id' => 2, 'constraint_id' => 2));
+            } catch (ForeignKeyConstraintViolationException $exception) {
+                $this->tearDownForeignKeyConstraintViolationExceptionTest();
+
+                throw $exception;
+            }
+        } catch (\Exception $exception) {
             $this->tearDownForeignKeyConstraintViolationExceptionTest();
 
             throw $exception;
@@ -88,14 +94,20 @@ public function testForeignKeyConstraintViolationExceptionOnUpdate()
 
         $this->setUpForeignKeyConstraintViolationExceptionTest();
 
-        $this->_conn->insert("constraint_error_table", array('id' => 1));
-        $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
+        try {
+            $this->_conn->insert("constraint_error_table", array('id' => 1));
+            $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
 
-        $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
+            $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
 
-        try {
-            $this->_conn->update('constraint_error_table', array('id' => 2), array('id' => 1));
-        } catch (ForeignKeyConstraintViolationException $exception) {
+            try {
+                $this->_conn->update('constraint_error_table', array('id' => 2), array('id' => 1));
+            } catch (ForeignKeyConstraintViolationException $exception) {
+                $this->tearDownForeignKeyConstraintViolationExceptionTest();
+
+                throw $exception;
+            }
+        } catch (\Exception $exception) {
             $this->tearDownForeignKeyConstraintViolationExceptionTest();
 
             throw $exception;
@@ -112,14 +124,20 @@ public function testForeignKeyConstraintViolationExceptionOnDelete()
 
         $this->setUpForeignKeyConstraintViolationExceptionTest();
 
-        $this->_conn->insert("constraint_error_table", array('id' => 1));
-        $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
+        try {
+            $this->_conn->insert("constraint_error_table", array('id' => 1));
+            $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
 
-        $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
+            $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
 
-        try {
-            $this->_conn->delete('constraint_error_table', array('id' => 1));
-        } catch (ForeignKeyConstraintViolationException $exception) {
+            try {
+                $this->_conn->delete('constraint_error_table', array('id' => 1));
+            } catch (ForeignKeyConstraintViolationException $exception) {
+                $this->tearDownForeignKeyConstraintViolationExceptionTest();
+
+                throw $exception;
+            }
+        } catch (\Exception $exception) {
             $this->tearDownForeignKeyConstraintViolationExceptionTest();
 
             throw $exception;
@@ -132,20 +150,26 @@ public function testForeignKeyConstraintViolationExceptionOnTruncate()
     {
         $platform = $this->_conn->getDatabasePlatform();
 
-        if ( ! $platform->supportsForeignKeyConstraints()) {
+        if (!$platform->supportsForeignKeyConstraints()) {
             $this->markTestSkipped("Only fails on platforms with foreign key constraints.");
         }
 
         $this->setUpForeignKeyConstraintViolationExceptionTest();
 
-        $this->_conn->insert("constraint_error_table", array('id' => 1));
-        $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
+        try {
+            $this->_conn->insert("constraint_error_table", array('id' => 1));
+            $this->_conn->insert("owning_table", array('id' => 1, 'constraint_id' => 1));
 
-        $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
+            $this->setExpectedException('\Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException');
 
-        try {
-            $this->_conn->executeUpdate($platform->getTruncateTableSQL('constraint_error_table'));
-        } catch (ForeignKeyConstraintViolationException $exception) {
+            try {
+                $this->_conn->executeUpdate($platform->getTruncateTableSQL('constraint_error_table'));
+            } catch (ForeignKeyConstraintViolationException $exception) {
+                $this->tearDownForeignKeyConstraintViolationExceptionTest();
+
+                throw $exception;
+            }
+        } catch (\Exception $exception) {
             $this->tearDownForeignKeyConstraintViolationExceptionTest();
 
             throw $exception;