Changeset 468 for trunk/tests

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/AppTest.php (modified) (10 diffs)
• tests/AuthFileTest.php (copied) (copied from branches/eli_branch/tests/AuthFileTest.php)
• tests/AuthSQLTest.php (copied) (copied from branches/eli_branch/tests/AuthSQLTest.php)
• tests/Auth_FileTest.php (modified) (3 diffs)
• tests/Auth_SQLTest.php (modified) (11 diffs)
• tests/AuthorizeNetTest.php (modified) (6 diffs)
• tests/CSSTest.php (modified) (3 diffs)
• tests/CacheTest.php (modified) (5 diffs)
• tests/DBSessionHandlerTest.php (modified) (5 diffs)
• tests/EmailTest.php (modified) (4 diffs)
• tests/FormValidatorTest.php (modified) (3 diffs)
• tests/Google_APITest.php (modified) (3 diffs)
• tests/HierarchyTest.php (modified) (3 diffs)
• tests/ImageThumbTest.php (modified) (3 diffs)
• tests/LockTest.php (modified) (3 diffs)
• tests/MCVETest.php (modified) (3 diffs)
• tests/NavTest.php (modified) (3 diffs)
• tests/PEditTest.php (modified) (3 diffs)
• tests/PageNumbersTest.php (modified) (3 diffs)
• tests/PageSequenceTest.php (modified) (3 diffs)
• tests/PayPalTest.php (modified) (5 diffs)
• tests/PrefsTest.php (modified) (3 diffs)
• tests/ScriptTimerTest.php (modified) (3 diffs)
• tests/SortOrderTest.php (modified) (3 diffs)
• tests/SpellCheckTest.php (modified) (3 diffs)
• tests/TemplateGlueTest.php (modified) (3 diffs)
• tests/UploadTest.php (modified) (6 diffs)
• tests/UtilitiesTest.php (modified) (3 diffs)
• tests/VersionTest.php (modified) (4 diffs)
• tests/_config.inc.php (modified) (5 diffs)
• tests/_skel.php (modified) (1 diff)
• tests/bootstrap.php (copied) (copied from branches/eli_branch/tests/bootstrap.php)
• tests/phpunit.xml (copied) (copied from branches/eli_branch/tests/phpunit.xml)
• tests/run_tests.sh (modified) (1 diff)

trunk/tests/AppTest.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 AppTest extends PHPUnit_TestCase {
+
+class AppTest extends PHPUnit_Framework_TestCase {
 
     var $App;
 
-    function AppTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
+    static $shared_session;
 
     function setUp()
@@ -44 +41 @@
         require dirname(__FILE__) . '/_config.inc.php';
         $this->App =& $app;
+        $_SESSION = AppTest::$shared_session;
     }
 
@@ -49 +47 @@
     {
         unset($this->App);
+        AppTest::$shared_session = $_SESSION;
     }
 
@@ -62 +61 @@
             'test_config_value' => 1234
         ));
