Changeset 136 for trunk/tests


Ignore:
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.

Location:
trunk/tests
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/AppTest.php

    r42 r136  
    3232    function test_getinstance()
    3333    {
    34         $thisapp =& App::getinstance();
     34        $thisapp =& App::getInstance();
    3535        $this->assertTrue(serialize($thisapp) == serialize($this->App), 'Objects do not match across instantiations.');
    3636    }
    … …  
    7171    function test_dbquery()
    7272    {
    73         $qid = DB::query("SELECT 2 + 2");
     73        $db =& DB::getInstance();
     74   
     75        $qid = $db->query("SELECT 2 + 2");
    7476        list($result) = mysql_fetch_row($qid);
    7577        $this->assertEquals('4', $result);
    … …  
    7880    function test_raisemsg()
    7981    {
     82        $app =& App::getInstance();
    8083        $expected = 'My message';
    81         App::raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
    82         $msg = current($_SESSION[$this->App->app]['messages']);
     84        $app->raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
     85        $msg = current($_SESSION[$this->App->_ns]['messages']);
    8386        $this->assertEquals($expected, $msg['message']);
    8487    }
    … …  
    8790    {
    8891        ob_start();
    89         App::printraisedmessages();
     92        $app =& App::getInstance();
     93        $app->printraisedmessages();
    9094        $result = ob_get_clean();
    9195        $this->assertContains('My message', $result, 'Raised message not found in output.');
    … …  
    9498    function test_logmsg()
    9599    {
     100        $app =& App::getInstance();
    96101        $file = $this->App->getParam('log_directory') . '/' . $this->App->getParam('log_filename');
    97         App::logMsg('Test log message', LOG_DEBUG, __FILE__, __LINE__);
     102        $app->logMsg('Test log message', LOG_DEBUG, __FILE__, __LINE__);
    98103        if ($result = file($file)) {
    99104            $result = end($result);
    … …  
    106111    function test_ohref()
    107112    {
     113        $app =& App::getInstance();
    108114        $_GET['arg1'] = 'A';
    109         $result = App::ohref('/some/url.php', array('arg1'), true);
     115        $result = $app->ohref('/some/url.php', array('arg1'), true);
    110116        $this->assertContains(session_name(), $result, 'SSID not found in URL.');
    111117        $this->assertContains('arg1=A', $result, 'Argument not passed through.');
    … …  
    114120    function test_printhiddensession()
    115121    {
     122        $app =& App::getInstance();
    116123        ob_start();
    117         App::printhiddensession();
     124        $app->printhiddensession();
    118125        $result = ob_get_clean();
    119126        $this->assertContains(session_name(), $result);
    … …  
    122129//     function test_dieurl()
    123130//     {
    124 //         App::dieURL('/die/to/this/url.php');
     131//         $app =& App::getInstance();
     132//         $app->dieURL('/die/to/this/url.php');
    125133//     }
    126134//

  • trunk/tests/Auth_FileTest.php

    r42 r136  
    2323        require dirname(__FILE__) . '/_config.inc.php';
    2424        require_once '../lib/Auth_File.inc.php';
    25         $this->Auth_File =& new Auth_File(array('htpasswd_file' => dirname(__FILE__) . '/_test_htpasswd'));
     25        $this->Auth_File =& new Auth_File('test_auth');
     26        $this->Auth_File->setParam(array('htpasswd_file' => dirname(__FILE__) . '/_test_htpasswd'));
    2627    }
    2728
    … …  
    4445        $result = $this->Auth_File->login('testuser', 'testpass');
    4546        $this->assertTrue($result, 'testuser login failed.');
    46         $this->assertTrue($_SESSION['_auth']['authenticated'], 'testuser authentication not found in session.');
     47        $this->assertTrue($_SESSION[$this->Auth_File->_ns]['authenticated'], 'testuser authentication not found in session.');
    4748    }
    4849
    … …  
    5152        $result = $this->Auth_File->login('testuser', 'testpass');
    5253        $this->Auth_File->clearauth();
    53         $this->assertFalse($_SESSION['_auth']['authenticated'], 'testuser authentication not false in session.');
     54        $this->assertFalse($_SESSION[$this->Auth_File->_ns]['authenticated'], 'testuser authentication not false in session.');
    5455    }
    5556

  • trunk/tests/Auth_SQLTest.php

    r42 r136  
    2121    function setUp()
    2222    {
    23         require dirname(__FILE__) . '/_config.inc.php';
     23        require dirname(__FILE__) . '/_config.inc.php';
    2424        require_once '../lib/Auth_SQL.inc.php';
    2525        $this->Auth_SQL =& new Auth_SQL('testauth');
    … …  
    2929            'db_login_table'    => 'test_login_tbl',
    3030            'login_url'         => '/login.php',
    31             'blocking'          => true
     31            'blocking'          => true,
     32            'encryption_type' => AUTH_ENCRYPT_MD5_HARDENED,
    3233        ));
    3334
    … …  
    3637
    3738        // Insert test data.
    38         DB::query("
     39        $db =& DB::getInstance();
     40        $db->query("
    3941            INSERT INTO test_user_tbl (
    4042                username,
    … …  
    4648            ) VALUES (
    4749                'testuser',
    48                 md5('testpass'),
     50                '" . $this->Auth_SQL->encryptPassword('testpass') . "',
    4951                'John',
    5052                'Doe',
    … …  
    5860    function tearDown()
    5961    {
    60         unset($this->Auth_SQL);
    61         DB::query("DROP TABLE IF EXISTS test_user_tbl");
    62         DB::query("DROP TABLE IF EXISTS test_login_tbl");
     62        $db =& DB::getInstance();
     63   
     64        unset($this->Auth_SQL);
     65        $db->query("DROP TABLE IF EXISTS test_user_tbl");
     66        $db->query("DROP TABLE IF EXISTS test_login_tbl");
    6367    }
    6468
    … …  
    6670    {
    6771        $this->Auth_SQL->setval('testuserkey', 'testuserval');
    68         $this->assertEquals('testuserval', $_SESSION[$this->Auth_SQL->_sess]['user_data']['testuserkey']);
     72        $this->assertEquals('testuserval', $_SESSION[$this->Auth_SQL->_ns]['user_data']['testuserkey']);
    6973    }
    7074
    7175    function test_getval()
    7276    {
    73         $_SESSION[$this->Auth_SQL->_sess]['user_data']['testuserkey'] = 'testuserval';
     77        $_SESSION[$this->Auth_SQL->_ns]['user_data']['testuserkey'] = 'testuserval';
    7478        $val = $this->Auth_SQL->getVal('testuserkey');
    7579        $this->assertEquals('testuserval', $val);
    … …  
    107111        $this->assertTrue($true, 'User login failed, but should have succeeded.');
    108112
    109         echo "Testing wrong password...\n";
     113        // Testing wrong password.
    110114        $false = $this->Auth_SQL->authenticate('testuser', 'wrongpass');
    111115
    … …  
    122126        $after_logged_in = $this->Auth_SQL->isloggedin();
    123127        $this->assertFalse($after_logged_in, '3. User is still logged in but should not be.');
    124 
    125         echo "Testing wrong password...\n";
     128       
     129        // Testing wrong password.
    126130        $login2 = $this->Auth_SQL->login('testuser', 'wrongpass');
    127131        $this->assertFalse($login2, '4. User login succeeded, but should have failed.');
    … …  
    140144    function test_blockaccount()
    141145    {
     146        $db =& DB::getInstance();
     147   
    142148        $this->Auth_SQL->login('testuser', 'testpass');
    143149        $this->Auth_SQL->blockaccount(null, 'blocktestuser');
    144         $qid = DB::query("
     150        $qid = $db->query("
    145151            SELECT blocked_reason
    146152            FROM test_user_tbl
    … …  
    152158    function test_unblockaccount()
    153159    {
    154         DB::query("
     160        $db =& DB::getInstance();
     161   
     162        $db->query("
    155163            UPDATE test_user_tbl SET blocked_reason = 'blocktestuser'
    156164        ");
    157165        $this->Auth_SQL->unblockaccount();
    158166
    159         $qid = DB::query("
     167        $qid = $db->query("
    160168            SELECT blocked_reason
    161169            FROM test_user_tbl
    … …  
    185193    function test_encryptpassword()
    186194    {
     195        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_MD5));
    187196        $result = $this->Auth_SQL->encryptpassword('123');
    188197        $this->assertEquals('202cb962ac59075b964b07152d234b70', $result);
     198
     199        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_MD5_HARDENED));
     200        $result = $this->Auth_SQL->encryptpassword('123');
     201        $this->assertEquals('c55e4ac608a8768ecd758fab971b0646', $result);
     202
     203        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1));
     204        $result = $this->Auth_SQL->encryptpassword('123');
     205        $this->assertEquals('40bd001563085fc35165329ea1ff5c5ecbdbbeef', $result);
     206
     207        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1_HARDENED));
     208        $result = $this->Auth_SQL->encryptpassword('123');
     209        $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $result);
     210
     211        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_PLAINTEXT));
     212        $result = $this->Auth_SQL->encryptpassword('123');
     213        $this->assertEquals('123', $result);
     214
     215        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_CRYPT));
     216        $result = $this->Auth_SQL->encryptpassword('123', 'saltstring');
     217        $this->assertEquals('saEZ6MlWYV9nQ', $result);
    189218    }
    190219
    191220    function test_setpassword()
    192221    {
     222        $db =& DB::getInstance();
     223   
     224        $this->Auth_SQL->setParam(array('encryption_type' => AUTH_ENCRYPT_SHA1_HARDENED));
    193225        $this->Auth_SQL->setpassword(null, '123');
    194         $qid = DB::query("
     226        $qid = $db->query("
    195227            SELECT userpass
    196228            FROM test_user_tbl
    197229        ");
    198230        list($pass) = mysql_fetch_row($qid);
    199         $this->assertEquals('202cb962ac59075b964b07152d234b70', $pass);
     231        $this->assertEquals('33d90af96a5928ac93cbd41fc436e8c55d2768c2', $pass);
    200232    }
    201233

  • trunk/tests/DBSessionHandlerTest.php

    r42 r136  
    2424        require_once '../lib/DBSessionHandler.inc.php';
    2525        session_write_close();
    26         $this->DBSessionHandler = new DBSessionHandler($app->db);
    27         $this->DBSessionHandler = new DBSessionHandler(null, array(
    28             'db_server' => $app->getParam('db_server'),
    29             'db_name' => $app->getParam('db_name'),
    30             'db_user' => $app->getParam('db_user'),
    31             'db_pass' => $app->getParam('db_pass'),
    32             'db_always_debug' => $app->getParam('db_always_debug'),
    33             'db_debug' => $app->getParam('db_debug'),
    34             'db_die_on_failure' => $app->getParam('db_die_on_failure'),
     26        $this->DBSessionHandler = new DBSessionHandler($app->db, array(
     27            'db_table' => 'session_tbl',
     28            'create_table' => true,
    3529        ));
    3630    }

  • trunk/tests/RecordLockTest.php

    r42 r136  
    2121
    2222    function setUp()
    23     {
     23    {   
    2424        require dirname(__FILE__) . '/_config.inc.php';
    2525        require_once '../lib/RecordLock.inc.php';
    2626        require_once '../lib/Auth_SQL.inc.php';
    2727
    28         $this->Auth_SQL =& new Auth_SQL('testauth');
     28        $this->Auth_SQL =& new Auth_SQL('test');
    2929        $this->Auth_SQL->setParam(array(
    3030            'db_table'          => 'test_user_tbl',
    … …  
    3939
    4040        // Insert test data.
    41         DB::query("
     41        $db =& DB::getInstance();
     42        $db->query("
    4243            INSERT INTO test_user_tbl (
    4344                username,
    … …  
    4950            ) VALUES (
    5051                'testuser',
    51                 md5('testpass'),
     52                '" . $this->Auth_SQL->encryptPassword('testpass') . "',
    5253                'John',
    5354                'Doe',
    … …  
    5758        ");
    5859        $this->Auth_SQL->login('testuser', 'testpass');
     60
     61        if (!$this->Auth_SQL->isLoggedIn()) {
     62            trigger_error("User login failed...tests canceled.", E_USER_ERROR);
     63        }
    5964
    6065        $this->RecordLock =& RecordLock::getInstance($this->Auth_SQL);
    … …  
    6772    function tearDown()
    6873    {
     74        $db =& DB::getInstance();
     75   
    6976        unset($this->RecordLock);
    7077        unset($this->Auth_SQL);
    71         DB::query("DROP TABLE IF EXISTS test_user_tbl");
    72         DB::query("DROP TABLE IF EXISTS test_login_tbl");
    73         DB::query("DROP TABLE IF EXISTS test_lock_tbl");
     78        $db->query("DROP TABLE IF EXISTS test_user_tbl");
     79        $db->query("DROP TABLE IF EXISTS test_login_tbl");
     80        $db->query("DROP TABLE IF EXISTS test_lock_tbl");
    7481    }
    7582

  • trunk/tests/RecordVersionTest.php

    r42 r136  
    2121
    2222    function setUp()
    23     {
     23    {   
    2424        require dirname(__FILE__) . '/_config.inc.php';
    2525        require_once '../lib/RecordVersion.inc.php';
    … …  
    3939
    4040        // Insert test data.
    41         DB::query("
     41        $db =& DB::getInstance();
     42        $db->query("
    4243            INSERT INTO test_user_tbl (
    4344                username,
    … …  
    6869    function tearDown()
    6970    {
     71        $db =& DB::getInstance();
     72   
    7073        unset($this->RecordVersion);
    7174        unset($this->Auth_SQL);
    72         DB::query("DROP TABLE IF EXISTS test_user_tbl");
    73         DB::query("DROP TABLE IF EXISTS test_login_tbl");
    74         DB::query("DROP TABLE IF EXISTS test_version_tbl");
     75        $db->query("DROP TABLE IF EXISTS test_user_tbl");
     76        $db->query("DROP TABLE IF EXISTS test_login_tbl");
     77        $db->query("DROP TABLE IF EXISTS test_version_tbl");
    7578    }
    7679

  • trunk/tests/SessionCacheTest.php

    r42 r136  
    44
    55/**
    6  * PHPUnit test case for SessionCache
     6 * PHPUnit test case for Cache
    77 *
    88 * The method skeletons below need to be filled in with
    … …  
    1313 */
    1414require_once 'PHPUnit.php';
    15 class SessionCacheTest extends PHPUnit_TestCase {
     15class CacheTest extends PHPUnit_TestCase {
    1616
    17     var $SessionCache;
     17    var $Cache;
    1818
    19     function SessionCacheTest($name)
     19    function CacheTest($name)
    2020    {
    2121        $this->PHPUnit_TestCase($name);
    … …  
    2525    {
    2626        require dirname(__FILE__) . '/_config.inc.php';
    27         require_once '../lib/SessionCache.inc.php';
    28         $this->SessionCache =& new SessionCache(PARAM);
     27        require_once '../lib/Cache.inc.php';
     28        $this->Cache =& new Cache(PARAM);
    2929    }
    3030
    3131    function tearDown()
    3232    {
    33         unset($this->SessionCache);
     33        unset($this->Cache);
    3434    }
    3535
    3636    function test_getinstance()
    3737    {
    38         $result = $this->SessionCache->getinstance(PARAM);
     38        $result = $this->Cache->getinstance(PARAM);
    3939        $expected = EXPECTED_VAL;
    4040        $this->assertEquals($expected, $result);
    … …  
    4343    function test_setparam()
    4444    {
    45         $result = $this->SessionCache->setparam(PARAM);
     45        $result = $this->Cache->setparam(PARAM);
    4646        $expected = EXPECTED_VAL;
    4747        $this->assertEquals($expected, $result);
    … …  
    5050    function test_getparam()
    5151    {
    52         $result = $this->SessionCache->getparam(PARAM);
     52        $result = $this->Cache->getparam(PARAM);
    5353        $expected = EXPECTED_VAL;
    5454        $this->assertEquals($expected, $result);
    … …  
    5757    function test_putcache()
    5858    {
    59         $result = $this->SessionCache->putcache(PARAM);
     59        $result = $this->Cache->putcache(PARAM);
    6060        $expected = EXPECTED_VAL;
    6161        $this->assertEquals($expected, $result);
    … …  
    6464    function test_getcache()
    6565    {
    66         $result = $this->SessionCache->getcache(PARAM);
     66        $result = $this->Cache->getcache(PARAM);
    6767        $expected = EXPECTED_VAL;
    6868        $this->assertEquals($expected, $result);
    … …  
    7171    function test_iscached()
    7272    {
    73         $result = $this->SessionCache->iscached(PARAM);
     73        $result = $this->Cache->iscached(PARAM);
    7474        $expected = EXPECTED_VAL;
    7575        $this->assertEquals($expected, $result);
    … …  
    7878    function test_breakcache()
    7979    {
    80         $result = $this->SessionCache->breakcache(PARAM);
     80        $result = $this->Cache->breakcache(PARAM);
    8181        $expected = EXPECTED_VAL;
    8282        $this->assertEquals($expected, $result);
    … …  
    8585}
    8686// Running the test.
    87 $suite = new PHPUnit_TestSuite('SessionCacheTest');
     87$suite = new PHPUnit_TestSuite('CacheTest');
    8888$result = PHPUnit::run($suite);
    8989echo $result->toString();

  • trunk/tests/_config.inc.php

    r43 r136  
    11<?php
    22require_once '../lib/App.inc.php';
    3 $app =& App::getinstance('testapp');
     3$app =& App::getInstance('testapp');
    44
    55$app->setParam(array(
Note: See TracChangeset for help on using the changeset viewer.