From 304cc2e0ccbf56fd44eebaf0b618221c54654973 Mon Sep 17 00:00:00 2001 From: beberlei Date: Sat, 3 Apr 2010 14:38:06 +0000 Subject: [PATCH] [2.0] DDC-341 - Added Composite Model-Set and 3 tests, fixed two bugs in SqlWalker with Composite Key support --- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index fad546ddc..9e02cb285 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -78,6 +78,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\Routing\RoutingRoute', 'Doctrine\Tests\Models\Routing\RoutingRouteBooking', ), + 'navigation' => array( + 'Doctrine\Tests\Models\Navigation\NavCountry', + 'Doctrine\Tests\Models\Navigation\NavPhotos', + 'Doctrine\Tests\Models\Navigation\NavTour', + 'Doctrine\Tests\Models\Navigation\NavPointOfInterest', + ), ); protected function useModelSet($setName) @@ -144,6 +150,14 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM RoutingLocation'); } + if(isset($this->_usedModelSets['navigation'])) { + $conn->executeUpdate('DELETE FROM navigation_tour_pois'); + $conn->executeUpdate('DELETE FROM navigation_photos'); + $conn->executeUpdate('DELETE FROM navigation_pois'); + $conn->executeUpdate('DELETE FROM navigation_tours'); + $conn->executeUpdate('DELETE FROM navigation_countries'); + } + $this->_em->clear(); }