Skip to content
Extraits de code Groupes Projets
Valider ccb89ad1 rédigé par mattab's avatar mattab
Parcourir les fichiers

Tests: re-enabling old test which was disabled "temporarily" months ago. +... 

Tests: re-enabling old test which was disabled "temporarily" months ago. + Removing one hack + refreshing the expected files
parent e49640c3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 41 ajouts et 125 suppressions
tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+ 1
− 2
Voir le fichier @ ccb89ad1
...@@ -105,8 +105,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture ...@@ -105,8 +105,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
$enabledAllUsers = $info['enabledAllUsers']; $enabledAllUsers = $info['enabledAllUsers'];
} }
APISegmentEditor::getInstance()->add( APISegmentEditor::getInstance()->add($segmentName, $info['definition'], $idSite, $autoArchive, $enabledAllUsers);
$segmentName, $info['definition'], $idSite, $autoArchive, $enabledAllUsers);
} }
} }
......
tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
+ 23
− 3
Voir le fichier @ ccb89ad1
...@@ -65,7 +65,17 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas ...@@ -65,7 +65,17 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas
$idSite = $this->idSite1; $idSite = $this->idSite1;
$idSite2 = $this->idSite2; $idSite2 = $this->idSite2;
// - $this->trackVisitsSite1($idSite, $dateTime);
$this->trackVisitsSite2($idSite2, $dateTime);
}
/**
* @param $idSite
* @param $dateTime
*/
private function trackVisitsSite1($idSite, $dateTime)
{
// -
// First visitor on Idsite 1: two page views // First visitor on Idsite 1: two page views
$datetimeSpanOverTwoDays = '2010-01-03 23:55:00'; $datetimeSpanOverTwoDays = '2010-01-03 23:55:00';
$visitorA = self::getTracker($idSite, $datetimeSpanOverTwoDays, $defaultInit = true); $visitorA = self::getTracker($idSite, $datetimeSpanOverTwoDays, $defaultInit = true);
...@@ -123,7 +133,15 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas ...@@ -123,7 +133,15 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas
$visitorB->setGenerationTime(452); $visitorB->setGenerationTime(452);
self::assertTrue($visitorB->doTrackPageView('Checkout / Purchasing...')); self::assertTrue($visitorB->doTrackPageView('Checkout / Purchasing...'));
self::checkBulkTrackingResponse($visitorB->doBulkTrack()); self::checkBulkTrackingResponse($visitorB->doBulkTrack());
}
/**
* @param $idSite2
* @param $dateTime
*/
private function trackVisitsSite2($idSite2, $dateTime)
{
// - // -
// First visitor on Idsite 2: one page view, with Website referrer // First visitor on Idsite 2: one page view, with Website referrer
$visitorAsite2 = self::getTracker($idSite2, Date::factory($dateTime)->addHour(24)->getDatetime(), $defaultInit = true); $visitorAsite2 = self::getTracker($idSite2, Date::factory($dateTime)->addHour(24)->getDatetime(), $defaultInit = true);
...@@ -133,16 +151,18 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas ...@@ -133,16 +151,18 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas
$visitorAsite2->DEBUG_APPEND_URL = '&_idts=' . Date::factory($dateTime)->addHour(24)->getTimestamp(); $visitorAsite2->DEBUG_APPEND_URL = '&_idts=' . Date::factory($dateTime)->addHour(24)->getTimestamp();
$visitorAsite2->setGenerationTime(193); $visitorAsite2->setGenerationTime(193);
self::checkResponse($visitorAsite2->doTrackPageView('Website 2 page view')); self::checkResponse($visitorAsite2->doTrackPageView('Website 2 page view'));
// test with invalid URL // test with invalid URL
$visitorAsite2->setUrl('this is invalid url'); $visitorAsite2->setUrl('this is invalid url');
// and an empty title // and an empty title
$visitorAsite2->setGenerationTime(203); $visitorAsite2->setGenerationTime(203);
self::checkResponse($visitorAsite2->doTrackPageView('')); self::checkResponse($visitorAsite2->doTrackPageView(''));
// track a page view with a domain alias to test the aggregation of both actions // track a page view with a domain alias to test the aggregation of both actions
$visitorAsite2->setUrl('http://example2alias.org/home#notIgnoredFragment#'); $visitorAsite2->setUrl('http://example2alias.org/home#notIgnoredFragment#');
$visitorAsite2->setGenerationTime(503); $visitorAsite2->setGenerationTime(503);
self::checkResponse($visitorAsite2->doTrackPageView('')); self::checkResponse($visitorAsite2->doTrackPageView(''));
} }
} }
tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
+ 17
− 16
Voir le fichier @ ccb89ad1
...@@ -31,7 +31,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e ...@@ -31,7 +31,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
public function getApiToCall() public function getApiToCall()
{ {
return array('Goals.getDaysToConversion', return array('Goals.getDaysToConversion',
// 'MultiSites.getAll' 'MultiSites.getAll'
); );
} }
...@@ -47,9 +47,10 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e ...@@ -47,9 +47,10 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
$singlePeriodApi = array('VisitsSummary.get', 'Goals.get'); $singlePeriodApi = array('VisitsSummary.get', 'Goals.get');
$periods = array( $periods = array(
// 'day', 'day',
'week', 'week',
// 'month', 'year' 'month',
'year'
); );
$result = array( $result = array(
...@@ -59,19 +60,19 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e ...@@ -59,19 +60,19 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
'periods' => $periods, 'periods' => $periods,
'setDateLastN' => true)), 'setDateLastN' => true)),
// // Request data for the last 6 periods and idSite=1 // Request data for the last 6 periods and idSite=1
// array($apiToCall, array('idSite' => $idSite1, array($apiToCall, array('idSite' => $idSite1,
// 'date' => $dateTime, 'date' => $dateTime,
// 'periods' => $periods, 'periods' => $periods,
// 'setDateLastN' => true, 'setDateLastN' => true,
// 'testSuffix' => '_idSiteOne_')), 'testSuffix' => '_idSiteOne_')),
//
// // We also test a single period to check that this use case (Reports per idSite in the response) works // We also test a single period to check that this use case (Reports per idSite in the response) works
// array($singlePeriodApi, array('idSite' => 'all', array($singlePeriodApi, array('idSite' => 'all',
// 'date' => $dateTime, 'date' => $dateTime,
// 'periods' => array('day', 'month'), 'periods' => array('day', 'month'),
// 'setDateLastN' => false, 'setDateLastN' => false,
// 'testSuffix' => '_NotLastNPeriods')), 'testSuffix' => '_NotLastNPeriods')),
); );
// testing metadata API for multiple periods // testing metadata API for multiple periods
......
tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePluginTemplate.getAnswerToLife.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>42</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePluginTemplate.getAnswerToLife.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>42</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.getActionsReturning_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>1</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.getBounceCountReturning_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>1</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.getConvertedVisitsReturning_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>1</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.getSumVisitsLengthReturning_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>0</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.getVisitsReturning_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>1</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getCampaigns_day.xml supprimé 100644 → 0
+ 0
− 10
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<testcol3>testdata3</testcol3>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
</row>
</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getKeywords_day.xml supprimé 100644 → 0
+ 0
− 12
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<testcol3>testdata3</testcol3>
<label>Keyword not defined</label>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
<label>Keyword not defined</label>
</row>
</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getNumberOfDistinctCampaigns_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>5</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getNumberOfDistinctKeywords_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>5</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getNumberOfDistinctSearchEngines_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>5</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getNumberOfDistinctWebsitesUrls_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>5</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getNumberOfDistinctWebsites_day.xml supprimé 100644 → 0
+ 0
− 2
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>5</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getReferrerType_day.xml supprimé 100644 → 0
+ 0
− 34
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<testcol3>testdata3</testcol3>
<label>Others</label>
<subtable>
<row>
<testcol3>testdata3</testcol3>
<label>Others</label>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
<label>Others</label>
</row>
</subtable>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
<label>Others</label>
<subtable>
<row>
<testcol3>testdata3</testcol3>
<label>Others</label>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
<label>Others</label>
</row>
</subtable>
</row>
</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getSearchEngines_day.xml supprimé 100644 → 0
+ 0
− 14
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<testcol3>testdata3</testcol3>
<url>URL unknown!</url>
<logo>plugins/Referrers/images/searchEngines/xx.png</logo>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
<url>URL unknown!</url>
<logo>plugins/Referrers/images/searchEngines/xx.png</logo>
</row>
</result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ReferrersTest_referrerOldName__Referrers.getWebsites_day.xml supprimé 100644 → 0
+ 0
− 10
Voir le fichier @ e49640c3
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<testcol3>testdata3</testcol3>
</row>
<row>
<testcol1>testdata1</testcol1>
<testcol2>testdata2</testcol2>
</row>
</result>
\ No newline at end of file
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter