Skip to content

Commit 80adcb6

Browse files
sgiehlsgiehl
committed
Merge branch '4.x-dev' into 5.x-dev
2 parents 6035713 + 161cb66 commit 80adcb6

2 files changed

Lines changed: 104 additions & 20 deletions

File tree

‎tests/System/TasksTest.php‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Piwik\Piwik;
1313
use Piwik\Plugins\AnonymousPiwikUsageMeasurement\tests\Fixtures\SendSystemReportTaskFixture;
1414
use Piwik\Tests\Framework\TestCase\SystemTestCase;
15+
use Piwik\Version;
1516

1617
/**
1718
* @group AnonymousPiwikUsageMeasurement
@@ -69,32 +70,35 @@ public function testApi($api, $params)
6970

7071
public function getApiForTesting()
7172
{
72-
$api = array(
73+
$apis = [
7374
'API.get',
7475
'Actions.getPageUrls',
7576
'Actions.getPageTitles',
7677
'Events',
7778
'Referrers.getReferrerType',
7879
'CustomVariables',
79-
);
80-
81-
$apiToTest = array();
82-
$apiToTest[] = array($api,
83-
array(
84-
'idSite' => 1,
85-
'date' => 'today',
86-
'periods' => array('year'),
87-
'testSuffix' => '',
88-
89-
'otherRequestParameters' => array(
90-
'hideColumns' => 'sum_bandwidth,nb_hits_with_bandwidth,min_bandwidth,max_bandwidth,avg_bandwidth,nb_total_overall_bandwidth,nb_total_pageview_bandwidth,nb_total_download_bandwidth',
91-
),
92-
93-
// when calling CustomVariables.getUsagesOfSlots, new archives are created until 'today',
94-
// which increments idsubdatatable, but we need to have deterministic idsubdatatable
95-
'apiNotToCall' => array('CustomVariables.getUsagesOfSlots'),
96-
)
97-
);
80+
];
81+
82+
$apiToTest = [];
83+
foreach ($apis as $api) {
84+
$apiToTest[] = [
85+
$api,
86+
[
87+
'idSite' => 1,
88+
'date' => 'today',
89+
'periods' => ['year'],
90+
'testSuffix' => ($api === 'API.get' && version_compare(Version::VERSION, '4.14.2', '<')) ? 'old' : '',
91+
92+
'otherRequestParameters' => [
93+
'hideColumns' => 'sum_bandwidth,nb_hits_with_bandwidth,min_bandwidth,max_bandwidth,avg_bandwidth,nb_total_overall_bandwidth,nb_total_pageview_bandwidth,nb_total_download_bandwidth',
94+
],
95+
96+
// when calling CustomVariables.getUsagesOfSlots, new archives are created until 'today',
97+
// which increments idsubdatatable, but we need to have deterministic idsubdatatable
98+
'apiNotToCall' => ['CustomVariables.getUsagesOfSlots'],
99+
]
100+
];
101+
}
98102

99103
return $apiToTest;
100104
}

‎tests/System/expected/test_old__API.get_year.xml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<result>
3+
<nb_visits>1</nb_visits>
4+
<nb_actions>39</nb_actions>
5+
<max_actions>39</max_actions>
6+
<bounce_count>0</bounce_count>
7+
<sum_visit_length>1</sum_visit_length>
8+
<nb_visits_new>1</nb_visits_new>
9+
<nb_actions_new>39</nb_actions_new>
10+
<max_actions_new>39</max_actions_new>
11+
<bounce_rate_new>0%</bounce_rate_new>
12+
<nb_actions_per_visit_new>39</nb_actions_per_visit_new>
13+
<avg_time_on_site_new>1</avg_time_on_site_new>
14+
<nb_visits_returning>0</nb_visits_returning>
15+
<nb_actions_returning>0</nb_actions_returning>
16+
<max_actions_returning>0</max_actions_returning>
17+
<bounce_rate_returning>0%</bounce_rate_returning>
18+
<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
19+
<avg_time_on_site_returning>0</avg_time_on_site_returning>
20+
<Referrers_visitorsFromSearchEngines>0</Referrers_visitorsFromSearchEngines>
21+
<Referrers_visitorsFromSocialNetworks>0</Referrers_visitorsFromSocialNetworks>
22+
<Referrers_visitorsFromDirectEntry>1</Referrers_visitorsFromDirectEntry>
23+
<Referrers_visitorsFromWebsites>0</Referrers_visitorsFromWebsites>
24+
<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
25+
<Referrers_distinctSearchEngines>0</Referrers_distinctSearchEngines>
26+
<Referrers_distinctSocialNetworks>0</Referrers_distinctSocialNetworks>
27+
<Referrers_distinctKeywords>0</Referrers_distinctKeywords>
28+
<Referrers_distinctWebsites>0</Referrers_distinctWebsites>
29+
<Referrers_distinctWebsitesUrls>0</Referrers_distinctWebsitesUrls>
30+
<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
31+
<Referrers_visitorsFromDirectEntry_percent>100%</Referrers_visitorsFromDirectEntry_percent>
32+
<Referrers_visitorsFromSearchEngines_percent>0%</Referrers_visitorsFromSearchEngines_percent>
33+
<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
34+
<Referrers_visitorsFromSocialNetworks_percent>0%</Referrers_visitorsFromSocialNetworks_percent>
35+
<Referrers_visitorsFromWebsites_percent>0%</Referrers_visitorsFromWebsites_percent>
36+
<PagePerformance_network_time>0</PagePerformance_network_time>
37+
<PagePerformance_network_hits>0</PagePerformance_network_hits>
38+
<PagePerformance_servery_time>0</PagePerformance_servery_time>
39+
<PagePerformance_server_hits>0</PagePerformance_server_hits>
40+
<PagePerformance_transfer_time>0</PagePerformance_transfer_time>
41+
<PagePerformance_transfer_hits>0</PagePerformance_transfer_hits>
42+
<PagePerformance_domprocessing_time>0</PagePerformance_domprocessing_time>
43+
<PagePerformance_domprocessing_hits>0</PagePerformance_domprocessing_hits>
44+
<PagePerformance_domcompletion_time>0</PagePerformance_domcompletion_time>
45+
<PagePerformance_domcompletion_hits>0</PagePerformance_domcompletion_hits>
46+
<PagePerformance_onload_time>0</PagePerformance_onload_time>
47+
<PagePerformance_onload_hits>0</PagePerformance_onload_hits>
48+
<PagePerformance_pageload_time>0</PagePerformance_pageload_time>
49+
<PagePerformance_pageload_hits>0</PagePerformance_pageload_hits>
50+
<avg_time_network>0</avg_time_network>
51+
<avg_time_server>0</avg_time_server>
52+
<avg_time_transfer>0</avg_time_transfer>
53+
<avg_time_dom_processing>0</avg_time_dom_processing>
54+
<avg_time_dom_completion>0</avg_time_dom_completion>
55+
<avg_time_on_load>0</avg_time_on_load>
56+
<avg_page_load_time>0</avg_page_load_time>
57+
<nb_conversions>0</nb_conversions>
58+
<nb_visits_converted>0</nb_visits_converted>
59+
<revenue>0</revenue>
60+
<conversion_rate>0%</conversion_rate>
61+
<nb_conversions_new_visit>0</nb_conversions_new_visit>
62+
<nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
63+
<revenue_new_visit>0</revenue_new_visit>
64+
<conversion_rate_new_visit>0%</conversion_rate_new_visit>
65+
<nb_conversions_returning_visit>0</nb_conversions_returning_visit>
66+
<nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
67+
<revenue_returning_visit>0</revenue_returning_visit>
68+
<conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
69+
<nb_pageviews>1</nb_pageviews>
70+
<nb_uniq_pageviews>1</nb_uniq_pageviews>
71+
<nb_downloads>0</nb_downloads>
72+
<nb_uniq_downloads>0</nb_uniq_downloads>
73+
<nb_outlinks>0</nb_outlinks>
74+
<nb_uniq_outlinks>0</nb_uniq_outlinks>
75+
<nb_searches>0</nb_searches>
76+
<nb_keywords>0</nb_keywords>
77+
<bounce_rate>0%</bounce_rate>
78+
<nb_actions_per_visit>39</nb_actions_per_visit>
79+
<avg_time_on_site>1</avg_time_on_site>
80+
</result>

0 commit comments

Comments
 (0)