Refactoring order parsing and seed evaluation

Author: fiunchinho

src/PHPUnitRandomizer/Command.php

@@ -17,75 +17,51 @@ public function __construct()
         $this->longOptions['seed=']     = 'seedHandler';
         $this->longOptions['order=']    = 'orderHandler';
         $this->seed                     = rand(0, 9999);
+        $this->order                    = 'defined';
     }
 
     public static function main($exit = TRUE)
     {
         return parent::main($exit);
     }
 
-    protected function orderHandler($order_parameter)
+    private function setSeedToPrinter($seed)
     {
-        if (!is_string($order_parameter)) {
-            $this->showError(
-                sprintf('Could not use "%s" as order.', $order_parameter)
-            );
-        }
-
-        $order_parts = explode(':', $order_parameter, 2);
-        if (count($order_parts) < 2) {
-            $this->order                = $order_parts[0];
-            $this->arguments['order']   = $this->order;
-            if ($this->order !== 'defined') {
-                $this->arguments['seed'] = $this->seed;
-                if (isset($this->arguments['printer']) && $this->arguments['printer'] instanceof ResultPrinter )
-                {
-                    $this->arguments['printer']->setSeed($this->seed);
-                }
-            }
-
-            return;
-        }
-
-        list($order, $seed) = $order_parts;
-        if ($order !== 'defined' && is_int($seed)) {
-            $this->showError(
-                sprintf('Could not use "%s" as order.', $order_parameter)
-            );
-        }
-
-        $this->order                = $order;
-        $this->arguments['order']   = $this->order;
-        $this->seed                 = $seed;
-        $this->arguments['seed']    = $this->seed;
-
         if (isset($this->arguments['printer']) && $this->arguments['printer'] instanceof ResultPrinter )
         {
-            $this->arguments['printer']->setSeed($this->seed);
+            $this->arguments['printer']->setSeed($seed);
         }
     }
 
-    protected function seedHandler($seed)
+    /**
+     * Parses arguments to know if random order is desired, and if seed was chosen.
+     * 
+     * @param  string $order String from command line parameter.
+     * @return array
+     */
+    private function getOrderAndSeed($order)
     {
-        if (!is_numeric($seed)) {
-            $this->showError(
-                sprintf('Could not use "%s" as seed.', $seed)
-            );
+        @list($order, $seed) = explode(':', $order, 2);
+
+        if (empty($seed)) {
+            $seed = $this->seed;
         }
 
-        if (isset($this->arguments['order'])) {
-            $this->showError(
-                sprintf('You can\'t use the \'order\' and \'seed\' arguments together')
-            );
+        if (!is_numeric($seed)) {
+            $this->showError("Could not use '$seed' as seed.");
         }
 
-        $this->seed         = intval($seed);
-        $this->arguments['seed']  = $this->seed;
+        return array($order, $seed);
+    }
 
-        if (isset($this->arguments['printer']) && $this->arguments['printer'] instanceof ResultPrinter )
-        {
-            $this->arguments['printer']->setSeed($this->seed);
-        }
+    protected function orderHandler($order_parameter)
+    {
+        list($order, $seed)         = $this->getOrderAndSeed($order_parameter);
+        $this->order                = $order;
+        $this->arguments['order']   = $order;
+        $this->seed                 = $seed;
+        $this->arguments['seed']    = $seed;
+        $this->setSeedToPrinter($this->seed);
     }
 
     protected function createRunner()
@@ -99,7 +75,7 @@ public function showHelp()
 
         print <<<EOT
 
-  --seed <seed>             Seed the randomizer with a specific seed.
+  --order <rand[:seed]>     Randomize the order of the tests. Optionally you can pass a seed to run a specific order.
 
 EOT;
     }

src/PHPUnitRandomizer/TestRunner.php

@@ -19,34 +19,24 @@ public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = NULL, PHP_C
     public function doRun(\PHPUnit_Framework_Test $suite, array $arguments = array())
     {
         $this->handleConfiguration($arguments);
-        if
-        (
-            (isset($arguments['order']) && $arguments['order'] !== 'defined')
-            || (isset($arguments['seed']))
-        )
+        if (isset($arguments['order']))
         {
             $suite = $this->getRandomTestSuite($suite, $arguments);
         }
 
         return parent::doRun($suite, $arguments);
     }
 
+    /**
+     * Creates a TestSuite with random tests.
+     * 
+     * @param  TestSuite    $suite     The suite to randomize.
+     * @param  array        $arguments Arguments to use.
+     * @return TestSuite
+     */
     private function getRandomTestSuite($suite, $arguments)
     {
-        if ($this->printer === NULL) {
-            if (isset($arguments['printer']) &&
-                $arguments['printer'] instanceof \PHPUnit_Util_Printer) {
-                $this->printer = $arguments['printer'];
-            } else {
-                $this->printer = new ResultPrinter(
-                    NULL,
-                    $arguments['verbose'],
-                    $arguments['colors'],
-                    $arguments['debug']
-                );
-                $this->printer->setSeed($this->seed);
-            }
-        }
+        $this->addPrinter($arguments);
 
         $random_suite   = new Decorator(
             $suite,
@@ -57,9 +47,29 @@ private function getRandomTestSuite($suite, $arguments)
             $arguments['processIsolation']
         );
 
-        $suite   = new \PHPUnit_Framework_TestSuite();
+        $suite = new \PHPUnit_Framework_TestSuite();
         $suite->addTest($random_suite, $arguments['groups']);
 
         return $suite;
     }
+
+    /**
+     * Sets printer to show the seed used to randomize the TestSuite.
+     * @param array $arguments Arguments to use.
+     */
+    private function addPrinter($arguments)
+    {
+        $this->printer = new ResultPrinter(
+            NULL,
+            $arguments['verbose'],
+            $arguments['colors'],
+            $arguments['debug']
+        );
+        $this->printer->setSeed($this->seed);
+
+        if (isset($arguments['printer']) &&
+            $arguments['printer'] instanceof \PHPUnit_Util_Printer) {
+            $this->printer = $arguments['printer'];
+        }
+    }
 }