[project @ TestDriver.php: factor instantiating a test suite from a class name into its own function]

1 files changed, 26 insertions, 19 deletions

diff --git a/Tests/TestDriver.php b/Tests/TestDriver.php
index 2aa1c98..516ddc2 100644
--- a/Tests/TestDriver.php
+++ b/Tests/TestDriver.php
@@ -68,34 +68,41 @@ function loadTests($test_dir, $test_names)
 
     foreach ($test_names as $filename) {
         $filename = $test_dir . $filename . '.php';
-        $class_name = str_replace('/', '_', $filename);
-        $class_name = basename($class_name, '.php');
         if (!global_require_once($filename)) {
             continue;
         }
-        $test = new $class_name($class_name);
-
-        if (is_a($test, 'PHPUnit_TestCase')) {
-            $s = new PHPUnit_TestSuite();
-            $s->setName($class_name);
-            $s->addTestSuite($class_name);
-            $test = $s;
-
-            $tc_array_name = $class_name . '_other';
-            if (array_key_exists($tc_array_name, $GLOBALS) &&
-                is_array($GLOBALS[$tc_array_name])) {
-                foreach ($GLOBALS[$tc_array_name] as $tc) {
-                    $test->addTestSuite(get_class($tc));
-                }
-            }
-        }
 
-        $suites[] = $test;
+        $class_name = str_replace('/', '_', $filename);
+        $class_name = basename($class_name, '.php');
+
+        $suites[] = makeSuite($class_name);
     }
 
     return $suites;
 }
 
+function makeSuite($class_name) {
+    $test = new $class_name($class_name);
+
+    if (is_a($test, 'PHPUnit_TestCase')) {
+        $s = new PHPUnit_TestSuite();
+        $s->setName($class_name);
+        $s->addTestSuite($class_name);
+        $test = $s;
+
+        $tc_array_name = $class_name . '_other';
+        if (array_key_exists($tc_array_name, $GLOBALS) &&
+            is_array($GLOBALS[$tc_array_name])) {
+            foreach ($GLOBALS[$tc_array_name] as $tc) {
+                $test->addTestSuite(get_class($tc));
+            }
+        }
+    }
+
+    return $test;
+}
+
+
 function global_require_once($name)
 {
     $f = include_once $name;