diff options
author | Stefan Giehl <stefan@matomo.org> | 2020-12-14 03:18:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-14 03:18:07 +0300 |
commit | 8f980c43988efd77dfbb15f48d64e6f987d45555 (patch) | |
tree | c9d051350d32e6b11dd0aef0f040605b853e956f /tests | |
parent | 3b528814c649f701c882c98096917ec3b9c382c3 (diff) |
fix some tests exception handling (#16932)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php index 2324cd63b8..b36268caae 100644 --- a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php +++ b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\System; use Piwik\API\Request; +use Piwik\Tests\Framework\Mock\FakeAccess; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesVisitsInPast; use Exception; @@ -99,18 +100,28 @@ class VisitsInPastInvalidateOldReportsTest extends SystemTestCase // Make an invalid call $idSiteNoAccess = 777; try { - $request = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSiteNoAccess . "&dates=2010-03-03&format=original"); + FakeAccess::clearAccess(); + $request = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSiteNoAccess . "&dates=2010-03-03&format=original&token_auth=" . self::$fixture::VIEW_USER_TOKEN); $request->process(); - $this->fail(); - } catch(Exception $e) {} + $this->fail('Invalidating archived reports with invalid idSite worked, but shouldn\'t'); + } catch(\PHPUnit\Framework\Exception $e) { + throw $e; + } catch(Exception $e) { + $this->assertStringContainsString('checkUserHasAdminAccess Fake exception', $e->getMessage()); + } + FakeAccess::clearAccess(true); // test an invalidate period parameter try { $invalidPeriod = "day,month"; $request = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&period=$invalidPeriod&idSites=$idSite&dates=2010-03-03&format=original"); $request->process(); - $this->fail(); - } catch(Exception $e) {} + $this->fail('Invalidating archived reports with an invalid period worked, but shouldn\'t'); + } catch(\PHPUnit\Framework\Exception $e) { + throw $e; + } catch(Exception $e) { + $this->assertStringContainsString("The period 'day,month' is not supported", $e->getMessage()); + } // 2) Call API again, with an older date, which should now return data $this->runApiTests($api, $params); @@ -145,6 +156,13 @@ class VisitsInPastInvalidateOldReportsTest extends SystemTestCase ); } + public function provideContainerConfig() + { + return array( + 'Piwik\Access' => new FakeAccess() + ); + } + public static function getOutputPrefix() { return 'VisitsInPast_InvalidateOldReports'; |