Changeset 130 for branches/2.0singleton/tests

Timestamp:

May 30, 2006 9:30:35 PM (18 years ago)

Author:

scdev

Message:

finished updating DB:: to $db->

Location:

branches/2.0singleton/tests

Files:

• AppTest.php (modified) (1 diff)
• Auth_SQLTest.php (modified) (6 diffs)
• RecordLockTest.php (modified) (3 diffs)
• RecordVersionTest.php (modified) (3 diffs)

branches/2.0singleton/tests/AppTest.php

@@ -71 +71 @@
     function test_dbquery()
     {
-        $qid = DB::query("SELECT 2 + 2");
+        $db =& DB::getInstance();
+    
+        $qid = $db->query("SELECT 2 + 2");
         list($result) = mysql_fetch_row($qid);
         $this->assertEquals('4', $result);

branches/2.0singleton/tests/Auth_SQLTest.php

@@ -21 +21 @@
     function setUp()
     {
-        require dirname(__FILE__) . '/_config.inc.php';
+        $db =& DB::getInstance();
+    
+        require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Auth_SQL.inc.php';
         $this->Auth_SQL =& new Auth_SQL('testauth');
@@ -36 +38 @@
 
         // Insert test data.
-        DB::query("
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -58 +60 @@
     function tearDown()
     {
-        unset($this->Auth_SQL);
-        DB::query("DROP TABLE IF EXISTS test_user_tbl");
-        DB::query("DROP TABLE IF EXISTS test_login_tbl");
+        $db =& DB::getInstance();
+    
+        unset($this->Auth_SQL);
+        $db->query("DROP TABLE IF EXISTS test_user_tbl");
+        $db->query("DROP TABLE IF EXISTS test_login_tbl");
     }
 
@@ -140 +144 @@
     function test_blockaccount()
     {
+        $db =& DB::getInstance();
+    
         $this->Auth_SQL->login('testuser', 'testpass');
         $this->Auth_SQL->blockaccount(null, 'blocktestuser');
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT blocked_reason
             FROM test_user_tbl
@@ -152 +158 @@
     function test_unblockaccount()
     {
-        DB::query("
+        $db =& DB::getInstance();
+    
+        $db->query("
             UPDATE test_user_tbl SET blocked_reason = 'blocktestuser'
         ");
         $this->Auth_SQL->unblockaccount();
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT blocked_reason
             FROM test_user_tbl
@@ -191 +199 @@
     function test_setpassword()
     {
+        $db =& DB::getInstance();
+    
         $this->Auth_SQL->setpassword(null, '123');
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT userpass
             FROM test_user_tbl

branches/2.0singleton/tests/RecordLockTest.php

@@ -22 +22 @@
     function setUp()
     {
+        $db =& DB::getInstance();
+    
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/RecordLock.inc.php';
@@ -39 +41 @@
 
         // Insert test data.
-        DB::query("
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -67 +69 @@
     function tearDown()
     {
+        $db =& DB::getInstance();
+    
         unset($this->RecordLock);
         unset($this->Auth_SQL);
-        DB::query("DROP TABLE IF EXISTS test_user_tbl");
-        DB::query("DROP TABLE IF EXISTS test_login_tbl");
-        DB::query("DROP TABLE IF EXISTS test_lock_tbl");
+        $db->query("DROP TABLE IF EXISTS test_user_tbl");
+        $db->query("DROP TABLE IF EXISTS test_login_tbl");
+        $db->query("DROP TABLE IF EXISTS test_lock_tbl");
     }
 

branches/2.0singleton/tests/RecordVersionTest.php

@@ -22 +22 @@
     function setUp()
     {
+        $db =& DB::getInstance();
+    
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/RecordVersion.inc.php';
@@ -39 +41 @@
 
         // Insert test data.
-        DB::query("
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -68 +70 @@
     function tearDown()
     {
+        $db =& DB::getInstance();
+    
         unset($this->RecordVersion);
         unset($this->Auth_SQL);
-        DB::query("DROP TABLE IF EXISTS test_user_tbl");
-        DB::query("DROP TABLE IF EXISTS test_login_tbl");
-        DB::query("DROP TABLE IF EXISTS test_version_tbl");
+        $db->query("DROP TABLE IF EXISTS test_user_tbl");
+        $db->query("DROP TABLE IF EXISTS test_login_tbl");
+        $db->query("DROP TABLE IF EXISTS test_version_tbl");
     }