Rework unit tests in "tests"

Author: rougin

tests/AppTest.php

@@ -14,28 +14,28 @@ class AppTest extends Testcase
     /**
      * @return void
      */
-    public function test_combustor_yml_file()
+    public function test_passed_if_config_file()
     {
         $app = new Console(__DIR__ . '/Fixture');
 
-        $expected = 'Rougin\Blueprint\Wrapper';
+        $expect = 'Rougin\Blueprint\Wrapper';
 
         $actual = $app->make()->find('create');
 
-        $this->assertInstanceOf($expected, $actual);
+        $this->assertInstanceOf($expect, $actual);
     }
 
     /**
      * @return void
      */
-    public function test_without_combustor_yml()
+    public function test_passed_if_no_config_file()
     {
         $app = new Console(__DIR__ . '/../');
 
-        $expected = 'Rougin\Blueprint\Wrapper';
+        $expect = 'Rougin\Blueprint\Wrapper';
 
         $actual = $app->make()->find('initialize');
 
-        $this->assertInstanceOf($expected, $actual);
+        $this->assertInstanceOf($expect, $actual);
     }
 }

tests/FileTest.php

@@ -12,24 +12,26 @@ class FileTest extends ScriptTest
     /**
      * @return void
      */
-    public function doSetUp()
+    public function test_passed_if_config_path()
     {
-        $this->app = new Console(__DIR__ . '/Fixture/Sample');
+        $path = __DIR__ . '/Fixture/Sample/config';
+
+        $ds = DIRECTORY_SEPARATOR;
+
+        $expect = str_replace(array('/', '\\'), $ds, $path);
+
+        $actual = $this->app->getConfigPath();
+
+        $this->assertEquals($expect, $actual);
     }
 
     /**
      * @return void
      */
-    public function test_config_path()
+    protected function doSetUp()
     {
-        $expected = __DIR__ . '/Fixture/Sample/config';
-
-        $ds = DIRECTORY_SEPARATOR;
-
-        $expected = str_replace(array('/', '\\'), $ds, $expected);
-
-        $actual = $this->app->getConfigPath();
+        $path = __DIR__ . '/Fixture/Sample';
 
-        $this->assertEquals($expected, $actual);
+        $this->app = new Console($path);
     }
 }

tests/ScriptTest.php

@@ -17,31 +17,75 @@ class ScriptTest extends Testcase
     protected $app;
 
     /**
-     * @return void
+     * @param string $name
+     *
+     * @return string
+     */
+    protected function getActualPage($name)
+    {
+        $path = $this->app->getPagesPath();
+
+        $files = glob($path . '/*.md');
+
+        $files = is_array($files) ? $files : array();
+
+        $selected = '';
+
+        foreach ($files as $file)
+        {
+            $base = basename($file);
+
+            $parsed = substr($base, 15, strlen($base));
+
+            if ($parsed === $name . '.md')
+            {
+                $selected = $file;
+
+                break;
+            }
+        }
+
+        /** @var string */
+        $actual = file_get_contents($selected);
+
+        return str_replace("\r\n", "\n", $actual);
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return string
      */
-    public function doSetUp()
+    protected function getTemplate($name)
     {
-        $this->app = new Console(__DIR__ . '/Fixture');
+        $path = __DIR__ . '/Fixture/Output/' . $name;
+
+        /** @var string */
+        $file = file_get_contents($path);
+
+        return str_replace("\r\n", "\n", $file);
     }
 
     /**
      * @return void
      */
-    public function test_compiling_pages()
+    public function test_passed_if_page_compiled()
     {
         $create = $this->findCommand('create');
 
-        $create->execute(array('name' => 'Hello world!'));
+        $data = array('name' => 'Hello world!');
+
+        $create->execute($data);
 
         $test = $this->findCommand('build');
 
         $test->execute(array());
 
-        $expected = $this->getTemplate('HelloWorld.html');
+        $expect = $this->getTemplate('HelloWorld.html');
 
         $actual = $this->getActualHtml('hello-world');
 
-        $this->assertEquals($expected, $actual);
+        $this->assertEquals($expect, $actual);
 
         $this->deletePath('build');
 
@@ -51,17 +95,19 @@ public function test_compiling_pages()
     /**
      * @return void
      */
-    public function test_creating_new_page()
+    public function test_passed_if_page_created()
     {
         $test = $this->findCommand('create');
 
-        $test->execute(array('name' => 'Hello world!'));
+        $data = array('name' => 'Hello world!');
+
+        $test->execute($data);
 
-        $expected = $this->getTemplate('HelloWorld.md');
+        $expect = $this->getTemplate('HelloWorld.md');
 
         $actual = $this->getActualPage('hello-world');
 
-        $this->assertEquals($expected, $actual);
+        $this->assertEquals($expect, $actual);
     }
 
     /**
@@ -84,10 +130,12 @@ protected function deletePath($name, $path = null)
 
         if (! is_dir($path))
         {
-            throw new \InvalidArgumentException('"' . $path . '" must be a directory');
+            $text = '"' . $path . '" must be a directory';
+
+            throw new \InvalidArgumentException($text);
         }
 
-        if (substr($path, strlen($path) - 1, 1) != '/')
+        if (substr($path, -1) != '/')
         {
             $path .= '/';
         }
@@ -111,14 +159,26 @@ protected function deletePath($name, $path = null)
         rmdir($path);
     }
 
+    /**
+     * @return void
+     */
+    protected function doSetUp()
+    {
+        $path = __DIR__ . '/Fixture';
+
+        $this->app = new Console($path);
+    }
+
     /**
      * @param string $name
      *
      * @return \Symfony\Component\Console\Tester\CommandTester
      */
     protected function findCommand($name)
     {
-        return new CommandTester($this->app->make()->find($name));
+        $command = $this->app->make()->find($name);
+
+        return new CommandTester($command);
     }
 
     /**
@@ -157,58 +217,8 @@ protected function getActualHtml($name)
         }
 
         /** @var string */
-        $result = file_get_contents($selected);
-
-        return str_replace("\r\n", "\n", $result);
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function getActualPage($name)
-    {
-        $path = $this->app->getPagesPath();
-
-        $files = glob($path . '/*.md');
-
-        $files = is_array($files) ? $files : array();
-
-        $selected = '';
-
-        foreach ($files as $file)
-        {
-            $base = basename($file);
-
-            $parsed = substr($base, 15, strlen($base));
+        $actual = file_get_contents($selected);
 
-            if ($parsed === $name . '.md')
-            {
-                $selected = $file;
-
-                break;
-            }
-        }
-
-        /** @var string */
-        $result = file_get_contents($selected);
-
-        return str_replace("\r\n", "\n", $result);
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function getTemplate($name)
-    {
-        $path = __DIR__ . '/Fixture/Output/' . $name;
-
-        /** @var string */
-        $file = file_get_contents($path);
-
-        return str_replace("\r\n", "\n", $file);
+        return str_replace("\r\n", "\n", $actual);
     }
 }