-        $this->assertTrue(1234 === $this->App->_params['test_config_value']);
+        $this->assertTrue(1234 === $this->App->getParam('test_config_value'));
     }
 
     function test_getParam()
     {
-        $this->App->_params['test_config_value2'] = 'okay';
+        //$this->App->setParam('test_config_value2', 'okay');
+        $this->App->setParam(array(
+            'test_config_value2' => 'okay'
+        ));
         $result = $this->App->getParam('test_config_value2');
         $this->assertEquals('okay', $result);
@@ -93 +95 @@
     {
         $db =& DB::getInstance();
-    
+
         $qid = $db->query("SELECT 2 + 2");
         list($result) = mysql_fetch_row($qid);
@@ -104 +106 @@
         $expected = 'My message';
         $app->raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
-        $msg = current($_SESSION['_app'][$this->App->_ns]['messages']);
+        $msg = current($_SESSION['_app']['testapp']['messages']);
         $this->assertEquals($expected, $msg['message']);
     }
@@ -111 +113 @@
     {
         ob_start();
+        $this->test_raisemsg();  //had to add this line for phpunit ver. 3.7 ///
         $app =& App::getInstance();
         $app->printraisedmessages();
@@ -205 +208 @@
 }
 // Running the test.
+/*
 $suite = new PHPUnit_TestSuite('AppTest');
 $result = PHPUnit::run($suite);
 echo $result->toString();
-?>
+ */

trunk/tests/Auth_FileTest.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/>.
@@ -120 +120 @@
 $result = PHPUnit::run($suite);
 echo $result->toString();
-?>

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();
-?>

trunk/tests/AuthorizeNetTest.php

@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class AuthorizeNetTest extends PHPUnit_TestCase {
+
+class AuthorizeNetTest extends PHPUnit_Framework_TestCase {
 
     var $AuthorizeNet;
-
-    function AuthorizeNetTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
-
+    
+    static $shared_session;
+    
     function setUp()
     {
@@ -45 +42 @@
         require_once '../lib/AuthorizeNet.inc.php';
 
-        $this->AuthorizeNet =& new AuthorizeNet();
+        $this->AuthorizeNet = new AuthorizeNet();
         $this->AuthorizeNet->setParam(array(
             'x_login' => 'myaccount',
@@ -61 +58 @@
             'x_zip' => '75010',
         ));
+        $_SESSION = AuthorizeNetTest::$shared_session;
     }
 
@@ -66 +64 @@
     {
         unset($this->AuthorizeNet);
+        AuthorizeNetTest::$shared_session = $_SESSION;
     }
 
@@ -71 +70 @@
     {
         $this->AuthorizeNet->setparam(array('x_Login' => 'myaccount2'));
-        $this->assertEquals('myaccount2', $this->AuthorizeNet->_params['x_Login']);
+        $this->assertEquals('myaccount2', $this->AuthorizeNet->getParam('x_Login'));
     }
 
@@ -119 +118 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('AuthorizeNetTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/CSSTest.php

@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class CSSTest extends PHPUnit_TestCase {
+
+class CSSTest extends PHPUnit_Framework_TestCase {
 
     var $CSS;
     var $test_css_file;
-
-    function CSSTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -46 +41 @@
         $this->test_css_file = dirname(__FILE__) . '/../css/codebase.inc.css';
         require_once '../lib/CSS.inc.php';
-        $this->CSS =& new CSS();
+        $this->CSS = new CSS();
         $this->CSS->setFile($this->test_css_file);
     }
@@ -86 +81 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('CSSTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/CacheTest.php

@@ -7 +7 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -14 +14 @@
  * 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/>.
@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class CacheTest extends PHPUnit_TestCase {
+
+class CacheTest extends PHPUnit_Framework_TestCase {
 
     var $Cache;
@@ -40 +40 @@
     function CacheTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -105 +105 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('CacheTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/DBSessionHandlerTest.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 DBSessionHandlerTest extends PHPUnit_TestCase {
+
+class DBSessionHandlerTest extends PHPUnit_Framework_TestCase {
 
     var $DBSessionHandler;
-
-    function DBSessionHandlerTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -73 +68 @@
     function test_DBsessionwrite()
     {
+        if (!isset($_SESSION)) {
+            $_SESSION = array();
+        }
         $this->DBSessionHandler->DBsessionwrite(session_id(), serialize($_SESSION));
     }
@@ -87 +85 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('DBSessionHandlerTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/EmailTest.php

@@ -1 +1 @@
 <?php
+
 /**
  * The Strangecode Codebase - a general application development framework for PHP
@@ -30 +31 @@
  * Created with PHPUnit_Skeleton on 2005-12-01
  */
-require_once 'PHPUnit.php';
-class EmailTest extends PHPUnit_TestCase {
+
+class EmailTest extends PHPUnit_Framework_TestCase {
 
     var $Email;
-
-    function EmailTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -44 +40 @@
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Email.inc.php';
-        $this->Email =& new Email();
+        $this->Email = new Email();
     }
 
@@ -122 +118 @@
 
 }
-// Running the test.
-$suite  = new PHPUnit_TestSuite('EmailTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/FormValidatorTest.php

@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class FormValidatorTest extends PHPUnit_TestCase {
+
+class FormValidatorTest extends PHPUnit_Framework_TestCase {
 
     var $FormValidator;
-
-    function FormValidatorTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -44 +39 @@
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/FormValidator.inc.php';
-        $this->FormValidator =& new FormValidator();
+        $this->FormValidator = new FormValidator();
     }
 
@@ -294 +289 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('FormValidatorTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/Google_APITest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class GoogleAPITest extends PHPUnit_TestCase {
+
+class GoogleAPITest extends PHPUnit_Framework_TestCase {
 
     var $GoogleAPI;
@@ -40 +40 @@
     function GoogleAPITest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -91 +91 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('GoogleAPITest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/HierarchyTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class HierarchyTest extends PHPUnit_TestCase {
+
+class HierarchyTest extends PHPUnit_Framework_TestCase {
 
     var $Hierarchy;
@@ -40 +40 @@
     function HierarchyTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -175 +175 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('HierarchyTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/ImageThumbTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class ImageThumbTest extends PHPUnit_TestCase {
+
+class ImageThumbTest extends PHPUnit_Framework_TestCase {
 
     var $ImageThumb;
@@ -40 +40 @@
     function ImageThumbTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -119 +119 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('ImageThumbTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/LockTest.php

@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class LockTest extends PHPUnit_TestCase {
+
+class LockTest extends PHPUnit_Framework_TestCase {
 
     var $Lock;
     var $Auth_SQL;
-
-    function LockTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -47 +42 @@
         require_once '../lib/Auth_SQL.inc.php';
 
-        $this->Auth_SQL =& new Auth_SQL('test');
+        $this->Auth_SQL = new Auth_SQL('test');
         $this->Auth_SQL->setParam(array(
             'db_table'          => 'test_user_tbl',
@@ -208 +203 @@
     {
         $result = $this->Lock->getsecondselapsed();
-        $this->assertType('integer', $result);
+        $this->assertInternalType('integer', $result);
     }
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('LockTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/MCVETest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class MCVETest extends PHPUnit_TestCase {
+
+class MCVETest extends PHPUnit_Framework_TestCase {
 
     var $MCVE;
@@ -40 +40 @@
     function MCVETest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -91 +91 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('MCVETest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/NavTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class NavigationTest extends PHPUnit_TestCase {
+
+class NavigationTest extends PHPUnit_Framework_TestCase {
 
     var $Navigation;
@@ -40 +40 @@
     function NavigationTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -133 +133 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('NavigationTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/PEditTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class PEditTest extends PHPUnit_TestCase {
+
+class PEditTest extends PHPUnit_Framework_TestCase {
 
     var $PEdit;
@@ -40 +40 @@
     function PEditTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -154 +154 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('PEditTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/PageNumbersTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class PageNumbersTest extends PHPUnit_TestCase {
+
+class PageNumbersTest extends PHPUnit_Framework_TestCase {
 
     var $PageNumbers;
@@ -40 +40 @@
     function PageNumbersTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -133 +133 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('PageNumbersTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/PageSequenceTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class PageSequenceTest extends PHPUnit_TestCase {
+
+class PageSequenceTest extends PHPUnit_Framework_TestCase {
 
     var $PageSequence;
@@ -40 +40 @@
     function PageSequenceTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -182 +182 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('PageSequenceTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/PayPalTest.php

@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class PayPalTest extends PHPUnit_TestCase {
+
+class PayPalTest extends PHPUnit_Framework_TestCase {
 
     var $PayPal;
-
-    function PayPalTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -44 +39 @@
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/PayPal.inc.php';
-        $this->PayPal =& new PayPal();
+        $this->PayPal = new PayPal();
 
         // Defaults for purchasing classified postings.
@@ -90 +85 @@
         ));
         $result = $this->PayPal->getlink('testitem');
-        $this->assertTrue(preg_match('/customdata/', $result));
+        //$this->assertTrue(preg_match('/customdata/', $result));
+        $this->assertSame(1, preg_match('/customdata/', $result));
     }
 
@@ -103 +99 @@
         $this->PayPal->printbutton('testitem');
         $result = ob_get_clean();
-        $this->assertTrue(preg_match('/customdata/', $result));
+        //$this->assertTrue(preg_match('/customdata/', $result));
+        $this->assertSame(1, preg_match('/customdata/', $result));
+        
     }
 
@@ -134 +132 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('PayPalTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/PrefsTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class PrefsTest extends PHPUnit_TestCase {
+
+class PrefsTest extends PHPUnit_Framework_TestCase {
 
     var $Prefs;
@@ -40 +40 @@
     function PrefsTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -112 +112 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('PrefsTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/ScriptTimerTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class ScriptTimerTest extends PHPUnit_TestCase {
+
+class ScriptTimerTest extends PHPUnit_Framework_TestCase {
 
     var $ScriptTimer;
@@ -40 +40 @@
     function ScriptTimerTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -77 +77 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('ScriptTimerTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/SortOrderTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class SortOrderTest extends PHPUnit_TestCase {
+
+class SortOrderTest extends PHPUnit_Framework_TestCase {
 
     var $SortOrder;
@@ -40 +40 @@
     function SortOrderTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -91 +91 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('SortOrderTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/SpellCheckTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class SpellCheckTest extends PHPUnit_TestCase {
+
+class SpellCheckTest extends PHPUnit_Framework_TestCase {
 
     var $SpellCheck;
@@ -40 +40 @@
     function SpellCheckTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -154 +154 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('SpellCheckTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/TemplateGlueTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class TemplateGlueTest extends PHPUnit_TestCase {
+
+class TemplateGlueTest extends PHPUnit_Framework_TestCase {
 
     var $TemplateGlue;
@@ -40 +40 @@
     function TemplateGlueTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -56 +56 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('TemplateGlueTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/UploadTest.php

@@ -7 +7 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -14 +14 @@
  * 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/>.
@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class UploadTest extends PHPUnit_TestCase {
+
+class UploadTest extends PHPUnit_Framework_TestCase {
 
     var $Upload;
@@ -40 +40 @@
     function UploadTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -120 +120 @@
     function test_getfilenameextension()
     {
-        $result = $this->Upload->getfilenameextension(PARAM);
+        $result = $this->Upload::getfilenameextension(PARAM);
         $expected = EXPECTED_VAL;
         $this->assertEquals($expected, $result);
@@ -126 +126 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('UploadTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/UtilitiesTest.php

@@ -33 +33 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class UtilitiesTest extends PHPUnit_TestCase {
+
+class UtilitiesTest extends PHPUnit_Framework_TestCase {
 
     var $Utilities;
@@ -40 +40 @@
     function UtilitiesTest($name)
     {
-        $this->PHPUnit_TestCase($name);
+        $this->PHPUnit_Framework_TestCase($name);
     }
 
@@ -56 +56 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('UtilitiesTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/VersionTest.php

@@ -30 +30 @@
  * Created with PHPUnit_Skeleton on 2005-08-09
  */
-require_once 'PHPUnit.php';
-class VersionTest extends PHPUnit_TestCase {
+
+class VersionTest extends PHPUnit_Framework_TestCase {
 
     var $Version;
     var $Auth_SQL;
-
-    function VersionTest($name)
-    {
-        $this->PHPUnit_TestCase($name);
-    }
 
     function setUp()
@@ -47 +42 @@
 
         require_once '../lib/Auth_SQL.inc.php';
-        $this->Auth_SQL =& new Auth_SQL('testauth');
+        $this->Auth_SQL = new Auth_SQL('testauth');
         $this->Auth_SQL->setParam(array(
             'db_table'          => 'test_user_tbl',
@@ -116 +111 @@
     {
         $result = $this->Version->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user');
-        $this->assertTrue($result);
+        $this->assertSame(1, $result);
     }
 
@@ -190 +185 @@
 
 }
-// Running the test.
-$suite = new PHPUnit_TestSuite('VersionTest');
-$result = PHPUnit::run($suite);
-echo $result->toString();
-?>

trunk/tests/_config.inc.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/>.
@@ -28 +28 @@
 */
 require_once '../lib/App.inc.php';
+
 $app =& App::getInstance('testapp');
 
@@ -44 +45 @@
     'db_die_on_failure' => true,
     'db_server' => 'localhost',
-    'db_name' => 'test',
-    'db_user' => 'root',
+    'db_name' => getenv('DB_NAME'),
+    'db_user' => getenv('DB_USER'),
     'db_pass' => getenv('DB_PASS'),
     'display_errors' => true,
@@ -59 +60 @@
 
 $app->start();
-?>

trunk/tests/_skel.php

@@ -78 +78 @@
 // }
 
-?>

trunk/tests/run_tests.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
+
+# This script sets-up the test environment and runs all tests.
+# You'll want to define your local mysql credentials for a test
+# database as environment variables, e.g., in ~/.bash_profile:
+#  export DB_NAME="test"
+#  export DB_USER="test"
+#  export DB_PASS="..."
 
 # Be in the directory with all the tests.
 cd `dirname $0`;
 
+# Get required ENV variables.
+if [[ -z "$DB_USER$DB_PASS$DB_NAME" ]]; then
+    echo "MySQL test DB credential environment variables are missing.\nSet these in ~/.bash_profile to avoid seeing these prompts each time.";
+fi
+for E in DB_USER DB_PASS DB_NAME; do
+    while [[ -z ${!E} ]]; do
+        read -p "$E: " $E;
+    done
+    export $E;
+done
+
 # Create database.
 mysql -e 'CREATE DATABASE IF NOT EXISTS `test`';
 
-# Run tests sequentially.
-for foo in *Test.php; 
-do
-    php $foo;
-done;
+# Go!
+echo "Running the tests!";
+echo "You'll want to 'tail -f /tmp/codebase_test_log' and watch for errors.";
+
+# Config options go in phpunit.xml
+# phpunit --tap | grep -v '^ok '
+phpunit --stderr