follow up r60916 - Use getType instead of instanceOf as suggested by Simetrical

[lhc/web/wiklou.git] / tests / DatabaseTest.php

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index edb785d..aa50de2 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -1,29 +1,18 @@
 <?php
 
-require_once( 'PHPUnit.php' );
-require_once( '../includes/Defines.php' );
-require_once( '../includes/Database.php' );
-require_once( '../includes/GlobalFunctions.php' );
-
-class DatabaseTest extends PHPUnit_TestCase {
+class DatabaseTest extends PHPUnit_Framework_TestCase {
        var $db;
 
-       function DatabaseTest( $name ) {
-               $this->PHPUnit_TestCase( $name );
-       }
-
        function setUp() {
-               $this->db = new Database();
-       }
-
-       function tearDown() {
-               unset( $this->db );
+               $this->db = wfGetDB( DB_SLAVE );
        }
 
        function testAddQuotesNull() {
-               $this->assertEquals(
-                       'NULL',
-                       $this->db->addQuotes( NULL ) );
+               $check = "NULL";
+               if ( $this->db->getType() === 'sqlite' ) {
+                       $check = "''";
+               }
+               $this->assertEquals( $check, $this->db->addQuotes( null ) );
        }
 
        function testAddQuotesInt() {
@@ -48,8 +37,12 @@ class DatabaseTest extends PHPUnit_TestCase {
        }
 
        function testAddQuotesStringQuote() {
+               $check = "'string''s cause trouble'";
+               if ( $this->db->getType() === 'mysql' ) {
+                       $check = "'string\'s cause trouble'";
+               }
                $this->assertEquals(
-                       "'string\'s cause trouble'",
+                       $check,
                        $this->db->addQuotes( "string's cause trouble" ) );
        }
 
@@ -65,18 +58,24 @@ class DatabaseTest extends PHPUnit_TestCase {
                $sql = $this->db->fillPrepared(
                        'SELECT * FROM cur WHERE cur_namespace=? AND cur_title=?',
                        array( 4, "Snicker's_paradox" ) );
-               $this->assertEquals(
-                       "SELECT * FROM cur WHERE cur_namespace='4' AND cur_title='Snicker\'s_paradox'",
-                       $sql);
+
+               $check = "SELECT * FROM cur WHERE cur_namespace='4' AND cur_title='Snicker''s_paradox'";
+               if ( $this->db->getType() === 'mysql' ) {
+                       $check = "SELECT * FROM cur WHERE cur_namespace='4' AND cur_title='Snicker\'s_paradox'";
+               }
+               $this->assertEquals( $check, $sql );
        }
 
        function testFillPreparedBang() {
                $sql = $this->db->fillPrepared(
                        'SELECT user_id FROM ! WHERE user_name=?',
                        array( '"user"', "Slash's Dot" ) );
-               $this->assertEquals(
-                       "SELECT user_id FROM \"user\" WHERE user_name='Slash\'s Dot'",
-                       $sql);
+
+               $check = "SELECT user_id FROM \"user\" WHERE user_name='Slash''s Dot'";
+               if ( $this->db->getType() === 'mysql' ) {
+                       $check = "SELECT user_id FROM \"user\" WHERE user_name='Slash\'s Dot'";
+               }
+               $this->assertEquals( $check, $sql );
        }
 
        function testFillPreparedRaw() {
@@ -90,4 +89,4 @@ class DatabaseTest extends PHPUnit_TestCase {
 
 }
 
-?>
+