Fixed unit tests
authorXavier Perseguers <typo3@perseguers.ch>
Wed, 26 Jan 2011 10:41:01 +0000 (10:41 +0000)
committerXavier Perseguers <typo3@perseguers.ch>
Wed, 26 Jan 2011 10:41:01 +0000 (10:41 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/dbal/trunk@42647 735d13b6-9817-0410-8766-e36946ffe9aa

typo3/sysext/dbal/ChangeLog
typo3/sysext/dbal/tests/FakeDbConnection.php
typo3/sysext/dbal/tests/dbOracleTest.php

index 32ffac3..9c581d7 100644 (file)
@@ -1,3 +1,7 @@
+2011-01-26  Xavier Perseguers  <typo3@perseguers.ch>
+
+       * Fixed unit tests
+
 2011-01-25  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Fixed bug #17221: Install tool is unable to delete database tables
index dda64a7..962c764 100644 (file)
@@ -48,7 +48,8 @@ class FakeDbConnection {
                $db->clearCachedFieldInfo();
                $db->_call('initInternalVariables');
 
-               include_once(t3lib_extMgm::extPath('adodb') . 'adodb/drivers/adodb-' . $driver . '.inc.php');
+               require_once(t3lib_extMgm::extPath('adodb') . 'adodb/adodb.inc.php');
+               require_once(t3lib_extMgm::extPath('adodb') . 'adodb/drivers/adodb-' . $driver . '.inc.php');
 
                $handlerKey = '_DEFAULT';
                $db->lastHandlerKey = $handlerKey;
index 2ce1ff4..6d53d1c 100644 (file)
@@ -318,7 +318,7 @@ class dbOracleTest extends BaseTestCase {
                                                . ' AND sys_refindex.ref_string LIKE CONCAT(tx_dam_file_tracking.file_path, tx_dam_file_tracking.file_name)'
                ));
                $expected = 'SELECT * FROM "sys_refindex", "tx_dam_file_tracking" WHERE "sys_refindex"."tablename" = \'tx_dam_file_tracking\'';
-               $expected .= ' AND (instr(LOWER("sys_refindex"."ref_string"), CONCAT("tx_dam_file_tracking"."file_path","tx_dam_file_tracking"."file_name"),1,1) > 0)';
+               $expected .= ' AND (instr(LOWER("sys_refindex"."ref_string"), concat("tx_dam_file_tracking"."file_path","tx_dam_file_tracking"."file_name"),1,1) > 0)';
                $this->assertEquals($expected, $query);
        }
 
@@ -448,7 +448,7 @@ class dbOracleTest extends BaseTestCase {
                $query = $this->cleanSql($GLOBALS['TYPO3_DB']->_call('SELECTqueryFromArray', $remappedParameters));
 
                $expected = 'SELECT * FROM "sys_refindex", "tx_dam_file_tracking" WHERE "sys_refindex"."tablename" = \'tx_dam_file_tracking\'';
-               $expected .= ' AND (instr(LOWER("sys_refindex"."ref_string"), CONCAT("tx_dam_file_tracking"."path","tx_dam_file_tracking"."filename"),1,1) > 0)';
+               $expected .= ' AND (instr(LOWER("sys_refindex"."ref_string"), concat("tx_dam_file_tracking"."path","tx_dam_file_tracking"."filename"),1,1) > 0)';
                $this->assertEquals($expected, $query);
        }
 
@@ -1137,7 +1137,7 @@ class dbOracleTest extends BaseTestCase {
                        'tt_content',
                        'bodytext LIKE BINARY \'test\''
                ));
-               $expected = 'SELECT * FROM "tt_content" WHERE (dbms_lob.instr(LOWER("bodytext"), \'test\',1,1) > 0)';
+               $expected = 'SELECT * FROM "tt_content" WHERE (dbms_lob.instr("bodytext", \'test\',1,1) > 0)';
                $this->assertEquals($expected, $query);
        }
 }