From 1645f11889eee54fe611974e561992accb5d690c Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 9 Dec 2014 23:52:05 +0100 Subject: [PATCH] fixed some tests --- ...ITest__Live.getLastVisitsDetails_range.xml | 70 +++++++-------- ...mEvents__Live.getLastVisitsDetails_day.xml | 20 ++--- ...vents__Live.getLastVisitsDetails_month.xml | 20 ++--- ...tLogs__Live.getLastVisitsDetails_range.xml | 80 +++++++++--------- ...itAsc__Live.getLastVisitsDetails_month.xml | 14 +-- ...Visit__Live.getLastVisitsDetails_month.xml | 14 +-- ...Count__Live.getLastVisitsDetails_month.xml | 14 +-- ...tDesc__Live.getLastVisitsDetails_month.xml | 14 +-- ...eTest__Live.getLastVisitsDetails_month.xml | 20 ++--- ...Support__Live.getLastVisitsDetails_day.xml | 4 +- ...ecified__Live.getLastVisitsDetails_day.xml | 4 +- ...eDays__Live.getLastVisitsDetails_month.xml | 6 +- ...nesTest__Live.getLastVisitsDetails_day.xml | 2 +- ...ortMetadata__API.getReportMetadata_day.xml | 16 ++-- ...vExport__Live.getLastVisitsDetails_day.csv | Bin 7376 -> 7376 bytes ...Ordered__Live.getLastVisitsDetails_day.xml | 4 +- ...thItems__Live.getLastVisitsDetails_day.xml | 6 +- ...tadataAndNormalAPI__Live.getLastVisits.xml | 6 +- ...alAPI__Live.getLastVisitsDetails_range.xml | 6 +- ...taAndNormalAPI__Live.getVisitorProfile.xml | 4 +- 20 files changed, 162 insertions(+), 162 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 14943c61f29..5f5b0e174d5 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -999,7 +999,6 @@ - 1024x768 flash, java @@ -1037,6 +1036,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1122,7 +1122,6 @@ - 1024x768 flash, java @@ -1160,6 +1159,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -1276,7 +1276,6 @@ - 1024x768 flash, java @@ -1314,6 +1313,7 @@ 12:34:06 12 10 + 1024x768 awesomeisp.com Awesomeisp http://www.awesomeisp.com/ @@ -1399,7 +1399,6 @@ - 1024x768 flash, java @@ -1437,6 +1436,7 @@ 12:34:06 12 11 + 1024x768 awesomeisp.com Awesomeisp http://www.awesomeisp.com/ @@ -1536,7 +1536,6 @@ - 1024x768 flash, java @@ -1574,6 +1573,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1673,7 +1673,6 @@ - 1024x768 flash, java @@ -1711,6 +1710,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1788,7 +1788,6 @@ - 1024x768 flash, java @@ -1826,6 +1825,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -1911,7 +1911,6 @@ - 1024x768 flash, java @@ -1949,6 +1948,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -2065,7 +2065,6 @@ - 1024x768 flash, java @@ -2103,6 +2102,7 @@ 12:34:06 12 10 + 1024x768 comcast.net Comcast http://www.comcast.net/ @@ -2219,7 +2219,6 @@ - 1024x768 flash, java @@ -2257,6 +2256,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2334,7 +2334,6 @@ - 1024x768 flash, java @@ -2372,6 +2371,7 @@ 12:34:06 12 11 + 1024x768 comcast.net Comcast http://www.comcast.net/ @@ -2457,7 +2457,6 @@ - 1024x768 flash, java @@ -2495,6 +2494,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -2594,7 +2594,6 @@ - 1024x768 flash, java @@ -2632,6 +2631,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2731,7 +2731,6 @@ - 1024x768 flash, java @@ -2769,6 +2768,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2868,7 +2868,6 @@ - 1024x768 flash, java @@ -2906,6 +2905,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2997,7 +2997,6 @@ - 1024x768 flash, java @@ -3035,6 +3034,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -3120,7 +3120,6 @@ - 1024x768 flash, java @@ -3158,6 +3157,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3243,7 +3243,6 @@ - 1024x768 flash, java @@ -3281,6 +3280,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3366,7 +3366,6 @@ - 1024x768 flash, java @@ -3404,6 +3403,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3489,7 +3489,6 @@ - 1024x768 flash, java @@ -3527,6 +3526,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3643,7 +3643,6 @@ - 1024x768 flash, java @@ -3681,6 +3680,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -3797,7 +3797,6 @@ - 1024x768 flash, java @@ -3835,6 +3834,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -3951,7 +3951,6 @@ - 1024x768 flash, java @@ -3989,6 +3988,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -4097,7 +4097,6 @@ - 1024x768 flash, java @@ -4135,6 +4134,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -4220,7 +4220,6 @@ - 1024x768 flash, java @@ -4258,6 +4257,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -4343,7 +4343,6 @@ - 1024x768 flash, java @@ -4381,6 +4380,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -4466,7 +4466,6 @@ - 1024x768 flash, java @@ -4504,6 +4503,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -4589,7 +4589,6 @@ - 1024x768 flash, java @@ -4627,6 +4626,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index afa050d312e..52df0964ab3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -68,6 +68,7 @@ + 1024x768 Europe eur France @@ -79,7 +80,6 @@ France - 1024x768 flash, java @@ -168,6 +168,7 @@ + 1024x768 Europe eur France @@ -179,7 +180,6 @@ France - 1024x768 flash, java @@ -336,6 +336,7 @@ + 1024x768 Europe eur France @@ -347,7 +348,6 @@ France - 1024x768 flash, java @@ -436,6 +436,7 @@ + 1024x768 Europe eur France @@ -447,7 +448,6 @@ France - 1024x768 flash, java @@ -771,6 +771,7 @@ + 1024x768 Europe eur France @@ -782,7 +783,6 @@ France - 1024x768 flash, java @@ -871,6 +871,7 @@ + 1024x768 Europe eur France @@ -882,7 +883,6 @@ France - 1024x768 director @@ -967,6 +967,7 @@ + 1024x768 Europe eur France @@ -978,7 +979,6 @@ France - 1024x768 director @@ -1131,6 +1131,7 @@ + 1024x768 Europe eur France @@ -1142,7 +1143,6 @@ France - 1024x768 director @@ -1227,6 +1227,7 @@ + 1024x768 Europe eur France @@ -1238,7 +1239,6 @@ France - 1024x768 director @@ -1558,6 +1558,7 @@ + 1024x768 Europe eur France @@ -1569,7 +1570,6 @@ France - 1024x768 director diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index afa050d312e..52df0964ab3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -68,6 +68,7 @@ + 1024x768 Europe eur France @@ -79,7 +80,6 @@ France - 1024x768 flash, java @@ -168,6 +168,7 @@ + 1024x768 Europe eur France @@ -179,7 +180,6 @@ France - 1024x768 flash, java @@ -336,6 +336,7 @@ + 1024x768 Europe eur France @@ -347,7 +348,6 @@ France - 1024x768 flash, java @@ -436,6 +436,7 @@ + 1024x768 Europe eur France @@ -447,7 +448,6 @@ France - 1024x768 flash, java @@ -771,6 +771,7 @@ + 1024x768 Europe eur France @@ -782,7 +783,6 @@ France - 1024x768 flash, java @@ -871,6 +871,7 @@ + 1024x768 Europe eur France @@ -882,7 +883,6 @@ France - 1024x768 director @@ -967,6 +967,7 @@ + 1024x768 Europe eur France @@ -978,7 +979,6 @@ France - 1024x768 director @@ -1131,6 +1131,7 @@ + 1024x768 Europe eur France @@ -1142,7 +1143,6 @@ France - 1024x768 director @@ -1227,6 +1227,7 @@ + 1024x768 Europe eur France @@ -1238,7 +1239,6 @@ France - 1024x768 director @@ -1558,6 +1558,7 @@ + 1024x768 Europe eur France @@ -1569,7 +1570,6 @@ France - 1024x768 director diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 5009922ea1a..1b6f100c5e0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -84,6 +84,7 @@ http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/ + 1366x768 North America amn United States @@ -95,7 +96,6 @@ Raleigh, North Carolina, United States 35.771999 -78.639000 - 1366x768 pdf, flash, java @@ -220,6 +220,7 @@ http://piwik.org/what-is-piwik/ + 1536x864 North America amn United States @@ -231,7 +232,6 @@ Lake Forest, California, United States 33.645000 -117.679001 - 1536x864 17:33:27 @@ -331,6 +331,7 @@ http://demo.piwik.org/index.php?module=MultiSites&action=index&date=yesterday&period=day&idSite=32 + 1920x1200 Europe eur Germany @@ -342,7 +343,6 @@ Germany 51 9 - 1920x1200 pdf, flash, java, quicktime, silverlight @@ -475,6 +475,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 2880x1800 North America amn United States @@ -486,7 +487,6 @@ United States 38 -97 - 2880x1800 pdf, flash, java, quicktime @@ -588,6 +588,7 @@ http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw + 1920x1080 Europe eur Belgium @@ -599,7 +600,6 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - 1920x1080 pdf, flash, java, silverlight @@ -712,6 +712,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1360x768 North America amn United States @@ -723,7 +724,6 @@ San Francisco, California, United States 37.792000 -122.408997 - 1360x768 pdf, flash, java, quicktime, windowsmedia, silverlight @@ -843,6 +843,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 2560x1440 Asia asi Japan @@ -854,7 +855,6 @@ Nihon'odori, Kanagawa, Japan 35.450001 139.649994 - 2560x1440 pdf, java, quicktime @@ -963,6 +963,7 @@ http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today + 360x640 Europe eur Germany @@ -974,7 +975,6 @@ Weilerswist, Nordrhein-Westfalen, Germany 50.766998 6.833000 - 360x640 flash @@ -1075,6 +1075,7 @@ http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html + 2560x1440 Europe eur Germany @@ -1086,7 +1087,6 @@ Mainz, Rheinland-Pfalz, Germany 50 8.271000 - 2560x1440 pdf, flash, java, quicktime, windowsmedia, silverlight @@ -1242,6 +1242,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1920x1080 Europe eur Russian Federation @@ -1253,7 +1254,6 @@ Moscow, Moscow City, Russian Federation 55.751999 37.616001 - 1920x1080 flash, java @@ -1358,6 +1358,7 @@ http://piwik.org/docs/installation/ + 1366x768 Europe eur Turkey @@ -1369,7 +1370,6 @@ Esentepe, Rize, Turkey 40.979000 40.415001 - 1366x768 pdf, flash, java, silverlight @@ -1482,6 +1482,7 @@ http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw + 1920x1080 Europe eur Belgium @@ -1493,7 +1494,6 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - 1920x1080 pdf, flash, java, silverlight @@ -1764,6 +1764,7 @@ + unknown Asia asi Japan @@ -1775,7 +1776,6 @@ Japan 36 138 - unknown 08:10:38 @@ -1878,6 +1878,7 @@ http://piwik.org/contribute% + 1024x768 Unknown unk Unknown @@ -1889,7 +1890,6 @@ Unknown - 1024x768 flash, java @@ -1993,6 +1993,7 @@ http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971 + 1280x800 Unknown unk Unknown @@ -2004,7 +2005,6 @@ Unknown - 1280x800 pdf, flash, java, director, windowsmedia, gears @@ -2124,6 +2124,7 @@ + unknown Asia asi Japan @@ -2135,7 +2136,6 @@ Japan 36 138 - unknown 20:15:41 @@ -2247,6 +2247,7 @@ + unknown Asia asi Japan @@ -2258,7 +2259,6 @@ Japan 36 138 - unknown 19:12:40 @@ -2377,6 +2377,7 @@ + unknown Asia asi Japan @@ -2388,7 +2389,6 @@ Japan 36 138 - unknown 18:10:38 @@ -2483,6 +2483,7 @@ + unknown North America amn United States @@ -2494,7 +2495,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 17:48:08 @@ -2589,6 +2589,7 @@ + unknown North America amn United States @@ -2600,7 +2601,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 17:48:07 @@ -2685,6 +2685,7 @@ + unknown Oceania oce Australia @@ -2696,7 +2697,6 @@ Australia -27 133 - unknown 17:46:03 @@ -2791,6 +2791,7 @@ + unknown Asia asi Japan @@ -2802,7 +2803,6 @@ Japan 36 138 - unknown 16:11:30 @@ -2897,6 +2897,7 @@ + unknown Asia asi Japan @@ -2908,7 +2909,6 @@ Japan 36 138 - unknown 16:10:38 @@ -2999,6 +2999,7 @@ + unknown Unknown unk Unknown @@ -3010,7 +3011,6 @@ Unknown - unknown 15:31:05 @@ -3101,6 +3101,7 @@ + unknown Unknown unk Unknown @@ -3112,7 +3113,6 @@ Unknown - unknown 13:49:46 @@ -3203,6 +3203,7 @@ + unknown South America ams Brazil @@ -3214,7 +3215,6 @@ Brazil -10 -55 - unknown 20:22:08 @@ -3305,6 +3305,7 @@ + unknown South America ams Brazil @@ -3316,7 +3317,6 @@ Brazil -10 -55 - unknown 20:21:28 @@ -3407,6 +3407,7 @@ + unknown South America ams Brazil @@ -3418,7 +3419,6 @@ Brazil -10 -55 - unknown 20:21:03 @@ -3509,6 +3509,7 @@ + unknown Asia asi Japan @@ -3520,7 +3521,6 @@ Japan 36 138 - unknown 20:01:17 @@ -3611,6 +3611,7 @@ + unknown Asia asi Japan @@ -3622,7 +3623,6 @@ Japan 36 138 - unknown 19:59:50 @@ -3713,6 +3713,7 @@ + unknown Unknown unk Unknown @@ -3724,7 +3725,6 @@ Unknown - unknown 18:03:40 @@ -3815,6 +3815,7 @@ + unknown Unknown unk Unknown @@ -3826,7 +3827,6 @@ Unknown - unknown 21:00:42 @@ -3917,6 +3917,7 @@ + unknown Unknown unk Unknown @@ -3928,7 +3929,6 @@ Unknown - unknown 20:56:45 @@ -4019,6 +4019,7 @@ + unknown North America amn United States @@ -4030,7 +4031,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 13:49:48 @@ -4121,6 +4121,7 @@ + unknown North America amn United States @@ -4132,7 +4133,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 13:48:20 @@ -4223,6 +4223,7 @@ + unknown North America amn United States @@ -4234,7 +4235,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 13:48:07 @@ -4325,6 +4325,7 @@ + unknown Asia asi Japan @@ -4336,7 +4337,6 @@ Japan 36 138 - unknown 08:12:03 @@ -4427,6 +4427,7 @@ + unknown Asia asi Japan @@ -4438,7 +4439,6 @@ Japan 36 138 - unknown 08:11:56 @@ -4529,6 +4529,7 @@ + unknown Asia asi Japan @@ -4540,7 +4541,6 @@ Japan 36 138 - unknown 08:11:30 @@ -4631,6 +4631,7 @@ + unknown Asia asi Japan @@ -4642,7 +4643,6 @@ Japan 36 138 - unknown 08:10:38 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 84b93135bd6..4af83361f6c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -66,7 +66,6 @@ - 1024x768 flash, java @@ -102,6 +101,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -218,7 +218,6 @@ - 1024x768 flash, java @@ -254,6 +253,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -339,7 +339,6 @@ - 1024x768 flash, java @@ -375,6 +374,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -491,7 +491,6 @@ - 1024x768 flash, java @@ -527,6 +526,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -612,7 +612,6 @@ - 1024x768 flash, java @@ -648,6 +647,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -764,7 +764,6 @@ - 1024x768 flash, java @@ -800,6 +799,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -877,7 +877,6 @@ - 1024x768 flash, java @@ -913,6 +912,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 10c86992caa..18a864dbcdd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 29273fa92bd..bf87d092566 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -97,7 +97,6 @@ - 1024x768 flash, java @@ -135,6 +134,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -220,7 +220,6 @@ - 1024x768 flash, java @@ -258,6 +257,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -374,7 +374,6 @@ - 1024x768 flash, java @@ -412,6 +411,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -511,7 +511,6 @@ - 1024x768 flash, java @@ -549,6 +548,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -634,7 +634,6 @@ - 1024x768 flash, java @@ -672,6 +671,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -757,7 +757,6 @@ - 1024x768 flash, java @@ -795,6 +794,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -870,7 +870,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -908,6 +907,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 10c86992caa..18a864dbcdd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 85ba4fcaa9e..855cc097558 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -999,7 +999,6 @@ - 1024x768 flash, java @@ -1037,6 +1036,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1122,7 +1122,6 @@ - 1024x768 flash, java @@ -1160,6 +1159,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -1276,7 +1276,6 @@ - 1024x768 flash, java @@ -1314,6 +1313,7 @@ 12:34:06 12 10 + 1024x768 awesomeisp.com Awesomeisp http://www.awesomeisp.com/ diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 32e79a2c86c..664c8bf45f9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -74,6 +74,7 @@ http://search.yahoo.com/search?p=purchase http://search.yahoo.com plugins/Referrers/images/searchEngines/search.yahoo.com.png + 1024x768 Europe eur France @@ -85,7 +86,6 @@ France - 1024x768 flash, java @@ -260,6 +260,7 @@ http://referrer.com/page.htm?param=valuewith some spaces + 1024x768 Europe eur France @@ -271,7 +272,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index cff7c54d200..4baa370d704 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -63,6 +63,7 @@ http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1024x768 Europe eur France @@ -74,7 +75,6 @@ France - 1024x768 flash, java @@ -168,6 +168,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1024x768 Europe eur France @@ -179,7 +180,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 3847bac724a..3953a817fba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -68,6 +68,7 @@ + unknown Unknown unk Unknown @@ -79,7 +80,6 @@ Unknown - unknown 10:00:00 @@ -159,6 +159,7 @@ + unknown Unknown unk Unknown @@ -170,7 +171,6 @@ Unknown - unknown 11:00:00 @@ -250,6 +250,7 @@ + unknown Unknown unk Unknown @@ -261,7 +262,6 @@ Unknown - unknown 12:00:00 diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index e4e40d6f848..d37012289bc 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -63,6 +63,7 @@ + 1024x768 Europe eur France @@ -74,7 +75,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 90ebe565a75..525999bee14 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -192,7 +192,7 @@ Visitor Settings Screen Resolution - UserSettings + Resolution getResolution Resolution @@ -213,9 +213,9 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04 - UserSettings_getResolution + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04 + Resolution_getResolution Visitor Settings @@ -240,7 +240,7 @@ Visitor Settings Visitor Configuration - UserSettings + Resolution getConfiguration Configuration This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution. @@ -262,9 +262,9 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04 - UserSettings_getConfiguration + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04 + Resolution_getConfiguration Visitor Settings diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index 74c05412efe173753065c333ec7aa19d9ecffe03..172e23b93df07e039866042b9c715f3ec0070931 100644 GIT binary patch delta 105 zcmca$dBJkSF1E=N*u^IAV!O6^8T%1denSQbtY9z#!O7mjQ#XGS=3(3{#c#rbLpBPR NHWtRsU!?9Z0suhQ9F+h7 delta 125 zcmca$dBJkSF1E=}*n}oOVml&S#E{BR%#hEJ!%)gl!jK7M diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 5f2a28ce3e5..6cdb55181ca 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -101,6 +101,7 @@ + 1024x768 Europe eur Poland @@ -112,7 +113,6 @@ Poland - 1024x768 flash, java @@ -310,6 +310,7 @@ + 1024x768 Europe eur Poland @@ -321,7 +322,6 @@ Poland - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index d7897e50e1e..57a190c4a20 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -177,6 +177,7 @@ + 1024x768 Europe eur Poland @@ -188,7 +189,6 @@ Poland - 1024x768 flash, java @@ -505,6 +505,7 @@ + 1024x768 Europe eur Poland @@ -516,7 +517,6 @@ Poland - 1024x768 flash, java @@ -719,6 +719,7 @@ + 1024x768 Europe eur France @@ -730,7 +731,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index cecf0df2493..d1d3cb310d6 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -71,6 +71,7 @@ + 1111x222 Europe eur France @@ -82,7 +83,6 @@ France - 1111x222 flash, java @@ -184,6 +184,7 @@ + 1111x222 Europe eur France @@ -195,7 +196,6 @@ France - 1111x222 flash, java @@ -357,6 +357,7 @@ http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1111x222 Europe eur France @@ -368,7 +369,6 @@ France - 1111x222 flash, java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index cecf0df2493..d1d3cb310d6 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -71,6 +71,7 @@ + 1111x222 Europe eur France @@ -82,7 +83,6 @@ France - 1111x222 flash, java @@ -184,6 +184,7 @@ + 1111x222 Europe eur France @@ -195,7 +196,6 @@ France - 1111x222 flash, java @@ -357,6 +357,7 @@ http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1111x222 Europe eur France @@ -368,7 +369,6 @@ France - 1111x222 flash, java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 64217e52508..76c9807789f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -117,6 +117,7 @@ + 1111x222 Europe eur France @@ -128,7 +129,6 @@ France - 1111x222 flash, java @@ -231,6 +231,7 @@ + 1111x222 Europe eur France @@ -242,7 +243,6 @@ France - 1111x222 flash, java