diff options
Diffstat (limited to 'tests/PHPUnit/Benchmarks')
8 files changed, 24 insertions, 11 deletions
diff --git a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php index f10f258943..adf616fa27 100644 --- a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php +++ b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php @@ -5,7 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\ArchiveProcessor\Rules; +use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Period; +use Piwik\Date; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php'; @@ -18,7 +21,7 @@ class ArchiveQueryBenchmark extends BenchmarkTestCase public function setUp() { - $archivingTables = Piwik_DataAccess_ArchiveTableCreator::getTablesArchivesInstalled(); + $archivingTables = ArchiveTableCreator::getTablesArchivesInstalled(); if (empty($archivingTables)) { $this->archivingLaunched = true; Piwik_VisitsSummary_API::getInstance()->get( @@ -36,9 +39,9 @@ class ArchiveQueryBenchmark extends BenchmarkTestCase echo "NOTE: Had to archive data, memory results will not be accurate. Run again for better results."; } - Piwik_ArchiveProcessor_Rules::$archivingDisabledByTests = true; + Rules::$archivingDisabledByTests = true; - $period = Period::factory(self::$fixture->period, Piwik_Date::factory(self::$fixture->date)); + $period = Period::factory(self::$fixture->period, Date::factory(self::$fixture->date)); $dateRange = $period->getDateStart().','.$period->getDateEnd(); Piwik_VisitsSummary_API::getInstance()->get(self::$fixture->idSite, 'day', $dateRange); diff --git a/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php b/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php index b58cde84a2..83569527d0 100644 --- a/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; /** * Reusable fixture. Adds 20,000 sites and tracks one pageview for each on one day. @@ -27,7 +28,7 @@ class Piwik_Test_Fixture_ManyThousandSitesOneVisitEach // track one visit for each site $t = BenchmarkTestCase::getLocalTracker(1); - $t->setForceVisitDateTime(Piwik_Date::factory($this->date)->addHour(6)); + $t->setForceVisitDateTime(Date::factory($this->date)->addHour(6)); for ($idSite = 1; $idSite < $this->siteCount + 1; ++$idSite) { $ip = "157.5.6.4"; $t->setIp($ip); diff --git a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php index 86b2c7a740..7696cda917 100644 --- a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; /** * Adds one site and 1000 actions for every day of one month (January). Each @@ -28,7 +29,7 @@ class Piwik_Test_Fixture_OneSiteThousandsOfDistinctUrlsOverMonth $goals->addGoal($this->idSite, 'all', 'url', 'http', 'contains', false, 5); $goals->addGoal($this->idSite, 'all', 'url', 'thing2', 'contains'); - $start = Piwik_Date::factory($this->date); + $start = Date::factory($this->date); $dates = array(); for ($day = 0; $day != 31; ++$day) { diff --git a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php index fcded59612..743a77bad9 100755 --- a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; /** * Reusable fixture. Tracks twelve thousand page views over a year for one site. @@ -36,7 +37,7 @@ class Piwik_Test_Fixture_OneSiteTwelveThousandVisitsOneYear } $visitTimes = array(); - $date = Piwik_Date::factory($this->date); + $date = Date::factory($this->date); for ($month = 0; $month != 12; ++$month) { for ($day = 0; $day != 25; ++$day) { $visitTimes[] = $date->addPeriod($month, 'MONTH')->addDay($day)->getDatetime(); diff --git a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php index 701a6066f8..fb257bb738 100755 --- a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\ArchiveProcessor\Rules; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; @@ -65,6 +66,6 @@ class Piwik_Test_Fixture_SqlDump } // make sure archiving will be called - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true); + Rules::setBrowserTriggerArchiving(true); } } diff --git a/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php b/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php index 80442430eb..e56a16a5df 100755 --- a/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; /** * Reusable fixture. Tracks twelve thousand page views for 1000 sites on one day. @@ -46,7 +47,7 @@ class Piwik_Test_Fixture_ThousandSitesTwelveVisitsEachOneDay } $visitTimes = array(); - $date = Piwik_Date::factory($this->date); + $date = Date::factory($this->date); for ($i = 0; $i != 4; ++$i) { $visitTimes[] = $date->addHour($i)->getDatetime(); } diff --git a/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php b/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php index 8ae47a4c1a..a1390fc67a 100644 --- a/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php +++ b/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php @@ -5,6 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\ArchiveProcessor\Rules; +use Piwik\DataAccess\ArchiveTableCreator; + require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php'; /** @@ -16,7 +19,7 @@ class MultiSitesBenchmark extends BenchmarkTestCase public function setUp() { - $archivingTables = Piwik_DataAccess_ArchiveTableCreator::getTablesArchivesInstalled(); + $archivingTables = ArchiveTableCreator::getTablesArchivesInstalled(); if (empty($archivingTables)) { $this->archivingLaunched = true; Piwik_VisitsSummary_API::getInstance()->get( @@ -34,7 +37,7 @@ class MultiSitesBenchmark extends BenchmarkTestCase echo "NOTE: Had to archive data, memory results will not be accurate. Run again for better results."; } - Piwik_ArchiveProcessor_Rules::$archivingDisabledByTests = true; + Rules::$archivingDisabledByTests = true; Piwik_MultiSites_API::getInstance()->getAll(self::$fixture->period, self::$fixture->date); } } diff --git a/tests/PHPUnit/Benchmarks/TrackerBenchmark.php b/tests/PHPUnit/Benchmarks/TrackerBenchmark.php index d92bd632a8..2203fe6655 100755 --- a/tests/PHPUnit/Benchmarks/TrackerBenchmark.php +++ b/tests/PHPUnit/Benchmarks/TrackerBenchmark.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; + require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php'; /** @@ -28,7 +30,7 @@ class TrackerBenchmark extends BenchmarkTestCase } // set dates & times - $date = Piwik_Date::factory(self::$fixture->date); + $date = Date::factory(self::$fixture->date); for ($i = 0; $i != 25; ++$i) { $this->visitDates[] = $date->addDay($i)->toString('Y-m-d'); } |