From 3a0f138dc83a4f3c25478e5ba07eabcd7ec2392a Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Mon, 26 Jun 2017 21:21:36 -0700 Subject: [PATCH] resourceloader: Complete test coverage for FileModule::getTemplates() * Add coverage for the 'else' branch for file not existing and an exception being thrown. Change-Id: Ia7d608f1ed72f07f46b969046d9c9910fbfd738d --- .../ResourceLoaderFileModuleTest.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php index 7d12e59ee2..9a03d3ca7c 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php @@ -41,6 +41,12 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { ] ], + 'htmlTemplateUnknown' => $base + [ + 'templates' => [ + 'templates/notfound.html', + ] + ], + 'aliasedHtmlTemplateModule' => $base + [ 'templates' => [ 'foo.html' => 'templates/template.html', @@ -259,6 +265,10 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { 'bar.html' => "
goodbye
\n", ], ], + [ + $modules['htmlTemplateUnknown'], + false, + ], ]; } @@ -270,7 +280,12 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { $rl = new ResourceLoaderFileModule( $module ); $rl->setName( 'testing' ); - $this->assertEquals( $rl->getTemplates(), $expected ); + if ( $expected === false ) { + $this->setExpectedException( MWException::class ); + $rl->getTemplates(); + } else { + $this->assertEquals( $rl->getTemplates(), $expected ); + } } public function testBomConcatenation() { -- 2.20.1