Merge branch '2.0'

Conflicts: Tests/Form/Type/DocumentTypeTest.php Tests/Validator/Constraints/UniqueValidatorTest.php
vicb · Dec 20, 2011 · d7d26e3 · d7d26e3
2 parents e29bea4 + 37eb381
commit d7d26e3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/Tests/Form/Type/DocumentTypeTest.php b/Tests/Form/Type/DocumentTypeTest.php
@@ -44,6 +44,11 @@ protected function setUp()
         if (!class_exists('Doctrine\\ODM\\MongoDB\\Version')) {
             $this->markTestSkipped('Doctrine MongoDB ODM is not available.');
         }
+        try {
+            new \Mongo();
+        } catch (\MongoException $e) {
+            $this->markTestSkipped('Unable to connect to Mongo.');
+        }
 
         $this->documentManager = TestCase::createTestDocumentManager();
         $this->documentManager->createQueryBuilder(self::DOCUMENT_CLASS)

diff --git a/Tests/Security/DocumentUserProviderTest.php b/Tests/Security/DocumentUserProviderTest.php
@@ -26,13 +26,13 @@ class DocumentUserProviderTest extends TestCase
 
     protected function setUp()
     {
+        parent::setUp();
+
         $this->documentManager = TestCase::createTestDocumentManager();
         $this->documentManager->createQueryBuilder(self::DOCUMENT_CLASS)
             ->remove()
             ->getQuery()
             ->execute();
-
-        parent::setUp();
     }
 
     public function testRefreshUserGetsUserByIdentifier()

diff --git a/Tests/TestCase.php b/Tests/TestCase.php
@@ -29,6 +29,11 @@ protected function setUp()
         if (!class_exists('Doctrine\\ODM\\MongoDB\\Version')) {
             $this->markTestSkipped('Doctrine MongoDB ODM is not available.');
         }
+        try {
+            new \Mongo();
+        } catch (\MongoException $e) {
+            $this->markTestSkipped('Unable to connect to Mongo.');
+        }
     }
 
     /**

diff --git a/Tests/Validator/Constraints/UniqueValidatorTest.php b/Tests/Validator/Constraints/UniqueValidatorTest.php
@@ -35,12 +35,9 @@ protected function setUp()
             __DIR__ . '/../DependencyInjection/Fixtures/Bundles/AnnotationsBundle/Document'
         ));
 
-        $this->dropDocumentCollection();
-    }
-
-    protected function tearDown()
-    {
-        $this->dropDocumentCollection();
+        $this->documentManager
+            ->getDocumentCollection('Symfony\Bundle\DoctrineMongoDBBundle\Tests\Fixtures\Validator\Document')
+            ->drop();
     }
 
     public function testValidateUniquenessForScalarField()
@@ -222,13 +219,6 @@ public function testEmbeddedDocumentIsNotUnsupported()
         $violationsList = $validator->validate(new EmbeddedDocument());
     }
 
-    private function dropDocumentCollection()
-    {
-        if ($this->documentManager) {
-            $this->documentManager->getDocumentCollection('Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Validator\Document')->drop();
-        }
-    }
-
     private function createMockRegistry($documentManagerName = null)
     {
         $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -17,3 +17,11 @@
 } elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
     require_once $file;
 }
+
+register_shutdown_function(function() {
+    try {
+        $mongo = new Mongo();
+        $mongo->doctrine->drop();
+    } catch (\MongoException $e) {
+    }
+});