Fix tests.

horde · Jun 30, 2016 · 4b23fc2 · 4b23fc2
1 parent e444c98
commit 4b23fc2
Showing 1 changed file with 40 additions and 33 deletions.
diff --git a/framework/ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php b/framework/ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php
@@ -9,6 +9,7 @@
 class Horde_ActiveSync_StateTest_Mongo_BaseTest extends Horde_ActiveSync_StateTest_Base
 {
     protected static $mongo;
+    protected static $reason;
 
     public function testGetDeviceInfo()
     {
@@ -37,16 +38,15 @@ public function testPolicyKeys()
     public function testDuplicatePIMAddition()
     {
         // @TODO. For now, cheat and add the data directly to the db.
-        try {
-            $mongo = new Horde_Mongo_Client();
-            $mongo->activesync_test->HAS_map->insert(array(
-                'sync_clientid' => 'abc',
-                'sync_user' => 'mike',
-                'message_uid' => 'def',
-                'sync_devid' => 'dev123'));
-            self::$state->loadDeviceInfo('dev123', 'mike');
-            $this->assertEquals('def', self::$state->isDuplicatePIMAddition('abc'));
-        } catch (MongoConnectionException $e) {}
+        $doc = array(
+            'sync_clientid' => 'abc',
+            'sync_user' => 'mike',
+            'message_uid' => 'def',
+            'sync_devid' => 'dev123'
+        );
+        self::$mongo->horde_activesync_test->HAS_map->insert($doc);
+        self::$state->loadDeviceInfo('dev123', 'mike');
+        $this->assertEquals('def', self::$state->isDuplicatePIMAddition('abc'));
     }
 
     /**
@@ -201,30 +201,11 @@ public function testPartialSyncWithOnlyChangedHbInterval()
         $this->_testPartialSyncWithOnlyChangedHbInterval();
     }
 
-    public static function tearDownAfterClass()
-    {
-        if ((extension_loaded('mongo') || extension_loaded('mongodb')) &&
-            class_exists('Horde_Mongo_Client') &&
-            ($config = self::getConfig('ACTIVESYNC_MONGO_TEST_CONFIG', __DIR__ . '/../..')) &&
-            isset($config['activesync']['mongo']['hostspec'])) {
-            try {
-                $factory = new Horde_Test_Factory_Mongo();
-                $mongo = $factory->create(array(
-                    'config' => $config['activesync']['mongo']['hostspec'],
-                    'dbname' => 'horde_activesync_test'
-                ));
-                $mongo->activesync_test->drop();
-            } catch (MongoConnectionException $e) {
-            }
-        }
-        parent::tearDownAfterClass();
-    }
-
-    public function setUp()
+    public static function setUpBeforeClass()
     {
         if (!(extension_loaded('mongo') || extension_loaded('mongodb')) ||
             !class_exists('Horde_Mongo_Client')) {
-            $this->markTestSkipped('MongoDB extension not loaded.');
+            self::$reason = 'MongoDB extension not loaded.';
             return;
         }
         if (($config = self::getConfig('ACTIVESYNC_MONGO_TEST_CONFIG', __DIR__ . '/../..')) &&
@@ -236,13 +217,39 @@ public function setUp()
             ));
         }
         if (empty(self::$mongo)) {
-            $this->markTestSkipped('Mongo connection failed.');
+            self::$reason = 'Mongo connection failed.';
             return;
         }
         self::$state = new Horde_ActiveSync_State_Mongo(array('connection' => self::$mongo));
+        self::$logger = new Horde_Test_Log();
+    }
+
+    public function setUp()
+    {
+        if (empty(self::$mongo)) {
+            $this->markTestSkipped(self::$reason);
+        }
         $backend = $this->getMockSkipConstructor('Horde_ActiveSync_Driver_Base');
         $backend->expects($this->any())->method('getUser')->will($this->returnValue('mike'));
         self::$state->setBackend($backend);
-        self::$logger = new Horde_Test_Log();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        if ((extension_loaded('mongo') || extension_loaded('mongodb')) &&
+            class_exists('Horde_Mongo_Client') &&
+            ($config = self::getConfig('ACTIVESYNC_MONGO_TEST_CONFIG', __DIR__ . '/../..')) &&
+            isset($config['activesync']['mongo']['hostspec'])) {
+            try {
+                $factory = new Horde_Test_Factory_Mongo();
+                $mongo = $factory->create(array(
+                    'config' => $config['activesync']['mongo']['hostspec'],
+                    'dbname' => 'horde_activesync_test'
+                ));
+                $mongo->activesync_test->drop();
+            } catch (MongoConnectionException $e) {
+            }
+        }
+        parent::tearDownAfterClass();
     }
 }