diff options
author | diosmosis <benaka@piwik.pro> | 2015-10-08 17:36:51 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-10-12 21:05:37 +0300 |
commit | 25de7742eceb032f1e3b9d60098215010d3825fa (patch) | |
tree | b30072ab7e970a35d6e30367db4cf9f60bb125f7 /tests | |
parent | 8c005494372645af76c973decd5b51d0884b87dc (diff) |
Fixing some failing tests.
Diffstat (limited to 'tests')
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index f0e4b7c19c..c64f0c3e62 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration; use Piwik\Archiver\Request; use Piwik\CliMulti; +use Piwik\Container\StaticContainer; use Piwik\CronArchive; use Piwik\Archive\ArchiveInvalidator; use Piwik\Date; @@ -31,7 +32,7 @@ class CronArchiveTest extends IntegrationTestCase Fixture::createWebsite('2014-12-12 00:01:02'); Fixture::createWebsite('2014-12-12 00:01:02'); - $ar = new ArchiveInvalidator(); + $ar = StaticContainer::get('Piwik\Archive\ArchiveInvalidator'); $ar->rememberToInvalidateArchivedReportsLater(1, Date::factory('2014-04-05')); $ar->rememberToInvalidateArchivedReportsLater(2, Date::factory('2014-04-05')); $ar->rememberToInvalidateArchivedReportsLater(2, Date::factory('2014-04-06')); diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php index e870fa6c51..e686146f73 100644 --- a/tests/PHPUnit/Integration/Tracker/VisitTest.php +++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration\Tracker; use Piwik\Cache; -use Piwik\Archive\ArchiveInvalidator; +use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Network\IPUtils; use Piwik\Plugin\Manager; @@ -411,7 +411,7 @@ class VisitTest extends IntegrationTestCase $visit->handle(); - $archive = new ArchiveInvalidator(); + $archive = StaticContainer::get('Piwik\Archive\ArchiveInvalidator'); $remembered = $archive->getRememberedArchivedReportsThatShouldBeInvalidated(); $this->assertSame($expectedRemeberedArchivedReports, $remembered); diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php index 7e9a576b71..c02023d7cb 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php @@ -9,9 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Archive; use Piwik\Cache; -use Piwik\Archive\ArchiveInvalidator; -use Piwik\Option; -use Piwik\Plugins\Goals\Archiver; +use Piwik\Container\StaticContainer; use Piwik\Segment; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; @@ -172,7 +170,7 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase $this->assertEquals(array(self::$fixture->idSite1, self::$fixture->idSite2), $cache->fetch('Archive.SiteIdsOfRememberedReportsInvalidated')); - $invalidator = new ArchiveInvalidator(); + $invalidator = StaticContainer::get('Piwik\Archive\ArchiveInvalidator'); self::$fixture->trackVisits(); |