[Test] as a service (#2419)

* Add test service * Update use keywords for Test * Fix last line * Use the new service * Improve readability. * Improve readability.
hechoendrupal · Jul 14, 2016 · 8dddfbc · 8dddfbc
1 parent c72e521
commit 8dddfbc
Show file tree

Hide file tree

Showing 3 changed files with 167 additions and 116 deletions.
diff --git a/config/services/test.yml b/config/services/test.yml
@@ -0,0 +1,9 @@
+services:
+  test_debug:
+    class: Drupal\Console\Command\Test\DebugCommand
+    tags:
+      - { name: console.command }
+  test_run:
+    class: Drupal\Console\Command\Test\RunCommand
+    tags:
+      - { name: console.command }
diff --git a/src/Command/Test/DebugCommand.php b/src/Command/Test/DebugCommand.php
@@ -12,37 +12,43 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Component\Serialization\Yaml;
-use Drupal\Console\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
+use Drupal\Console\Command\Shared\ContainerAwareCommandTrait;
+use Drupal\Console\Annotation\DrupalCommand;
 use Drupal\Console\Style\DrupalStyle;
 
 /**
  * Class DebugCommand
  * @package Drupal\Console\Command\Test
  */
-class DebugCommand extends ContainerAwareCommand
+class DebugCommand extends Command
 {
+    use ContainerAwareCommandTrait;
+
     /**
-     * {@inheritdoc}
+     * @DrupalCommand(
+     *     dependencies = {
+     *         “simpletest"
+     *     }
+     * )
      */
     protected function configure()
     {
         $this
-            ->setName('test:debug')
-            ->setDescription($this->trans('commands.test.debug.description'))
-            ->addArgument(
-                'group',
-                InputArgument::OPTIONAL,
-                $this->trans('commands.test.debug.options.group'),
-                null
-            )
-            ->addOption(
-                'test-class',
-                '',
-                InputOption::VALUE_OPTIONAL,
-                $this->trans('commands.test.debug.arguments.test-class')
-            );
-
-        $this->addDependency('simpletest');
+          ->setName('test:debug')
+          ->setDescription($this->trans('commands.test.debug.description'))
+          ->addArgument(
+            'group',
+            InputArgument::OPTIONAL,
+            $this->trans('commands.test.debug.options.group'),
+            NULL
+          )
+          ->addOption(
+            'test-class',
+            '',
+            InputOption::VALUE_OPTIONAL,
+            $this->trans('commands.test.debug.arguments.test-class')
+          );
     }
 
     /**
@@ -52,42 +58,45 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
         //Registers namespaces for disabled modules.
-        $this->getTestDiscovery()->registerTestNamespaces();
+        $this->getDrupalService('test_discovery')->registerTestNamespaces();
 
         $testClass = $input->getOption('test-class');
         $group = $input->getArgument('group');
 
         if ($testClass) {
             $this->testDetail($io, $testClass);
-        } else {
+        }
+        else {
             $this->testList($io, $group);
         }
     }
 
     private function testDetail(DrupalStyle $io, $test_class)
     {
-        $testingGroups = $this->getTestDiscovery()->getTestClasses(null);
+        $testingGroups = $this->getDrupalService('test_discovery')->getTestClasses(NULL);
 
-        $testDetails = null;
+        $testDetails = NULL;
         foreach ($testingGroups as $testing_group => $tests) {
             foreach ($tests as $key => $test) {
                 if ($test['name'] == $test_class) {
                     $testDetails = $test;
                     break;
                 }
             }
-            if ($testDetails !== null) {
+            if ($testDetails !== NULL) {
                 break;
             }
         }
 
-        $class = null;
+        $class = NULL;
         if ($testDetails) {
             $class = new \ReflectionClass($test['name']);
             if (is_subclass_of($testDetails['name'], 'PHPUnit_Framework_TestCase')) {
                 $testDetails['type'] = 'phpunit';
-            } else {
-                $testDetails = $this->getTestDiscovery()->getTestInfo($testDetails['name']);
+            }
+            else {
+                $testDetails = $this->getDrupalService('test_discovery')
+                  ->getTestInfo($testDetails['name']);
                 $testDetails['type'] = 'simpletest';
             }
 
@@ -109,29 +118,32 @@ private function testDetail(DrupalStyle $io, $test_class)
                     }
                 }
             }
-        } else {
+        }
+        else {
             $io->error($this->trans('commands.test.debug.messages.not-found'));
         }
     }
 
     protected function testList(DrupalStyle $io, $group)
     {
-        $testingGroups = $this->getTestDiscovery()->getTestClasses(null);
+        $testingGroups = $this->getDrupalService('test_discovery')
+          ->getTestClasses(NULL);
 
         if (empty($group)) {
             $tableHeader = [$this->trans('commands.test.debug.messages.group')];
-        } else {
+        }
+        else {
             $tableHeader = [
-                $this->trans('commands.test.debug.messages.class'),
-                $this->trans('commands.test.debug.messages.type')
+              $this->trans('commands.test.debug.messages.class'),
+              $this->trans('commands.test.debug.messages.type')
             ];
 
             $io->writeln(
-                sprintf(
-                    '%s: %s',
-                    $this->trans('commands.test.debug.messages.group'),
-                    $group
-                )
+              sprintf(
+                '%s: %s',
+                $this->trans('commands.test.debug.messages.group'),
+                $group
+              )
             );
         }
 
@@ -149,7 +161,8 @@ protected function testList(DrupalStyle $io, $group)
             foreach ($tests as $test) {
                 if (is_subclass_of($test['name'], 'PHPUnit_Framework_TestCase')) {
                     $test['type'] = 'phpunit';
-                } else {
+                }
+                else {
                     $test['type'] = 'simpletest';
                 }
                 $tableRows[] =[
@@ -162,14 +175,15 @@ protected function testList(DrupalStyle $io, $group)
 
         if ($group) {
             $io->success(
-                sprintf(
-                    $this->trans('commands.test.debug.messages.success-group'),
-                    $group
-                )
+              sprintf(
+                $this->trans('commands.test.debug.messages.success-group'),
+                $group
+              )
             );
-        } else {
+        }
+        else {
             $io->success(
-                $this->trans('commands.test.debug.messages.success-groups')
+              $this->trans('commands.test.debug.messages.success-groups')
             );
         }
     }