From 979c02ba1f9efc86cf1e1ec449e4fe3cfedae060 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 20 Mar 2012 14:30:46 +0100
Subject: [PATCH] [HttpKernel] Fix MongoDbProfilerStorageTest

---
 .../Profiler/MongoDbProfilerStorageTest.php   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/tests/Symfony/Tests/Component/HttpKernel/Profiler/MongoDbProfilerStorageTest.php b/tests/Symfony/Tests/Component/HttpKernel/Profiler/MongoDbProfilerStorageTest.php
index f639a3b677..9e5335801c 100644
--- a/tests/Symfony/Tests/Component/HttpKernel/Profiler/MongoDbProfilerStorageTest.php
+++ b/tests/Symfony/Tests/Component/HttpKernel/Profiler/MongoDbProfilerStorageTest.php
@@ -26,25 +26,23 @@ class MongoDbProfilerStorageTest extends AbstractProfilerStorageTest
 {
     protected static $storage;
 
-    public static function tearDownAfterClass()
-    {
-        if (self::$storage) {
-            self::$storage->purge();
-        }
-    }
-
-    protected function setUp()
+    static public function setUpBeforeClass()
     {
         if (extension_loaded('mongo')) {
             self::$storage = new DummyMongoDbProfilerStorage('mongodb://localhost/symfony_tests/profiler_data', '', '', 86400);
             try {
                 self::$storage->getMongo();
-                self::$storage->purge();
             } catch (\MongoConnectionException $e) {
-                $this->markTestSkipped('MongoDbProfilerStorageTest requires that there is a MongoDB server present on localhost');
+                self::$storage = null;
             }
-        } else {
-            $this->markTestSkipped('MongoDbProfilerStorageTest requires that the extension mongo is loaded');
+        }
+    }
+
+    static public function tearDownAfterClass()
+    {
+        if (self::$storage) {
+            self::$storage->purge();
+            self::$storage = null;
         }
     }
 
@@ -71,4 +69,13 @@ class MongoDbProfilerStorageTest extends AbstractProfilerStorageTest
     {
         return self::$storage;
     }
+
+    protected function setUp()
+    {
+        if (self::$storage) {
+            self::$storage->purge();
+        } else {
+            $this->markTestSkipped('MongoDbProfilerStorageTest requires then mongo PHP extennsion and a MongoDB server on localhost');
+        }
+    }
 }