Skip to content

Commit b8405c8

Browse files
sgiehlsgiehl
authored
Updates expected test files after core change (#111)
* update expected test files * adjust expected test results * update expected test results * fix tests for older releases * adjust version
1 parent a5349e0 commit b8405c8

5 files changed

Lines changed: 91 additions & 9 deletions

‎tests/System/AutoSuggestAPITest.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ public function getApiForTesting()
5757

5858
$xmlFieldsToRemove = ['latitude', 'longitude'];
5959

60+
if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
61+
// In Matomo 5.5 ai referrer had been added
62+
$xmlFieldsToRemove = array_merge($xmlFieldsToRemove, ['referrerAIAssistantUrl', 'referrerAIAssistantIcon']);
63+
}
64+
6065
$apiForTesting[] = [
6166
'Live.getLastVisitsDetails',
6267
[

‎tests/System/CustomVariablesSystemTest.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ public function getApiForTesting()
5353
];
5454
}
5555

56+
if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
57+
// In Matomo 5.5 ai referrer had been added
58+
$xmlFieldsToRemove = array_merge($xmlFieldsToRemove, ['referrerAIAssistantUrl', 'referrerAIAssistantIcon']);
59+
}
60+
5661
return [
5762
[
5863
$apiToCall,

‎tests/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function getApiForTesting()
7878
*/
7979
public function testCheck()
8080
{
81-
if (version_compare(Version::VERSION, '5.4.0-b3', '<')) {
81+
if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
8282
self::markTestSkipped('archive numbers have changed');
8383
}
8484

@@ -97,25 +97,25 @@ public function testCheck()
9797
// 1) CHECK 'day' archive stored in January
9898
// We expect 2 segments
9999
// * (1 custom variable name + 2 ref metrics
100-
// + 1 subtable chunk for the custom var values + 6 Referrers blob (2 of them subtables)
100+
// + 1 subtable chunk for the custom var values + 7 Referrers blob (2 of them subtables)
101101
// )
102-
'archive_blob_2010_01' => 20,
102+
'archive_blob_2010_01' => 22,
103103
// This contains all 'last N' weeks & days,
104104
// (8 metrics
105-
// + 6 referrer metrics
105+
// + 7 referrer metrics
106106
// + 3 done flag )
107107
// * 2 segments
108108
// for each "Last N" date that has data (just one date)
109-
'archive_numeric_2010_01' => 34,
109+
'archive_numeric_2010_01' => 36,
110110

111111
// 2) CHECK 'week' archive stored in December (week starts the month before)
112-
// We expect 2 segments * (2 custom variable name + 2 ref metrics + 1 subtable chunk for the values of the name + 6 referrers blob (2 of them subtables))
113-
'archive_blob_2009_12' => 20,
112+
// We expect 2 segments * (2 custom variable name + 2 ref metrics + 1 subtable chunk for the values of the name + 7 referrers blob (2 of them subtables))
113+
'archive_blob_2009_12' => 22,
114114
// 8 metrics,
115-
// 6 Referrer metrics,
115+
// 7 Referrer metrics,
116116
// 3 done flag (referrers, CustomVar, VisitsSummary), all for period = 2, day w/ visits is in new year, other days have no data
117117
// X * 2 segments
118-
'archive_numeric_2009_12' => (8 + 6 + 3) * 2,
118+
'archive_numeric_2009_12' => (8 + 7 + 3) * 2,
119119
);
120120

121121
foreach ($tests as $table => $expectedRows) {

‎tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
8787
<referrerSocialNetworkUrl />
8888
<referrerSocialNetworkIcon />
89+
<referrerAIAssistantUrl />
90+
<referrerAIAssistantIcon />
8991
<languageCode>fr</languageCode>
9092
<language>French</language>
9193
<deviceType>Desktop</deviceType>
@@ -316,6 +318,8 @@
316318
<referrerSearchEngineIcon />
317319
<referrerSocialNetworkUrl />
318320
<referrerSocialNetworkIcon />
321+
<referrerAIAssistantUrl />
322+
<referrerAIAssistantIcon />
319323
<languageCode>fr</languageCode>
320324
<language>French</language>
321325
<deviceType>Desktop</deviceType>
@@ -473,6 +477,8 @@
473477
<referrerSearchEngineIcon />
474478
<referrerSocialNetworkUrl />
475479
<referrerSocialNetworkIcon />
480+
<referrerAIAssistantUrl />
481+
<referrerAIAssistantIcon />
476482
<languageCode>fr</languageCode>
477483
<language>French</language>
478484
<deviceType>Desktop</deviceType>
@@ -692,6 +698,8 @@
692698
<referrerSearchEngineIcon />
693699
<referrerSocialNetworkUrl />
694700
<referrerSocialNetworkIcon />
701+
<referrerAIAssistantUrl />
702+
<referrerAIAssistantIcon />
695703
<languageCode>fr</languageCode>
696704
<language>French</language>
697705
<deviceType>Desktop</deviceType>
@@ -858,6 +866,8 @@
858866
<referrerSearchEngineIcon />
859867
<referrerSocialNetworkUrl />
860868
<referrerSocialNetworkIcon />
869+
<referrerAIAssistantUrl />
870+
<referrerAIAssistantIcon />
861871
<languageCode>fr</languageCode>
862872
<language>French</language>
863873
<deviceType>Desktop</deviceType>
@@ -1128,6 +1138,8 @@
11281138
<referrerSearchEngineIcon />
11291139
<referrerSocialNetworkUrl />
11301140
<referrerSocialNetworkIcon />
1141+
<referrerAIAssistantUrl />
1142+
<referrerAIAssistantIcon />
11311143
<languageCode>fr</languageCode>
11321144
<language>French</language>
11331145
<deviceType>Desktop</deviceType>
@@ -1285,6 +1297,8 @@
12851297
<referrerSearchEngineIcon />
12861298
<referrerSocialNetworkUrl />
12871299
<referrerSocialNetworkIcon />
1300+
<referrerAIAssistantUrl />
1301+
<referrerAIAssistantIcon />
12881302
<languageCode>fr</languageCode>
12891303
<language>French</language>
12901304
<deviceType>Desktop</deviceType>
@@ -1504,6 +1518,8 @@
15041518
<referrerSearchEngineIcon />
15051519
<referrerSocialNetworkUrl />
15061520
<referrerSocialNetworkIcon />
1521+
<referrerAIAssistantUrl />
1522+
<referrerAIAssistantIcon />
15071523
<languageCode>fr</languageCode>
15081524
<language>French</language>
15091525
<deviceType>Desktop</deviceType>
@@ -1661,6 +1677,8 @@
16611677
<referrerSearchEngineIcon />
16621678
<referrerSocialNetworkUrl />
16631679
<referrerSocialNetworkIcon />
1680+
<referrerAIAssistantUrl />
1681+
<referrerAIAssistantIcon />
16641682
<languageCode>fr</languageCode>
16651683
<language>French</language>
16661684
<deviceType>Desktop</deviceType>
@@ -1899,6 +1917,8 @@
18991917
<referrerSearchEngineIcon />
19001918
<referrerSocialNetworkUrl />
19011919
<referrerSocialNetworkIcon />
1920+
<referrerAIAssistantUrl />
1921+
<referrerAIAssistantIcon />
19021922
<languageCode>fr</languageCode>
19031923
<language>French</language>
19041924
<deviceType>Desktop</deviceType>
@@ -2065,6 +2085,8 @@
20652085
<referrerSearchEngineIcon />
20662086
<referrerSocialNetworkUrl />
20672087
<referrerSocialNetworkIcon />
2088+
<referrerAIAssistantUrl />
2089+
<referrerAIAssistantIcon />
20682090
<languageCode>fr</languageCode>
20692091
<language>French</language>
20702092
<deviceType>Desktop</deviceType>
@@ -2316,6 +2338,8 @@
23162338
<referrerSearchEngineIcon />
23172339
<referrerSocialNetworkUrl />
23182340
<referrerSocialNetworkIcon />
2341+
<referrerAIAssistantUrl />
2342+
<referrerAIAssistantIcon />
23192343
<languageCode />
23202344
<language>Unknown</language>
23212345
<deviceType>Tablet</deviceType>
@@ -2559,6 +2583,8 @@
25592583
<referrerSearchEngineIcon />
25602584
<referrerSocialNetworkUrl />
25612585
<referrerSocialNetworkIcon />
2586+
<referrerAIAssistantUrl />
2587+
<referrerAIAssistantIcon />
25622588
<languageCode>fr</languageCode>
25632589
<language>French</language>
25642590
<deviceType>Desktop</deviceType>
@@ -2716,6 +2742,8 @@
27162742
<referrerSearchEngineIcon />
27172743
<referrerSocialNetworkUrl />
27182744
<referrerSocialNetworkIcon />
2745+
<referrerAIAssistantUrl />
2746+
<referrerAIAssistantIcon />
27192747
<languageCode />
27202748
<language>Unknown</language>
27212749
<deviceType>Tablet</deviceType>
@@ -2873,6 +2901,8 @@
28732901
<referrerSearchEngineIcon />
28742902
<referrerSocialNetworkUrl />
28752903
<referrerSocialNetworkIcon />
2904+
<referrerAIAssistantUrl />
2905+
<referrerAIAssistantIcon />
28762906
<languageCode>fr</languageCode>
28772907
<language>French</language>
28782908
<deviceType>Desktop</deviceType>
@@ -3111,6 +3141,8 @@
31113141
<referrerSearchEngineIcon />
31123142
<referrerSocialNetworkUrl />
31133143
<referrerSocialNetworkIcon />
3144+
<referrerAIAssistantUrl />
3145+
<referrerAIAssistantIcon />
31143146
<languageCode />
31153147
<language>Unknown</language>
31163148
<deviceType>Desktop</deviceType>
@@ -3341,6 +3373,8 @@
33413373
<referrerSearchEngineIcon />
33423374
<referrerSocialNetworkUrl />
33433375
<referrerSocialNetworkIcon />
3376+
<referrerAIAssistantUrl />
3377+
<referrerAIAssistantIcon />
33443378
<languageCode>fr</languageCode>
33453379
<language>French</language>
33463380
<deviceType>Desktop</deviceType>
@@ -3498,6 +3532,8 @@
34983532
<referrerSearchEngineIcon />
34993533
<referrerSocialNetworkUrl />
35003534
<referrerSocialNetworkIcon />
3535+
<referrerAIAssistantUrl />
3536+
<referrerAIAssistantIcon />
35013537
<languageCode />
35023538
<language>Unknown</language>
35033539
<deviceType>Desktop</deviceType>
@@ -3655,6 +3691,8 @@
36553691
<referrerSearchEngineIcon />
36563692
<referrerSocialNetworkUrl />
36573693
<referrerSocialNetworkIcon />
3694+
<referrerAIAssistantUrl />
3695+
<referrerAIAssistantIcon />
36583696
<languageCode>fr</languageCode>
36593697
<language>French</language>
36603698
<deviceType>Desktop</deviceType>
@@ -3874,6 +3912,8 @@
38743912
<referrerSearchEngineIcon />
38753913
<referrerSocialNetworkUrl />
38763914
<referrerSocialNetworkIcon />
3915+
<referrerAIAssistantUrl />
3916+
<referrerAIAssistantIcon />
38773917
<languageCode>fr</languageCode>
38783918
<language>French</language>
38793919
<deviceType>Desktop</deviceType>
@@ -4093,6 +4133,8 @@
40934133
<referrerSearchEngineIcon />
40944134
<referrerSocialNetworkUrl />
40954135
<referrerSocialNetworkIcon />
4136+
<referrerAIAssistantUrl />
4137+
<referrerAIAssistantIcon />
40964138
<languageCode />
40974139
<language>Unknown</language>
40984140
<deviceType>Desktop</deviceType>
@@ -4304,6 +4346,8 @@
43044346
<referrerSearchEngineIcon />
43054347
<referrerSocialNetworkUrl />
43064348
<referrerSocialNetworkIcon />
4349+
<referrerAIAssistantUrl />
4350+
<referrerAIAssistantIcon />
43074351
<languageCode>fr</languageCode>
43084352
<language>French</language>
43094353
<deviceType>Smartphone</deviceType>
@@ -4523,6 +4567,8 @@
45234567
<referrerSearchEngineIcon />
45244568
<referrerSocialNetworkUrl />
45254569
<referrerSocialNetworkIcon />
4570+
<referrerAIAssistantUrl />
4571+
<referrerAIAssistantIcon />
45264572
<languageCode>fr</languageCode>
45274573
<language>French</language>
45284574
<deviceType>Desktop</deviceType>
@@ -4689,6 +4735,8 @@
46894735
<referrerSearchEngineIcon />
46904736
<referrerSocialNetworkUrl />
46914737
<referrerSocialNetworkIcon />
4738+
<referrerAIAssistantUrl />
4739+
<referrerAIAssistantIcon />
46924740
<languageCode>fr</languageCode>
46934741
<language>French</language>
46944742
<deviceType>Desktop</deviceType>
@@ -4855,6 +4903,8 @@
48554903
<referrerSearchEngineIcon />
48564904
<referrerSocialNetworkUrl />
48574905
<referrerSocialNetworkIcon />
4906+
<referrerAIAssistantUrl />
4907+
<referrerAIAssistantIcon />
48584908
<languageCode />
48594909
<language>Unknown</language>
48604910
<deviceType>Desktop</deviceType>
@@ -5021,6 +5071,8 @@
50215071
<referrerSearchEngineIcon />
50225072
<referrerSocialNetworkUrl />
50235073
<referrerSocialNetworkIcon />
5074+
<referrerAIAssistantUrl />
5075+
<referrerAIAssistantIcon />
50245076
<languageCode>fr</languageCode>
50255077
<language>French</language>
50265078
<deviceType>Smartphone</deviceType>
@@ -5187,6 +5239,8 @@
51875239
<referrerSearchEngineIcon />
51885240
<referrerSocialNetworkUrl />
51895241
<referrerSocialNetworkIcon />
5242+
<referrerAIAssistantUrl />
5243+
<referrerAIAssistantIcon />
51905244
<languageCode>fr</languageCode>
51915245
<language>French</language>
51925246
<deviceType>Desktop</deviceType>
@@ -5457,6 +5511,8 @@
54575511
<referrerSearchEngineIcon />
54585512
<referrerSocialNetworkUrl />
54595513
<referrerSocialNetworkIcon />
5514+
<referrerAIAssistantUrl />
5515+
<referrerAIAssistantIcon />
54605516
<languageCode>fr</languageCode>
54615517
<language>French</language>
54625518
<deviceType>Phablet</deviceType>
@@ -5727,6 +5783,8 @@
57275783
<referrerSearchEngineIcon />
57285784
<referrerSocialNetworkUrl />
57295785
<referrerSocialNetworkIcon />
5786+
<referrerAIAssistantUrl />
5787+
<referrerAIAssistantIcon />
57305788
<languageCode />
57315789
<language>Unknown</language>
57325790
<deviceType>Desktop</deviceType>
@@ -5989,6 +6047,8 @@
59896047
<referrerSearchEngineIcon />
59906048
<referrerSocialNetworkUrl />
59916049
<referrerSocialNetworkIcon />
6050+
<referrerAIAssistantUrl />
6051+
<referrerAIAssistantIcon />
59926052
<languageCode>fr</languageCode>
59936053
<language>French</language>
59946054
<deviceType>Smartphone</deviceType>
@@ -6259,6 +6319,8 @@
62596319
<referrerSearchEngineIcon />
62606320
<referrerSocialNetworkUrl />
62616321
<referrerSocialNetworkIcon />
6322+
<referrerAIAssistantUrl />
6323+
<referrerAIAssistantIcon />
62626324
<languageCode>fr</languageCode>
62636325
<language>French</language>
62646326
<deviceType>Desktop</deviceType>
@@ -6416,6 +6478,8 @@
64166478
<referrerSearchEngineIcon />
64176479
<referrerSocialNetworkUrl />
64186480
<referrerSocialNetworkIcon />
6481+
<referrerAIAssistantUrl />
6482+
<referrerAIAssistantIcon />
64196483
<languageCode>fr</languageCode>
64206484
<language>French</language>
64216485
<deviceType>Phablet</deviceType>
@@ -6573,6 +6637,8 @@
65736637
<referrerSearchEngineIcon />
65746638
<referrerSocialNetworkUrl />
65756639
<referrerSocialNetworkIcon />
6640+
<referrerAIAssistantUrl />
6641+
<referrerAIAssistantIcon />
65766642
<languageCode>fr</languageCode>
65776643
<language>French</language>
65786644
<deviceType>Desktop</deviceType>
@@ -6730,6 +6796,8 @@
67306796
<referrerSearchEngineIcon />
67316797
<referrerSocialNetworkUrl />
67326798
<referrerSocialNetworkIcon />
6799+
<referrerAIAssistantUrl />
6800+
<referrerAIAssistantIcon />
67336801
<languageCode>fr</languageCode>
67346802
<language>French</language>
67356803
<deviceType>Smartphone</deviceType>
@@ -6887,6 +6955,8 @@
68876955
<referrerSearchEngineIcon />
68886956
<referrerSocialNetworkUrl />
68896957
<referrerSocialNetworkIcon />
6958+
<referrerAIAssistantUrl />
6959+
<referrerAIAssistantIcon />
68906960
<languageCode>fr</languageCode>
68916961
<language>French</language>
68926962
<deviceType>Desktop</deviceType>

‎tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@
120120
<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
121121
<referrerSocialNetworkUrl />
122122
<referrerSocialNetworkIcon />
123+
<referrerAIAssistantUrl />
124+
<referrerAIAssistantIcon />
123125
<languageCode>fr</languageCode>
124126
<language>French</language>
125127
<deviceType>Desktop</deviceType>

0 commit comments

Comments
 (0)