Changeset 468 for trunk/tests/Auth_SQLTest.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• tests/Auth_SQLTest.php (modified) (11 diffs)

trunk/tests/Auth_SQLTest.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
+
 class Auth_SQLTest extends PHPUnit_TestCase {
 
@@ -51 +51 @@
             'login_url'         => '/login.php',
             'blocking'          => true,
-            'encryption_type' => AUTH_ENCRYPT_MD5_HARDENED,
+            'encryption_type' => Auth_SQL::ENCRYPT_MD5_HARDENED,
         ));
 
@@ -80 +80 @@
     {
         $db =& DB::getInstance();
-    
+
         unset($this->Auth_SQL);
         $db->query("DROP TABLE IF EXISTS test_user_tbl");
@@ -145 +145 @@
         $after_logged_in = $this->Auth_SQL->isloggedin();
         $this->assertFalse($after_logged_in, '3. User is still logged in but should not be.');
-        
+
         // Testing wrong password.
         $login2 = $this->Auth_SQL->login('testuser', 'wrongpass');
@@ -164 +164 @@
     {
         $db =& DB::getInstance();
-    
+
         $this->Auth_SQL->login('testuser', 'testpass');
         $this->Auth_SQL->blockaccount(null, 'blocktestuser');
@@ -178 +178 @@
     {
         $db =& DB::getInstance();
-    
+
         $db->query("
             UPDATE test_user_tbl SET blocked_reason = 'blocktestuser'
@@ -212 +212 @@
     function test_encryptpassword()
     {
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_MD5));
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_MD5));
         $result = $this->Auth_SQL->encryptpassword('123');
         $this->assertEquals('202cb962ac59075b964b07152d234b70', $result);
 
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_MD5_HARDENED));
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_MD5_HARDENED));
         $result = $this->Auth_SQL->encryptpassword('123');
         $this->assertEquals('c55e4ac608a8768ecd758fab971b0646', $result);
 
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1));
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_SHA1));
         $result = $this->Auth_SQL->encryptpassword('123');
         $this->assertEquals('40bd001563085fc35165329ea1ff5c5ecbdbbeef', $result);
 
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1_HARDENED));
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_SHA1_HARDENED));
         $result = $this->Auth_SQL->encryptpassword('123');
         $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $result);
 
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_PLAINTEXT));
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_PLAINTEXT));
         $result = $this->Auth_SQL->encryptpassword('123');
         $this->assertEquals('123', $result);
 
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_CRYPT));
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_CRYPT));
         $result = $this->Auth_SQL->encryptpassword('123', 'saltstring');
         $this->assertEquals('saEZ6MlWYV9nQ', $result);
@@ -240 +240 @@
     {
         $db =& DB::getInstance();
-    
-        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1_HARDENED));
+
+        $this->Auth_SQL->setParam(array('encryption_type' => Auth_SQL::ENCRYPT_SHA1_HARDENED));
         $this->Auth_SQL->setpassword(null, '123');
         $qid = $db->query("
@@ -261 +261 @@
 $result = PHPUnit::run($suite);
 echo $result->toString();
-?>