Changeset 136 for trunk/tests/Auth_SQLTest.php

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

• trunk/tests/Auth_SQLTest.php (modified) (11 diffs)

trunk/tests/Auth_SQLTest.php

@@ -21 +21 @@
     function setUp()
     {
-        require dirname(__FILE__) . '/_config.inc.php';
+        require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Auth_SQL.inc.php';
         $this->Auth_SQL =& new Auth_SQL('testauth');
@@ -29 +29 @@
             'db_login_table'    => 'test_login_tbl',
             'login_url'         => '/login.php',
-            'blocking'          => true
+            'blocking'          => true,
+            'encryption_type' => AUTH_ENCRYPT_MD5_HARDENED,
         ));
 
@@ -36 +37 @@
 
         // Insert test data.
-        DB::query("
+        $db =& DB::getInstance();
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -46 +48 @@
             ) VALUES (
                 'testuser',
-                md5('testpass'),
+                '" . $this->Auth_SQL->encryptPassword('testpass') . "',
                 'John',
                 'Doe',
@@ -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");
     }
 
@@ -66 +70 @@
     {
         $this->Auth_SQL->setval('testuserkey', 'testuserval');
-        $this->assertEquals('testuserval', $_SESSION[$this->Auth_SQL->_sess]['user_data']['testuserkey']);
+        $this->assertEquals('testuserval', $_SESSION[$this->Auth_SQL->_ns]['user_data']['testuserkey']);
     }
 
     function test_getval()
     {
-        $_SESSION[$this->Auth_SQL->_sess]['user_data']['testuserkey'] = 'testuserval';
+        $_SESSION[$this->Auth_SQL->_ns]['user_data']['testuserkey'] = 'testuserval';
         $val = $this->Auth_SQL->getVal('testuserkey');
         $this->assertEquals('testuserval', $val);
@@ -107 +111 @@
         $this->assertTrue($true, 'User login failed, but should have succeeded.');
 
-        echo "Testing wrong password...\n";
+        // Testing wrong password.
         $false = $this->Auth_SQL->authenticate('testuser', 'wrongpass');
 
@@ -122 +126 @@
         $after_logged_in = $this->Auth_SQL->isloggedin();
         $this->assertFalse($after_logged_in, '3. User is still logged in but should not be.');
-
-        echo "Testing wrong password...\n";
+        
+        // Testing wrong password.
         $login2 = $this->Auth_SQL->login('testuser', 'wrongpass');
         $this->assertFalse($login2, '4. User login succeeded, but should have failed.');
@@ -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
@@ -185 +193 @@
     function test_encryptpassword()
     {
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_MD5));
         $result = $this->Auth_SQL->encryptpassword('123');
         $this->assertEquals('202cb962ac59075b964b07152d234b70', $result);
+
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_MD5_HARDENED));
+        $result = $this->Auth_SQL->encryptpassword('123');
+        $this->assertEquals('c55e4ac608a8768ecd758fab971b0646', $result);
+
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1));
+        $result = $this->Auth_SQL->encryptpassword('123');
+        $this->assertEquals('40bd001563085fc35165329ea1ff5c5ecbdbbeef', $result);
+
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1_HARDENED));
+        $result = $this->Auth_SQL->encryptpassword('123');
+        $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $result);
+
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_PLAINTEXT));
+        $result = $this->Auth_SQL->encryptpassword('123');
+        $this->assertEquals('123', $result);
+
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_CRYPT));
+        $result = $this->Auth_SQL->encryptpassword('123', 'saltstring');
+        $this->assertEquals('saEZ6MlWYV9nQ', $result);
     }
 
     function test_setpassword()
     {
+        $db =& DB::getInstance();
+    
+        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1_HARDENED));
         $this->Auth_SQL->setpassword(null, '123');
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT userpass
             FROM test_user_tbl
         ");
         list($pass) = mysql_fetch_row($qid);
-        $this->assertEquals('202cb962ac59075b964b07152d234b70', $pass);
+        $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $pass);
     }