Fix the new archive query benchmark.

1 files changed, 10 insertions, 9 deletions

diff --git a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
index a9a23e6eca..4b456f9df3 100644
--- a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
+++ b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
@@ -19,7 +19,8 @@ class ArchiveQueryBenchmark extends BenchmarkTestCase
         $archivingTables = Piwik::getTablesArchivesInstalled();
         if (empty($archivingTables)) {
             $this->archivingLaunched = true;
-            $this->launchArchiving();
+            Piwik_VisitsSummary_API::getInstance()->get(
+                self::$fixture->idSite, self::$fixture->period, self::$fixture->date);
         }
     }
 
@@ -29,15 +30,15 @@ class ArchiveQueryBenchmark extends BenchmarkTestCase
      */
     public function testArchivingProcess()
     {
-        echo "NOTE: Had to archive tables, memory results will not be accurate. Run again for better results.";
+        if ($this->archivingLaunched) {
+            echo "NOTE: Had to archive tables, memory results will not be accurate. Run again for better results.";
+        }
         
         Piwik_ArchiveProcessing::$forceDisableArchiving = true;
-        $this->launchArchiving();
-    }
-    
-    private function launchArchiving()
-    {
-        Piwik_VisitsSummary_API::getInstance()->get(
-            self::$fixture->idSite, self::$fixture->period, self::$fixture->date);
+        
+        $period = Piwik_Period::factory(self::$fixture->period, Piwik_Date::factory(self::$fixture->date));
+        $dateRange = $period->getDateStart().','.$period->getDateEnd();
+        
+        Piwik_VisitsSummary_API::getInstance()->get(self::$fixture->idSite, 'day', $dateRange);
     }
 }