diff options
33 files changed, 51 insertions, 77 deletions
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml index 0987dbd970..c9f1986b2e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -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> @@ -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> @@ -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> @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index 588098350f..b0ecf5b676 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -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> @@ -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> @@ -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> @@ -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> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 894e4becd3..2faa0742a5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index 3a0e7bbff0..50b14e2ae4 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index f4c9aec148..3fae74571b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 5e74500257..92c88ab042 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -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> @@ -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> @@ -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> @@ -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> @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index a40261e6eb..211b3504c1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 6403c9ba51..a1e694906d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml index e20c0e9112..0e80bf7ceb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml @@ -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> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml index 792b864a20..58e9ba46bb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml @@ -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> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml index 30a8428de7..deb88da799 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -35,7 +35,6 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <segmentValue>purchase</segmentValue> </row> </subtable> </row> @@ -74,7 +73,6 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segment>referrerName==referrer.com</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index d2dc3c069d..d358b9a330 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml index f6a2c1dc79..fd61a97675 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml @@ -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> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml index 47c37e286c..0776d8038e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml @@ -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> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index bf50216dad..2225e62fa0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -37,7 +37,6 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <segmentValue>purchase</segmentValue> </row> </subtable> </row> @@ -78,7 +77,6 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segment>referrerName==referrer.com</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index 8a2a0a5424..c95226160c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -25,8 +25,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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml index d94f89b37f..26274c83a1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==kia+ora</segment> + <segment>referrerType==search;referrerKeyword==kia+ora</segment> <subtable> <row> <label>Google</label> @@ -57,7 +57,7 @@ <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==hello+world</segment> + <segment>referrerType==search;referrerKeyword==hello+world</segment> <subtable> <row> <label>Bing</label> @@ -82,7 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==salut</segment> + <segment>referrerType==search;referrerKeyword==salut</segment> <subtable> <row> <label>Google</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml index d2f83ce8cd..20c01e5dd5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml @@ -18,7 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segment>referrerKeyword==</segment> + <segment>referrerType==search;referrerKeyword==</segment> <subtable> <row> <label>Google</label> @@ -43,7 +43,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment> + <segment>referrerType==search;referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment> <subtable> <row> <label>Google</label> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 60448cc998..3d396ecdb8 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -61,9 +61,9 @@ <row> <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> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index 96dc629582..c751366bfd 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -74,9 +74,9 @@ <row> <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> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index a09fb9074f..95ecfbfd3c 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -71,16 +71,16 @@ <row> <code>pl</code> <logo>plugins/UserCountry/images/flags/pl.png</logo> + <segment>countryCode==pl</segment> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segment>countryCode==pl</segment> </row> <row> <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> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml index 6306627c7f..284c301614 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -31,9 +31,9 @@ <revenue>3111.11</revenue> <code>pl</code> <logo>plugins/UserCountry/images/flags/pl.png</logo> + <segment>countryCode==pl</segment> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segment>countryCode==pl</segment> </row> <row> <label>France</label> @@ -55,8 +55,8 @@ <revenue>10</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>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml index 9f391df90c..1e511f6135 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml @@ -12,8 +12,8 @@ <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> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index d97f54ef85..f704570bac 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -58,9 +58,9 @@ <row> <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> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml index 2910f29472..418287bdef 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml @@ -10,7 +10,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segment>referrerKeyword==this+keyword+should+be+ranked</segment> + <segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment> <subtable> <row> <label>Google</label> @@ -42,6 +42,6 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <nb_visits>0</nb_visits> - <segment>referrerKeyword==piwik</segment> + <segment>referrerType==search;referrerKeyword==piwik</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml index 332fcecabb..8202c35460 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml @@ -10,7 +10,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever1.com</segment> <referer_type>3</referer_type> </row> <row> @@ -23,7 +22,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever0.com</segment> <referer_type>3</referer_type> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml index 2d61cf0ac0..10af9e9721 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==this+search+term</segment> + <segment>referrerType==search;referrerKeyword==this+search+term</segment> <subtable> <row> <label>Ask</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==search+term+2</segment> + <segment>referrerType==search;referrerKeyword==search+term+2</segment> <subtable> <row> <label>Alexa</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml index 23183cc323..6b8c754c71 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -32,7 +32,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentValue>this search term</segmentValue> </row> <row> <label>search term 2</label> @@ -44,7 +43,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentValue>search term 2</segmentValue> </row> <row> <label>Others</label> @@ -80,7 +78,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever0.com</segment> </row> <row> <label>whatever1.com</label> @@ -92,7 +89,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever1.com</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml index 332fcecabb..8202c35460 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml @@ -10,7 +10,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever1.com</segment> <referer_type>3</referer_type> </row> <row> @@ -23,7 +22,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever0.com</segment> <referer_type>3</referer_type> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml index 2d61cf0ac0..10af9e9721 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==this+search+term</segment> + <segment>referrerType==search;referrerKeyword==this+search+term</segment> <subtable> <row> <label>Ask</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerKeyword==search+term+2</segment> + <segment>referrerType==search;referrerKeyword==search+term+2</segment> <subtable> <row> <label>Alexa</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml index 23183cc323..6b8c754c71 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml @@ -32,7 +32,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentValue>this search term</segmentValue> </row> <row> <label>search term 2</label> @@ -44,7 +43,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentValue>search term 2</segmentValue> </row> <row> <label>Others</label> @@ -80,7 +78,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever0.com</segment> </row> <row> <label>whatever1.com</label> @@ -92,7 +89,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>referrerName==whatever1.com</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml index 8fec9b4662..3048e12e70 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml @@ -12,7 +12,7 @@ <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> - <segment>referrerKeyword==this+keyword+should+be+ranked</segment> + <segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment> <subtable> <row> <label>Google</label> @@ -44,7 +44,7 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <nb_visits>0</nb_visits> - <segment>referrerKeyword==piwik</segment> + <segment>referrerType==search;referrerKeyword==piwik</segment> </row> </result> <result date="2010-01-04" /> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml index e0adf2db50..70da348df7 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml @@ -12,7 +12,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segment>referrerKeyword==this+keyword+should+be+ranked</segment> + <segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment> <subtable> <row> <label>Google</label> @@ -44,7 +44,7 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <nb_visits>0</nb_visits> - <segment>referrerKeyword==piwik</segment> + <segment>referrerType==search;referrerKeyword==piwik</segment> </row> </result> <result date="From 2010-01-04 to 2010-01-10" /> |