[Simpletest-devel] simpletest simpletest.php, 1.18, 1.19 test_case.php, 1.38, 1.39

[Marcus B. <las...@us...>]

Update of /cvsroot/simpletest/simpletest
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28267

Modified Files:
	simpletest.php test_case.php 
Log Message:
Refactoring test case detection in autorun and TestSuite

Index: simpletest.php
===================================================================
RCS file: /cvsroot/simpletest/simpletest/simpletest.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** simpletest.php	27 Mar 2007 13:09:35 -0000	1.18
--- simpletest.php	30 Apr 2007 23:39:58 -0000	1.19
***************
*** 16,19 ****
--- 16,20 ----
      }
      require_once(dirname(__FILE__) . '/default_reporter.php');
+     require_once(dirname(__FILE__) . '/compatibility.php');
      /**#@-*/
  
***************
*** 86,100 ****
           */
          function isTestCase($candidate) {
!             $allowed = array('unittestcase',
!                              'webtestcase',
!                              'testsuite',
!                              'grouptest');
!             $class = is_object($candidate) ? get_class($candidate) : $candidate;
!             while ($class = get_parent_class($class)) {
!                 $class = strtolower($class);
!                 if (in_array($class, $allowed)) {
                      return true;
                  }
!             }
              return false;
          }
--- 87,96 ----
           */
          function isTestCase($candidate) {
!             $class = strtolower(is_object($candidate) ? get_class($candidate) : $candidate);
!             do {
!                 if (($class == 'simpletestcase') || ($class == 'testsuite')) {
                      return true;
                  }
!             } while ($class = strtolower(get_parent_class($class)));
              return false;
          }

Index: test_case.php
===================================================================
RCS file: /cvsroot/simpletest/simpletest/test_case.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** test_case.php	14 Mar 2007 15:15:24 -0000	1.38
--- test_case.php	30 Apr 2007 23:39:58 -0000	1.39
***************
*** 621,625 ****
              while ($class = get_parent_class($class)) {
                  $class = strtolower($class);
!                 if ($class == 'simpletestcase' || $class == 'testsuite' || $class == 'grouptest') {
                      return $class;
                  }
--- 621,625 ----
              while ($class = get_parent_class($class)) {
                  $class = strtolower($class);
!                 if ($class == 'simpletestcase' || $class == 'testsuite') {
                      return $class;
                  }