diff options
| author | sgiehl <stefan@piwik.org> | 2014-11-28 17:06:51 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-11-28 17:06:51 +0300 |
| commit | 8a25a5f180586a932ca8c7985adad1c5312551f0 (patch) | |
| tree | cccccdf3dcca3ada23b9c71fd01a80feafc552fa /tests/PHPUnit | |
| parent | b00a6254df1f769441c53d7f53be55844fb0f1c9 (diff) | |
removed screen type report and widget
Diffstat (limited to 'tests/PHPUnit')
40 files changed, 0 insertions, 899 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 0ef089e70c..6140bf8214 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -84,10 +84,8 @@ <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -180,10 +178,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -276,10 +272,8 @@ <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -372,10 +366,8 @@ <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -468,10 +460,8 @@ <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -564,10 +554,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -660,10 +648,8 @@ <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -756,10 +742,8 @@ <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> - <screenType>unknown</screenType> <deviceType>Smartphone</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -852,10 +836,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 7bc0f5a098..896b4d503f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -193,10 +193,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -307,10 +305,8 @@ <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -416,10 +412,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -539,10 +533,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -651,10 +643,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -751,10 +741,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -857,10 +845,8 @@ <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -947,10 +933,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -1053,10 +1037,8 @@ <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> - <screenType>unknown</screenType> <deviceType>Smartphone</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -1153,10 +1135,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> 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 58c15349b3..8e3799fa9e 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1013,9 +999,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1138,9 +1122,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1294,9 +1276,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1419,9 +1399,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1558,9 +1536,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1697,9 +1673,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1814,9 +1788,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1939,9 +1911,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2095,9 +2065,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2251,9 +2219,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2368,9 +2334,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2493,9 +2457,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2632,9 +2594,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2771,9 +2731,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2910,9 +2868,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3041,9 +2997,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3166,9 +3120,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3291,9 +3243,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3416,9 +3366,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3541,9 +3489,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3697,9 +3643,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3853,9 +3797,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4009,9 +3951,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4157,9 +4097,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4282,9 +4220,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4407,9 +4343,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4532,9 +4466,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4657,9 +4589,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 cabb71c501..a45e6b00b5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -79,9 +79,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -181,9 +179,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -351,9 +347,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -453,9 +447,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -790,9 +782,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -892,9 +882,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -990,9 +978,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1156,9 +1142,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1254,9 +1238,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1587,9 +1569,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 cabb71c501..a45e6b00b5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -79,9 +79,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -181,9 +179,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -351,9 +347,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -453,9 +447,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -790,9 +782,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -892,9 +882,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -990,9 +978,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1156,9 +1142,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1254,9 +1238,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1587,9 +1569,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 23cef7562d..93c0819d6c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -95,9 +95,7 @@ <location>Raleigh, North Carolina, United States</location> <latitude>35.771999</latitude> <longitude>-78.639000</longitude> - <screenType>wide</screenType> <resolution>1366x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> @@ -233,9 +231,7 @@ <location>Lake Forest, California, United States</location> <latitude>33.645000</latitude> <longitude>-117.679001</longitude> - <screenType>wide</screenType> <resolution>1536x864</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:33:27</visitLocalTime> @@ -346,9 +342,7 @@ <location>Germany</location> <latitude>51</latitude> <longitude>9</longitude> - <screenType>wide</screenType> <resolution>1920x1200</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> @@ -492,9 +486,7 @@ <location>United States</location> <latitude>38</latitude> <longitude>-97</longitude> - <screenType>wide</screenType> <resolution>2880x1800</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> @@ -607,9 +599,7 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <screenType>wide</screenType> <resolution>1920x1080</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -733,9 +723,7 @@ <location>San Francisco, California, United States</location> <latitude>37.792000</latitude> <longitude>-122.408997</longitude> - <screenType>wide</screenType> <resolution>1360x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> @@ -866,9 +854,7 @@ <location>Nihon'odori, Kanagawa, Japan</location> <latitude>35.450001</latitude> <longitude>139.649994</longitude> - <screenType>wide</screenType> <resolution>2560x1440</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> @@ -988,9 +974,7 @@ <location>Weilerswist, Nordrhein-Westfalen, Germany</location> <latitude>50.766998</latitude> <longitude>6.833000</longitude> - <screenType>mobile</screenType> <resolution>360x640</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/mobile.gif</screenTypeIcon> <plugins>flash</plugins> <pluginsIcons> <row> @@ -1102,9 +1086,7 @@ <location>Mainz, Rheinland-Pfalz, Germany</location> <latitude>50</latitude> <longitude>8.271000</longitude> - <screenType>wide</screenType> <resolution>2560x1440</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> @@ -1271,9 +1253,7 @@ <location>Moscow, Moscow City, Russian Federation</location> <latitude>55.751999</latitude> <longitude>37.616001</longitude> - <screenType>wide</screenType> <resolution>1920x1080</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1389,9 +1369,7 @@ <location>Esentepe, Rize, Turkey</location> <latitude>40.979000</latitude> <longitude>40.415001</longitude> - <screenType>wide</screenType> <resolution>1366x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -1515,9 +1493,7 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <screenType>wide</screenType> <resolution>1920x1080</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -1799,9 +1775,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:10:38</visitLocalTime> @@ -1915,9 +1889,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2032,9 +2004,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>wide</screenType> <resolution>1280x800</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> @@ -2165,9 +2135,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:15:41</visitLocalTime> @@ -2290,9 +2258,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>19:12:40</visitLocalTime> @@ -2422,9 +2388,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>18:10:38</visitLocalTime> @@ -2530,9 +2494,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:48:08</visitLocalTime> @@ -2638,9 +2600,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:48:07</visitLocalTime> @@ -2736,9 +2696,7 @@ <location>Australia</location> <latitude>-27</latitude> <longitude>133</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:46:03</visitLocalTime> @@ -2844,9 +2802,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>16:11:30</visitLocalTime> @@ -2952,9 +2908,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>16:10:38</visitLocalTime> @@ -3056,9 +3010,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>15:31:05</visitLocalTime> @@ -3160,9 +3112,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:49:46</visitLocalTime> @@ -3264,9 +3214,7 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:22:08</visitLocalTime> @@ -3368,9 +3316,7 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:21:28</visitLocalTime> @@ -3472,9 +3418,7 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:21:03</visitLocalTime> @@ -3576,9 +3520,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:01:17</visitLocalTime> @@ -3680,9 +3622,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>19:59:50</visitLocalTime> @@ -3784,9 +3724,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>18:03:40</visitLocalTime> @@ -3888,9 +3826,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>21:00:42</visitLocalTime> @@ -3992,9 +3928,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:56:45</visitLocalTime> @@ -4096,9 +4030,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:49:48</visitLocalTime> @@ -4200,9 +4132,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:48:20</visitLocalTime> @@ -4304,9 +4234,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:48:07</visitLocalTime> @@ -4408,9 +4336,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:12:03</visitLocalTime> @@ -4512,9 +4438,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:11:56</visitLocalTime> @@ -4616,9 +4540,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:11:30</visitLocalTime> @@ -4720,9 +4642,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:10:38</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml deleted file mode 100644 index 2048a44e64..0000000000 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/screens/unknown.gif</logo> - </row> - <row> - <label>Normal</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> - <row> - <label>Wide</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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> - <logo>plugins/UserSettings/images/screens/wide.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml deleted file mode 100644 index 2048a44e64..0000000000 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/screens/unknown.gif</logo> - </row> - <row> - <label>Normal</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> - <row> - <label>Wide</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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> - <logo>plugins/UserSettings/images/screens/wide.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 5f234ed9c5..0879f6fb5b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -102,10 +102,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -225,10 +223,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -348,10 +344,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -471,10 +465,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -625,10 +617,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -779,10 +769,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -925,10 +913,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 8e034ec059..d252d03f5d 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,9 +66,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -220,9 +218,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -343,9 +339,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -497,9 +491,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -620,9 +612,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -774,9 +764,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -889,9 +877,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 c6ff4bfdff..2975b07bcb 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,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 9c5c5cc080..759645d39d 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,9 +97,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -222,9 +220,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -378,9 +374,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -517,9 +511,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -642,9 +634,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -767,9 +757,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -882,9 +870,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 c6ff4bfdff..2975b07bcb 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,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 6bc6d4b5aa..bd23daaa04 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1013,9 +999,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1138,9 +1122,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1294,9 +1276,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml deleted file mode 100644 index f1acb38cb9..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml deleted file mode 100644 index f1acb38cb9..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file 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 849af36fed..6649f123d9 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 @@ -85,9 +85,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -273,9 +271,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml deleted file mode 100644 index 1aa955af66..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>9</nb_actions> - <nb_users>0</nb_users> - <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml deleted file mode 100644 index 1aa955af66..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>9</nb_actions> - <nb_users>0</nb_users> - <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file 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 8173b17251..9b0149ac2a 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 @@ -74,9 +74,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -181,9 +179,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 dfaee585ef..4eb429a763 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 @@ -79,9 +79,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>10:00:00</visitLocalTime> @@ -172,9 +170,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>11:00:00</visitLocalTime> @@ -265,9 +261,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>12:00:00</visitLocalTime> 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 e0516433ba..17d9192ba4 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -74,9 +74,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 560e7ebe33..8ca1417d42 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -2124,99 +2119,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/dual.gif'> - - Dual </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 41 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.56 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:13:21 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 11.11% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 3454389180..1023f2402f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -2107,93 +2102,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/dual.gif'> - - Dual </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 41 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.6 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:13:21 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 11% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> 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 72a5b780f3..eff0ec8836 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -239,34 +239,6 @@ </row> <row> <category>Visitor Settings</category> - <name>Normal / Widescreen</name> - <module>UserSettings</module> - <action>getScreenType</action> - <dimension>Type of screen</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getScreenType</uniqueId> - </row> - <row> - <category>Visitor Settings</category> <name>Visitor Configuration</name> <module>UserSettings</module> <action>getConfiguration</action> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 27a8a409e0..346c1542db 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv 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 a6103ff862..76d48bc7b6 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 @@ -112,9 +112,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -323,9 +321,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 de1db7a777..5ff6e58fba 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -188,9 +188,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -518,9 +516,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -734,9 +730,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 7861e2ab4e..dd359fb284 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -2161,74 +2156,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 9bcbc71028..b47e49d44c 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -2144,68 +2139,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml deleted file mode 100644 index 106f23f16b..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="2009-01-04" /> - <result date="2009-01-05" /> - <result date="2009-01-06" /> - <result date="2009-01-07" /> - <result date="2009-01-08" /> - <result date="2009-01-09" /> - <result date="2009-01-10" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml deleted file mode 100644 index 5cfb246edc..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="From 2008-12-29 to 2009-01-04" /> - <result date="From 2009-01-05 to 2009-01-11" /> - <result date="From 2009-01-12 to 2009-01-18" /> - <result date="From 2009-01-19 to 2009-01-25" /> - <result date="From 2009-01-26 to 2009-02-01" /> - <result date="From 2009-02-02 to 2009-02-08" /> - <result date="From 2009-02-09 to 2009-02-15" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml deleted file mode 100644 index 106f23f16b..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="2009-01-04" /> - <result date="2009-01-05" /> - <result date="2009-01-06" /> - <result date="2009-01-07" /> - <result date="2009-01-08" /> - <result date="2009-01-09" /> - <result date="2009-01-10" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml deleted file mode 100644 index 5cfb246edc..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="From 2008-12-29 to 2009-01-04" /> - <result date="From 2009-01-05 to 2009-01-11" /> - <result date="From 2009-01-12 to 2009-01-18" /> - <result date="From 2009-01-19 to 2009-01-25" /> - <result date="From 2009-01-26 to 2009-02-01" /> - <result date="From 2009-02-02 to 2009-02-08" /> - <result date="From 2009-02-09 to 2009-02-15" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file 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 a4a21e48af..b48064a09c 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 @@ -82,9 +82,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -197,9 +195,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -372,9 +368,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 a4a21e48af..b48064a09c 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 @@ -82,9 +82,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -197,9 +195,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -372,9 +368,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 b1e550645e..60e389c7ab 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 @@ -125,9 +125,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -241,9 +239,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 7b5bad19d8..ff6884e62b 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -62,7 +62,6 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill); - $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getWideScreen', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill); $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add'); |