[Solar-svn] Revision 2690

[pmjones at solarphp.com]

Branch: updated PhpUnit tests to use Solar_Example classes (vice Solar_Test_Example)



Modified: branches/orm/tests/Solar/Cache/AdapterTestCase.php
===================================================================
--- branches/orm/tests/Solar/Cache/AdapterTestCase.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/Cache/AdapterTestCase.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -144,7 +144,7 @@
     public function testSave_Object()
     {
         $id = 'coyote';
-        $data = Solar::factory('Solar_Test_Example');
+        $data = Solar::factory('Solar_Example');
         $this->assertTrue($this->_cache->save($id, $data));
         $this->assertEquals($this->_cache->fetch($id), $data);
     }

Modified: branches/orm/tests/Solar/Class/MapTest.php
===================================================================
--- branches/orm/tests/Solar/Class/MapTest.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/Class/MapTest.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -16,7 +16,8 @@
         $dir = Solar::fixdir(dirname(__FILE__) . '/../../support/');
         $base = realpath($dir);
         $map = Solar::factory('Solar_Class_Map');
-        $actual = $map->fetch($base, 'Solar_Class_Map');
+        $map->setBase($base);
+        $actual = $map->fetch('Solar_Class_Map');
         $expect = array (
             "Solar_Class_Map_DirOne_TestOne" => Solar::fixdir("$base/Solar/Class/Map/DirOne/") . "TestOne.php",
             "Solar_Class_Map_DirOne_TestTwo" => Solar::fixdir("$base/Solar/Class/Map/DirOne/") . "TestTwo.php",

Modified: branches/orm/tests/Solar/Controller/PageTest.php
===================================================================
--- branches/orm/tests/Solar/Controller/PageTest.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/Controller/PageTest.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -37,7 +37,7 @@
         $this->_request = Solar::factory('Solar_Request');
         
         // set up the example page controller object
-        $this->_page = Solar::factory('Solar_Controller_PageController');
+        $this->_page = Solar::factory('Solar_Example_Controller_Page');
     }
     
     public function teardown()

Modified: branches/orm/tests/Solar/Debug/VarTest.php
===================================================================
--- branches/orm/tests/Solar/Debug/VarTest.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/Debug/VarTest.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -36,8 +36,8 @@
         // expected output for strings
         $this->_expect_string = 'string(33) "foo < bar > baz " dib & zim ? gir"' . "\n";
         
-        // Solar_Test_Example class
-        $this->_actual_object = Solar::factory('Solar_Test_Example');
+        // Solar_Example class
+        $this->_actual_object = Solar::factory('Solar_Example');
         
         // var dumpers
         $this->_var_text = Solar::factory('Solar_Debug_Var', array('output' => 'text'));

Modified: branches/orm/tests/Solar/Markdown/Extra/EmStrongTest.php
===================================================================
--- branches/orm/tests/Solar/Markdown/Extra/EmStrongTest.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/Markdown/Extra/EmStrongTest.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -111,14 +111,14 @@
     public function testRender_underscoreWords()
     {
         $source = array();
-        $source[] = "Solar_Test_Example";
-        $source[] = "_Solar_Test_Example_";
-        $source[] = "_ Solar_Test_Example _";
+        $source[] = "Solar_Example";
+        $source[] = "_Solar_Example_";
+        $source[] = "_ Solar_Example _";
         $source = implode(" ", $source);
         
-        $expect[] = "Solar_Test_Example";
-        $expect[] = "<em>Solar_Test_Example</em>";
-        $expect[] = "_ Solar_Test_Example _";
+        $expect[] = "Solar_Example";
+        $expect[] = "<em>Solar_Example</em>";
+        $expect[] = "_ Solar_Example _";
         $expect = implode(" ", $expect);
         
         $actual = $this->_spanTransform($source);

Modified: branches/orm/tests/Solar/View/Helper/GetTextRawTest.php
===================================================================
--- branches/orm/tests/Solar/View/Helper/GetTextRawTest.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/View/Helper/GetTextRawTest.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -15,10 +15,10 @@
     public function testGetTextRaw_resetClass()
     {
         Solar::start(false);
-        $example = Solar::factory('Solar_Test_Example');
+        $example = Solar::factory('Solar_Example');
         
         $helper = $this->_view->getHelper('getTextRaw');
-        $helper->setClass('Solar_Test_Example');
+        $helper->setClass('Solar_Example');
         
         $actual = $this->_view->getTextRaw('HELLO_WORLD');
         $expect = 'hello world';

Modified: branches/orm/tests/Solar/View/Helper/GetTextTest.php
===================================================================
--- branches/orm/tests/Solar/View/Helper/GetTextTest.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/Solar/View/Helper/GetTextTest.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -15,10 +15,10 @@
     public function testGetText_setClass()
     {
         Solar::start(false);
-        $example = Solar::factory('Solar_Test_Example');
+        $example = Solar::factory('Solar_Example');
         
         $helper = $this->_view->getHelper('getText');
-        $helper->setClass('Solar_Test_Example');
+        $helper->setClass('Solar_Example');
         
         $actual = $this->_view->getTextRaw('HELLO_WORLD');
         $expect = 'hello world';

Modified: branches/orm/tests/support/config.inc.php
===================================================================
--- branches/orm/tests/support/config.inc.php	2007-08-13 22:01:23 UTC (rev 2689)
+++ branches/orm/tests/support/config.inc.php	2007-08-13 22:29:25 UTC (rev 2690)
@@ -7,7 +7,7 @@
 $config['Solar']['ini_set']['display_errors'] = true;
 $config['Solar']['ini_set']['date.timezone'] = 'America/Chicago';
 
-$config['Solar_Test_Example'] = array(
+$config['Solar_Example'] = array(
     'zim' => 'gaz',
 );