From 7c7f6da66d2bb9dde9eacb057638ee942e40acb9 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Wed, 5 Sep 2018 01:56:29 +0200 Subject: Stable sort for most frequent segment values (#13286) * Use a stable sort when sorting most frequent segment values * update test files --- plugins/API/API.php | 24 ++++++++++++++++++---- ...actionUrl__API.getSuggestedValuesForSegment.xml | 20 +++++++++--------- ...owserCode__API.getSuggestedValuesForSegment.xml | 4 ++-- ...erVersion__API.getSuggestedValuesForSegment.xml | 8 ++++---- ...Test_city__API.getSuggestedValuesForSegment.xml | 6 +++--- ...untryCode__API.getSuggestedValuesForSegment.xml | 4 ++-- ...ePageName__API.getSuggestedValuesForSegment.xml | 2 +- ...ageValue2__API.getSuggestedValuesForSegment.xml | 6 +++--- ...ageValue5__API.getSuggestedValuesForSegment.xml | 6 +++--- ...PageValue__API.getSuggestedValuesForSegment.xml | 16 +++++++-------- ...bleValue1__API.getSuggestedValuesForSegment.xml | 6 +++--- ...stomVariableValue1__VisitsSummary.get_range.xml | 6 +++--- ...bleValue5__API.getSuggestedValuesForSegment.xml | 6 +++--- ...stomVariableValue5__VisitsSummary.get_range.xml | 6 +++--- ...ableValue__API.getSuggestedValuesForSegment.xml | 16 +++++++-------- ...ustomVariableValue__VisitsSummary.get_range.xml | 6 +++--- ...viceBrand__API.getSuggestedValuesForSegment.xml | 6 +++--- ...viceModel__API.getSuggestedValuesForSegment.xml | 2 +- ...wnloadUrl__API.getSuggestedValuesForSegment.xml | 6 +++--- ...PITest_downloadUrl__VisitsSummary.get_range.xml | 6 +++--- ...entAction__API.getSuggestedValuesForSegment.xml | 6 +++--- ...PITest_eventAction__VisitsSummary.get_range.xml | 6 +++--- ...tCategory__API.getSuggestedValuesForSegment.xml | 6 +++--- ...Test_eventCategory__VisitsSummary.get_range.xml | 6 +++--- ...eventName__API.getSuggestedValuesForSegment.xml | 6 +++--- ...tAPITest_eventName__VisitsSummary.get_range.xml | 6 +++--- ...ventValue__API.getSuggestedValuesForSegment.xml | 6 +++--- ..._latitude__API.getSuggestedValuesForSegment.xml | 6 +++--- ...longitude__API.getSuggestedValuesForSegment.xml | 4 ++-- ...ystemCode__API.getSuggestedValuesForSegment.xml | 2 +- ...emVersion__API.getSuggestedValuesForSegment.xml | 8 ++++---- ...utlinkUrl__API.getSuggestedValuesForSegment.xml | 6 +++--- ...APITest_outlinkUrl__VisitsSummary.get_range.xml | 6 +++--- ...egionCode__API.getSuggestedValuesForSegment.xml | 8 ++++---- ...APITest_regionCode__VisitsSummary.get_range.xml | 4 ++-- ...t_visitIp__API.getSuggestedValuesForSegment.xml | 22 ++++++++++---------- ...visitorId__API.getSuggestedValuesForSegment.xml | 24 +++++++++++----------- ...tAPITest_visitorId__VisitsSummary.get_range.xml | 6 +++--- 38 files changed, 158 insertions(+), 142 deletions(-) (limited to 'plugins/API') diff --git a/plugins/API/API.php b/plugins/API/API.php index 83bdc04623..fa913d887f 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -693,7 +693,7 @@ class API extends \Piwik\Plugin\API /** * @param $values - * @param $value + * * @return array */ private function getMostFrequentValues($values) @@ -710,9 +710,25 @@ class API extends \Piwik\Plugin\API // we have a list of all values. let's show the most frequently used first. $values = array_count_values($values); - arsort($values); - $values = array_keys($values); - return $values; + // Sort this list by converting and sorting the array with custom method, so the result doesn't differ between PHP versions + $sortArray = []; + + foreach ($values as $value => $count) { + $sortArray[] = [ + 'value' => $value, + 'count' => $count + ]; + } + + usort($sortArray, function($a, $b) { + if ($a['count'] == $b['count']) { + return strcmp($a['value'], $b['value']); + } + + return $a['count'] > $b['count'] ? -1 : 1; + }); + + return array_column($sortArray, 'value'); } private function doesSuggestedValuesCallbackNeedData($suggestedValuesCallback) diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml index 2aaf85d5c1..57bba2b33a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml @@ -2,22 +2,22 @@ http://piwik.net/space/quest/iv http://piwik.net/grue/lair - http://example.org/path/file1.zip - http://example.org/path/file0.zip - http://example-outlink.org/1.html http://example-outlink.org/0.html - http://example-outlink.org/3.html - http://example.org/path/file3.zip + http://example-outlink.org/1.html + http://example.org/path/file0.zip + http://example.org/path/file1.zip http://example-outlink.org/2.html + http://example-outlink.org/3.html http://example.org/path/file2.zip + http://example.org/path/file3.zip + http://example-outlink.org/4.html + http://example-outlink.org/5.html + http://example-outlink.org/6.html http://example-outlink.org/7.html http://example-outlink.org/8.html http://example.org/path/file4.zip - http://example-outlink.org/6.html + http://example.org/path/file5.zip http://example.org/path/file6.zip - http://example-outlink.org/4.html - http://example-outlink.org/5.html - http://example.org/path/file8.zip http://example.org/path/file7.zip - http://example.org/path/file5.zip + http://example.org/path/file8.zip \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml index 43031de55b..f40c864e4f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml @@ -3,8 +3,8 @@ FF CH IE - QQ - CM AN + CM + QQ SF \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml index 91740cd18d..e5183cb661 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml @@ -1,11 +1,11 @@ 3.6 + 11 + 3 32 - 5 33 - 8 34 - 11 - 3 + 5 + 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml index c5a7afa2b4..3eb5552994 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml @@ -3,9 +3,9 @@ Stratford-upon-Avon Vancouver Besançon - Nuneaton and Bedworth - London - Lhasa Hluboká nad Vltavou + Lhasa + London + Nuneaton and Bedworth not a city \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml index 57ad401634..e820badd0e 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml @@ -4,10 +4,10 @@ ca ru us - it + cn fr id - cn + it mk xx \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml index 77fa6e91a9..c26e714a25 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml @@ -1,6 +1,6 @@ - Cvar 5 PAGE name Cvar 2 PAGE name + Cvar 5 PAGE name Search Category \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml index 18b4e9b372..79849260d4 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Cvar2 PAGE value is 1 Cvar2 PAGE value is 0 + Cvar2 PAGE value is 1 Cvar2 PAGE value is 2 Cvar2 PAGE value is 3 Cvar2 PAGE value is 4 - Cvar2 PAGE value is 7 - Cvar2 PAGE value is 6 Cvar2 PAGE value is 5 + Cvar2 PAGE value is 6 + Cvar2 PAGE value is 7 Cvar2 PAGE value is 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml index 0425837789..9ce36b0f97 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Cvar5 PAGE value is 1 Cvar5 PAGE value is 0 + Cvar5 PAGE value is 1 Cvar5 PAGE value is 2 Cvar5 PAGE value is 3 Cvar5 PAGE value is 4 - Cvar5 PAGE value is 7 - Cvar5 PAGE value is 6 Cvar5 PAGE value is 5 + Cvar5 PAGE value is 6 + Cvar5 PAGE value is 7 Cvar5 PAGE value is 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml index 0ab1e3a74c..e20cde6740 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml @@ -1,22 +1,22 @@ CAT + Cvar2 PAGE value is 0 + Cvar2 PAGE value is 1 Cvar5 PAGE value is 0 Cvar5 PAGE value is 1 - Cvar2 PAGE value is 1 - Cvar2 PAGE value is 0 + Cvar2 PAGE value is 2 Cvar2 PAGE value is 3 Cvar5 PAGE value is 2 Cvar5 PAGE value is 3 - Cvar2 PAGE value is 2 - Cvar2 PAGE value is 5 Cvar2 PAGE value is 4 + Cvar2 PAGE value is 5 Cvar2 PAGE value is 6 - Cvar5 PAGE value is 8 + Cvar2 PAGE value is 7 + Cvar2 PAGE value is 8 + Cvar5 PAGE value is 4 Cvar5 PAGE value is 5 Cvar5 PAGE value is 6 - Cvar5 PAGE value is 4 Cvar5 PAGE value is 7 - Cvar2 PAGE value is 8 - Cvar2 PAGE value is 7 + Cvar5 PAGE value is 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml index b157cb068a..641de91df2 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Cvar1 value is 1 Cvar1 value is 0 + Cvar1 value is 1 Cvar1 value is 2 Cvar1 value is 3 Cvar1 value is 4 - Cvar1 value is 7 - Cvar1 value is 6 Cvar1 value is 5 + Cvar1 value is 6 + Cvar1 value is 7 Cvar1 value is 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml index 2748f63834..f3e5435061 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 7 - 16 + 19 7 4 4863 - 4 + 5 57% - 2.3 + 2.7 695 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml index 40b2b0992a..4ad457f263 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Cvar5 value is 1 Cvar5 value is 0 + Cvar5 value is 1 Cvar5 value is 2 Cvar5 value is 3 Cvar5 value is 4 - Cvar5 value is 7 - Cvar5 value is 6 Cvar5 value is 5 + Cvar5 value is 6 + Cvar5 value is 7 Cvar5 value is 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml index 2748f63834..f3e5435061 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 7 - 16 + 19 7 4 4863 - 4 + 5 57% - 2.3 + 2.7 695 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml index 6be328a177..bf4f5c750d 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml @@ -1,21 +1,21 @@ - Cvar1 value is 1 Cvar1 value is 0 - Cvar5 value is 1 + Cvar1 value is 1 Cvar5 value is 0 - Cvar1 value is 3 + Cvar5 value is 1 Cvar1 value is 2 + Cvar1 value is 3 Cvar5 value is 2 Cvar5 value is 3 Cvar1 value is 4 - Cvar5 value is 7 Cvar1 value is 5 - Cvar5 value is 6 + Cvar1 value is 6 Cvar1 value is 7 - Cvar5 value is 5 - Cvar5 value is 8 Cvar1 value is 8 Cvar5 value is 4 - Cvar1 value is 6 + Cvar5 value is 5 + Cvar5 value is 6 + Cvar5 value is 7 + Cvar5 value is 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml index 2748f63834..f3e5435061 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 7 - 16 + 19 7 4 4863 - 4 + 5 57% - 2.3 + 2.7 695 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml index 6929bcb5c1..981ff8e068 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml @@ -1,9 +1,9 @@ Unknown - Samsung - Google Dell - Sony + Google HTC + Samsung + Sony \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml index f2fa6fe257..3e7a99414c 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml @@ -1,8 +1,8 @@ Generic Desktop + Desire GALAXY Note 3 Nexus 4 - Desire Xperia Tablet S \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml index b30da2f6c7..6a41edacad 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - http://example.org/path/file1.zip http://example.org/path/file0.zip + http://example.org/path/file1.zip http://example.org/path/file2.zip http://example.org/path/file3.zip http://example.org/path/file4.zip - http://example.org/path/file7.zip - http://example.org/path/file6.zip http://example.org/path/file5.zip + http://example.org/path/file6.zip + http://example.org/path/file7.zip http://example.org/path/file8.zip \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml index f83f0d8a40..678b7ca235 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 4 - 16 + 20 4 0 6484 - 4 + 5 0% - 4 + 5 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml index df2f6b2dac..54a85499a5 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Action1 Action0 + Action1 Action2 Action3 Action4 - Action7 - Action6 Action5 + Action6 + Action7 Action8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml index f83f0d8a40..678b7ca235 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 4 - 16 + 20 4 0 6484 - 4 + 5 0% - 4 + 5 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml index 952a834c1a..63e871d30b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Cat1 Cat0 + Cat1 Cat2 Cat3 Cat4 - Cat7 - Cat6 Cat5 + Cat6 + Cat7 Cat8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml index f83f0d8a40..678b7ca235 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 4 - 16 + 20 4 0 6484 - 4 + 5 0% - 4 + 5 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml index fa8c853fcf..d3167c7537 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - Name1 Name0 + Name1 Name2 Name3 Name4 - Name7 - Name6 Name5 + Name6 + Name7 Name8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml index f83f0d8a40..678b7ca235 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 4 - 16 + 20 4 0 6484 - 4 + 5 0% - 4 + 5 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml index 90d8127471..dd0c19e6ec 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - 346.678 345.678 + 346.678 347.678 348.678 349.678 - 352.678 - 351.678 350.678 + 351.678 + 352.678 353.678 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml index 8cc367528e..2d7b659de6 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml @@ -2,9 +2,9 @@ 49.25 123.456 - 47.249 - 38 - 29.65 124.456 + 29.65 + 38 + 47.249 1 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml index 43e5a510a3..dc47a6cecd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml @@ -1,10 +1,10 @@ -123.133 + -97 21.321 + 22.231 6.018 - -97 91.1 - 22.231 2 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml index c79c69b966..0077b052d6 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml @@ -2,6 +2,6 @@ WIN AND - UBT MLD + UBT \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml index 4d86f11bfd..2e7171bf58 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ XP + 4.1 + 4.3 4.4 + 7 + 8 8.1 - 4.3 9.04 Vista - 4.1 - 7 - 8 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml index 4c58bd37df..5eb4584591 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - http://example-outlink.org/1.html http://example-outlink.org/0.html + http://example-outlink.org/1.html http://example-outlink.org/2.html http://example-outlink.org/3.html http://example-outlink.org/4.html - http://example-outlink.org/7.html - http://example-outlink.org/6.html http://example-outlink.org/5.html + http://example-outlink.org/6.html + http://example-outlink.org/7.html http://example-outlink.org/8.html \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml index f83f0d8a40..678b7ca235 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 4 - 16 + 20 4 0 6484 - 4 + 5 0% - 4 + 5 1621 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml index 3687cc46dc..9a69fa129e 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml @@ -1,12 +1,12 @@ - WAR BC + WAR SPE - BFC - XZ - LND 18 + BFC KEN + LND + XZ CA \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml index ca32407536..789c2c6fd1 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 6 - 17 + 16 6 3 4863 5 50% - 2.8 + 2.7 811 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml index e969ca3cc5..aeab59dbdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml @@ -1,20 +1,20 @@ 194.57.91.215 - ::ffff:137.82.130.49 - 1.2.4.1 - 137.82.0.0 - 103.29.196.229 - 151.100.101.92 - 137.82.130.0 1.2.4.0 - 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df + 1.2.4.1 1.2.4.2 - 1.2.4.7 - 1.2.4.8 - 1.2.4.6 - 1.2.4.5 1.2.4.3 1.2.4.4 + 1.2.4.5 + 1.2.4.6 + 1.2.4.7 + 1.2.4.8 + 103.29.196.229 113.62.1.1 + 137.82.0.0 + 137.82.130.0 + 151.100.101.92 + 2003:f6:93bf:26f:9ec7:a6ff:fe29:27df + ::ffff:137.82.130.49 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml index e21f421867..8f2deb63ee 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml @@ -1,21 +1,21 @@ - 908c9a564a864265 - d0fb963ff976f9c3 - b8c37e33defde51c - ffc58105bf6f8a91 - a9b7ba70783b617e - 1bd69c7df3112fb9 - e93028bdc1aacdfb 08f90c1a41715536 - d806ca13ca3449af - fba9d88164f3e2d9 - 9246444d94f081e3 - d7322ed717dedf1e 1587965fb4d4b5af + 1bd69c7df3112fb9 2387337ba1e0b024 - fed33392d3a48aa1 + 908c9a564a864265 + 9246444d94f081e3 a4380923dd651c19 + a9b7ba70783b617e aa68c75c4a77c87f + b8c37e33defde51c + d0fb963ff976f9c3 + d7322ed717dedf1e + d806ca13ca3449af + e93028bdc1aacdfb + fba9d88164f3e2d9 + fed33392d3a48aa1 + ffc58105bf6f8a91 e64bc481700c5d69 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml index 1f4bd3c02b..0e04d3f6d9 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ 2 - 5 + 6 2 1 1621 - 4 + 5 50% - 2.5 + 3 811 \ No newline at end of file -- cgit v1.2.3