[limb-svn] r6064 - 3.x/trunk/limb/tests_runner/src

[svn at limb-project.com]

Author: pachanga
Date: 2007-07-04 12:58:58 +0400 (Wed, 04 Jul 2007)
New Revision: 6064
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6064

Modified:
   3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php
   3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php
Log:
-- reverting LIMB_TESTS_RUNNER_FILE_FILTER and LIMB_TESTS_RUNNER_FILE_CLASS_FORMAT constants
-- LIMB_TESTS_RUNNER_FILE_FILTER has more general values 

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php	2007-07-03 14:33:33 UTC (rev 6063)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeDirNode.class.php	2007-07-04 08:58:58 UTC (rev 6064)
@@ -11,6 +11,8 @@
 require_once(dirname(__FILE__) . '/lmbDetachedFixture.class.php');
 require_once(dirname(__FILE__) . '/lmbTestFileFilter.class.php');
 
+ at define('LIMB_TESTS_RUNNER_FILE_FILTER', '*Test.class.php;*test.php;*Test.php');
+
 /**
  * class lmbTestTreeDirNode.
  *
@@ -19,7 +21,7 @@
  */
 class lmbTestTreeDirNode extends lmbTestTreeShallowDirNode
 {
-  protected static $file_filter = '*Test.class.php;*.test.php;*_test.php';
+  protected static $file_filter;
   protected $loaded;
 
   function createTestCase()
@@ -30,18 +32,23 @@
 
   static function getFileFilter()
   {
-    if(is_object(self :: $file_filter))
-      return self :: $file_filter;
-    elseif(is_array(self :: $file_filter))
-      return new lmbTestFileFilter(self :: $file_filter);
-    else
-      return new lmbTestFileFilter(explode(';', self :: $file_filter));
+    if(!is_object(self :: $file_filter))
+      self :: setFileFilter(LIMB_TESTS_RUNNER_FILE_FILTER);
+    return self :: $file_filter;
   }
 
   static function setFileFilter($filter)
   {
-    $prev = self :: getFileFilter();
-    self :: $file_filter = $filter;
+    $prev = self :: $file_filter;
+
+    if(is_object($filter))
+      $obj = $filter;
+    elseif(is_array($filter))
+      $obj = new lmbTestFileFilter($filter);
+    else
+      $obj = new lmbTestFileFilter(explode(';', $filter));
+
+    self :: $file_filter = $obj;
     return $prev;
   }
 

Modified: 3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php	2007-07-03 14:33:33 UTC (rev 6063)
+++ 3.x/trunk/limb/tests_runner/src/lmbTestTreeFileNode.class.php	2007-07-04 08:58:58 UTC (rev 6064)
@@ -9,6 +9,8 @@
 require_once(dirname(__FILE__). '/lmbTestTreeTerminalNode.class.php');
 require_once(dirname(__FILE__). '/lmbTestUserException.class.php');
 
+ at define('LIMB_TESTS_RUNNER_FILE_CLASS_FORMAT', '%s.class.php');
+
 /**
  * class lmbTestTreeFileNode.
  *
@@ -17,7 +19,7 @@
  */
 class lmbTestTreeFileNode extends lmbTestTreeTerminalNode
 {
-  protected static $class_format = '%s.class.php';
+  protected static $class_format;
   protected $file;
   protected $class;
 
@@ -29,6 +31,8 @@
 
   static function getClassFormat()
   {
+    if(!self :: $class_format)
+      self :: $class_format = LIMB_TESTS_RUNNER_FILE_CLASS_FORMAT;
     return self :: $class_format;
   }