diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-02-13 20:50:22 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-02-13 20:50:22 +0300 |
| commit | 806bedba1a43d7d78b687d1d23a6b861a2b70035 (patch) | |
| tree | 19f9ae52817f93b74a9d34f31af48dd9d59d6a74 /tests/PHPUnit | |
| parent | b18b499688bcabcc3aa0b358dbc78936a9f607e2 (diff) | |
refs #4633 rename segmentFilter => segment
Diffstat (limited to 'tests/PHPUnit')
214 files changed, 1051 insertions, 1051 deletions
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml index a16af7bd2f..9d4036502d 100644 --- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml @@ -75,7 +75,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment> </row> <row> <label>/Home</label> @@ -87,7 +87,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml index 75c111e7dd..3330a1f532 100644 --- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml @@ -64,7 +64,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment> </row> <row> <label>/Home</label> @@ -76,7 +76,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml index 1f40f3a55f..5b6feb65e3 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>operatingSystemCode==WXP;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml index d6b1f54334..9893e79025 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserEngine==gecko</segmentFilter> + <segment>browserEngine==gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml index 1f40f3a55f..5b6feb65e3 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>operatingSystemCode==WXP;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index 81b53dcd71..cad39c5a0f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -161,51 +161,51 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> </row> <row> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> </row> <row> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> </row> <row> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> </row> <row> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> </row> <row> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> </row> <row> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> </row> <row> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> </row> <row> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> </row> <row> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> </row> <row> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> </row> <row> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index 4f9e6b111d..6116b82403 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -80,15 +80,15 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> </row> <row> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> </row> <row> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index 13dea9baf7..3827317e63 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -116,30 +116,30 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> </row> <row> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> </row> <row> </row> <row> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> </row> <row> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> </row> <row> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> </row> <row> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml index 31287387f3..2539c55bb3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml @@ -16,7 +16,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.666</avg_time_generation> <url>http://example.org/movies</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segment> </row> <row> <label>/webradio</label> @@ -37,6 +37,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://example.org/webradio</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml index ad053a1955..dfbc1b65a0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml @@ -16,7 +16,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.666</avg_time_generation> <url>http://example.org/movies</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segment> </row> <row> <label>/webradio</label> @@ -37,6 +37,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://example.org/webradio</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml index c633b5a363..022083daa9 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -57,7 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Search query here</label> @@ -82,7 +82,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -118,7 +118,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -154,7 +154,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -190,7 +190,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -226,7 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -262,7 +262,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -287,7 +287,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -312,7 +312,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -337,7 +337,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -362,6 +362,6 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml index 9ac5f80dfd..690d452cd5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml @@ -10,7 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -57,7 +57,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Search query here</label> @@ -82,7 +82,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -118,7 +118,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -154,7 +154,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -190,7 +190,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -226,7 +226,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -262,7 +262,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -287,7 +287,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -312,7 +312,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -337,7 +337,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -362,6 +362,6 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml index f740647245..0616bb52ea 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>playTrailer</label> @@ -134,7 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>play</label> @@ -214,7 +214,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml index 7032517c9d..43d8ed7afe 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml @@ -10,7 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>playTrailer</label> @@ -134,7 +134,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>play</label> @@ -214,7 +214,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml index f6b37adfe7..686c2a12c1 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>clickBuyNow</label> @@ -112,7 +112,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>play</label> @@ -227,7 +227,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -252,7 +252,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>playTrailer</label> @@ -277,7 +277,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>playTrailer</label> @@ -302,7 +302,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Search</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml index 8d9740913e..3ddb207d33 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml @@ -10,7 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>clickBuyNow</label> @@ -112,7 +112,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>play</label> @@ -227,7 +227,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -252,7 +252,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>playTrailer</label> @@ -277,7 +277,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>playTrailer</label> @@ -302,7 +302,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Search</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml index bf53c1e631..6be4d52e8b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -57,7 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Search query here</label> @@ -82,7 +82,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -118,7 +118,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -154,7 +154,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -190,7 +190,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -226,7 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -262,7 +262,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -287,7 +287,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -312,7 +312,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -337,6 +337,6 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml index c2979a9c00..2c7daee22f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>playTrailer</label> @@ -134,7 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>play</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml index b3e5a2e90f..e703cb83fd 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>clickBuyNow</label> @@ -112,7 +112,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>play</label> @@ -227,7 +227,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>playTrailer</label> @@ -252,7 +252,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>playTrailer</label> @@ -277,7 +277,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Search</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml index f740647245..0616bb52ea 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>playTrailer</label> @@ -134,7 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>play</label> @@ -214,7 +214,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml index 7032517c9d..43d8ed7afe 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml @@ -10,7 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>playTrailer</label> @@ -134,7 +134,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>play</label> @@ -214,7 +214,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml index f6b37adfe7..686c2a12c1 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>clickBuyNow</label> @@ -112,7 +112,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>play</label> @@ -227,7 +227,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -252,7 +252,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>playTrailer</label> @@ -277,7 +277,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>playTrailer</label> @@ -302,7 +302,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Search</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml index 8d9740913e..3ddb207d33 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml @@ -10,7 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>clickBuyNow</label> @@ -112,7 +112,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>play</label> @@ -227,7 +227,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -252,7 +252,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>playTrailer</label> @@ -277,7 +277,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>playTrailer</label> @@ -302,7 +302,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Search</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml index cb28224c94..b32b2ae040 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Movie</label> @@ -35,7 +35,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Movie</label> @@ -60,7 +60,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>Movie</label> @@ -96,7 +96,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>Movie</label> @@ -132,7 +132,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>Movie</label> @@ -168,7 +168,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>Movie</label> @@ -204,7 +204,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>Movie</label> @@ -240,7 +240,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Movie</label> @@ -265,7 +265,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -290,7 +290,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>Music</label> @@ -315,7 +315,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Movie</label> @@ -340,7 +340,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> <subtable> <row> <label>Movie</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml index 7cfde0a1aa..a6a3d0be52 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml @@ -10,7 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Movie</label> @@ -35,7 +35,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Movie</label> @@ -60,7 +60,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>Movie</label> @@ -96,7 +96,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>Movie</label> @@ -132,7 +132,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>Movie</label> @@ -168,7 +168,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>Movie</label> @@ -204,7 +204,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>Movie</label> @@ -240,7 +240,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Movie</label> @@ -265,7 +265,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -290,7 +290,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>Music</label> @@ -315,7 +315,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Movie</label> @@ -340,7 +340,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> <subtable> <row> <label>Movie</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml index 6717c32ba1..999268fdc6 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>Movie</label> @@ -35,7 +35,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>Music</label> @@ -84,7 +84,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -109,7 +109,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>Movie</label> @@ -134,7 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>Movie</label> @@ -159,7 +159,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Movie</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml index 94db9a9ded..d19bd1fefd 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml @@ -10,7 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>Movie</label> @@ -35,7 +35,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>Music</label> @@ -84,7 +84,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -109,7 +109,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>Movie</label> @@ -134,7 +134,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>Movie</label> @@ -159,7 +159,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Search+query+here</segmentFilter> + <segment>eventName==Search+query+here</segment> <subtable> <row> <label>Movie</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml index c633b5a363..022083daa9 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -57,7 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Search query here</label> @@ -82,7 +82,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -118,7 +118,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -154,7 +154,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -190,7 +190,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -226,7 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -262,7 +262,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -287,7 +287,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -312,7 +312,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -337,7 +337,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -362,6 +362,6 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml index 9ac5f80dfd..690d452cd5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml @@ -10,7 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -57,7 +57,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Search</segmentFilter> + <segment>eventAction==Search</segment> <subtable> <row> <label>Search query here</label> @@ -82,7 +82,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -118,7 +118,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -154,7 +154,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -190,7 +190,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -226,7 +226,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>9.55</avg_event_value> - <segmentFilter>eventAction==rating</segmentFilter> + <segment>eventAction==rating</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -262,7 +262,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==clickBuyNow</segmentFilter> + <segment>eventAction==clickBuyNow</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -287,7 +287,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -312,7 +312,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -337,7 +337,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -362,6 +362,6 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==Purchase</segmentFilter> + <segment>eventAction==Purchase</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml index a67b042898..793018425d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -68,7 +68,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -93,7 +93,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml index 8000e3dbd4..c958defeb9 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml @@ -10,7 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -68,7 +68,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -93,7 +93,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> - <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> + <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml index 35d00353e3..49170578d6 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playTrailer</segmentFilter> + <segment>eventAction==playTrailer</segment> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -57,7 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play25%25</segmentFilter> + <segment>eventAction==play25%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -93,7 +93,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play50%25</segmentFilter> + <segment>eventAction==play50%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -129,7 +129,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play75%25</segmentFilter> + <segment>eventAction==play75%25</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -165,7 +165,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playEnd</segmentFilter> + <segment>eventAction==playEnd</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -201,7 +201,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -226,7 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==playStart</segmentFilter> + <segment>eventAction==playStart</segment> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml index 88c0b4d327..319be3b443 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventCategory==Movie</segmentFilter> + <segment>eventCategory==Movie</segment> <subtable> <row> <label>playTrailer</label> @@ -90,7 +90,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventCategory==Music</segmentFilter> + <segment>eventCategory==Music</segment> <subtable> <row> <label>play</label> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml index 4aa85ffe10..11f30a6954 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml @@ -10,7 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segmentFilter> + <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> <subtable> <row> <label>play25%</label> @@ -90,7 +90,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> + <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> <subtable> <row> <label>play</label> @@ -159,7 +159,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segmentFilter> + <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> <subtable> <row> <label>playTrailer</label> @@ -184,7 +184,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> + <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> <subtable> <row> <label>playTrailer</label> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml index 73c1489673..59b45f61fe 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml @@ -19,7 +19,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.15</avg_time_generation> <url>http://example.org/dir1/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segment> </row> <row> <label>dir1/sub/dir/page1.html</label> @@ -35,7 +35,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir1/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segment> </row> <row> <label>dir1/sub/dir/page2.html</label> @@ -53,7 +53,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir1/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> <label>dir2/sub/dir/page0.html</label> @@ -74,7 +74,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir2/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segment> </row> <row> <label>dir2/sub/dir/page1.html</label> @@ -90,7 +90,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.6</avg_time_generation> <url>http://example.org/dir2/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segment> </row> <row> <label>dir2/sub/dir/page2.html</label> @@ -108,7 +108,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir2/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> <label>dir3/sub/dir/page0.html</label> @@ -129,7 +129,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir3/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segment> </row> <row> <label>dir3/sub/dir/page1.html</label> @@ -145,7 +145,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir3/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segment> </row> <row> <label>dir3/sub/dir/page2.html</label> @@ -163,7 +163,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>1.35</avg_time_generation> <url>http://example.org/dir3/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> <label>page1.html</label> @@ -180,7 +180,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> <row> <label>sub/dir/dir1/page1.html</label> @@ -197,6 +197,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/sub/dir/dir1/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml index 8b77a42ecd..41aff4d22e 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml @@ -130,7 +130,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> <row> <label>sub</label> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml index 628975b9cc..a2c2fa204e 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml @@ -19,7 +19,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir2/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segment> </row> <row> <label>dir2/sub/dir/page1.html</label> @@ -35,7 +35,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.6</avg_time_generation> <url>http://example.org/dir2/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segment> </row> <row> <label>dir2/sub/dir/page2.html</label> @@ -53,6 +53,6 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir2/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml index b7f5bb049d..d02a61ce87 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml @@ -76,7 +76,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.15</avg_time_generation> <url>http://example.org/dir1/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -93,7 +93,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir1/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -112,7 +112,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir1/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -191,7 +191,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir2/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -208,7 +208,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.6</avg_time_generation> <url>http://example.org/dir2/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -227,7 +227,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir2/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -306,7 +306,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir3/sub/dir/page0.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -323,7 +323,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir3/sub/dir/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -342,7 +342,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>1.35</avg_time_generation> <url>http://example.org/dir3/sub/dir/page2.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> <is_aggregate>0</is_aggregate> </row> <row> @@ -362,7 +362,7 @@ <avg_time_generation>0</avg_time_generation> <url>http://example.org/page1.html</url> <is_aggregate>0</is_aggregate> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> <row> <label>sub</label> @@ -428,7 +428,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/sub/dir/dir1/page1.html</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> <is_aggregate>0</is_aggregate> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index db38d73559..0b8861041c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -547,7 +547,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segment> </row> <row> <label>Citrix</label> @@ -692,7 +692,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/moved-permanently</label> @@ -713,7 +713,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -736,7 +736,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment> </row> <row> <label>/to-an-error</label> @@ -759,7 +759,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> <label>download</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index a0c3f66015..c402a53da6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -363,7 +363,7 @@ <exit_rate>71%</exit_rate> <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segment> </row> <row> <label>docs</label> @@ -1030,7 +1030,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</label> @@ -1053,7 +1053,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.413</avg_time_generation> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segment> </row> <row> <label>/moved-permanently</label> @@ -1074,7 +1074,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -1097,7 +1097,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment> </row> <row> <label>/to-an-error</label> @@ -1120,7 +1120,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> <label>changelog</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 48248f425c..2a26e63c8d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -547,7 +547,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segment> </row> <row> <label>Citrix</label> @@ -689,7 +689,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -712,7 +712,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment> </row> <row> <label>/temp-redirect</label> @@ -730,7 +730,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment> </row> <row> <label>/to-an-error</label> @@ -753,7 +753,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> <label>download</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index 5448020af2..0e9983c2b4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -363,7 +363,7 @@ <exit_rate>71%</exit_rate> <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segment> </row> <row> <label>docs</label> @@ -1027,7 +1027,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</label> @@ -1050,7 +1050,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.413</avg_time_generation> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segment> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -1073,7 +1073,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment> </row> <row> <label>/temp-redirect</label> @@ -1091,7 +1091,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment> </row> <row> <label>/to-an-error</label> @@ -1114,7 +1114,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> <label>contact</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index a52faeb86c..47829dd214 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -547,7 +547,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2F</segment> </row> <row> <label>Citrix</label> @@ -705,7 +705,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/moved-permanently</label> @@ -726,7 +726,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -749,7 +749,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <segmentFilter>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment> </row> <row> <label>/temp-redirect</label> @@ -767,7 +767,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment> </row> <row> <label>/to-an-error</label> @@ -790,7 +790,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> <label>download</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 5411b711ef..c76fe4dc01 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -363,7 +363,7 @@ <exit_rate>71%</exit_rate> <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2F</segment> </row> <row> <label>docs</label> @@ -1062,7 +1062,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</label> @@ -1085,7 +1085,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.413</avg_time_generation> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> - <segmentFilter>pageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segment> </row> <row> <label>/moved-permanently</label> @@ -1106,7 +1106,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -1129,7 +1129,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <segmentFilter>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment> </row> <row> <label>/temp-redirect</label> @@ -1147,7 +1147,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment> </row> <row> <label>/to-an-error</label> @@ -1170,7 +1170,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> - <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> <label>changelog</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index 06dd10a5cb..1fb125914d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>16</nb_visits_converted> <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==WebKit</segmentFilter> + <segment>browserEngine==WebKit</segment> </row> <row> <label>Trident (IE)</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==Trident</segmentFilter> + <segment>browserEngine==Trident</segment> </row> <row> <label>Blink (Chrome, Opera)</label> @@ -34,7 +34,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <segmentFilter>browserEngine==Blink</segmentFilter> + <segment>browserEngine==Blink</segment> </row> <row> <label>Unknown</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==</segmentFilter> + <segment>browserEngine==</segment> </row> <row> <label>Gecko (Firefox)</label> @@ -58,6 +58,6 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==Gecko</segmentFilter> + <segment>browserEngine==Gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index c955bf9002..2c687028a7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==EP;browserVersion==2.30</segmentFilter> + <segment>browserCode==EP;browserVersion==2.30</segment> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> + <segment>browserCode==IE;browserVersion==9.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==RM;browserVersion==0.9</segmentFilter> + <segment>browserCode==RM;browserVersion==0.9</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==UNK;browserVersion==</segmentFilter> + <segment>browserCode==UNK;browserVersion==</segment> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>browserCode==CH;browserVersion==37.0</segmentFilter> + <segment>browserCode==CH;browserVersion==37.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==AN;browserVersion==</segmentFilter> + <segment>browserCode==AN;browserVersion==</segment> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==CH;browserVersion==19.0</segmentFilter> + <segment>browserCode==CH;browserVersion==19.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==CH;browserVersion==20.0</segmentFilter> + <segment>browserCode==CH;browserVersion==20.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -114,7 +114,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> + <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -127,7 +127,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> - <segmentFilter>browserCode==CH;browserVersion==11.0</segmentFilter> + <segment>browserCode==CH;browserVersion==11.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -140,7 +140,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> - <segmentFilter>browserCode==CH;browserVersion==39.0</segmentFilter> + <segment>browserCode==CH;browserVersion==39.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -153,7 +153,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> - <segmentFilter>browserCode==CH;browserVersion==41.0</segmentFilter> + <segment>browserCode==CH;browserVersion==41.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -166,7 +166,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>browserCode==CM;browserVersion==39.0</segmentFilter> + <segment>browserCode==CM;browserVersion==39.0</segment> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> </row> <row> @@ -179,7 +179,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> - <segmentFilter>browserCode==IE;browserVersion==6.0</segmentFilter> + <segment>browserCode==IE;browserVersion==6.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -192,7 +192,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> - <segmentFilter>browserCode==IE;browserVersion==8.0</segmentFilter> + <segment>browserCode==IE;browserVersion==8.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 22b2ce81fc..16aa9095e1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - <segmentFilter>browserCode==CH</segmentFilter> + <segment>browserCode==CH</segment> </row> <row> <label>Internet Explorer</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> - <segmentFilter>browserCode==IE</segmentFilter> + <segment>browserCode==IE</segment> </row> <row> <label>Epiphany</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> - <segmentFilter>browserCode==EP</segmentFilter> + <segment>browserCode==EP</segment> </row> <row> <label>RockMelt</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - <segmentFilter>browserCode==RM</segmentFilter> + <segment>browserCode==RM</segment> </row> <row> <label>Unknown</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> - <segmentFilter>browserCode==UNK</segmentFilter> + <segment>browserCode==UNK</segment> </row> <row> <label>Android Browser</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> - <segmentFilter>browserCode==AN</segmentFilter> + <segment>browserCode==AN</segment> </row> <row> <label>Firefox</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> - <segmentFilter>browserCode==FF</segmentFilter> + <segment>browserCode==FF</segment> </row> <row> <label>Chrome Mobile</label> @@ -102,6 +102,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> - <segmentFilter>browserCode==CM</segmentFilter> + <segment>browserCode==CM</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index ce2197886f..38dd7759a4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==7</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.6</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.10</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==UNK;operatingSystemVersion==UNK</segmentFilter> + <segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==2.3</segmentFilter> + <segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.4</segmentFilter> + <segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -114,7 +114,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> - <segmentFilter>operatingSystemCode==BOT;operatingSystemVersion==UNK</segmentFilter> + <segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -127,7 +127,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> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -140,7 +140,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> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.8</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -153,7 +153,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> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 8593134c46..7ebd0835aa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>29</nb_visits_converted> <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>deviceType==desktop</segmentFilter> + <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> @@ -35,55 +35,55 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>deviceType==smartphone</segmentFilter> + <segment>deviceType==smartphone</segment> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tablet</segmentFilter> + <segment>deviceType==tablet</segment> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==feature+phone</segmentFilter> + <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==console</segmentFilter> + <segment>deviceType==console</segment> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tv</segmentFilter> + <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==car+browser</segmentFilter> + <segment>deviceType==car+browser</segment> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smart+display</segmentFilter> + <segment>deviceType==smart+display</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==camera</segmentFilter> + <segment>deviceType==camera</segment> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==portable+media+player</segmentFilter> + <segment>deviceType==portable+media+player</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml index 3823686d3c..bac3a36cd1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml @@ -10,7 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==connect</segmentFilter> + <segment>eventAction==connect</segment> </row> <row> <label>play</label> @@ -22,7 +22,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventAction==play</segmentFilter> + <segment>eventAction==play</segment> <subtable> <row> <label>myvideo</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml index 8c7199a85a..43f62b91e7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml @@ -10,7 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventCategory==cloudfront_rtmp</segmentFilter> + <segment>eventCategory==cloudfront_rtmp</segment> <subtable> <row> <label>connect</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml index f3df70d01b..d2ad8c6a1a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml @@ -10,7 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> - <segmentFilter>eventName==myvideo</segmentFilter> + <segment>eventName==myvideo</segment> <subtable> <row> <label>play</label> 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 a08c747f2d..0987dbd970 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,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==www.test.nl</segmentFilter> + <segment>referrerName==www.test.nl</segment> <referer_type>3</referer_type> </row> <row> @@ -39,7 +39,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==sn110w.snt110.mail.live.com</segmentFilter> + <segment>referrerName==sn110w.snt110.mail.live.com</segment> <referer_type>3</referer_type> </row> <row> @@ -60,7 +60,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==piwik.org</segmentFilter> + <segment>referrerName==piwik.org</segment> <referer_type>3</referer_type> </row> <row> @@ -81,7 +81,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>referrerName==example.com</segmentFilter> + <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 efcb7c21dd..588098350f 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,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>referrerName==example.com</segmentFilter> + <segment>referrerName==example.com</segment> </row> <row> <label>piwik.org</label> @@ -77,7 +77,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==piwik.org</segmentFilter> + <segment>referrerName==piwik.org</segment> </row> <row> <label>sn110w.snt110.mail.live.com</label> @@ -97,7 +97,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==sn110w.snt110.mail.live.com</segmentFilter> + <segment>referrerName==sn110w.snt110.mail.live.com</segment> </row> <row> <label>www.test.nl</label> @@ -117,7 +117,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==www.test.nl</segmentFilter> + <segment>referrerName==www.test.nl</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 13bacfb184..f872b378ad 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -18,7 +18,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>referrerName==example.com</segmentFilter> + <segment>referrerName==example.com</segment> <subtable> <row> <label>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</label> @@ -51,7 +51,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==piwik.org</segmentFilter> + <segment>referrerName==piwik.org</segment> <subtable> <row> <label>http://piwik.org/contribute%</label> @@ -84,7 +84,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==sn110w.snt110.mail.live.com</segmentFilter> + <segment>referrerName==sn110w.snt110.mail.live.com</segment> <subtable> <row> <label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label> @@ -117,7 +117,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==www.test.nl</segmentFilter> + <segment>referrerName==www.test.nl</segment> <subtable> <row> <label>https://www.test.nl/</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml index 6a0e66ad8f..6adc37a0cd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>31</nb_visits_converted> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <segmentFilter>resolution==unknown</segmentFilter> + <segment>resolution==unknown</segment> </row> <row> <label>1024x768</label> @@ -22,7 +22,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> - <segmentFilter>resolution==1024x768</segmentFilter> + <segment>resolution==1024x768</segment> </row> <row> <label>1280x800</label> @@ -34,6 +34,6 @@ <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> - <segmentFilter>resolution==1280x800</segmentFilter> + <segment>resolution==1280x800</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index 0193f18852..d91f34ccc0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -47,7 +47,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>39.044</lat> <long>-77.488</long> - <segmentFilter>city==Ashburn;regionCode==VA;countryCode==us</segmentFilter> + <segment>city==Ashburn;regionCode==VA;countryCode==us</segment> <city_name>Ashburn</city_name> <region>VA</region> <country>us</country> @@ -75,7 +75,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>69.4</lat> <long>-81.8</long> - <segmentFilter>city==Igloolik;regionCode==NU;countryCode==ca</segmentFilter> + <segment>city==Igloolik;regionCode==NU;countryCode==ca</segment> <city_name>Igloolik</city_name> <region>NU</region> <country>ca</country> 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 deb7e6019b..894e4becd3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -22,7 +22,7 @@ <logo>plugins/UserCountry/images/flags/jp.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==jp</segmentFilter> + <segment>countryCode==jp</segment> </row> <row> <label>Unknown</label> @@ -47,7 +47,7 @@ <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==xx</segmentFilter> + <segment>countryCode==xx</segment> </row> <row> <label>United States</label> @@ -71,7 +71,7 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==us</segmentFilter> + <segment>countryCode==us</segment> </row> <row> <label>Brazil</label> @@ -95,7 +95,7 @@ <logo>plugins/UserCountry/images/flags/br.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==br</segmentFilter> + <segment>countryCode==br</segment> </row> <row> <label>Australia</label> @@ -111,7 +111,7 @@ <logo>plugins/UserCountry/images/flags/au.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==au</segmentFilter> + <segment>countryCode==au</segment> </row> <row> <label>Canada</label> @@ -135,6 +135,6 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==ca</segmentFilter> + <segment>countryCode==ca</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 9e45d25c47..5631e75efb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -43,7 +43,7 @@ <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==VA;countryCode==us</segmentFilter> + <segment>regionCode==VA;countryCode==us</segment> <region>VA</region> <country>us</country> <country_name>United States</country_name> @@ -68,7 +68,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==NU;countryCode==ca</segmentFilter> + <segment>regionCode==NU;countryCode==ca</segment> <region>NU</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index 06dd10a5cb..1fb125914d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>16</nb_visits_converted> <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==WebKit</segmentFilter> + <segment>browserEngine==WebKit</segment> </row> <row> <label>Trident (IE)</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==Trident</segmentFilter> + <segment>browserEngine==Trident</segment> </row> <row> <label>Blink (Chrome, Opera)</label> @@ -34,7 +34,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <segmentFilter>browserEngine==Blink</segmentFilter> + <segment>browserEngine==Blink</segment> </row> <row> <label>Unknown</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==</segmentFilter> + <segment>browserEngine==</segment> </row> <row> <label>Gecko (Firefox)</label> @@ -58,6 +58,6 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserEngine==Gecko</segmentFilter> + <segment>browserEngine==Gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index c955bf9002..2c687028a7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==EP;browserVersion==2.30</segmentFilter> + <segment>browserCode==EP;browserVersion==2.30</segment> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> + <segment>browserCode==IE;browserVersion==9.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==RM;browserVersion==0.9</segmentFilter> + <segment>browserCode==RM;browserVersion==0.9</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==UNK;browserVersion==</segmentFilter> + <segment>browserCode==UNK;browserVersion==</segment> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>browserCode==CH;browserVersion==37.0</segmentFilter> + <segment>browserCode==CH;browserVersion==37.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==AN;browserVersion==</segmentFilter> + <segment>browserCode==AN;browserVersion==</segment> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==CH;browserVersion==19.0</segmentFilter> + <segment>browserCode==CH;browserVersion==19.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==CH;browserVersion==20.0</segmentFilter> + <segment>browserCode==CH;browserVersion==20.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -114,7 +114,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> + <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -127,7 +127,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> - <segmentFilter>browserCode==CH;browserVersion==11.0</segmentFilter> + <segment>browserCode==CH;browserVersion==11.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -140,7 +140,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> - <segmentFilter>browserCode==CH;browserVersion==39.0</segmentFilter> + <segment>browserCode==CH;browserVersion==39.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -153,7 +153,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> - <segmentFilter>browserCode==CH;browserVersion==41.0</segmentFilter> + <segment>browserCode==CH;browserVersion==41.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -166,7 +166,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>browserCode==CM;browserVersion==39.0</segmentFilter> + <segment>browserCode==CM;browserVersion==39.0</segment> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> </row> <row> @@ -179,7 +179,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> - <segmentFilter>browserCode==IE;browserVersion==6.0</segmentFilter> + <segment>browserCode==IE;browserVersion==6.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -192,7 +192,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> - <segmentFilter>browserCode==IE;browserVersion==8.0</segmentFilter> + <segment>browserCode==IE;browserVersion==8.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 22b2ce81fc..16aa9095e1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - <segmentFilter>browserCode==CH</segmentFilter> + <segment>browserCode==CH</segment> </row> <row> <label>Internet Explorer</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> - <segmentFilter>browserCode==IE</segmentFilter> + <segment>browserCode==IE</segment> </row> <row> <label>Epiphany</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> - <segmentFilter>browserCode==EP</segmentFilter> + <segment>browserCode==EP</segment> </row> <row> <label>RockMelt</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - <segmentFilter>browserCode==RM</segmentFilter> + <segment>browserCode==RM</segment> </row> <row> <label>Unknown</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> - <segmentFilter>browserCode==UNK</segmentFilter> + <segment>browserCode==UNK</segment> </row> <row> <label>Android Browser</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> - <segmentFilter>browserCode==AN</segmentFilter> + <segment>browserCode==AN</segment> </row> <row> <label>Firefox</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> - <segmentFilter>browserCode==FF</segmentFilter> + <segment>browserCode==FF</segment> </row> <row> <label>Chrome Mobile</label> @@ -102,6 +102,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> - <segmentFilter>browserCode==CM</segmentFilter> + <segment>browserCode==CM</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 8593134c46..7ebd0835aa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>29</nb_visits_converted> <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>deviceType==desktop</segmentFilter> + <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> @@ -35,55 +35,55 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>deviceType==smartphone</segmentFilter> + <segment>deviceType==smartphone</segment> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tablet</segmentFilter> + <segment>deviceType==tablet</segment> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==feature+phone</segmentFilter> + <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==console</segmentFilter> + <segment>deviceType==console</segment> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tv</segmentFilter> + <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==car+browser</segmentFilter> + <segment>deviceType==car+browser</segment> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smart+display</segmentFilter> + <segment>deviceType==smart+display</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==camera</segmentFilter> + <segment>deviceType==camera</segment> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==portable+media+player</segmentFilter> + <segment>deviceType==portable+media+player</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index ce2197886f..38dd7759a4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==7</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.6</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.10</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==UNK;operatingSystemVersion==UNK</segmentFilter> + <segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==2.3</segmentFilter> + <segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.4</segmentFilter> + <segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -114,7 +114,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> - <segmentFilter>operatingSystemCode==BOT;operatingSystemVersion==UNK</segmentFilter> + <segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -127,7 +127,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> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -140,7 +140,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> - <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.8</segmentFilter> + <segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -153,7 +153,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> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml index 6a0e66ad8f..6adc37a0cd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>31</nb_visits_converted> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <segmentFilter>resolution==unknown</segmentFilter> + <segment>resolution==unknown</segment> </row> <row> <label>1024x768</label> @@ -22,7 +22,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> - <segmentFilter>resolution==1024x768</segmentFilter> + <segment>resolution==1024x768</segment> </row> <row> <label>1280x800</label> @@ -34,6 +34,6 @@ <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> - <segmentFilter>resolution==1280x800</segmentFilter> + <segment>resolution==1280x800</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 7394b03aff..e3f6916792 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==0</segmentFilter> + <segment>visitLocalHour==0</segment> </row> <row> <label>1h</label> @@ -22,7 +22,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> - <segmentFilter>visitLocalHour==1</segmentFilter> + <segment>visitLocalHour==1</segment> </row> <row> <label>2h</label> @@ -34,7 +34,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==2</segmentFilter> + <segment>visitLocalHour==2</segment> </row> <row> <label>3h</label> @@ -46,7 +46,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==3</segmentFilter> + <segment>visitLocalHour==3</segment> </row> <row> <label>4h</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==4</segmentFilter> + <segment>visitLocalHour==4</segment> </row> <row> <label>5h</label> @@ -70,7 +70,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==5</segmentFilter> + <segment>visitLocalHour==5</segment> </row> <row> <label>6h</label> @@ -82,7 +82,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==6</segmentFilter> + <segment>visitLocalHour==6</segment> </row> <row> <label>7h</label> @@ -94,7 +94,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==7</segmentFilter> + <segment>visitLocalHour==7</segment> </row> <row> <label>8h</label> @@ -106,7 +106,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==8</segmentFilter> + <segment>visitLocalHour==8</segment> </row> <row> <label>9h</label> @@ -118,7 +118,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==9</segmentFilter> + <segment>visitLocalHour==9</segment> </row> <row> <label>10h</label> @@ -130,7 +130,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==10</segmentFilter> + <segment>visitLocalHour==10</segment> </row> <row> <label>11h</label> @@ -142,7 +142,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> - <segmentFilter>visitLocalHour==11</segmentFilter> + <segment>visitLocalHour==11</segment> </row> <row> <label>12h</label> @@ -154,7 +154,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==12</segmentFilter> + <segment>visitLocalHour==12</segment> </row> <row> <label>13h</label> @@ -166,7 +166,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==13</segmentFilter> + <segment>visitLocalHour==13</segment> </row> <row> <label>14h</label> @@ -178,7 +178,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==14</segmentFilter> + <segment>visitLocalHour==14</segment> </row> <row> <label>15h</label> @@ -190,7 +190,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> - <segmentFilter>visitLocalHour==15</segmentFilter> + <segment>visitLocalHour==15</segment> </row> <row> <label>16h</label> @@ -202,7 +202,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==16</segmentFilter> + <segment>visitLocalHour==16</segment> </row> <row> <label>17h</label> @@ -214,7 +214,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <segmentFilter>visitLocalHour==17</segmentFilter> + <segment>visitLocalHour==17</segment> </row> <row> <label>18h</label> @@ -226,7 +226,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==18</segmentFilter> + <segment>visitLocalHour==18</segment> </row> <row> <label>19h</label> @@ -238,7 +238,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==19</segmentFilter> + <segment>visitLocalHour==19</segment> </row> <row> <label>20h</label> @@ -250,7 +250,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==20</segmentFilter> + <segment>visitLocalHour==20</segment> </row> <row> <label>21h</label> @@ -262,7 +262,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> - <segmentFilter>visitLocalHour==21</segmentFilter> + <segment>visitLocalHour==21</segment> </row> <row> <label>22h</label> @@ -274,7 +274,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==22</segmentFilter> + <segment>visitLocalHour==22</segment> </row> <row> <label>23h</label> @@ -286,6 +286,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitLocalHour==23</segmentFilter> + <segment>visitLocalHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 80dd4201fa..da07966d39 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> <label>1h</label> @@ -31,7 +31,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> <label>2h</label> @@ -43,7 +43,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> <label>3h</label> @@ -55,7 +55,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> <label>4h</label> @@ -76,7 +76,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> <label>5h</label> @@ -88,7 +88,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> <label>6h</label> @@ -100,7 +100,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> <label>7h</label> @@ -121,7 +121,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> <label>8h</label> @@ -142,7 +142,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> <label>9h</label> @@ -154,7 +154,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> <label>10h</label> @@ -166,7 +166,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> <label>11h</label> @@ -187,7 +187,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> <label>12h</label> @@ -208,7 +208,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> <label>13h</label> @@ -229,7 +229,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> <label>14h</label> @@ -241,7 +241,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> <label>15h</label> @@ -262,7 +262,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> <label>16h</label> @@ -283,7 +283,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>10</revenue> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> <label>17h</label> @@ -304,7 +304,7 @@ </goals> <nb_conversions>7</nb_conversions> <revenue>35</revenue> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> <label>18h</label> @@ -325,7 +325,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> <label>19h</label> @@ -346,7 +346,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>10</revenue> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> <label>20h</label> @@ -367,7 +367,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> <label>21h</label> @@ -388,7 +388,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> <label>22h</label> @@ -400,7 +400,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> <label>23h</label> @@ -412,6 +412,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml index 129439273c..ba2ccdf172 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml @@ -16,6 +16,6 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.635</avg_time_generation> <url>http://example.org/0</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F0</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2F0</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml index 9221fa4ce7..2f4b47c2f8 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml @@ -10,6 +10,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/dir2/sub/0/file.php</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2F0%2Ffile.php</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2F0%2Ffile.php</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml index da905d8434..576c78dacd 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml @@ -14,6 +14,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/dir/file.php?foo=bar&foo2=bar</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Ffile.php%3Ffoo%3Dbar%26foo2%3Dbar</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Ffile.php%3Ffoo%3Dbar%26foo2%3Dbar</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml index d33b719f35..c79c3b7ae5 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml @@ -14,6 +14,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://example.org/dir/subdir</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Fsubdir</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Fsubdir</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml index 9fbff20062..65c519b014 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml @@ -19,6 +19,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.523</avg_time_generation> <url>http://example.org/%C3%A9%C3%A9%C3%A9%22%27...%20%3Cthis%20is%20cool%3E!</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F%C3%A9%C3%A9%C3%A9%22%27...+%3Cthis+is+cool%3E%21</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2F%C3%A9%C3%A9%C3%A9%22%27...+%3Cthis+is+cool%3E%21</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 5065550f08..4526378f9b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -56,7 +56,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> - <segmentFilter>city==Vancouver;regionCode==BC;countryCode==ca</segmentFilter> + <segment>city==Vancouver;regionCode==BC;countryCode==ca</segment> <city_name>Vancouver</city_name> <region>BC</region> <country>ca</country> @@ -89,7 +89,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> - <segmentFilter>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segmentFilter> + <segment>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segment> <city_name>Stratford-upon-Avon</city_name> <region>P3</region> <country>gb</country> @@ -122,7 +122,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>47.249</lat> <long>6.018</long> - <segmentFilter>city==Besan%C3%A7on;regionCode==A6;countryCode==fr</segmentFilter> + <segment>city==Besan%C3%A7on;regionCode==A6;countryCode==fr</segment> <city_name>Besançon</city_name> <region>A6</region> <country>fr</country> @@ -153,7 +153,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==Hlubok%C3%A1+nad+Vltavou;regionCode==66;countryCode==ru</segmentFilter> + <segment>city==Hlubok%C3%A1+nad+Vltavou;regionCode==66;countryCode==ru</segment> <city_name>Hluboká nad Vltavou</city_name> <region>66</region> <country>ru</country> @@ -186,7 +186,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>29.65</lat> <long>91.1</long> - <segmentFilter>city==Lhasa;regionCode==1;countryCode==ti</segmentFilter> + <segment>city==Lhasa;regionCode==1;countryCode==ti</segment> <city_name>Lhasa</city_name> <region>1</region> <country>ti</country> @@ -217,7 +217,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==London;regionCode==H9;countryCode==gb</segmentFilter> + <segment>city==London;regionCode==H9;countryCode==gb</segment> <city_name>London</city_name> <region>H9</region> <country>gb</country> @@ -248,7 +248,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segmentFilter> + <segment>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segment> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> @@ -279,7 +279,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==Stratford-upon-Avon;regionCode==66;countryCode==mk</segmentFilter> + <segment>city==Stratford-upon-Avon;regionCode==66;countryCode==mk</segment> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>mk</country> @@ -310,7 +310,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==Stratford-upon-Avon;regionCode==66;countryCode==ru</segmentFilter> + <segment>city==Stratford-upon-Avon;regionCode==66;countryCode==ru</segment> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>ru</country> @@ -341,7 +341,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==Stratford-upon-Avon;regionCode==G5;countryCode==gb</segmentFilter> + <segment>city==Stratford-upon-Avon;regionCode==G5;countryCode==gb</segment> <city_name>Stratford-upon-Avon</city_name> <region>G5</region> <country>gb</country> @@ -369,7 +369,7 @@ <sum_daily_nb_users>1</sum_daily_nb_users> <lat>1</lat> <long>2</long> - <segmentFilter>city==not+a+city;regionCode==CA;countryCode==us</segmentFilter> + <segment>city==not+a+city;regionCode==CA;countryCode==us</segment> <city_name>not a city</city_name> <region>CA</region> <country>us</country> 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 59c4dd3a58..3a0e7bbff0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -27,7 +27,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==gb</segmentFilter> + <segment>countryCode==gb</segment> </row> <row> <label>Canada</label> @@ -56,7 +56,7 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==ca</segmentFilter> + <segment>countryCode==ca</segment> </row> <row> <label>Russian Federation</label> @@ -85,7 +85,7 @@ <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==ru</segmentFilter> + <segment>countryCode==ru</segment> </row> <row> <label>United States</label> @@ -114,7 +114,7 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==us</segmentFilter> + <segment>countryCode==us</segment> </row> <row> <label>France</label> @@ -143,7 +143,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> <row> <label>Indonesia</label> @@ -172,7 +172,7 @@ <logo>plugins/UserCountry/images/flags/id.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==id</segmentFilter> + <segment>countryCode==id</segment> </row> <row> <label>Italy</label> @@ -201,7 +201,7 @@ <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==it</segmentFilter> + <segment>countryCode==it</segment> </row> <row> <label>Macedonia, the Former Yugoslav Republic of</label> @@ -230,7 +230,7 @@ <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==mk</segmentFilter> + <segment>countryCode==mk</segment> </row> <row> <label>Tibet</label> @@ -259,7 +259,7 @@ <logo>plugins/UserCountry/images/flags/ti.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==ti</segmentFilter> + <segment>countryCode==ti</segment> </row> <row> <label>Unknown</label> @@ -288,6 +288,6 @@ <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==xx</segmentFilter> + <segment>countryCode==xx</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index bf899780a3..3f66e47721 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -52,7 +52,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==BC;countryCode==ca</segmentFilter> + <segment>regionCode==BC;countryCode==ca</segment> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> @@ -82,7 +82,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==P3;countryCode==gb</segmentFilter> + <segment>regionCode==P3;countryCode==gb</segment> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -112,7 +112,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==66;countryCode==ru</segmentFilter> + <segment>regionCode==66;countryCode==ru</segment> <region>66</region> <country>ru</country> <country_name>Russian Federation</country_name> @@ -142,7 +142,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==1;countryCode==ti</segmentFilter> + <segment>regionCode==1;countryCode==ti</segment> <region>1</region> <country>ti</country> <country_name>Tibet</country_name> @@ -172,7 +172,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==66;countryCode==mk</segmentFilter> + <segment>regionCode==66;countryCode==mk</segment> <region>66</region> <country>mk</country> <country_name>Macedonia, the Former Yugoslav Republic of</country_name> @@ -202,7 +202,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==A6;countryCode==fr</segmentFilter> + <segment>regionCode==A6;countryCode==fr</segment> <region>A6</region> <country>fr</country> <country_name>France</country_name> @@ -232,7 +232,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==G5;countryCode==gb</segmentFilter> + <segment>regionCode==G5;countryCode==gb</segment> <region>G5</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -262,7 +262,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==H9;countryCode==gb</segmentFilter> + <segment>regionCode==H9;countryCode==gb</segment> <region>H9</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -287,7 +287,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <segmentFilter>regionCode==CA;countryCode==us</segmentFilter> + <segment>regionCode==CA;countryCode==us</segment> <region>CA</region> <country>us</country> <country_name>United States</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index cc0d8afbd8..fa25ca307f 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -25,7 +25,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> - <segmentFilter>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segmentFilter> + <segment>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segment> <city_name>Stratford-upon-Avon</city_name> <region>P3</region> <country>gb</country> 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 6ad1658745..f4c9aec148 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 @@ -27,6 +27,6 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==gb</segmentFilter> + <segment>countryCode==gb</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index cdc1a1a229..673c09f94d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -23,7 +23,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==P3;countryCode==gb</segmentFilter> + <segment>regionCode==P3;countryCode==gb</segment> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> 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 f5f453d212..5e74500257 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 @@ -27,7 +27,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==gb</segmentFilter> + <segment>countryCode==gb</segment> </row> <row> <label>Russian Federation</label> @@ -56,7 +56,7 @@ <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==ru</segmentFilter> + <segment>countryCode==ru</segment> </row> <row> <label>France</label> @@ -85,7 +85,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> <row> <label>Italy</label> @@ -114,7 +114,7 @@ <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==it</segmentFilter> + <segment>countryCode==it</segment> </row> <row> <label>Macedonia, the Former Yugoslav Republic of</label> @@ -143,6 +143,6 @@ <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==mk</segmentFilter> + <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.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index d82cc166fb..b64ec6a819 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -25,7 +25,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> - <segmentFilter>city==Vancouver;regionCode==BC;countryCode==ca</segmentFilter> + <segment>city==Vancouver;regionCode==BC;countryCode==ca</segment> <city_name>Vancouver</city_name> <region>BC</region> <country>ca</country> 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 89ad0c364d..a40261e6eb 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 @@ -27,6 +27,6 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==ca</segmentFilter> + <segment>countryCode==ca</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 64783618ac..3fdca68028 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -23,7 +23,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==BC;countryCode==ca</segmentFilter> + <segment>regionCode==BC;countryCode==ca</segment> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index d0fa142f4e..57d7264bdc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -25,7 +25,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> - <segmentFilter>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segmentFilter> + <segment>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segment> <city_name>Stratford-upon-Avon</city_name> <region>P3</region> <country>gb</country> @@ -56,7 +56,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segmentFilter> + <segment>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segment> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> 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 2a6bbbb5d2..6403c9ba51 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 @@ -27,6 +27,6 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==gb</segmentFilter> + <segment>countryCode==gb</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index fe29ea3744..04e7049815 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -23,7 +23,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>regionCode==P3;countryCode==gb</segmentFilter> + <segment>regionCode==P3;countryCode==gb</segment> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 7d628fa12a..db0e68eec9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -316,76 +316,76 @@ </reportData> <reportMetadata> <row> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml index 23a508e8e9..b03bf17f1b 100644 --- a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml @@ -13,7 +13,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/exit-page</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fexit-page</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fexit-page</segment> </row> <row> <label>page</label> diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml index aabd619ffe..b60059d21a 100644 --- a/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>721</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==anothersite.com</segmentFilter> + <segment>referrerName==anothersite.com</segment> <subtable> <row> <label>http://anothersite.com/whatever.html</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml index 4b00d2bad7..03f73e41df 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml @@ -20,7 +20,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml index 3ce521ab13..cbe0c54470 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml @@ -17,7 +17,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.023</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml index 4b7e1149c7..2a46f6f4a1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml @@ -15,7 +15,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.224</avg_time_generation> <url>http://example.org/</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2F</segment> </row> <row> <label>/index.htm</label> @@ -34,7 +34,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.023</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.htm?parameter=Should display</label> @@ -56,7 +56,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml index 61a7d56829..5b118e92d7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserEngine==Gecko</segmentFilter> + <segment>browserEngine==Gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index a083c46720..3b81bc098d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> + <segment>browserCode==FF;browserVersion==3.6</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index bbdb2c3d6d..a5759e34ec 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> - <segmentFilter>browserCode==FF</segmentFilter> + <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 08b331b507..9707adaacf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 522f8a716c..2607acf076 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -9,61 +9,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>deviceType==desktop</segmentFilter> + <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smartphone</segmentFilter> + <segment>deviceType==smartphone</segment> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tablet</segmentFilter> + <segment>deviceType==tablet</segment> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==feature+phone</segmentFilter> + <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==console</segmentFilter> + <segment>deviceType==console</segment> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tv</segmentFilter> + <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==car+browser</segmentFilter> + <segment>deviceType==car+browser</segment> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smart+display</segmentFilter> + <segment>deviceType==smart+display</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==camera</segmentFilter> + <segment>deviceType==camera</segment> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==portable+media+player</segmentFilter> + <segment>deviceType==portable+media+player</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </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 147b0ac55c..e20c0e9112 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,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <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 85cfe0f589..792b864a20 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> - <segmentFilter>referrerKeyword==purchase</segmentFilter> + <segment>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 1fb87a1f7b..30a8428de7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -74,7 +74,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml index 50c2be558d..9c7860d9da 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml @@ -17,7 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> + <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml index c336162bf5..37df5a9869 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml @@ -17,7 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml index ce93429ef0..28af23e62d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>resolution==1024x768</segmentFilter> + <segment>resolution==1024x768</segment> </row> </result>
\ No newline at end of file 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 adf7a9395f..d2dc3c069d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -26,6 +26,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml index 61a7d56829..5b118e92d7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserEngine==Gecko</segmentFilter> + <segment>browserEngine==Gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml index a083c46720..3b81bc098d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> + <segment>browserCode==FF;browserVersion==3.6</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml index bbdb2c3d6d..a5759e34ec 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> - <segmentFilter>browserCode==FF</segmentFilter> + <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml index 522f8a716c..2607acf076 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml @@ -9,61 +9,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>deviceType==desktop</segmentFilter> + <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smartphone</segmentFilter> + <segment>deviceType==smartphone</segment> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tablet</segmentFilter> + <segment>deviceType==tablet</segment> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==feature+phone</segmentFilter> + <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==console</segmentFilter> + <segment>deviceType==console</segment> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tv</segmentFilter> + <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==car+browser</segmentFilter> + <segment>deviceType==car+browser</segment> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smart+display</segmentFilter> + <segment>deviceType==smart+display</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==camera</segmentFilter> + <segment>deviceType==camera</segment> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==portable+media+player</segmentFilter> + <segment>deviceType==portable+media+player</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml index 08b331b507..9707adaacf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml index ce93429ef0..28af23e62d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>resolution==1024x768</segmentFilter> + <segment>resolution==1024x768</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml index eea8474455..0b6712aa1b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==0</segmentFilter> + <segment>visitLocalHour==0</segment> </row> <row> <label>1h</label> @@ -20,7 +20,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==1</segmentFilter> + <segment>visitLocalHour==1</segment> </row> <row> <label>2h</label> @@ -31,7 +31,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==2</segmentFilter> + <segment>visitLocalHour==2</segment> </row> <row> <label>3h</label> @@ -42,7 +42,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==3</segmentFilter> + <segment>visitLocalHour==3</segment> </row> <row> <label>4h</label> @@ -53,7 +53,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==4</segmentFilter> + <segment>visitLocalHour==4</segment> </row> <row> <label>5h</label> @@ -64,7 +64,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==5</segmentFilter> + <segment>visitLocalHour==5</segment> </row> <row> <label>6h</label> @@ -75,7 +75,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==6</segmentFilter> + <segment>visitLocalHour==6</segment> </row> <row> <label>7h</label> @@ -86,7 +86,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==7</segmentFilter> + <segment>visitLocalHour==7</segment> </row> <row> <label>8h</label> @@ -97,7 +97,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==8</segmentFilter> + <segment>visitLocalHour==8</segment> </row> <row> <label>9h</label> @@ -108,7 +108,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==9</segmentFilter> + <segment>visitLocalHour==9</segment> </row> <row> <label>10h</label> @@ -119,7 +119,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==10</segmentFilter> + <segment>visitLocalHour==10</segment> </row> <row> <label>11h</label> @@ -130,7 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==11</segmentFilter> + <segment>visitLocalHour==11</segment> </row> <row> <label>12h</label> @@ -141,7 +141,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>visitLocalHour==12</segmentFilter> + <segment>visitLocalHour==12</segment> </row> <row> <label>13h</label> @@ -152,7 +152,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==13</segmentFilter> + <segment>visitLocalHour==13</segment> </row> <row> <label>14h</label> @@ -163,7 +163,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==14</segmentFilter> + <segment>visitLocalHour==14</segment> </row> <row> <label>15h</label> @@ -174,7 +174,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==15</segmentFilter> + <segment>visitLocalHour==15</segment> </row> <row> <label>16h</label> @@ -185,7 +185,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==16</segmentFilter> + <segment>visitLocalHour==16</segment> </row> <row> <label>17h</label> @@ -196,7 +196,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==17</segmentFilter> + <segment>visitLocalHour==17</segment> </row> <row> <label>18h</label> @@ -207,7 +207,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==18</segmentFilter> + <segment>visitLocalHour==18</segment> </row> <row> <label>19h</label> @@ -218,7 +218,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==19</segmentFilter> + <segment>visitLocalHour==19</segment> </row> <row> <label>20h</label> @@ -229,7 +229,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==20</segmentFilter> + <segment>visitLocalHour==20</segment> </row> <row> <label>21h</label> @@ -240,7 +240,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==21</segmentFilter> + <segment>visitLocalHour==21</segment> </row> <row> <label>22h</label> @@ -251,7 +251,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==22</segmentFilter> + <segment>visitLocalHour==22</segment> </row> <row> <label>23h</label> @@ -262,6 +262,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==23</segmentFilter> + <segment>visitLocalHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml index 9c2adfb1fa..6626c3ffaf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> <label>1h</label> @@ -20,7 +20,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> <label>2h</label> @@ -31,7 +31,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> <label>3h</label> @@ -42,7 +42,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> <label>4h</label> @@ -53,7 +53,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> <label>5h</label> @@ -64,7 +64,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> <label>6h</label> @@ -75,7 +75,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> <label>7h</label> @@ -86,7 +86,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> <label>8h</label> @@ -97,7 +97,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> <label>9h</label> @@ -108,7 +108,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> <label>10h</label> @@ -119,7 +119,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> <label>11h</label> @@ -138,7 +138,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> <label>12h</label> @@ -157,7 +157,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> <label>13h</label> @@ -168,7 +168,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> <label>14h</label> @@ -179,7 +179,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> <label>15h</label> @@ -190,7 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> <label>16h</label> @@ -201,7 +201,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> <label>17h</label> @@ -212,7 +212,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> <label>18h</label> @@ -223,7 +223,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> <label>19h</label> @@ -234,7 +234,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> <label>20h</label> @@ -245,7 +245,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> <label>21h</label> @@ -256,7 +256,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> <label>22h</label> @@ -267,7 +267,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> <label>23h</label> @@ -278,6 +278,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index 86ae59110f..4995a7684d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -55,7 +55,7 @@ <reportMetadata> <row> <url>http://example.org/store/purchase.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fstore%2Fpurchase.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fstore%2Fpurchase.htm</segment> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml index 7aa36902eb..9b846c1895 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml @@ -155,76 +155,76 @@ </reportData> <reportMetadata> <row> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml index ea033832f9..1e0a59c457 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml @@ -19,7 +19,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> - <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> + <segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml index ebe03b68fb..d61ef0162c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml @@ -17,7 +17,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.024</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml index bf909a3f87..c86cc78b13 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml @@ -14,7 +14,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.224</avg_time_generation> <url>http://example.org/</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2F</segment> </row> <row> <label>/index.htm</label> @@ -33,7 +33,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.024</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.htm?parameter=Should display</label> @@ -54,7 +54,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml index 5ce8125a9d..14c3dc0d52 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserEngine==Gecko</segmentFilter> + <segment>browserEngine==Gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 7393a6c35f..10868debe6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> + <segment>browserCode==FF;browserVersion==3.6</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 8c7b31d6bf..0bb4fd3f0b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> - <segmentFilter>browserCode==FF</segmentFilter> + <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index 76e2ea51b7..205baa4d5b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 6c2e471542..d52006abf9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -10,61 +10,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>deviceType==desktop</segmentFilter> + <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smartphone</segmentFilter> + <segment>deviceType==smartphone</segment> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tablet</segmentFilter> + <segment>deviceType==tablet</segment> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==feature+phone</segmentFilter> + <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==console</segmentFilter> + <segment>deviceType==console</segment> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tv</segmentFilter> + <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==car+browser</segmentFilter> + <segment>deviceType==car+browser</segment> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smart+display</segmentFilter> + <segment>deviceType==smart+display</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==camera</segmentFilter> + <segment>deviceType==camera</segment> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==portable+media+player</segmentFilter> + <segment>deviceType==portable+media+player</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </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 5455d26b5a..f6a2c1dc79 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,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <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 4dac5a544d..47c37e286c 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> - <segmentFilter>referrerKeyword==purchase</segmentFilter> + <segment>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 29cb726085..bf50216dad 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 @@ -78,7 +78,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml index 91bc9aecfa..35b195308e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml @@ -18,7 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> + <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml index 0dfe6357dd..265598f6ee 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml @@ -18,7 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> 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 6dad93f7d8..8a2a0a5424 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 @@ -27,6 +27,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml index 5ce8125a9d..14c3dc0d52 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserEngine==Gecko</segmentFilter> + <segment>browserEngine==Gecko</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml index 7393a6c35f..10868debe6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> + <segment>browserCode==FF;browserVersion==3.6</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml index 8c7b31d6bf..0bb4fd3f0b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> - <segmentFilter>browserCode==FF</segmentFilter> + <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml index 6c2e471542..d52006abf9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml @@ -10,61 +10,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>deviceType==desktop</segmentFilter> + <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smartphone</segmentFilter> + <segment>deviceType==smartphone</segment> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tablet</segmentFilter> + <segment>deviceType==tablet</segment> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==feature+phone</segmentFilter> + <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==console</segmentFilter> + <segment>deviceType==console</segment> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==tv</segmentFilter> + <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==car+browser</segmentFilter> + <segment>deviceType==car+browser</segment> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==smart+display</segmentFilter> + <segment>deviceType==smart+display</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==camera</segmentFilter> + <segment>deviceType==camera</segment> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> - <segmentFilter>deviceType==portable+media+player</segmentFilter> + <segment>deviceType==portable+media+player</segment> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index 76e2ea51b7..205baa4d5b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> + <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml index 047ed92f79..3ed29e7c44 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>resolution==1024x768</segmentFilter> + <segment>resolution==1024x768</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml index f166f11a6f..c89a8a6d25 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==0</segmentFilter> + <segment>visitLocalHour==0</segment> </row> <row> <label>1h</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==1</segmentFilter> + <segment>visitLocalHour==1</segment> </row> <row> <label>2h</label> @@ -34,7 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==2</segmentFilter> + <segment>visitLocalHour==2</segment> </row> <row> <label>3h</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==3</segmentFilter> + <segment>visitLocalHour==3</segment> </row> <row> <label>4h</label> @@ -58,7 +58,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==4</segmentFilter> + <segment>visitLocalHour==4</segment> </row> <row> <label>5h</label> @@ -70,7 +70,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==5</segmentFilter> + <segment>visitLocalHour==5</segment> </row> <row> <label>6h</label> @@ -82,7 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==6</segmentFilter> + <segment>visitLocalHour==6</segment> </row> <row> <label>7h</label> @@ -94,7 +94,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==7</segmentFilter> + <segment>visitLocalHour==7</segment> </row> <row> <label>8h</label> @@ -106,7 +106,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==8</segmentFilter> + <segment>visitLocalHour==8</segment> </row> <row> <label>9h</label> @@ -118,7 +118,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==9</segmentFilter> + <segment>visitLocalHour==9</segment> </row> <row> <label>10h</label> @@ -130,7 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==10</segmentFilter> + <segment>visitLocalHour==10</segment> </row> <row> <label>11h</label> @@ -142,7 +142,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==11</segmentFilter> + <segment>visitLocalHour==11</segment> </row> <row> <label>12h</label> @@ -154,7 +154,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>visitLocalHour==12</segmentFilter> + <segment>visitLocalHour==12</segment> </row> <row> <label>13h</label> @@ -166,7 +166,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==13</segmentFilter> + <segment>visitLocalHour==13</segment> </row> <row> <label>14h</label> @@ -178,7 +178,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==14</segmentFilter> + <segment>visitLocalHour==14</segment> </row> <row> <label>15h</label> @@ -190,7 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==15</segmentFilter> + <segment>visitLocalHour==15</segment> </row> <row> <label>16h</label> @@ -202,7 +202,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==16</segmentFilter> + <segment>visitLocalHour==16</segment> </row> <row> <label>17h</label> @@ -214,7 +214,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==17</segmentFilter> + <segment>visitLocalHour==17</segment> </row> <row> <label>18h</label> @@ -226,7 +226,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==18</segmentFilter> + <segment>visitLocalHour==18</segment> </row> <row> <label>19h</label> @@ -238,7 +238,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==19</segmentFilter> + <segment>visitLocalHour==19</segment> </row> <row> <label>20h</label> @@ -250,7 +250,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==20</segmentFilter> + <segment>visitLocalHour==20</segment> </row> <row> <label>21h</label> @@ -262,7 +262,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==21</segmentFilter> + <segment>visitLocalHour==21</segment> </row> <row> <label>22h</label> @@ -274,7 +274,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==22</segmentFilter> + <segment>visitLocalHour==22</segment> </row> <row> <label>23h</label> @@ -286,6 +286,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==23</segmentFilter> + <segment>visitLocalHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index 8f1b279503..944821160b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> <label>1h</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> <label>2h</label> @@ -34,7 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> <label>3h</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> <label>4h</label> @@ -58,7 +58,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> <label>5h</label> @@ -70,7 +70,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> <label>6h</label> @@ -82,7 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> <label>7h</label> @@ -94,7 +94,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> <label>8h</label> @@ -106,7 +106,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> <label>9h</label> @@ -118,7 +118,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> <label>10h</label> @@ -130,7 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> <label>11h</label> @@ -150,7 +150,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> <label>12h</label> @@ -170,7 +170,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> <label>13h</label> @@ -182,7 +182,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> <label>14h</label> @@ -194,7 +194,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> <label>15h</label> @@ -206,7 +206,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> <label>16h</label> @@ -218,7 +218,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> <label>17h</label> @@ -230,7 +230,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> <label>18h</label> @@ -242,7 +242,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> <label>19h</label> @@ -254,7 +254,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> <label>20h</label> @@ -266,7 +266,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> <label>21h</label> @@ -278,7 +278,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> <label>22h</label> @@ -290,7 +290,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> <label>23h</label> @@ -302,6 +302,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml index be1a67bb8d..aaf619965e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml @@ -17,7 +17,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/contact.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fcontact.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fcontact.htm</segment> </row> <row> <label>category</label> 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 9da78c7f25..d94f89b37f 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> - <segmentFilter>referrerKeyword==kia+ora</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==hello+world</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==salut</segmentFilter> + <segment>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 22276b704e..d2f83ce8cd 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> - <segmentFilter>referrerKeyword==</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segmentFilter> + <segment>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_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml index ac51ac9a3d..981347b803 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml @@ -18,7 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42.26</revenue> - <segmentFilter>referrerType==campaign;referrerName==ga+campaign</segmentFilter> + <segment>referrerType==campaign;referrerName==ga+campaign</segment> <subtable> <row> <label>piwik kwd</label> @@ -73,7 +73,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerType==campaign;referrerName==adwords+campaign</segmentFilter> + <segment>referrerType==campaign;referrerName==adwords+campaign</segment> <subtable> <row> <label>(adwords) www.adwords-publisher-website.org</label> @@ -109,7 +109,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerType==campaign;referrerName==adwords+%28text%29</segmentFilter> + <segment>referrerType==campaign;referrerName==adwords+%28text%29</segment> <subtable> <row> <label>(adwords) www.example.com</label> @@ -134,7 +134,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerType==campaign;referrerName==adwords+%28text_image%29</segmentFilter> + <segment>referrerType==campaign;referrerName==adwords+%28text_image%29</segment> <subtable> <row> <label>(adwords) example.com</label> @@ -167,7 +167,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>24</revenue> - <segmentFilter>referrerType==campaign;referrerName==credited+to+another+goal</segmentFilter> + <segment>referrerType==campaign;referrerName==credited+to+another+goal</segment> <subtable> <row> <label>example.org</label> @@ -208,7 +208,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <segmentFilter>referrerType==campaign;referrerName==credited+to+goal+please</segmentFilter> + <segment>referrerType==campaign;referrerName==credited+to+goal+please</segment> <subtable> <row> <label>example.org</label> diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml index 1d80af64cd..7312e0fedc 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==mutantregistration.com</segmentFilter> + <segment>referrerName==mutantregistration.com</segment> <subtable> <row> <label>http://mutantregistration.com</label> @@ -35,7 +35,7 @@ <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==myotherreferrerwebsite.com</segmentFilter> + <segment>referrerName==myotherreferrerwebsite.com</segment> <subtable> <row> <label>http://myotherreferrerwebsite.com</label> @@ -60,7 +60,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==myreferrerwebsite.com</segmentFilter> + <segment>referrerName==myreferrerwebsite.com</segment> <subtable> <row> <label>http://myreferrerwebsite.com</label> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index 459302f912..ac8e26d1f4 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -77,15 +77,15 @@ <result prettyDate="Sunday 3 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment> </row> <row> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml index 5f859a86b2..570f393b9a 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml @@ -77,15 +77,15 @@ <result prettyDate="2010, January"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment> </row> <row> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment> </row> </result> <result prettyDate="2010, February" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml index 9d84e15cdb..b001f1be29 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml @@ -13,7 +13,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -27,7 +27,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -40,7 +40,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment> </row> </result> <result date="2010-01-04" /> @@ -67,7 +67,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</label> @@ -79,7 +79,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment> </row> </result> <result date="2010-01-04" /> @@ -103,7 +103,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segment> </row> <row> <label>/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</label> @@ -115,7 +115,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment> </row> <row> <label>/index.htm?q=Search 1&IsPageView=1</label> @@ -132,7 +132,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment> </row> </result> <result date="2010-01-04" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml index 57e60b2a58..ddae944352 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml @@ -13,7 +13,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -27,7 +27,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -40,7 +40,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment> </row> </result> <result date="2010-02" /> @@ -67,7 +67,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</label> @@ -79,7 +79,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment> </row> </result> <result date="2010-02" /> @@ -103,7 +103,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segment> </row> <row> <label>/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</label> @@ -115,7 +115,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment> </row> <row> <label>/index.htm?q=Search 1&IsPageView=1</label> @@ -132,7 +132,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment> </row> </result> <result date="2010-02" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml index f14f11079b..5617717b0d 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml @@ -11,7 +11,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -25,7 +25,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -38,6 +38,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml index 013bdd80b6..12b4aea3ad 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml @@ -11,7 +11,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -25,7 +25,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -38,6 +38,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index e3a5d44f88..50de1f59c4 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -223,11 +223,11 @@ <result prettyDate="Sunday 3 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result prettyDate="Monday 4 January 2010"> @@ -238,11 +238,11 @@ <result prettyDate="Tuesday 5 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <url /> @@ -251,11 +251,11 @@ <result prettyDate="Wednesday 6 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <url /> @@ -264,11 +264,11 @@ <result prettyDate="Thursday 7 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <url /> @@ -277,11 +277,11 @@ <result prettyDate="Friday 8 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <url /> @@ -290,11 +290,11 @@ <result prettyDate="Saturday 9 January 2010"> <row> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <url /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index 2b86ba1f4f..215d5fe694 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -109,13 +109,13 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> </row> </result> <result prettyDate="Monday 4 January 2010"> <row> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> </row> </result> @@ -124,13 +124,13 @@ <result prettyDate="Thursday 7 January 2010" /> <result prettyDate="Friday 8 January 2010"> <row> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> </row> </result> <result prettyDate="Saturday 9 January 2010"> <row> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml index 1e2080ab0f..c67d91399b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml @@ -23,7 +23,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/products</label> @@ -46,7 +46,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="2010-01-04"> @@ -86,7 +86,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -104,7 +104,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -142,7 +142,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -160,7 +160,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -198,7 +198,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -216,7 +216,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -254,7 +254,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -272,7 +272,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -310,7 +310,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -328,7 +328,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -371,7 +371,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml index e32b5d9e9d..08d1c90f9a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml @@ -23,7 +23,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>Page URL not defined</label> @@ -56,7 +56,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>/products</label> @@ -79,7 +79,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="2010-02" /> @@ -112,7 +112,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml index f416a1ce36..fc85313690 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml @@ -23,7 +23,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/products</label> @@ -46,7 +46,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="From 2010-01-04 to 2010-01-10"> @@ -84,7 +84,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -102,7 +102,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> </result> <result date="From 2010-01-11 to 2010-01-17"> @@ -125,7 +125,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -143,7 +143,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -190,7 +190,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml index 44a0e1ce36..0d0f6aaca8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml @@ -23,7 +23,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>Page URL not defined</label> @@ -56,7 +56,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>/products</label> @@ -79,7 +79,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="2011" /> @@ -112,7 +112,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml index f0cea9f926..68cf105bb4 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml @@ -12,7 +12,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -39,7 +39,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -69,7 +69,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -96,7 +96,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -126,7 +126,7 @@ <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> + <segment>referrerName==only-homepage-referrer.com</segment> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index baf6483b39..cb53e090a5 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -12,7 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> + <segment>referrerName==only-homepage-referrer.com</segment> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index c43d480368..dad94debe3 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -12,7 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -39,7 +39,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -77,7 +77,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -111,7 +111,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> + <segment>referrerName==only-homepage-referrer.com</segment> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index 086c01292c..a20510ef16 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -12,7 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> + <segment>referrerName==only-homepage-referrer.com</segment> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml index e9c3aa5f1f..4087b624e2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml @@ -22,7 +22,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/products</label> @@ -45,7 +45,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="2010-01-04"> @@ -85,7 +85,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -103,7 +103,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -141,7 +141,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -159,7 +159,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -197,7 +197,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -215,7 +215,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -253,7 +253,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -271,7 +271,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> @@ -309,7 +309,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -327,7 +327,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml index 44c5f1ba43..6e13a1e872 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml @@ -22,7 +22,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>Page URL not defined</label> @@ -55,7 +55,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>/products</label> @@ -78,7 +78,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="2010-02" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml index 8f4c8ef43a..8366107a19 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml @@ -22,7 +22,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/products</label> @@ -45,7 +45,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="From 2010-01-04 to 2010-01-10"> @@ -83,7 +83,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -101,7 +101,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> </result> <result date="From 2010-01-11 to 2010-01-17"> @@ -124,7 +124,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>/thankyou</label> @@ -142,7 +142,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml index 47d044b724..fb02cf8629 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml @@ -22,7 +22,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment> </row> <row> <label>Page URL not defined</label> @@ -55,7 +55,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment> </row> <row> <label>/products</label> @@ -78,7 +78,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment> </row> </result> <result date="2011" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml index 2d0795cf91..67bf4d2ac5 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml @@ -11,7 +11,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -38,7 +38,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -68,7 +68,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -95,7 +95,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index d151503d5f..d04b442b1c 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -11,7 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index 7020455958..1af9b3a261 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -11,7 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -38,7 +38,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -76,7 +76,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index c7e850c90a..c80e5068c0 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -11,7 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>referrerName==referrer.com</segmentFilter> + <segment>referrerName==referrer.com</segment> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml index 0562371d1a..f48878ed7e 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml @@ -123,7 +123,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment> </row> <row> <label>/Home</label> @@ -135,7 +135,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml index 0562371d1a..f48878ed7e 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml @@ -123,7 +123,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment> </row> <row> <label>/Home</label> @@ -135,7 +135,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml index 36dcc573f8..cd12df23f8 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml @@ -124,7 +124,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment> </row> <row> <label>/Home</label> @@ -136,7 +136,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml index 36dcc573f8..cd12df23f8 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml @@ -124,7 +124,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment> </row> <row> <label>/Home</label> @@ -136,7 +136,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment> </row> <row> <label>Contact</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 e9443d4066..60448cc998 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -63,7 +63,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <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 eb1a89b00f..96dc629582 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 @@ -76,7 +76,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index 252dcb55ab..b8a61be777 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -316,76 +316,76 @@ </reportData> <reportMetadata> <row> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</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 34c01175fa..a09fb9074f 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -73,14 +73,14 @@ <logo>plugins/UserCountry/images/flags/pl.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==pl</segmentFilter> + <segment>countryCode==pl</segment> </row> <row> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <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 0c53b50140..6306627c7f 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -33,7 +33,7 @@ <logo>plugins/UserCountry/images/flags/pl.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==pl</segmentFilter> + <segment>countryCode==pl</segment> </row> <row> <label>France</label> @@ -57,6 +57,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml index bb4506a284..845699c6d2 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==0</segmentFilter> + <segment>visitLocalHour==0</segment> </row> <row> <label>1h</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==1</segmentFilter> + <segment>visitLocalHour==1</segment> </row> <row> <label>2h</label> @@ -34,7 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==2</segmentFilter> + <segment>visitLocalHour==2</segment> </row> <row> <label>3h</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==3</segmentFilter> + <segment>visitLocalHour==3</segment> </row> <row> <label>4h</label> @@ -58,7 +58,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==4</segmentFilter> + <segment>visitLocalHour==4</segment> </row> <row> <label>5h</label> @@ -70,7 +70,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==5</segmentFilter> + <segment>visitLocalHour==5</segment> </row> <row> <label>6h</label> @@ -82,7 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==6</segmentFilter> + <segment>visitLocalHour==6</segment> </row> <row> <label>7h</label> @@ -94,7 +94,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==7</segmentFilter> + <segment>visitLocalHour==7</segment> </row> <row> <label>8h</label> @@ -106,7 +106,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==8</segmentFilter> + <segment>visitLocalHour==8</segment> </row> <row> <label>9h</label> @@ -118,7 +118,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==9</segmentFilter> + <segment>visitLocalHour==9</segment> </row> <row> <label>10h</label> @@ -130,7 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==10</segmentFilter> + <segment>visitLocalHour==10</segment> </row> <row> <label>11h</label> @@ -142,7 +142,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==11</segmentFilter> + <segment>visitLocalHour==11</segment> </row> <row> <label>12h</label> @@ -154,7 +154,7 @@ <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <segmentFilter>visitLocalHour==12</segmentFilter> + <segment>visitLocalHour==12</segment> </row> <row> <label>13h</label> @@ -166,7 +166,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==13</segmentFilter> + <segment>visitLocalHour==13</segment> </row> <row> <label>14h</label> @@ -178,7 +178,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==14</segmentFilter> + <segment>visitLocalHour==14</segment> </row> <row> <label>15h</label> @@ -190,7 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==15</segmentFilter> + <segment>visitLocalHour==15</segment> </row> <row> <label>16h</label> @@ -202,7 +202,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==16</segmentFilter> + <segment>visitLocalHour==16</segment> </row> <row> <label>17h</label> @@ -214,7 +214,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==17</segmentFilter> + <segment>visitLocalHour==17</segment> </row> <row> <label>18h</label> @@ -226,7 +226,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==18</segmentFilter> + <segment>visitLocalHour==18</segment> </row> <row> <label>19h</label> @@ -238,7 +238,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==19</segmentFilter> + <segment>visitLocalHour==19</segment> </row> <row> <label>20h</label> @@ -250,7 +250,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==20</segmentFilter> + <segment>visitLocalHour==20</segment> </row> <row> <label>21h</label> @@ -262,7 +262,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==21</segmentFilter> + <segment>visitLocalHour==21</segment> </row> <row> <label>22h</label> @@ -274,7 +274,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==22</segmentFilter> + <segment>visitLocalHour==22</segment> </row> <row> <label>23h</label> @@ -286,6 +286,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitLocalHour==23</segmentFilter> + <segment>visitLocalHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml index 340ddeaaa1..84a48688b8 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml @@ -18,7 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>10</revenue> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> <label>1h</label> @@ -30,7 +30,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> <label>2h</label> @@ -61,7 +61,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>3111.11</revenue> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> <label>3h</label> @@ -73,7 +73,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> <label>4h</label> @@ -85,7 +85,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> <label>5h</label> @@ -97,7 +97,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> <label>6h</label> @@ -109,7 +109,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> <label>7h</label> @@ -130,7 +130,7 @@ </goals> <nb_conversions>0</nb_conversions> <revenue>0</revenue> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> <label>8h</label> @@ -142,7 +142,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> <label>9h</label> @@ -154,7 +154,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> <label>10h</label> @@ -166,7 +166,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> <label>11h</label> @@ -178,7 +178,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> <label>12h</label> @@ -190,7 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> <label>13h</label> @@ -202,7 +202,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> <label>14h</label> @@ -214,7 +214,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> <label>15h</label> @@ -226,7 +226,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> <label>16h</label> @@ -238,7 +238,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> <label>17h</label> @@ -250,7 +250,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> <label>18h</label> @@ -262,7 +262,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> <label>19h</label> @@ -274,7 +274,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> <label>20h</label> @@ -286,7 +286,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> <label>21h</label> @@ -298,7 +298,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> <label>22h</label> @@ -310,7 +310,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> <label>23h</label> @@ -322,6 +322,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml index 46b632de3c..c0091c6eef 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml @@ -15,7 +15,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/homepage</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment> </row> <row> <label>/news</label> @@ -34,7 +34,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/news</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segment> </row> <row> <label>sub1</label> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml index 87462b68c3..ec3805d0ff 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml @@ -10,6 +10,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>resolution==1024x768</segmentFilter> + <segment>resolution==1024x768</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 cdb1990717..9f391df90c 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 @@ -14,6 +14,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml index 5429c6907c..4f4de53b6e 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml @@ -10,7 +10,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> <label>1h</label> @@ -22,7 +22,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> <label>2h</label> @@ -34,7 +34,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> <label>3h</label> @@ -46,7 +46,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> <label>4h</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> <label>5h</label> @@ -70,7 +70,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> <label>6h</label> @@ -82,7 +82,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> <label>7h</label> @@ -94,7 +94,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> <label>8h</label> @@ -106,7 +106,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> <label>9h</label> @@ -118,7 +118,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> <label>10h</label> @@ -130,7 +130,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> <label>11h</label> @@ -142,7 +142,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> <label>12h</label> @@ -154,7 +154,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> <label>13h</label> @@ -166,7 +166,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> <label>14h</label> @@ -178,7 +178,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> <label>15h</label> @@ -190,7 +190,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> <label>16h</label> @@ -202,7 +202,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> <label>17h</label> @@ -214,7 +214,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> <label>18h</label> @@ -226,7 +226,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> <label>19h</label> @@ -238,7 +238,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> <label>20h</label> @@ -250,7 +250,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> <label>21h</label> @@ -262,7 +262,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> <label>22h</label> @@ -274,7 +274,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> <label>23h</label> @@ -286,6 +286,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml index 018d31f7ab..8258370871 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml @@ -15,7 +15,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/homepage</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment> </row> <row> <label>/news</label> @@ -34,7 +34,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/news</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segment> </row> <row> <label>sub1</label> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml index b8256bd516..2b0bf155df 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml @@ -15,7 +15,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/homepage</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment> </row> <row> <label>news</label> @@ -34,7 +34,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/news</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segment> </row> <row> <label>sub1/sub2/sub3/news</label> @@ -48,6 +48,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/sub1/sub2/sub3/news</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fsub1%2Fsub2%2Fsub3%2Fnews</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub1%2Fsub2%2Fsub3%2Fnews</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 45599068e7..d97f54ef85 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 @@ -60,7 +60,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> - <segmentFilter>countryCode==fr</segmentFilter> + <segment>countryCode==fr</segment> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml index 46f666ea16..457accfc9a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml @@ -17,7 +17,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>50%</exit_rate> <url>http://example.org/homepage</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment> </row> <row> <label>user</label> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml index 2aeca9fae4..566315146e 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml @@ -12,7 +12,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <nb_visits>0</nb_visits> - <segmentFilter>referrerType==campaign;referrerName==campaign+name+-+yeah%21</segmentFilter> + <segment>referrerType==campaign;referrerName==campaign+name+-+yeah%21</segment> <subtable> <row> <label>campaign keyword - right...</label> 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 2ba81831d8..2910f29472 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> - <segmentFilter>referrerKeyword==this+keyword+should+be+ranked</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==piwik</segmentFilter> + <segment>referrerKeyword==piwik</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 9cc5d5f011..23bcf1329b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> + <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> + <segment>browserCode==IE;browserVersion==9.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index 0c8d501613..99b2ce1993 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.0</segmentFilter> + <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> 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 a9436bf83f..332fcecabb 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,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever1.com</segmentFilter> + <segment>referrerName==whatever1.com</segment> <referer_type>3</referer_type> </row> <row> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever0.com</segmentFilter> + <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 62b0fbce59..2d61cf0ac0 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> - <segmentFilter>referrerKeyword==this+search+term</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==search+term+2</segmentFilter> + <segment>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 127c0a4942..23183cc323 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -80,7 +80,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever0.com</segmentFilter> + <segment>referrerName==whatever0.com</segment> </row> <row> <label>whatever1.com</label> @@ -92,7 +92,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever1.com</segmentFilter> + <segment>referrerName==whatever1.com</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml index 9ec10bb990..fbd996bbe3 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_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> - <segmentFilter>referrerType==search;referrerName==Google</segmentFilter> + <segment>referrerType==search;referrerName==Google</segment> <url>http://google.com</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> <subtable> @@ -48,7 +48,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> + <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml index bd85718705..cb46ea8f5f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever0.com</segmentFilter> + <segment>referrerName==whatever0.com</segment> <subtable> <row> <label>http://whatever0.com/0</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever1.com</segmentFilter> + <segment>referrerName==whatever1.com</segment> <subtable> <row> <label>http://whatever1.com/0</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml index 8604b27aec..70e4bab0ff 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>resolution==1920x1080</segmentFilter> + <segment>resolution==1920x1080</segment> </row> <row> <label>1280x1024</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>resolution==1280x1024</segmentFilter> + <segment>resolution==1280x1024</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml index b25a896506..b9c8e33524 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>city==Melbourne;regionCode==07;countryCode==au</segmentFilter> + <segment>city==Melbourne;regionCode==07;countryCode==au</segment> <city_name>Melbourne</city_name> <region>07</region> <country>au</country> @@ -28,7 +28,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>city==Nice;regionCode==B8;countryCode==fr</segmentFilter> + <segment>city==Nice;regionCode==B8;countryCode==fr</segment> <city_name>Nice</city_name> <region>B8</region> <country>fr</country> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml index af4ce205a1..e1782dfd61 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>regionCode==07;countryCode==au</segmentFilter> + <segment>regionCode==07;countryCode==au</segment> <region>07</region> <country>au</country> <country_name>Australia</country_name> @@ -27,7 +27,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>regionCode==B8;countryCode==fr</segmentFilter> + <segment>regionCode==B8;countryCode==fr</segment> <region>B8</region> <country>fr</country> <country_name>France</country_name> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index 9cc5d5f011..23bcf1329b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> + <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> + <segment>browserCode==IE;browserVersion==9.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index 0c8d501613..99b2ce1993 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> + <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.0</segmentFilter> + <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> 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 a9436bf83f..332fcecabb 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,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever1.com</segmentFilter> + <segment>referrerName==whatever1.com</segment> <referer_type>3</referer_type> </row> <row> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever0.com</segmentFilter> + <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 62b0fbce59..2d61cf0ac0 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> - <segmentFilter>referrerKeyword==this+search+term</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==search+term+2</segmentFilter> + <segment>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 127c0a4942..23183cc323 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 @@ -80,7 +80,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever0.com</segmentFilter> + <segment>referrerName==whatever0.com</segment> </row> <row> <label>whatever1.com</label> @@ -92,7 +92,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever1.com</segmentFilter> + <segment>referrerName==whatever1.com</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml index 9ec10bb990..fbd996bbe3 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_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> - <segmentFilter>referrerType==search;referrerName==Google</segmentFilter> + <segment>referrerType==search;referrerName==Google</segment> <url>http://google.com</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> <subtable> @@ -48,7 +48,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> + <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml index bd85718705..cb46ea8f5f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever0.com</segmentFilter> + <segment>referrerName==whatever0.com</segment> <subtable> <row> <label>http://whatever0.com/0</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>referrerName==whatever1.com</segmentFilter> + <segment>referrerName==whatever1.com</segment> <subtable> <row> <label>http://whatever1.com/0</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml index 8604b27aec..70e4bab0ff 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>resolution==1920x1080</segmentFilter> + <segment>resolution==1920x1080</segment> </row> <row> <label>1280x1024</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>resolution==1280x1024</segmentFilter> + <segment>resolution==1280x1024</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index b25a896506..b9c8e33524 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>city==Melbourne;regionCode==07;countryCode==au</segmentFilter> + <segment>city==Melbourne;regionCode==07;countryCode==au</segment> <city_name>Melbourne</city_name> <region>07</region> <country>au</country> @@ -28,7 +28,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>city==Nice;regionCode==B8;countryCode==fr</segmentFilter> + <segment>city==Nice;regionCode==B8;countryCode==fr</segment> <city_name>Nice</city_name> <region>B8</region> <country>fr</country> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index af4ce205a1..e1782dfd61 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>regionCode==07;countryCode==au</segmentFilter> + <segment>regionCode==07;countryCode==au</segment> <region>07</region> <country>au</country> <country_name>Australia</country_name> @@ -27,7 +27,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>regionCode==B8;countryCode==fr</segmentFilter> + <segment>regionCode==B8;countryCode==fr</segment> <region>B8</region> <country>fr</country> <country_name>France</country_name> diff --git a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml index d1211383eb..aff3a51e64 100644 --- a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml @@ -38,7 +38,7 @@ </goals> <nb_conversions>8</nb_conversions> <revenue>1332</revenue> - <segmentFilter>visitServerHour==0</segmentFilter> + <segment>visitServerHour==0</segment> </row> <row> <label>1h</label> @@ -50,7 +50,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==1</segmentFilter> + <segment>visitServerHour==1</segment> </row> <row> <label>2h</label> @@ -62,7 +62,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==2</segmentFilter> + <segment>visitServerHour==2</segment> </row> <row> <label>3h</label> @@ -74,7 +74,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==3</segmentFilter> + <segment>visitServerHour==3</segment> </row> <row> <label>4h</label> @@ -86,7 +86,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==4</segmentFilter> + <segment>visitServerHour==4</segment> </row> <row> <label>5h</label> @@ -98,7 +98,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==5</segmentFilter> + <segment>visitServerHour==5</segment> </row> <row> <label>6h</label> @@ -110,7 +110,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==6</segmentFilter> + <segment>visitServerHour==6</segment> </row> <row> <label>7h</label> @@ -122,7 +122,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==7</segmentFilter> + <segment>visitServerHour==7</segment> </row> <row> <label>8h</label> @@ -134,7 +134,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==8</segmentFilter> + <segment>visitServerHour==8</segment> </row> <row> <label>9h</label> @@ -146,7 +146,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==9</segmentFilter> + <segment>visitServerHour==9</segment> </row> <row> <label>10h</label> @@ -158,7 +158,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==10</segmentFilter> + <segment>visitServerHour==10</segment> </row> <row> <label>11h</label> @@ -170,7 +170,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==11</segmentFilter> + <segment>visitServerHour==11</segment> </row> <row> <label>12h</label> @@ -182,7 +182,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==12</segmentFilter> + <segment>visitServerHour==12</segment> </row> <row> <label>13h</label> @@ -194,7 +194,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==13</segmentFilter> + <segment>visitServerHour==13</segment> </row> <row> <label>14h</label> @@ -206,7 +206,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==14</segmentFilter> + <segment>visitServerHour==14</segment> </row> <row> <label>15h</label> @@ -218,7 +218,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==15</segmentFilter> + <segment>visitServerHour==15</segment> </row> <row> <label>16h</label> @@ -230,7 +230,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==16</segmentFilter> + <segment>visitServerHour==16</segment> </row> <row> <label>17h</label> @@ -242,7 +242,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==17</segmentFilter> + <segment>visitServerHour==17</segment> </row> <row> <label>18h</label> @@ -254,7 +254,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==18</segmentFilter> + <segment>visitServerHour==18</segment> </row> <row> <label>19h</label> @@ -266,7 +266,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==19</segmentFilter> + <segment>visitServerHour==19</segment> </row> <row> <label>20h</label> @@ -278,7 +278,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==20</segmentFilter> + <segment>visitServerHour==20</segment> </row> <row> <label>21h</label> @@ -290,7 +290,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==21</segmentFilter> + <segment>visitServerHour==21</segment> </row> <row> <label>22h</label> @@ -302,7 +302,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==22</segmentFilter> + <segment>visitServerHour==22</segment> </row> <row> <label>23h</label> @@ -314,6 +314,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segmentFilter>visitServerHour==23</segmentFilter> + <segment>visitServerHour==23</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml index 7ce507892a..21450c0dd4 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml @@ -17,6 +17,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>50%</exit_rate> <url>http://example.org/homepage</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml index 7ce507892a..21450c0dd4 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml @@ -17,6 +17,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>50%</exit_rate> <url>http://example.org/homepage</url> - <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment> </row> </result>
\ No newline at end of file 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 515359ad29..8fec9b4662 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> - <segmentFilter>referrerKeyword==this+keyword+should+be+ranked</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==piwik</segmentFilter> + <segment>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 269fb7f690..e0adf2db50 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> - <segmentFilter>referrerKeyword==this+keyword+should+be+ranked</segmentFilter> + <segment>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> - <segmentFilter>referrerKeyword==piwik</segmentFilter> + <segment>referrerKeyword==piwik</segment> </row> </result> <result date="From 2010-01-04 to 2010-01-10" /> diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php index b959e0b562..4e5b128aca 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php @@ -67,7 +67,7 @@ class AddSegmentFilterByLabelMappingTest extends UnitTestCase { $this->table->filter($this->filter, array('segmentName', $this->getEmptyMapping())); - $metadata = $this->table->getRowsMetadata('segmentFilter'); + $metadata = $this->table->getRowsMetadata('segment'); $this->assertSame(array(false, false, false, false, false, false), $metadata); } @@ -75,7 +75,7 @@ class AddSegmentFilterByLabelMappingTest extends UnitTestCase { $this->table->filter($this->filter, array('segmentName', $this->getMapping())); - $metadata = $this->table->getRowsMetadata('segmentFilter'); + $metadata = $this->table->getRowsMetadata('segment'); $expected = array('segmentName==Core', false, 'segmentName==pluginstests', false, false, false); $this->assertSame($expected, $metadata); } @@ -88,7 +88,7 @@ class AddSegmentFilterByLabelMappingTest extends UnitTestCase ); $this->table->filter($this->filter, array('segmentName', $mapping)); - $metadata = $this->table->getRowsMetadata('segmentFilter'); + $metadata = $this->table->getRowsMetadata('segment'); $expected = array('segmentName==Core+tests', false, 'segmentName==plugins+t%C3%A4sts', false, false, false); $this->assertSame($expected, $metadata); } diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php index c31ea3bed8..eb84c2fce9 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php @@ -40,7 +40,7 @@ class AddSegmentFilterBySegmentValueTest extends UnitTestCase $this->table = new DataTable(); $this->addRowWithMetadata(array('test' => '1')); $this->addRowWithMetadata(array('test' => '2', 'segmentValue' => 'teeest')); - $this->addRowWithMetadata(array('test' => '3', 'segmentValue' => 'existing', 'segmentFilter' => 'city==mytest')); + $this->addRowWithMetadata(array('test' => '3', 'segmentValue' => 'existing', 'segment' => 'city==mytest')); $this->addRowWithMetadata(array('test' => '1', 'segmentValue' => 'test/test2.r')); $this->addRowWithMetadata(array('test' => '4')); } @@ -72,7 +72,7 @@ class AddSegmentFilterBySegmentValueTest extends UnitTestCase public function test_filter_shouldNotOverwriteAnExistingSegmentValue() { - $row = $this->addRowWithMetadata(array('segmentValue' => 'existing', 'segmentFilter' => 'city==mytest')); + $row = $this->addRowWithMetadata(array('segmentValue' => 'existing', 'segment' => 'city==mytest')); $this->table->filter($this->filter, array($this->report)); @@ -127,7 +127,7 @@ class AddSegmentFilterBySegmentValueTest extends UnitTestCase private function assertSegmentFilter($expected, Row $row) { - $segmentFilter = $row->getMetadata('segmentFilter'); + $segmentFilter = $row->getMetadata('segment'); $this->assertSame($expected, $segmentFilter); } diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php index 4762b967d0..1d9e3f919c 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php @@ -57,7 +57,7 @@ class AddSegmentFilterTest extends UnitTestCase $segmentStart = $segmentName . '=='; $this->table->filter($this->filter, array($segmentName)); - $segmentValues = $this->table->getRowsMetadata('segmentFilter'); + $segmentValues = $this->table->getRowsMetadata('segment'); $expected = array( $segmentStart . 'http%3A%2F%2Fpiwik.org%2Ftest', false, // empty label we do not generate for this currently @@ -77,7 +77,7 @@ class AddSegmentFilterTest extends UnitTestCase $this->table->filter($this->filter, array('mysegment')); - $this->assertFalse($summaryRow->getMetadata('segmentFilter')); + $this->assertFalse($summaryRow->getMetadata('segment')); } public function test_filter_IfTwoSegmentsAreGiven_ShouldOnlyGenerateAFilterForLabelsHavingThatManyExplodedParts() @@ -85,7 +85,7 @@ class AddSegmentFilterTest extends UnitTestCase // must result in 2 exploded parts for city and region $this->table->filter($this->filter, array(array('city', 'region'), $delimiter = ' ')); - $segmentValues = $this->table->getRowsMetadata('segmentFilter'); + $segmentValues = $this->table->getRowsMetadata('segment'); $expected = array( false, false, @@ -103,7 +103,7 @@ class AddSegmentFilterTest extends UnitTestCase // must result in 3 exploded parts city, region and country $this->table->filter($this->filter, array(array('city', 'region', 'country'), $delimiter = ' ')); - $segmentValues = $this->table->getRowsMetadata('segmentFilter'); + $segmentValues = $this->table->getRowsMetadata('segment'); $expected = array( false, false, @@ -121,7 +121,7 @@ class AddSegmentFilterTest extends UnitTestCase // must result in 3 exploded parts city, region and country $this->table->filter($this->filter, array(array('city', '', 'country'), $delimiter = ' ')); - $segmentValues = $this->table->getRowsMetadata('segmentFilter'); + $segmentValues = $this->table->getRowsMetadata('segment'); $expected = array( false, false, @@ -141,7 +141,7 @@ class AddSegmentFilterTest extends UnitTestCase $this->table->filter($this->filter, array(array('seg1', 'seg2'), $delimiter = ' ')); - $this->assertFalse($summaryRow->getMetadata('segmentFilter')); + $this->assertFalse($summaryRow->getMetadata('segment')); } } diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php index 2e3c6d98fa..5dc4035f6b 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php @@ -32,10 +32,10 @@ class PrependSegmentFilterTest extends UnitTestCase { $this->table = new DataTable(); $this->addRowWithMetadata(array('test' => '1')); - $this->addRowWithMetadata(array('test' => '2', 'segmentFilter' => 'country=NZ')); + $this->addRowWithMetadata(array('test' => '2', 'segment' => 'country=NZ')); $this->addRowWithMetadata(array('test' => '3')); - $this->addRowWithMetadata(array('test' => '1', 'segmentFilter' => 'country=AU')); - $this->addRowWithMetadata(array('test' => '4', 'segmentFilter' => '')); + $this->addRowWithMetadata(array('test' => '1', 'segment' => 'country=AU')); + $this->addRowWithMetadata(array('test' => '4', 'segment' => '')); } private function addRowWithMetadata($metadata) @@ -52,7 +52,7 @@ class PrependSegmentFilterTest extends UnitTestCase $prepend = 'city=test;'; $this->table->filter($this->filter, array($prepend)); - $metadata = $this->table->getRowsMetadata('segmentFilter'); + $metadata = $this->table->getRowsMetadata('segment'); $this->assertSame(array( false, $prepend . 'country=NZ', |