Misc improvements for tests

javiereguiluz · May 24, 2015 · e4097ea · e4097ea
1 parent 9249cc7
commit e4097ea
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 40 deletions.
diff --git a/src/Easybook/Tests/DependencyInjection/ApplicationTest.php b/src/Easybook/Tests/DependencyInjection/ApplicationTest.php
@@ -69,27 +69,31 @@ public function testSlugifyUniquely()
         }
     }
 
-    public function testHighlight()
+    /**
+     * @dataProvider provideHighlightFixtures
+     */
+    public function testHighlight($originalFilePath, $highlightedFilePath)
     {
         // mock the $app object to disable the highlight cache
         $app = $this->getMock('Easybook\DependencyInjection\Application', array('edition'));
         $app->expects($this->any())
             ->method('edition')
             ->will($this->returnValue(null));
 
-        $fixturesDir = __DIR__.'/fixtures/highlight';
+        $languageToHighlight = substr(basename($originalFilePath), 0, -4);
 
         $this->assertEquals(
-            file_get_contents($fixturesDir.'/highlighted_html_snippet.txt'),
-            $app->highlight(file_get_contents($fixturesDir.'/raw_html_snippet.txt'), 'html'),
-            'HTML code snippet is highlighted correctly.'
+            file_get_contents($highlightedFilePath),
+            $app->highlight(file_get_contents($originalFilePath), $languageToHighlight),
+            'Code snippet is highlighted correctly.'
         );
+    }
 
-        $this->assertEquals(
-            file_get_contents($fixturesDir.'/highlighted_php_snippet.txt'),
-            $app->highlight(file_get_contents($fixturesDir.'/raw_php_snippet.txt'), 'php'),
-            'PHP code snippet is highlighted correctly.'
-        );
+    public function provideHighlightFixtures()
+    {
+        $fixturesDir = __DIR__.'/fixtures/highlight';
+
+        return array_map(null, glob($fixturesDir.'/input/*.txt'), glob($fixturesDir.'/output/*.txt'));
     }
 
     public function testBookMethodShortcut()
@@ -134,17 +138,16 @@ public function testEditionMethodShortcut()
         $this->assertEquals('epub', $app->edition('format'));
     }
 
+    /**
+     * @expectedException PHPUnit_Framework_Error_Deprecated
+     * @expectedExceptionMessage The "publishing.id" option is deprecated
+     */
     public function testDeprecatedPublishingIdProperty()
     {
         $app = new Application();
         $app['publishing.edition.id'] = 'custom_edition_id';
 
-        try {
-            $id = $app['publishing.id'];
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('PHPUnit_Framework_Error_Deprecated', $e);
-            $this->assertContains('The "publishing.id" option is deprecated', $e->getMessage());
-        }
+        $id = $app['publishing.id'];
     }
 
     /**
@@ -185,6 +188,10 @@ public function getPublishers()
         );
     }
 
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessage Unknown "this_format_does_not_exist" format
+     */
     public function testUnsupportedPublisher()
     {
         $app = new Application();
@@ -200,13 +207,13 @@ public function testUnsupportedPublisher()
             ),
         );
 
-        try {
-            $publisher = $app['publisher'];
-        } catch (\RuntimeException $e) {
-            $this->assertContains('Unknown "this_format_does_not_exist" format', $e->getMessage());
-        }
+        $publisher = $app['publisher'];
     }
 
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessage (easybook only supports Markdown)
+     */
     public function testUnsupportedContentFormat()
     {
         $app = new Application();
@@ -217,11 +224,7 @@ public function testUnsupportedContentFormat()
             ),
         );
 
-        try {
-            $parser = $app['parser'];
-        } catch (\RuntimeException $e) {
-            $this->assertContains('(easybook only supports Markdown)', $e->getMessage());
-        }
+        $parser = $app['parser'];
     }
 
     public function testGetTitleMethodForDefaultTitles()

diff --git a/src/Easybook/Tests/DependencyInjection/RenderTest.php b/src/Easybook/Tests/DependencyInjection/RenderTest.php
@@ -43,27 +43,25 @@ public function setUp()
 
     public function tearDown()
     {
-        //$this->filesystem->remove($this->templateDir);
+        $this->filesystem->remove($this->templateDir);
     }
 
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessage (easybook only supports Twig)
+     */
     public function testNonTwigTemplate()
     {
-        try {
-            $this->app->render('template.tpl');
-        } catch (\RuntimeException $e) {
-            $this->assertInstanceOf('RuntimeException', $e);
-            $this->assertContains('(easybook only supports Twig)', $e->getMessage());
-        }
+        $this->app->render('template.tpl');
     }
 
+    /**
+     * @expectedException Twig_Error_Loader
+     * @expectedExceptionRegExp /Unable to find template (.*)/
+     */
     public function testUndefinedTwigTemplate()
     {
-        try {
-            $this->app->render('template.twig');
-        } catch (\Twig_Error_Loader $e) {
-            $this->assertInstanceOf('Twig_Error_Loader', $e);
-            $this->assertContains('Unable to find template', $e->getMessage());
-        }
+        $this->app->render('template.twig');
     }
 
     public function testSimpleTemplate()

diff --git a/...n/fixtures/highlight/raw_html_snippet.txt → ...jection/fixtures/highlight/input/html.txt b/...n/fixtures/highlight/raw_html_snippet.txt → ...jection/fixtures/highlight/input/html.txt
diff --git a/...on/fixtures/highlight/raw_php_snippet.txt → ...njection/fixtures/highlight/input/php.txt b/...on/fixtures/highlight/raw_php_snippet.txt → ...njection/fixtures/highlight/input/php.txt
diff --git a/...es/highlight/highlighted_html_snippet.txt → ...ection/fixtures/highlight/output/html.txt b/...es/highlight/highlighted_html_snippet.txt → ...ection/fixtures/highlight/output/html.txt
diff --git a/...res/highlight/highlighted_php_snippet.txt → ...jection/fixtures/highlight/output/php.txt b/...res/highlight/highlighted_php_snippet.txt → ...jection/fixtures/highlight/output/php.txt
diff --git a/src/Easybook/Tests/Publishers/PublisherTest.php b/src/Easybook/Tests/Publishers/PublisherTest.php
@@ -40,7 +40,7 @@ public function setUp()
 
     public function tearDown()
     {
-        //$this->filesystem->remove($this->tmpDir);
+        $this->filesystem->remove($this->tmpDir);
 
         parent::tearDown();
     }