add test-runner command

Adam16 · Jan 8, 2017 · 7f4a978 · 7f4a978
1 parent e3f7248
commit 7f4a978
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 45 deletions.
diff --git a/src/Console.php b/src/Console.php
@@ -1,12 +1,12 @@
 <?php
-
 namespace Pds\Skeleton;
 
 class Console
 {
     protected $commandsWhitelist = [
         'validate' => 'Pds\Skeleton\ComplianceValidator',
         'generate' => 'Pds\Skeleton\PackageGenerator',
+        'test' => 'Pds\Skeleton\TestRunner',
     ];
 
     public function execute($args)
@@ -19,7 +19,7 @@ public function execute($args)
             if (array_key_exists($commandName, $this->commandsWhitelist)) {
                 return $this->executeCommand($this->commandsWhitelist[$commandName], $args);
             }
-            
+
             $this->outputHelp();
             return false;
         }
@@ -38,7 +38,7 @@ protected function outputHelp()
     {
         echo 'Available commands:' . PHP_EOL;
         foreach ($this->commandsWhitelist as $key => $value) {
-            echo 'pdsskeleton ' . $key . PHP_EOL;
+            echo 'pds-skeleton ' . $key . PHP_EOL;
         }
     }
-}
+}
diff --git a/src/TestRunner.php b/src/TestRunner.php
@@ -0,0 +1,11 @@
+<?php
+namespace Pds\Skeleton;
+
+class TestRunner
+{
+    public function execute()
+    {
+        ComplianceValidatorTest::run();
+        PackageGeneratorTest::run();
+    }
+}
diff --git a/tests/ComplianceValidatorTest.php b/tests/ComplianceValidatorTest.php
@@ -1,30 +1,18 @@
 <?php
-
-$autoloadFiles = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php'
-];
-
-foreach ($autoloadFiles as $autoloadFile) {
-    if (file_exists($autoloadFile)) {
-        require_once $autoloadFile;
-        break;
-    }
-}
-
-use Pds\Skeleton\ComplianceValidator;
-
-$tester = new ComplianceValidatorTest();
-// Test all 4 possible states.
-$tester->testValidate_WithIncorrectBin_ReturnsIncorrectBin();
-$tester->testValidate_WithoutVendor_ReturnsMissingVendor();
-
-echo "Errors: {$tester->numErrors}" . PHP_EOL;
+namespace Pds\Skeleton;
 
 class ComplianceValidatorTest
 {
     public $numErrors = 0;
 
+    public static function run()
+    {
+        $tester = new ComplianceValidatorTest();
+        $tester->testValidate_WithIncorrectBin_ReturnsIncorrectBin();
+        $tester->testValidate_WithoutVendor_ReturnsMissingVendor();
+        echo __CLASS__ . " errors: {$tester->numErrors}" . PHP_EOL;
+    }
+
     public function testValidate_WithIncorrectBin_ReturnsIncorrectBin()
     {
         $paths = [

diff --git a/tests/PackageGeneratorTest.php b/tests/PackageGeneratorTest.php
@@ -1,29 +1,17 @@
 <?php
-
-$autoloadFiles = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php'
-];
-
-foreach ($autoloadFiles as $autoloadFile) {
-    if (file_exists($autoloadFile)) {
-        require_once $autoloadFile;
-        break;
-    }
-}
-
-use Pds\Skeleton\ComplianceValidator;
-use Pds\Skeleton\PackageGenerator;
-
-$tester = new PackageGeneratorTest();
-$tester->testGenerate_WithMissingBin_ReturnsBin();
-
-echo "Errors: {$tester->numErrors}" . PHP_EOL;
+namespace Pds\Skeleton;
 
 class PackageGeneratorTest
 {
     public $numErrors = 0;
 
+    public static function run()
+    {
+        $tester = new PackageGeneratorTest();
+        $tester->testGenerate_WithMissingBin_ReturnsBin();
+        echo __CLASS__ . " errors: {$tester->numErrors}" . PHP_EOL;
+    }
+
     public function testGenerate_WithMissingBin_ReturnsBin()
     {
         $validatorResults = [