Changeset 165

Timestamp:

05/25/08 12:55:44 (8 months ago)

Author:

iteman

Message:

- Refactored.

Location:

trunk

Files:

• bin/specrunner (modified) (1 diff)
• bin/testrunner (modified) (1 diff)
• bin/testrunner-st (modified) (1 diff)
• src/Stagehand/TestRunner.php (modified) (11 diffs)

trunk/bin/specrunner

@@ -45 +45 @@
 require_once 'Stagehand/TestRunner.php';
 
-$result = Stagehand_TestRunner::run('PHPSpec');
+$runner = new Stagehand_TestRunner('PHPSpec');
+$result = $runner->run();
 
 exit($result);

trunk/bin/testrunner

@@ -45 +45 @@
 require_once 'Stagehand/TestRunner.php';
 
-$result = Stagehand_TestRunner::run('PHPUnit');
+$runner = new Stagehand_TestRunner('PHPUnit');
+$result = $runner->run();
 
 exit($result);

trunk/bin/testrunner-st

@@ -45 +45 @@
 require_once 'Stagehand/TestRunner.php';
 
-$result = Stagehand_TestRunner::run('SimpleTest');
+$runner = new Stagehand_TestRunner('SimpleTest');
+$result = $runner->run();
 
 exit($result);

trunk/src/Stagehand/TestRunner.php

@@ -72 +72 @@
      */
 
+    private $_testRunnerName;
+    private $_config;
+
     /**#@-*/
 
@@ -77 +80 @@
      * @access public
      */
+
+    // }}}
+    // {{{ __construct()
+
+    /**
+     * @param string $testRunnerName
+     */
+    public function __construct($testRunnerName)
+    {
+        $this->_testRunnerName = $testRunnerName;
+    }
 
     // }}}
@@ -84 +98 @@
      * Runs tests automatically.
      *
-     * @param string $testRunnerName
-     */
-    public static function run($testRunnerName)
+     * @return integer
+     */
+    public function run()
     {
         if (!array_key_exists('argv', $_SERVER)) {
@@ -94 +108 @@
 
         try {
-            $config = self::_parseOptions();
-            if (is_null($config)) {
+            $this->_config = $this->_parseOptions();
+            if (is_null($this->_config)) {
                 return 1;
             }
 
-            if (!$config->enableAutotest) {
-                self::_runTests($testRunnerName, $config);
+            if (!$this->_config->enableAutotest) {
+                $this->_runTests();
             } else {
-                self::_monitorAlteration($config);
+                $this->_monitorAlteration();
             }
         } catch (Stagehand_TestRunner_Exception $e) {
             echo 'ERROR: ' . $e->getMessage() . "\n";
-            self::_displayUsage();
+            $this->_displayUsage();
             return 1;
         }
@@ -131 +145 @@
      * Displays the usage.
      */
-    private static function _displayUsage()
+    private function _displayUsage()
     {
         echo "Usage: {$_SERVER['SCRIPT_NAME']} [options] [directory or file]
@@ -155 +169 @@
      * Displays the version.
      */
-    private static function _displayVersion()
-    {
-        echo "Stagehand_TestRunner @package_version@
+    private function _displayVersion()
+    {
+        echo "Stagehand_TestRunner @package_version@ ({$this->_testRunnerName})
 
 Copyright (c) 2005-2008 KUBO Atsuhiro <iteman@users.sourceforge.net>,
@@ -173 +187 @@
      * directory is always added to the target directories.
      *
-     * @param stdClass $config
      * @throws Stagehand_TestRunner_Exception
      * @since Method available since Release 2.1.0
      */
-    private static function _monitorAlteration($config)
+    private function _monitorAlteration()
     {
         $targetDirectories = array();
-        foreach (array_merge($config->targetDirectories, (array)$config->directory)
+        foreach (array_merge($this->_config->targetDirectories, (array)$this->_config->directory)
                  as $directory
                  ) {
@@ -224 +237 @@
         $options[] = '-R';
 
-        if (!is_null($config->preloadFile)) {
-            $options[] = "-p {$config->preloadFile}";
-        }
-
-        if ($config->color) {
+        if (!is_null($this->_config->preloadFile)) {
+            $options[] = "-p {$this->_config->preloadFile}";
+        }
+
+        if ($this->_config->color) {
             $options[] = '-c';
         }
 
-        if ($config->useGrowl) {
+        if ($this->_config->useGrowl) {
             $options[] = '-g';
         }
 
-        $options[] = $config->directory;
+        $options[] = $this->_config->directory;
 
         $monitor = new Stagehand_TestRunner_AlterationMonitor($targetDirectories,
@@ -254 +267 @@
      * @since Method available since Release 2.1.0
      */
-    private static function _parseOptions()
+    private function _parseOptions()
     {
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
@@ -287 +300 @@
                     switch ($option[0]) {
                     case 'h':
-                        self::_displayUsage();
+                        $this->_displayUsage();
                         return;
                     case 'V':
-                        self::_displayVersion();
+                        $this->_displayVersion();
                         return;
                     case 'R':
@@ -337 +350 @@
      * Runs tests.
      *
-     * @param string $testRunnerName
-     * @param stdClass $config
      * @since Method available since Release 2.1.0
      */
-    private static function _runTests($testRunnerName, $config)
-    {
-        include_once "Stagehand/TestRunner/Collector/$testRunnerName.php";
-        $className = "Stagehand_TestRunner_Collector_$testRunnerName";
-        $collector = new $className($config->directory, $config->isRecursive);
+    private function _runTests()
+    {
+        include_once "Stagehand/TestRunner/Collector/{$this->_testRunnerName}.php";
+        $className = "Stagehand_TestRunner_Collector_{$this->_testRunnerName}";
+        $collector = new $className($this->_config->directory,
+                                    $this->_config->isRecursive
+                                    );
         $suite = $collector->collect();
 
-        include_once "Stagehand/TestRunner/Runner/$testRunnerName.php";
-        $className = "Stagehand_TestRunner_Runner_$testRunnerName";
+        include_once "Stagehand/TestRunner/Runner/{$this->_testRunnerName}.php";
+        $className = "Stagehand_TestRunner_Runner_{$this->_testRunnerName}";
         $runner = new $className();
-        $runner->run($suite, $config);
-
-        if ($config->useGrowl) {
+        $runner->run($suite, $this->_config);
+
+        if ($this->_config->useGrowl) {
             $notification = $runner->getNotification();
             $application = new Net_Growl_Application('Stagehand_TestRunner',