Skip to content

Commit

Permalink
refs #4633 fixed tests.
Browse files Browse the repository at this point in the history 
* No longer any segmentValue in subtables, this was a bug
* Referer.getReferrerType should not have any segments
* Order of some segments slightly changed in metadata output since we
  do process them earlier now
* Append segemnt refererType=search to keywords
  • Loading branch information
@tsteur
tsteur committed Feb 16, 2015
1 parent 22aea94 commit 9f1bcf6
Show file tree
Hide file tree
Showing 33 changed files with 51 additions and 77 deletions.
4 changes: 0 additions & 4 deletions tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
View file
Expand Up @@ -18,7 +18,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>referrerName==www.test.nl</segment>
<referer_type>3</referer_type>
</row>
<row>
Expand All @@ -39,7 +38,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>referrerName==sn110w.snt110.mail.live.com</segment>
<referer_type>3</referer_type>
</row>
<row>
Expand All @@ -60,7 +58,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>referrerName==piwik.org</segment>
<referer_type>3</referer_type>
</row>
<row>
Expand All @@ -81,7 +78,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<segment>referrerName==example.com</segment>
<referer_type>3</referer_type>
</row>
</result>
4 changes: 0 additions & 4 deletions tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
View file
Expand Up @@ -57,7 +57,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<segment>referrerName==example.com</segment>
</row>
<row>
<label>piwik.org</label>
Expand All @@ -77,7 +76,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>referrerName==piwik.org</segment>
</row>
<row>
<label>sn110w.snt110.mail.live.com</label>
Expand All @@ -97,7 +95,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>referrerName==sn110w.snt110.mail.live.com</segment>
</row>
<row>
<label>www.test.nl</label>
Expand All @@ -117,7 +114,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>referrerName==www.test.nl</segment>
</row>
</subtable>
</row>
Expand Down
12 changes: 6 additions & 6 deletions tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
View file
Expand Up @@ -20,9 +20,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>jp</code>
<logo>plugins/UserCountry/images/flags/jp.png</logo>
<segment>countryCode==jp</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==jp</segment>
</row>
<row>
<label>Unknown</label>
Expand All @@ -45,9 +45,9 @@
<nb_visits_converted>0</nb_visits_converted>
<code>xx</code>
<logo>plugins/UserCountry/images/flags/xx.png</logo>
<segment>countryCode==xx</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==xx</segment>
</row>
<row>
<label>United States</label>
Expand All @@ -69,9 +69,9 @@
<sum_daily_nb_users>2</sum_daily_nb_users>
<code>us</code>
<logo>plugins/UserCountry/images/flags/us.png</logo>
<segment>countryCode==us</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==us</segment>
</row>
<row>
<label>Brazil</label>
Expand All @@ -93,9 +93,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>br</code>
<logo>plugins/UserCountry/images/flags/br.png</logo>
<segment>countryCode==br</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==br</segment>
</row>
<row>
<label>Australia</label>
Expand All @@ -109,9 +109,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>au</code>
<logo>plugins/UserCountry/images/flags/au.png</logo>
<segment>countryCode==au</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==au</segment>
</row>
<row>
<label>Canada</label>
Expand All @@ -133,8 +133,8 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>ca</code>
<logo>plugins/UserCountry/images/flags/ca.png</logo>
<segment>countryCode==ca</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==ca</segment>
</row>
</result>
20 changes: 10 additions & 10 deletions ...PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
View file
Expand Up @@ -25,9 +25,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>gb</code>
<logo>plugins/UserCountry/images/flags/gb.png</logo>
<segment>countryCode==gb</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==gb</segment>
</row>
<row>
<label>Canada</label>
Expand All @@ -54,9 +54,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>ca</code>
<logo>plugins/UserCountry/images/flags/ca.png</logo>
<segment>countryCode==ca</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==ca</segment>
</row>
<row>
<label>Russian Federation</label>
Expand All @@ -83,9 +83,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>ru</code>
<logo>plugins/UserCountry/images/flags/ru.png</logo>
<segment>countryCode==ru</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==ru</segment>
</row>
<row>
<label>United States</label>
Expand All @@ -112,9 +112,9 @@
<sum_daily_nb_users>1</sum_daily_nb_users>
<code>us</code>
<logo>plugins/UserCountry/images/flags/us.png</logo>
<segment>countryCode==us</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==us</segment>
</row>
<row>
<label>France</label>
Expand All @@ -141,9 +141,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>fr</code>
<logo>plugins/UserCountry/images/flags/fr.png</logo>
<segment>countryCode==fr</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==fr</segment>
</row>
<row>
<label>Indonesia</label>
Expand All @@ -170,9 +170,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>id</code>
<logo>plugins/UserCountry/images/flags/id.png</logo>
<segment>countryCode==id</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==id</segment>
</row>
<row>
<label>Italy</label>
Expand All @@ -199,9 +199,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>it</code>
<logo>plugins/UserCountry/images/flags/it.png</logo>
<segment>countryCode==it</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==it</segment>
</row>
<row>
<label>Macedonia, the Former Yugoslav Republic of</label>
Expand All @@ -228,9 +228,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>mk</code>
<logo>plugins/UserCountry/images/flags/mk.png</logo>
<segment>countryCode==mk</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==mk</segment>
</row>
<row>
<label>Tibet</label>
Expand All @@ -257,9 +257,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>ti</code>
<logo>plugins/UserCountry/images/flags/ti.png</logo>
<segment>countryCode==ti</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==ti</segment>
</row>
<row>
<label>Unknown</label>
Expand All @@ -286,8 +286,8 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>xx</code>
<logo>plugins/UserCountry/images/flags/xx.png</logo>
<segment>countryCode==xx</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==xx</segment>
</row>
</result>
2 changes: 1 addition & 1 deletion ...m/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
View file
Expand Up @@ -25,8 +25,8 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>gb</code>
<logo>plugins/UserCountry/images/flags/gb.png</logo>
<segment>countryCode==gb</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==gb</segment>
</row>
</result>
10 changes: 5 additions & 5 deletions ...ected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
View file
Expand Up @@ -25,9 +25,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>gb</code>
<logo>plugins/UserCountry/images/flags/gb.png</logo>
<segment>countryCode==gb</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==gb</segment>
</row>
<row>
<label>Russian Federation</label>
Expand All @@ -54,9 +54,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>ru</code>
<logo>plugins/UserCountry/images/flags/ru.png</logo>
<segment>countryCode==ru</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==ru</segment>
</row>
<row>
<label>France</label>
Expand All @@ -83,9 +83,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>fr</code>
<logo>plugins/UserCountry/images/flags/fr.png</logo>
<segment>countryCode==fr</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==fr</segment>
</row>
<row>
<label>Italy</label>
Expand All @@ -112,9 +112,9 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>it</code>
<logo>plugins/UserCountry/images/flags/it.png</logo>
<segment>countryCode==it</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==it</segment>
</row>
<row>
<label>Macedonia, the Former Yugoslav Republic of</label>
Expand All @@ -141,8 +141,8 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>mk</code>
<logo>plugins/UserCountry/images/flags/mk.png</logo>
<segment>countryCode==mk</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==mk</segment>
</row>
</result>
2 changes: 1 addition & 1 deletion ...pected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
View file
Expand Up @@ -25,8 +25,8 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>ca</code>
<logo>plugins/UserCountry/images/flags/ca.png</logo>
<segment>countryCode==ca</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==ca</segment>
</row>
</result>
2 changes: 1 addition & 1 deletion ...expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
View file
Expand Up @@ -25,8 +25,8 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>gb</code>
<logo>plugins/UserCountry/images/flags/gb.png</logo>
<segment>countryCode==gb</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==gb</segment>
</row>
</result>
1 change: 0 additions & 1 deletion tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml
View file
Expand Up @@ -17,7 +17,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
<segment>referrerName==referrer.com</segment>
<referer_type>3</referer_type>
</row>
<row>
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
View file
Expand Up @@ -17,7 +17,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
<segment>referrerKeyword==purchase</segment>
<segment>referrerType==search;referrerKeyword==purchase</segment>
<subtable>
<row>
<label>Yahoo!</label>
Expand Down
2 changes: 0 additions & 2 deletions tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
View file
Expand Up @@ -35,7 +35,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
<segmentValue>purchase</segmentValue>
</row>
</subtable>
</row>
Expand Down Expand Up @@ -74,7 +73,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
<segment>referrerName==referrer.com</segment>
</row>
</subtable>
</row>
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
View file
Expand Up @@ -24,8 +24,8 @@
<revenue>43</revenue>
<code>fr</code>
<logo>plugins/UserCountry/images/flags/fr.png</logo>
<segment>countryCode==fr</segment>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
<segment>countryCode==fr</segment>
</row>
</result>
1 change: 0 additions & 1 deletion ...Unit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
View file
Expand Up @@ -18,7 +18,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
<segment>referrerName==referrer.com</segment>
<referer_type>3</referer_type>
</row>
<row>
Expand Down
2 changes: 1 addition & 1 deletion ...System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
View file
Expand Up @@ -18,7 +18,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
<segment>referrerKeyword==purchase</segment>
<segment>referrerType==search;referrerKeyword==purchase</segment>
<subtable>
<row>
<label>Yahoo!</label>
Expand Down

0 comments on commit 9f1bcf6

Please sign in to comment.