Changeset 468 for trunk/tests/AppTest.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/AppTest.php (modified) (10 diffs)

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