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

trunk/tests/AppTest.php

@@ -32 +32 @@
     function test_getinstance()
     {
-        $thisapp =& App::getinstance();
+        $thisapp =& App::getInstance();
         $this->assertTrue(serialize($thisapp) == serialize($this->App), 'Objects do not match across instantiations.');
     }
@@ -71 +71 @@
     function test_dbquery()
     {
-        $qid = DB::query("SELECT 2 + 2");
+        $db =& DB::getInstance();
+    
+        $qid = $db->query("SELECT 2 + 2");
         list($result) = mysql_fetch_row($qid);
         $this->assertEquals('4', $result);
@@ -78 +80 @@
     function test_raisemsg()
     {
+        $app =& App::getInstance();
         $expected = 'My message';
-        App::raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
-        $msg = current($_SESSION[$this->App->app]['messages']);
+        $app->raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
+        $msg = current($_SESSION[$this->App->_ns]['messages']);
         $this->assertEquals($expected, $msg['message']);
     }
@@ -87 +90 @@
     {
         ob_start();
-        App::printraisedmessages();
+        $app =& App::getInstance();
+        $app->printraisedmessages();
         $result = ob_get_clean();
         $this->assertContains('My message', $result, 'Raised message not found in output.');
@@ -94 +98 @@
     function test_logmsg()
     {
+        $app =& App::getInstance();
         $file = $this->App->getParam('log_directory') . '/' . $this->App->getParam('log_filename');
-        App::logMsg('Test log message', LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg('Test log message', LOG_DEBUG, __FILE__, __LINE__);
         if ($result = file($file)) {
             $result = end($result);
@@ -106 +111 @@
     function test_ohref()
     {
+        $app =& App::getInstance();
         $_GET['arg1'] = 'A';
-        $result = App::ohref('/some/url.php', array('arg1'), true);
+        $result = $app->ohref('/some/url.php', array('arg1'), true);
         $this->assertContains(session_name(), $result, 'SSID not found in URL.');
         $this->assertContains('arg1=A', $result, 'Argument not passed through.');
@@ -114 +120 @@
     function test_printhiddensession()
     {
+        $app =& App::getInstance();
         ob_start();
-        App::printhiddensession();
+        $app->printhiddensession();
         $result = ob_get_clean();
         $this->assertContains(session_name(), $result);
@@ -122 +129 @@
 //     function test_dieurl()
 //     {
-//         App::dieURL('/die/to/this/url.php');
+//         $app =& App::getInstance();
+//         $app->dieURL('/die/to/this/url.php');
 //     }
 //