Trying again

git-svn-id: http://dev.piwik.org/svn/trunk@7511 59fd770c-687e-43c8-a1e3-f5a4ff64c105

tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php

@@ -161,7 +161,10 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ
         // Second new visitor on Idsite 1: one page view
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
-	    $visitorB->setTokenAuth(self::getTokenAuth());
+        // calc token auth by hand in test environment
+        $tokenAuth = md5(
+            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+        $visitorB->setTokenAuth($tokenAuth);
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());

tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php

@@ -113,7 +113,9 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisa
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
         // calc token auth by hand in test environment
-        $visitorB->setTokenAuth(self::getTokenAuth());
+        $tokenAuth = md5(
+            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+        $visitorB->setTokenAuth($tokenAuth);
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());

tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php

@@ -155,7 +155,9 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
         // calc token auth by hand in test environment
-	    $visitorB->setTokenAuth(self::getTokenAuth());
+        $tokenAuth = md5(
+            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+        $visitorB->setTokenAuth($tokenAuth);
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());

tests/PHPUnit/Plugins/PrivacyManagerTest.php

@@ -620,7 +620,11 @@ class PrivacyManagerTest extends IntegrationTestCase
         
         $t = IntegrationTestCase::getTracker(self::$idSite, $start, $defaultInit = true);
         $t->enableBulkTracking();
-        $t->setTokenAuth(self::getTokenAuth());
+	    // calc token auth by hand in test environment
+	    $tokenAuth = md5(
+		    Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+	    $t->setTokenAuth($tokenAuth);
+
         for ($daysAgo = self::$daysAgoStart; $daysAgo >= 0; $daysAgo -= 5) // one visit every 5 days
         {
             $dateTime = $start->subDay($daysAgo)->toString();