Adds some tests

Author: sgiehl

core/ExceptionHandler.php

@@ -88,8 +88,8 @@ public static function dieWithHtmlErrorPage($exception)
 
         // Log the error with an appropriate loglevel.
         switch (true) {
-            case ($exception instanceof HttpCodeException && $exception->getCode() > 400 && $exception->getCode() < 500):
-                // Do not log exception that results in 4xx HTTP status codes
+            case ($exception instanceof HttpCodeException && $exception->getCode() >= 400 && $exception->getCode() < 500):
+                // Log exceptions, resulting in 4xx HTTP status code, only at debug level
                 self::logException($exception, Log::DEBUG);
                 break;
             default:

tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php

@@ -13,6 +13,7 @@
 use Piwik\AssetManager\UIAssetFetcher\Chunk;
 use Piwik\AssetManager\UIAssetFetcher\PluginUmdAssetFetcher;
 use Piwik\Filesystem;
+use Piwik\Http\BadRequestException;
 use Piwik\Plugin\Manager;
 use Piwik\Tests\Framework\TestCase\UnitTestCase;
 
@@ -172,6 +173,17 @@ public function testGetChunkFilesWhenLoadingUmdsIndividually()
         $this->assertEquals($expectedChunkFiles, $actualChunkFiles);
     }
 
+    public function testGetChunkFilesThrows404WhenChunkIsMissing()
+    {
+        $plugins = array_keys(self::TEST_PLUGIN_DEPENDENCIES);
+        $instance = new PluginUmdAssetFetcher($plugins, null, 'does-not-exist', false);
+
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionCode(404);
+
+        $instance->getCatalog();
+    }
+
     public function testGetChunkFilesWhenLoadingUmdsIndividuallyAndNotAllPluginsActivated()
     {
         $plugins = array_keys(self::TEST_PLUGIN_DEPENDENCIES);

tests/PHPUnit/Integration/Plugin/ManagerTest.php

@@ -12,6 +12,8 @@
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
+use Piwik\Exception\PluginDeactivatedException;
+use Piwik\Exception\PluginNotFoundException;
 use Piwik\Http\ControllerResolver;
 use Piwik\Plugin;
 use Piwik\Cache as PiwikCache;
@@ -160,6 +162,37 @@ public function testIsPluginInstalledPluginInstalledConfigButNotExists()
         $this->assertTrue($this->manager->isPluginInstalled('FooBarBaz', false));
     }
 
+    public function testCheckIsPluginActivatedThrows404WhenPluginMissing()
+    {
+        $this->expectException(PluginNotFoundException::class);
+        $this->expectExceptionCode(404);
+
+        $this->manager->checkIsPluginActivated('NotARealPlugin');
+    }
+
+    public function testCheckIsPluginActivatedThrows403WhenPluginDeactivated()
+    {
+        $pluginName = 'ExampleTheme';
+        $wasActivated = $this->manager->isPluginActivated($pluginName);
+
+        if ($wasActivated) {
+            $this->manager->deactivatePlugin($pluginName);
+        }
+
+        try {
+            $this->assertTrue($this->manager->isPluginInFilesystem($pluginName));
+
+            $this->expectException(PluginDeactivatedException::class);
+            $this->expectExceptionCode(403);
+
+            $this->manager->checkIsPluginActivated($pluginName);
+        } finally {
+            if ($wasActivated) {
+                $this->manager->activatePlugin($pluginName);
+            }
+        }
+    }
+
     /**
      * @dataProvider getPluginNameProvider
      */

tests/PHPUnit/System/ResponseCodeTest.php

@@ -101,6 +101,46 @@ public function testProcessedApiShouldHaveCorrectHttpStatus()
         $this->assertEquals(200, $info['http_code']);
     }
 
+    public function testApiMissingRequiredParameterShouldReturn400()
+    {
+        [$response, $info] = $this->curl(
+            Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=API&method=SitesManager.getSiteFromId',
+            ['token_auth' => Fixture::ADMIN_USER_TOKEN]
+        );
+
+        $this->assertEquals(400, $info['http_code']);
+        $this->assertStringContainsString('Please specify a value for \'idSite\'', $response);
+    }
+
+    public function testValidModuleInvalidActionShouldReturn404()
+    {
+        [$response, $info] = $this->curl(
+            Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=CoreHome&action=doesNotExist'
+        );
+
+        $this->assertEquals(404, $info['http_code']);
+        $this->assertStringContainsString("Action 'doesNotExist' not found in the module 'CoreHome'", $response);
+    }
+
+    public function testMissingAssetChunkShouldReturn404()
+    {
+        [, $info] = $this->curl(
+            Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=Proxy&action=getPluginUmdJs&plugin=NotAPlugin'
+        );
+
+        $this->assertEquals(404, $info['http_code']);
+    }
+
+    public function testMissingPluginShouldReturn404HttpStatus()
+    {
+        [$response, $info] = $this->curl(
+            Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=NotAPlugin&action=index'
+        );
+
+        $this->assertEquals(404, $info['http_code']);
+        $this->assertStringContainsString('The plugin NotAPlugin was not found.', $response);
+    }
+
     private function curl($url, $postParams = [])
     {
         if (!function_exists('curl_init')) {