From 12a9459eafde3ca20fc0788c2ae015a55b4b921a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 23 Nov 2016 23:03:48 +0100
Subject: [PATCH] LegacyStorageTest: improve readability...

...and move config "loading" to BaseTestCase
---
 library/Businessprocess/Test/BaseTestCase.php |  6 ++++
 .../Storage/LegacyStorageTest.php             | 34 ++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/library/Businessprocess/Test/BaseTestCase.php b/library/Businessprocess/Test/BaseTestCase.php
index 8154bd4..0a74885 100644
--- a/library/Businessprocess/Test/BaseTestCase.php
+++ b/library/Businessprocess/Test/BaseTestCase.php
@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Businessprocess\Test;
 
+use Icinga\Application\Config;
 use Icinga\Application\ApplicationBootstrap;
 use Icinga\Application\Icinga;
 use PHPUnit_Framework_TestCase;
@@ -19,6 +20,11 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
         $this->app();
     }
 
+    protected function emptyConfigSection()
+    {
+        return Config::module('businessprocess')->getSection('global');
+    }
+
     /**
      * @param null $subDir
      * @return string
diff --git a/test/php/library/Businessprocess/Storage/LegacyStorageTest.php b/test/php/library/Businessprocess/Storage/LegacyStorageTest.php
index 985ddf3..5abcc87 100644
--- a/test/php/library/Businessprocess/Storage/LegacyStorageTest.php
+++ b/test/php/library/Businessprocess/Storage/LegacyStorageTest.php
@@ -2,23 +2,21 @@
 
 namespace Tests\Icinga\Module\Businessprocess\Storage;
 
-use Icinga\Application\Config;
 use Icinga\Module\Businessprocess\Test\BaseTestCase;
 use Icinga\Module\Businessprocess\Storage\LegacyStorage;
-use Icinga\Module\Businessprocess\Storage\Storage;
 
 class LegacyStorageTest extends BaseTestCase
 {
-    public function testWhetherItCanBeInstantiatedWithAnEmptyConfigSection()
+    public function testCanBeInstantiatedWithAnEmptyConfigSection()
     {
         $baseClass = 'Icinga\\Module\\Businessprocess\\Storage\\LegacyStorage';
         $this->assertInstanceOf(
             $baseClass,
-            new LegacyStorage(Config::module('businessprocess')->getSection('global'))
+            new LegacyStorage($this->emptyConfigSection())
         );
     }
 
-    public function testWhetherDefaultConfigDirIsDetermined()
+    public function testDefaultConfigDirIsDiscoveredCorrectly()
     {
         $this->assertEquals(
             $this->getTestsBaseDir('config/modules/businessprocess/processes'),
@@ -26,7 +24,7 @@ class LegacyStorageTest extends BaseTestCase
         );
     }
 
-    public function testWhetherAllProcessesAreListed()
+    public function testAllAvailableProcessesAreListed()
     {
         $keys = array_keys($this->makeInstance()->listProcesses());
         sort($keys);
@@ -40,7 +38,7 @@ class LegacyStorageTest extends BaseTestCase
         );
     }
 
-    public function testWhetherHeadersAreRespectedInProcessList()
+    public function testHeaderTitlesAreRespectedInProcessList()
     {
         $keys = array_values($this->makeInstance()->listProcesses());
         sort($keys);
@@ -54,7 +52,7 @@ class LegacyStorageTest extends BaseTestCase
         );
     }
 
-    public function testWhetherProcessFilenameIsReturned()
+    public function testProcessFilenameIsReturned()
     {
         $this->assertEquals(
             $this->getTestsBaseDir('config/modules/businessprocess/processes/simple_with-header.conf'),
@@ -62,21 +60,21 @@ class LegacyStorageTest extends BaseTestCase
         );
     }
 
-    public function testWhetherExistingProcessExists()
+    public function testAnExistingProcessExists()
     {
         $this->assertTrue(
             $this->makeInstance()->hasProcess('simple_with-header')
         );
     }
 
-    public function testWhetherMissingProcessIsMissing()
+    public function testAMissingProcessIsMissing()
     {
         $this->assertFalse(
             $this->makeInstance()->hasProcess('simple_with-headerx')
         );
     }
 
-    public function testWhetherValidProcessCanBeLoaded()
+    public function testAValidProcessCanBeLoaded()
     {
         $processClass = 'Icinga\\Module\\Businessprocess\\BusinessProcess';
         $this->assertInstanceOf(
@@ -85,7 +83,7 @@ class LegacyStorageTest extends BaseTestCase
         );
     }
 
-    public function testWhetherConfigCanBeLoadedFromAString()
+    public function testProcessConfigCanBeLoadedFromAString()
     {
         $processClass = 'Icinga\\Module\\Businessprocess\\BusinessProcess';
         $this->assertInstanceOf(
@@ -94,10 +92,14 @@ class LegacyStorageTest extends BaseTestCase
         );
     }
 
-    public function testWhetherProcessSourceCanBeFetched()
+    public function testFullProcessSourceCanBeFetched()
     {
         $this->assertEquals(
-            file_get_contents($this->getTestsBaseDir('config/modules/businessprocess/processes/simple_with-header.conf')),
+            file_get_contents(
+                $this->getTestsBaseDir(
+                    'config/modules/businessprocess/processes/simple_with-header.conf'
+                )
+            ),
             $this->makeInstance()->getSource('simple_with-header')
         );
     }
@@ -107,6 +109,6 @@ class LegacyStorageTest extends BaseTestCase
      */
     protected function makeInstance()
     {
-        return new LegacyStorage(Config::module('businessprocess')->getSection('global'));
+        return new LegacyStorage($this->emptyConfigSection());
     }
-}
\ No newline at end of file
+}