Fix some of the problems with Oracle testsuite

doctrine · Jun 26, 2011 · 5243125 · 5243125
1 parent 6994401
commit 5243125
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -274,10 +274,15 @@ public function testConcatFunction()
      */
     public function testDateDiff()
     {
-        $arg = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), '2011-01-01') AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m")
-                ->getARrayResult();
-
-        $this->assertTrue($arg[0]['diff'] > 0);
+        $query = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day')) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m");
+        $arg = $query->getArrayResult();
+
+        $this->assertEquals(-10, $arg[0]['diff'], "Should be roughly -10 (or -9)", 1);
+
+        $query = $this->_em->createQuery("SELECT DATE_DIFF(DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day'), CURRENT_TIMESTAMP()) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m");
+        $arg = $query->getArrayResult();
+
+        $this->assertEquals(10, $arg[0]['diff'], "Should be roughly 10 (or 9)", 1);
     }
 
     /**

diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -297,6 +297,13 @@ protected function _getEntityManager($config = null, $eventManager = null) {
             }
         }
 
+        if (isset($GLOBALS['db_event_subscribers'])) {
+            foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) {
+                $subscriberInstance = new $subscriberClass();
+                $evm->addEventSubscriber($subscriberInstance);
+            }
+        }
+
         return \Doctrine\ORM\EntityManager::create($conn, $config);
     }
 

diff --git a/tests/Doctrine/Tests/TestUtil.php b/tests/Doctrine/Tests/TestUtil.php
@@ -77,17 +77,7 @@ public static function getConnection()
                 }
             }
 
-            $eventManager = null;
-            if (isset($GLOBALS['db_event_subscribers'])) {
-                $eventManager = new \Doctrine\Common\EventManager();
-                foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) {
-                    $subscriberInstance = new $subscriberClass();
-                    $eventManager->addEventSubscriber($subscriberInstance);
-                }
-            }
-
-            $conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, $eventManager);
-
+            $conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, null);
         } else {
             $params = array(
                 'driver' => 'pdo_sqlite',