[limb-svn] r6022 - in 3.x/trunk/limb/tests_runner: src tests/cases

[svn at limb-project.com]

Author: pachanga
Date: 2007-06-28 17:35:51 +0400 (Thu, 28 Jun 2007)
New Revision: 6022
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6022

Modified:
   3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestWebUI.class.php
   3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php
   3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFileNodeTest.class.php
Log:
-- static $class_format property moved from lmbTestTreeDirNode into lmbTestTreeFileNode
-- lmbTestTreeFileNode doesn't accept second argument anymore

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php	2007-06-28 13:18:44 UTC (rev 6021)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php	2007-06-28 13:35:51 UTC (rev 6022)
@@ -20,7 +20,6 @@
 class lmbTestTreeDirNode extends lmbTestTreeShallowDirNode
 {
   protected static $file_filter = '*Test.class.php;*.test.php;*_test.php';
-  protected static $class_format = '%s.class.php';
   protected $loaded;
 
   function createTestCase()
@@ -46,18 +45,6 @@
     return $prev;
   }
 
-  static function getClassFormat()
-  {
-    return self :: $class_format;
-  }
-
-  static function setClassFormat($format)
-  {
-    $prev = self :: $class_format;
-    self :: $class_format = $format;
-    return $prev;
-  }
-
   function _loadChildren()
   {
     if(!is_null($this->loaded) && $this->loaded)
@@ -70,7 +57,7 @@
       if(is_dir($item))
         $this->addChild(new lmbTestTreeDirNode($item));
       else
-        $this->addChild(new lmbTestTreeFileNode($item, $this->_extractClassName($item)));
+        $this->addChild(new lmbTestTreeFileNode($item));
     }
     $this->loaded = true;
   }
@@ -100,15 +87,6 @@
     return true;
   }
 
-  protected function _extractClassName($file)
-  {
-    $regex = preg_quote(self :: $class_format);
-    $regex = '~^' . str_replace('%s', '(.*)', $regex) . '$~';
-
-    if(preg_match($regex, basename($file), $m))
-      return $m[1];
-  }
-
   protected function _dirSorter($a, $b)
   {
     if(is_dir($a) && !is_dir($b))

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php	2007-06-28 13:18:44 UTC (rev 6021)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php	2007-06-28 13:35:51 UTC (rev 6022)
@@ -16,15 +16,28 @@
  */
 class lmbTestTreeFileNode extends lmbTestTreeTerminalNode
 {
+  protected static $class_format = '%s.class.php';
   protected $file;
   protected $class;
 
-  function __construct($file, $class = null)
+  function __construct($file)
   {
     $this->file = $file;
-    $this->class = $class;
+    $this->class = $this->_extractClassName($file);
   }
 
+  static function getClassFormat()
+  {
+    return self :: $class_format;
+  }
+
+  static function setClassFormat($format)
+  {
+    $prev = self :: $class_format;
+    self :: $class_format = $format;
+    return $prev;
+  }
+
   function getFile()
   {
     return $this->file;
@@ -35,6 +48,15 @@
     return $this->class;
   }
 
+  protected function _extractClassName($file)
+  {
+    $regex = preg_quote(self :: $class_format);
+    $regex = '~^' . str_replace('%s', '(.*)', $regex) . '$~';
+
+    if(preg_match($regex, basename($file), $m))
+      return $m[1];
+  }
+
   protected function _doCreateTestCase()
   {
     $suite = new TestSuite(basename($this->file));

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestWebUI.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestWebUI.class.php	2007-06-28 13:18:44 UTC (rev 6021)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestWebUI.class.php	2007-06-28 13:35:51 UTC (rev 6022)
@@ -7,6 +7,7 @@
  * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 require_once(dirname(__FILE__) . '/lmbTestTreePath.class.php');
+require_once(dirname(__FILE__) . '/lmbTestRunner.class.php');
 require_once(dirname(__FILE__) . '/lmbTestHTMLReporter.class.php');
 
 /**

Modified: 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php	2007-06-28 13:18:44 UTC (rev 6021)
+++ 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeDirNodeTest.class.php	2007-06-28 13:35:51 UTC (rev 6022)
@@ -76,19 +76,19 @@
   {
     $foo = new GeneratedTestClass();
     touch($this->var_dir . '/junk.php');
-    touch($this->var_dir . '/' . $foo->getFileName());
+    touch($this->var_dir . '/' . $foo->getFileName() . '.yo');
 
-    $prev_filter = lmbTestTreeDirNode :: setFileFilter('*.class.php');
-    $prev_format = lmbTestTreeDirNode :: setClassFormat('%s.class.php');
+    $prev_filter = lmbTestTreeDirNode :: setFileFilter('*.class.php.yo');
+    $prev_format = lmbTestTreeFileNode :: setClassFormat('%s.class.php.yo');
 
-    $node = new lmbTestTreeDirNode($this->var_dir, array('*.class.php'), '%s.class.php');
+    $node = new lmbTestTreeDirNode($this->var_dir);
     $nodes = $node->getChildren();
     $this->assertEqual(sizeof($nodes), 1);
-    $this->assertEqual($nodes[0]->getFile(), $this->var_dir . '/' . $foo->getFileName());
+    $this->assertEqual($nodes[0]->getFile(), $this->var_dir . '/' . $foo->getFileName() . '.yo');
     $this->assertEqual($nodes[0]->getClass(), $foo->getClass());
 
     lmbTestTreeDirNode :: setFileFilter($prev_filter);
-    lmbTestTreeDirNode :: setClassFormat($prev_format);
+    lmbTestTreeFileNode :: setClassFormat($prev_format);
   }
 
   function testFindChildByPath()
@@ -142,7 +142,6 @@
     //we check for any possible garbage during php includes
     ob_start();
     $group = $node->createTestCase();
-
     $group->run(new SimpleReporter());
     $str = ob_get_contents();
     ob_end_clean();

Modified: 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFileNodeTest.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFileNodeTest.class.php	2007-06-28 13:18:44 UTC (rev 6021)
+++ 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFileNodeTest.class.php	2007-06-28 13:35:51 UTC (rev 6022)
@@ -33,7 +33,6 @@
 
     ob_start();
     $group = $node->createTestCase();
-
     $group->run(new SimpleReporter());
     $str = ob_get_contents();
     ob_end_clean();
@@ -48,15 +47,14 @@
     file_put_contents(LIMB_VAR_DIR . '/unique_module_name.php',
     "<?php\n" . $foo->generateClass() . "\n" . $bar->generateClass() . "\n?>");
 
-    $node = new lmbTestTreeFileNode(LIMB_VAR_DIR . '/unique_module_name.php', $foo->getClass());
+    $node = new lmbTestTreeFileNode(LIMB_VAR_DIR . '/unique_module_name.php');
 
     ob_start();
     $group = $node->createTestCase();
-
     $group->run(new SimpleReporter());
     $str = ob_get_contents();
     ob_end_clean();
-    $this->assertEqual($str, $foo->getOutput());
+    $this->assertEqual($str, $foo->getOutput() . $bar->getOutput());
   }
 
   function testGetTestLabel()