Re-arrange tests to differenciate between integration and unit tests. (#4)

* Re-arrange tests to differenciate between integration and unit tests.
* Split unit tests in unit and integration tests and clean them up a little.
* Fix AbstractUnit to handle service names with suffixes in them correctly while instance name determination
* Add dedicated namespace for tests in composer.json.
* Add AbstractUnitTest
* Remove obsolete data provider

Author: func0der

composer.json

@@ -13,7 +13,13 @@
     "autoload": {
         "psr-4": {
             "SystemCtl\\": [
-                "src/",
+                "src/"
+            ]
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SystemCtl\\Tests\\": [
                 "tests/"
             ]
         }

phpunit.xml

@@ -12,8 +12,11 @@
          bootstrap="./vendor/autoload.php"
 >
     <testsuites>
-        <testsuite name="unittests">
-            <directory>./tests/</directory>
+        <testsuite name="unit-tests">
+            <directory>./tests/Unit</directory>
+        </testsuite>
+        <testsuite name="integration-tests">
+            <directory>./tests/Integration</directory>
         </testsuite>
     </testsuites>
 
@@ -26,4 +29,4 @@
         </whitelist>
     </filter>
 
-</phpunit>
+</phpunit>

src/Unit/AbstractUnit.php

@@ -42,11 +42,18 @@ public function isMultiInstance(): bool
 
     /**
      * @inheritDoc
+     * @todo: Everything in here should happen inside the constructor and stored
+     *      afterwards.
      */
     public function getInstanceName(): ?string
     {
-        $parts = explode('@', $this->name);
-        return $parts[1] ?? null;
+        $instanceName = explode('@', $this->name, 2)[1] ?? null;
+
+        if (is_string($instanceName) && strpos($instanceName, '.') !== false) {
+            $instanceName = explode('.', $instanceName, 2)[0];
+        }
+
+        return $instanceName;
     }
 
     /**

tests/SystemCtlTest.php tests/Integration/SystemCtlTest.phptests/SystemCtlTest.php renamed to tests/Integration/SystemCtlTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SystemCtl\Test;
+namespace SystemCtl\Test\Integration;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\Process;
@@ -13,36 +13,6 @@
 
 class SystemCtlTest extends TestCase
 {
-    /**
-     * @param string $output
-     * @return \PHPUnit_Framework_MockObject_MockObject|SystemCtl
-     */
-    private function buildSystemCtlMock($output)
-    {
-
-        $process = $this->getMockBuilder(Process::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getOutput'])
-            ->getMock();
-
-        $process->method('getOutput')->willReturn($output);
-
-        $processBuilder = $this->getMockBuilder(ProcessBuilder::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getProcess'])
-            ->getMock();
-
-        $processBuilder->method('getProcess')->willReturn($process);
-
-        $systemctl = $this->getMockBuilder(SystemCtl::class)
-            ->setMethods(['getProcessBuilder'])
-            ->getMock();
-
-        $systemctl->method('getProcessBuilder')->willReturn($processBuilder);
-
-        return $systemctl;
-    }
-
     public function testListUnitsWithAvailableUnits()
     {
         $output = <<<EOT
@@ -55,7 +25,7 @@ public function testListUnitsWithAvailableUnits()
   systemd-ask-password-wall.path                     loaded active waiting
   acpid.service                                      loaded active running
   beanstalkd.service                                 loaded active running
-  console-setup.service                              loaded active exited 
+  console-setup.service                              loaded active exited
   cron.service                                       loaded active running
 EOT;
         $systemctl = $this->buildSystemCtlMock($output);
@@ -75,7 +45,7 @@ public function testListUnitsWithSupportedUnits()
   systemd-ask-password-wall.path                     loaded active waiting
   acpid.service                                      loaded active running
   beanstalkd.service                                 loaded active running
-  console-setup.service                              loaded active exited 
+  console-setup.service                              loaded active exited
   cron.service                                       loaded active running
 EOT;
         $systemctl = $this->buildSystemCtlMock($output);
@@ -97,16 +67,6 @@ public function testCreateUnitFromUnsupportedSuffixShouldRaiseException()
         SystemCtl::unitFromSuffix('unsupported', 'FailUnit');
     }
 
-    public function testGetServiceWithName()
-    {
-        $output = 'testService.service Active Running';
-        $systemctl = $this->buildSystemCtlMock($output);
-
-        $service = $systemctl->getService('testService');
-        $this->assertInstanceOf(Service::class, $service);
-        $this->assertEquals('testService', $service->getName());
-    }
-
     public function testGetServices()
     {
         $output = <<<EOT
@@ -115,7 +75,7 @@ public function testGetServices()
   awesomeservice.service    Active running
   nonservice.timer          Active running
 PLACEHOLDER STUFF
-  
+
 EOT;
 
         $systemctl = $this->buildSystemCtlMock($output);
@@ -124,15 +84,6 @@ public function testGetServices()
         $this->assertCount(2, $services);
     }
 
-    public function testGetTimerWithName()
-    {
-        $systemctl = new SystemCtl();
-
-        $timer = $systemctl->getTimer('testTimer');
-        $this->assertInstanceOf(Timer::class, $timer);
-        $this->assertEquals('testTimer', $timer->getName());
-    }
-
     public function testGetTimers()
     {
         $output = <<<EOT
@@ -161,4 +112,33 @@ public function testSetBinaryShouldChangeCommand()
         $processBuilder = $systemCtl->getProcessBuilder();
         $this->assertEquals("'/usr/sbin/systemctl'", $processBuilder->getProcess()->getCommandLine());
     }
+
+    /**
+     * @param string $output
+     * @return \PHPUnit_Framework_MockObject_MockObject|SystemCtl
+     */
+    private function buildSystemCtlMock($output)
+    {
+        $process = $this->getMockBuilder(Process::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOutput'])
+            ->getMock();
+
+        $process->method('getOutput')->willReturn($output);
+
+        $processBuilder = $this->getMockBuilder(ProcessBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProcess'])
+            ->getMock();
+
+        $processBuilder->method('getProcess')->willReturn($process);
+
+        $systemctl = $this->getMockBuilder(SystemCtl::class)
+            ->setMethods(['getProcessBuilder'])
+            ->getMock();
+
+        $systemctl->method('getProcessBuilder')->willReturn($processBuilder);
+
+        return $systemctl;
+    }
 }

tests/Unit/UnitTest.php tests/Integration/Unit/UnitTest.phptests/Unit/UnitTest.php renamed to tests/Integration/Unit/UnitTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SystemCtl\Test\Unit;
+namespace SystemCtl\Test\Integration\Unit;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\Process;
@@ -131,24 +131,4 @@ public function testTimerCommandsIfProcessIsUnsuccessFulShouldRaiseException()
         $this->expectException(CommandFailedException::class);
         $timer->start();
     }
-
-    public function testMultiInstanceUnit()
-    {
-        $process = $this->getMockBuilder(Process::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ProcessBuilder $processBuilder */
-        $processBuilder = $this->getMockBuilder(ProcessBuilder::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getProcess'])
-            ->getMock();
-
-        $processBuilder->method('getProcess')->willReturn($process);
-
-        $unit = new Service('service@1', $processBuilder);
-        $this->assertEquals('service@1', $unit->getName());
-        $this->assertTrue($unit->isMultiInstance());
-        $this->assertEquals('1', $unit->getInstanceName());
-    }
 }

tests/Unit/SystemCtlTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace SystemCtl\Test\Unit;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\Process;
+use Symfony\Component\Process\ProcessBuilder;
+use SystemCtl\Exception\UnitTypeNotSupportedException;
+use SystemCtl\Unit\Service;
+use SystemCtl\SystemCtl;
+use SystemCtl\Unit\Timer;
+use SystemCtl\Unit\UnitInterface;
+
+class SystemCtlTest extends TestCase
+{
+    /**
+     * @param string $output
+     * @return \PHPUnit_Framework_MockObject_MockObject|SystemCtl
+     */
+    private function buildSystemCtlMock($output)
+    {
+
+        $process = $this->getMockBuilder(Process::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOutput'])
+            ->getMock();
+
+        $process->method('getOutput')->willReturn($output);
+
+        $processBuilder = $this->getMockBuilder(ProcessBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProcess'])
+            ->getMock();
+
+        $processBuilder->method('getProcess')->willReturn($process);
+
+        $systemctl = $this->getMockBuilder(SystemCtl::class)
+            ->setMethods(['getProcessBuilder'])
+            ->getMock();
+
+        $systemctl->method('getProcessBuilder')->willReturn($processBuilder);
+
+        return $systemctl;
+    }
+
+    public function testGetServiceWithName()
+    {
+        $systemctl = new SystemCtl();
+
+        $service = $systemctl->getService('testService');
+        $this->assertInstanceOf(Service::class, $service);
+        $this->assertEquals('testService', $service->getName());
+    }
+
+    public function testGetTimerWithName()
+    {
+        $systemctl = new SystemCtl();
+
+        $timer = $systemctl->getTimer('testTimer');
+        $this->assertInstanceOf(Timer::class, $timer);
+        $this->assertEquals('testTimer', $timer->getName());
+    }
+}