diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-01-22 05:59:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-22 05:59:04 +0300 |
| commit | f8c6ec87e95182ca28edf0c9eb4fea0bf5817ab0 (patch) | |
| tree | d0b68a94fc91f4a8cfd0d729378aec2135519585 /tests/PHPUnit/System/expected | |
| parent | ad416a899d33cb846a87c9b20345dbdbab776525 (diff) | |
Fix system tests (#11250)
* Fix tests
* Fixed custom dimension tests
* Contents plugin tests
* System tests: we now use PNG images
* System tests: we now use PNG images
Diffstat (limited to 'tests/PHPUnit/System/expected')
37 files changed, 414 insertions, 414 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index a4ec4deb32..95b637e5ce 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -10,95 +10,95 @@ try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- -INFO [2017-01-07 07:08:27] --------------------------- -INFO [2017-01-07 07:08:27] INIT -INFO [2017-01-07 07:08:27] Running Piwik 3.0.1-b2 as Super User -INFO [2017-01-07 07:08:27] --------------------------- -INFO [2017-01-07 07:08:27] NOTES -INFO [2017-01-07 07:08:27] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO [2017-01-07 07:08:27] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO [2017-01-07 07:08:27] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2017-01-07 07:08:27] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 -INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2017-01-07 07:08:27] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 -INFO [2017-01-07 07:08:27] --------------------------- -INFO [2017-01-07 07:08:27] START -INFO [2017-01-07 07:08:27] Starting Piwik reports archiving... -INFO [2017-01-07 07:08:27] Old report was invalidated for website id 1 -INFO [2017-01-07 07:08:27] Will pre-process for website id = 1, period = day, date = last52 -INFO [2017-01-07 07:08:27] - pre-processing all visits -INFO [2017-01-07 07:08:29] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-07 07:08:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:08:29] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:08:33] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.443s -INFO [2017-01-07 07:08:33] Will pre-process for website id = 1, period = week, date = last260 -INFO [2017-01-07 07:08:33] - pre-processing all visits -INFO [2017-01-07 07:08:33] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-07 07:08:33] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:09:31] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:10:02] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 89.589s -INFO [2017-01-07 07:10:02] Will pre-process for website id = 1, period = month, date = last52 -INFO [2017-01-07 07:10:02] - pre-processing all visits -INFO [2017-01-07 07:10:02] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-07 07:10:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:10:13] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:10:19] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 16.506s -INFO [2017-01-07 07:10:19] Will pre-process for website id = 1, period = year, date = last7 -INFO [2017-01-07 07:10:19] - pre-processing all visits -INFO [2017-01-07 07:10:19] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-07 07:10:19] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:10:25] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-07 07:10:28] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 9.642s -INFO [2017-01-07 07:10:28] Archived website id = 1, 16 API requests, Time elapsed: 121.189s [1/3 done] -INFO [2017-01-07 07:10:29] Old report was invalidated for website id 2 -INFO [2017-01-07 07:10:29] Will pre-process for website id = 2, period = day, date = last52 -INFO [2017-01-07 07:10:29] - pre-processing all visits -INFO [2017-01-07 07:10:30] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.630s -INFO [2017-01-07 07:10:30] Will pre-process for website id = 2, period = week, date = last260 -INFO [2017-01-07 07:10:30] - pre-processing all visits -INFO [2017-01-07 07:10:52] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 21.658s -INFO [2017-01-07 07:10:52] Will pre-process for website id = 2, period = month, date = last52 -INFO [2017-01-07 07:10:52] - pre-processing all visits -INFO [2017-01-07 07:10:56] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 3.966s -INFO [2017-01-07 07:10:56] Will pre-process for website id = 2, period = year, date = last7 -INFO [2017-01-07 07:10:56] - pre-processing all visits -INFO [2017-01-07 07:10:57] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.630s -INFO [2017-01-07 07:10:57] Archived website id = 2, 4 API requests, Time elapsed: 28.888s [2/3 done] -INFO [2017-01-07 07:10:57] Old report was invalidated for website id 3 -INFO [2017-01-07 07:10:57] Will pre-process for website id = 3, period = day, date = last52 -INFO [2017-01-07 07:10:57] - pre-processing all visits -INFO [2017-01-07 07:10:59] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.639s -INFO [2017-01-07 07:10:59] Will pre-process for website id = 3, period = week, date = last260 -INFO [2017-01-07 07:10:59] - pre-processing all visits -INFO [2017-01-07 07:11:22] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 22.770s -INFO [2017-01-07 07:11:22] Will pre-process for website id = 3, period = month, date = last52 -INFO [2017-01-07 07:11:22] - pre-processing all visits -INFO [2017-01-07 07:11:26] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.387s -INFO [2017-01-07 07:11:26] Will pre-process for website id = 3, period = year, date = last7 -INFO [2017-01-07 07:11:26] - pre-processing all visits -INFO [2017-01-07 07:11:29] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.432s -INFO [2017-01-07 07:11:29] Archived website id = 3, 4 API requests, Time elapsed: 31.233s [3/3 done] -INFO [2017-01-07 07:11:29] Done archiving! -INFO [2017-01-07 07:11:29] --------------------------- -INFO [2017-01-07 07:11:29] SUMMARY -INFO [2017-01-07 07:11:29] Total visits for today across archived websites: 0 -INFO [2017-01-07 07:11:29] Archived today's reports for 3 websites -INFO [2017-01-07 07:11:29] Archived week/month/year for 3 websites -INFO [2017-01-07 07:11:29] Skipped 0 websites -INFO [2017-01-07 07:11:29] - 0 skipped because no new visit since the last script execution -INFO [2017-01-07 07:11:29] - 0 skipped because existing daily reports are less than 150 seconds old -INFO [2017-01-07 07:11:29] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old -INFO [2017-01-07 07:11:29] Total API requests: 24 -INFO [2017-01-07 07:11:29] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 181477 ms, no error -INFO [2017-01-07 07:11:29] Time elapsed: 181.477s -INFO [2017-01-07 07:11:29] --------------------------- -INFO [2017-01-07 07:11:29] SCHEDULED TASKS -INFO [2017-01-07 07:11:29] Starting Scheduled tasks... -INFO [2017-01-07 07:11:29] done -INFO [2017-01-07 07:11:29] ---------------------------
\ No newline at end of file +INFO [2017-01-22 00:03:37] --------------------------- +INFO [2017-01-22 00:03:37] INIT +INFO [2017-01-22 00:03:37] Running Piwik 3.0.1 as Super User +INFO [2017-01-22 00:03:37] --------------------------- +INFO [2017-01-22 00:03:37] NOTES +INFO [2017-01-22 00:03:37] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. +INFO [2017-01-22 00:03:37] See the doc at: http://piwik.org/docs/setup-auto-archiving/ +INFO [2017-01-22 00:03:37] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. +INFO [2017-01-22 00:03:37] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 +INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2017-01-22 00:03:37] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 +INFO [2017-01-22 00:03:37] --------------------------- +INFO [2017-01-22 00:03:37] START +INFO [2017-01-22 00:03:37] Starting Piwik reports archiving... +INFO [2017-01-22 00:03:37] Old report was invalidated for website id 1 +INFO [2017-01-22 00:03:37] Will pre-process for website id = 1, period = day, date = last52 +INFO [2017-01-22 00:03:37] - pre-processing all visits +INFO [2017-01-22 00:03:39] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-22 00:03:39] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:03:39] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:03:44] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 6.567s +INFO [2017-01-22 00:03:44] Will pre-process for website id = 1, period = week, date = last260 +INFO [2017-01-22 00:03:44] - pre-processing all visits +INFO [2017-01-22 00:03:44] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-22 00:03:44] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:05:14] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:05:58] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 134.312s +INFO [2017-01-22 00:05:58] Will pre-process for website id = 1, period = month, date = last52 +INFO [2017-01-22 00:05:58] - pre-processing all visits +INFO [2017-01-22 00:05:58] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-22 00:05:58] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:06:10] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:06:16] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 17.904s +INFO [2017-01-22 00:06:16] Will pre-process for website id = 1, period = year, date = last7 +INFO [2017-01-22 00:06:16] - pre-processing all visits +INFO [2017-01-22 00:06:16] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-22 00:06:16] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:06:23] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-22 00:06:26] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 10.251s +INFO [2017-01-22 00:06:26] Archived website id = 1, 16 API requests, Time elapsed: 169.041s [1/3 done] +INFO [2017-01-22 00:06:26] Old report was invalidated for website id 2 +INFO [2017-01-22 00:06:26] Will pre-process for website id = 2, period = day, date = last52 +INFO [2017-01-22 00:06:26] - pre-processing all visits +INFO [2017-01-22 00:06:28] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.963s +INFO [2017-01-22 00:06:28] Will pre-process for website id = 2, period = week, date = last260 +INFO [2017-01-22 00:06:28] - pre-processing all visits +INFO [2017-01-22 00:06:59] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 31.146s +INFO [2017-01-22 00:06:59] Will pre-process for website id = 2, period = month, date = last52 +INFO [2017-01-22 00:06:59] - pre-processing all visits +INFO [2017-01-22 00:07:03] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.273s +INFO [2017-01-22 00:07:03] Will pre-process for website id = 2, period = year, date = last7 +INFO [2017-01-22 00:07:03] - pre-processing all visits +INFO [2017-01-22 00:07:05] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.745s +INFO [2017-01-22 00:07:05] Archived website id = 2, 4 API requests, Time elapsed: 39.131s [2/3 done] +INFO [2017-01-22 00:07:05] Old report was invalidated for website id 3 +INFO [2017-01-22 00:07:05] Will pre-process for website id = 3, period = day, date = last52 +INFO [2017-01-22 00:07:05] - pre-processing all visits +INFO [2017-01-22 00:07:07] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.947s +INFO [2017-01-22 00:07:07] Will pre-process for website id = 3, period = week, date = last260 +INFO [2017-01-22 00:07:07] - pre-processing all visits +INFO [2017-01-22 00:07:39] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 31.604s +INFO [2017-01-22 00:07:39] Will pre-process for website id = 3, period = month, date = last52 +INFO [2017-01-22 00:07:39] - pre-processing all visits +INFO [2017-01-22 00:07:44] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.779s +INFO [2017-01-22 00:07:44] Will pre-process for website id = 3, period = year, date = last7 +INFO [2017-01-22 00:07:44] - pre-processing all visits +INFO [2017-01-22 00:07:46] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.549s +INFO [2017-01-22 00:07:46] Archived website id = 3, 4 API requests, Time elapsed: 40.884s [3/3 done] +INFO [2017-01-22 00:07:46] Done archiving! +INFO [2017-01-22 00:07:46] --------------------------- +INFO [2017-01-22 00:07:46] SUMMARY +INFO [2017-01-22 00:07:46] Total visits for today across archived websites: 0 +INFO [2017-01-22 00:07:46] Archived today's reports for 3 websites +INFO [2017-01-22 00:07:46] Archived week/month/year for 3 websites +INFO [2017-01-22 00:07:46] Skipped 0 websites +INFO [2017-01-22 00:07:46] - 0 skipped because no new visit since the last script execution +INFO [2017-01-22 00:07:46] - 0 skipped because existing daily reports are less than 150 seconds old +INFO [2017-01-22 00:07:46] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old +INFO [2017-01-22 00:07:46] Total API requests: 24 +INFO [2017-01-22 00:07:46] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 249195 ms, no error +INFO [2017-01-22 00:07:46] Time elapsed: 249.195s +INFO [2017-01-22 00:07:46] --------------------------- +INFO [2017-01-22 00:07:46] SCHEDULED TASKS +INFO [2017-01-22 00:07:46] Starting Scheduled tasks... +INFO [2017-01-22 00:07:46] done +INFO [2017-01-22 00:07:46] ---------------------------
\ No newline at end of file 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 503f25c55f..6a1de22513 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 @@ -69,7 +69,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> @@ -177,7 +177,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -285,7 +285,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -393,7 +393,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -501,7 +501,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -609,7 +609,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -717,7 +717,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -933,7 +933,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> 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 0c3a52fd22..ba4c50883e 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 @@ -260,7 +260,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -376,7 +376,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -497,7 +497,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -609,7 +609,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -740,7 +740,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -879,7 +879,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -991,7 +991,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Bot</operatingSystem> @@ -1103,7 +1103,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1204,7 +1204,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> 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 63364610cd..8c9dbbcce2 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -63,7 +63,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -248,7 +248,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -379,7 +379,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -553,7 +553,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -684,7 +684,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -877,7 +877,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1008,7 +1008,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1182,7 +1182,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1313,7 +1313,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1506,7 +1506,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1637,7 +1637,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1811,7 +1811,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1985,7 +1985,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -2108,7 +2108,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -2432,7 +2432,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -2625,7 +2625,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -2748,7 +2748,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -2879,7 +2879,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Dell</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -3053,7 +3053,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -3401,7 +3401,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -3567,7 +3567,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> @@ -3698,7 +3698,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -3960,7 +3960,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> @@ -4091,7 +4091,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> @@ -4284,7 +4284,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -4670,7 +4670,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -4855,7 +4855,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Phablet</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Samsung</deviceBrand> <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> @@ -4986,7 +4986,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -5248,7 +5248,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> @@ -5379,7 +5379,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Phablet</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Samsung</deviceBrand> <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> 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 6b6983c922..5fad2e391c 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -53,7 +53,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -160,7 +160,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -345,7 +345,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -452,7 +452,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -850,7 +850,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -957,7 +957,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1060,7 +1060,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1241,7 +1241,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1344,7 +1344,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1687,7 +1687,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 df0b8e12b6..a307bd6bb0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -53,7 +53,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -156,7 +156,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -337,7 +337,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -440,7 +440,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -783,7 +783,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -886,7 +886,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -993,7 +993,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1178,7 +1178,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1285,7 +1285,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1683,7 +1683,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 19c0f325af..59e8831abf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -19,7 +19,7 @@ <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + <logo>plugins/DevicesDetection/images/brand/Unknown.png</logo> <segment>deviceBrand==Unknown</segment> </row> <row> @@ -40,7 +40,7 @@ <revenue>10</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> + <logo>plugins/DevicesDetection/images/brand/HTC.png</logo> <segment>deviceBrand==HTC</segment> </row> <row> @@ -61,7 +61,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/brand/Apple.ico</logo> + <logo>plugins/DevicesDetection/images/brand/Apple.png</logo> <segment>deviceBrand==Apple</segment> </row> <row> @@ -82,7 +82,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo> + <logo>plugins/DevicesDetection/images/brand/Samsung.png</logo> <segment>deviceBrand==Samsung</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 4f8796278f..d4b21903a5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -19,7 +19,7 @@ <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <segment>deviceType==desktop</segment> - <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.png</logo> </row> <row> <label>Smartphone</label> @@ -61,7 +61,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Camera</label> @@ -79,31 +79,31 @@ <label>Console</label> <nb_visits>0</nb_visits> <segment>deviceType==console</segment> - <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + <logo>plugins/DevicesDetection/images/screens/console.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> <segment>deviceType==feature+phone</segment> - <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + <logo>plugins/DevicesDetection/images/screens/mobile.png</logo> </row> <row> <label>Phablet</label> <nb_visits>0</nb_visits> <segment>deviceType==phablet</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> <segment>deviceType==portable+media+player</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> <segment>deviceType==smart+display</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Tablet</label> 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 c4a8368cd1..e72171566e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -46,7 +46,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>77</visitCount> @@ -71,7 +71,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> @@ -192,7 +192,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> @@ -217,7 +217,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -308,7 +308,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> @@ -333,7 +333,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -466,7 +466,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>7</visitCount> @@ -491,7 +491,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> @@ -573,7 +573,7 @@ </row> </customVariables> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -586,7 +586,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -611,7 +611,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -744,7 +744,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> @@ -858,7 +858,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>4</visitCount> @@ -883,7 +883,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> @@ -987,7 +987,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> @@ -1108,7 +1108,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1133,7 +1133,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1314,7 +1314,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 8</operatingSystem> @@ -1414,7 +1414,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1439,7 +1439,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1572,7 +1572,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1894,7 +1894,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -2006,7 +2006,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac</operatingSystem> @@ -2135,7 +2135,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows</operatingSystem> @@ -2230,7 +2230,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> @@ -2255,7 +2255,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> @@ -2535,7 +2535,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> @@ -2651,7 +2651,7 @@ <userId>user2</userId> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> @@ -2676,7 +2676,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> @@ -2794,7 +2794,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> @@ -2916,7 +2916,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -3014,7 +3014,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> @@ -3039,7 +3039,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -3180,7 +3180,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -3393,7 +3393,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -3493,7 +3493,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -3603,7 +3603,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -3717,7 +3717,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -3850,7 +3850,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -3991,7 +3991,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -4105,7 +4105,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Bot</operatingSystem> @@ -4219,7 +4219,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -4322,7 +4322,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -4550,7 +4550,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> @@ -4664,7 +4664,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -4774,7 +4774,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -4884,7 +4884,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -4994,7 +4994,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -5104,7 +5104,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -5214,7 +5214,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -5324,7 +5324,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -5434,7 +5434,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -5544,7 +5544,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> @@ -5654,7 +5654,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -5764,7 +5764,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -5874,7 +5874,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -5984,7 +5984,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -6094,7 +6094,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -6204,7 +6204,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> @@ -6424,7 +6424,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 99e290e529..2e3a5af366 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -35,7 +35,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>77</visitCount> @@ -60,7 +60,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> @@ -170,7 +170,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>2</visitCount> @@ -195,7 +195,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -275,7 +275,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -300,7 +300,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -422,7 +422,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>7</visitCount> @@ -447,7 +447,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> @@ -529,7 +529,7 @@ </row> </customVariables> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -542,7 +542,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -567,7 +567,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -689,7 +689,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> @@ -792,7 +792,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>4</visitCount> @@ -817,7 +817,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> @@ -910,7 +910,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>2</visitCount> @@ -1020,7 +1020,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>5</visitCount> @@ -1045,7 +1045,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1215,7 +1215,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 8</operatingSystem> @@ -1304,7 +1304,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>5</visitCount> @@ -1329,7 +1329,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1451,7 +1451,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows 7</operatingSystem> @@ -1579,7 +1579,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1666,7 +1666,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1691,7 +1691,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1861,7 +1861,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 2a99405309..6b6bc9ca3b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -83,7 +83,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -110,7 +110,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -135,7 +135,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -241,7 +241,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -266,7 +266,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -388,7 +388,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -415,7 +415,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -440,7 +440,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index c4bbb582ee..8829c8aad1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -48,7 +48,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -73,7 +73,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -214,7 +214,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -241,7 +241,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -266,7 +266,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -372,7 +372,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -397,7 +397,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 06e1bef9a1..d70e0114c0 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 @@ -69,7 +69,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -231,7 +231,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -359,7 +359,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -521,7 +521,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -649,7 +649,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -811,7 +811,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -931,7 +931,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 ab5f5e2975..260624a09e 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 @@ -63,7 +63,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -196,7 +196,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -223,7 +223,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -248,7 +248,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -354,7 +354,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -379,7 +379,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -501,7 +501,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -528,7 +528,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -553,7 +553,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -659,7 +659,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -684,7 +684,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -825,7 +825,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -852,7 +852,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -877,7 +877,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -983,7 +983,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1008,7 +1008,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 6c6531774e..08eebcd87f 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 @@ -103,7 +103,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -233,7 +233,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -397,7 +397,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -543,7 +543,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -673,7 +673,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -803,7 +803,7 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -923,7 +923,7 @@ <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 ab5f5e2975..260624a09e 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 @@ -63,7 +63,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -196,7 +196,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -223,7 +223,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -248,7 +248,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -354,7 +354,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -379,7 +379,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -501,7 +501,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -528,7 +528,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -553,7 +553,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -659,7 +659,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -684,7 +684,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -825,7 +825,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -852,7 +852,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -877,7 +877,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -983,7 +983,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1008,7 +1008,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 a9c90d5638..1ec1cbf690 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -63,7 +63,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -196,7 +196,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -223,7 +223,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -248,7 +248,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -354,7 +354,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -379,7 +379,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -501,7 +501,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -528,7 +528,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -553,7 +553,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -659,7 +659,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -684,7 +684,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -825,7 +825,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -852,7 +852,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -877,7 +877,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -983,7 +983,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1008,7 +1008,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1130,7 +1130,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -1157,7 +1157,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1182,7 +1182,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1288,7 +1288,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1313,7 +1313,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -1454,7 +1454,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -1481,7 +1481,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1506,7 +1506,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 643a67f1a7..719b3d6e76 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -18,7 +18,7 @@ <nb_conversions>1</nb_conversions> <revenue>1</revenue> <segment>deviceType==desktop</segment> - <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.png</logo> </row> <row> <label>Camera</label> @@ -42,25 +42,25 @@ <label>Feature phone</label> <nb_visits>0</nb_visits> <segment>deviceType==feature+phone</segment> - <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + <logo>plugins/DevicesDetection/images/screens/mobile.png</logo> </row> <row> <label>Phablet</label> <nb_visits>0</nb_visits> <segment>deviceType==phablet</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> <segment>deviceType==portable+media+player</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> <segment>deviceType==smart+display</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Smartphone</label> @@ -92,6 +92,6 @@ <nb_conversions>1</nb_conversions> <revenue>42</revenue> <nb_visits>0</nb_visits> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml index b2ee7881e0..f03b829dbf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -23,7 +23,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>43</revenue> - <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + <logo>plugins/DevicesDetection/images/brand/Unknown.png</logo> <segment>deviceBrand==Unknown</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index e809cc9f97..4942c2ae8e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -24,7 +24,7 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <segment>deviceType==desktop</segment> - <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.png</logo> </row> <row> <label>Camera</label> @@ -42,31 +42,31 @@ <label>Console</label> <nb_visits>0</nb_visits> <segment>deviceType==console</segment> - <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + <logo>plugins/DevicesDetection/images/screens/console.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> <segment>deviceType==feature+phone</segment> - <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + <logo>plugins/DevicesDetection/images/screens/mobile.png</logo> </row> <row> <label>Phablet</label> <nb_visits>0</nb_visits> <segment>deviceType==phablet</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> <segment>deviceType==portable+media+player</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> <segment>deviceType==smart+display</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> </row> <row> <label>Smartphone</label> 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 bc89424726..732e0bcf75 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 @@ -40,7 +40,7 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> @@ -65,7 +65,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -161,7 +161,7 @@ <interactionPosition /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -187,7 +187,7 @@ <interactionPosition /> <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -200,7 +200,7 @@ <interactionPosition /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -277,7 +277,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 875c59cbea..eb51dbca0c 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 @@ -52,7 +52,7 @@ <languageCode>fr</languageCode> <language>Français</language> <deviceType>Inconnu</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Inconnu</deviceBrand> <deviceModel /> <operatingSystem>Bot</operatingSystem> @@ -167,7 +167,7 @@ <languageCode>fr</languageCode> <language>Français</language> <deviceType>Inconnu</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> <deviceBrand>Inconnu</deviceBrand> <deviceModel /> <operatingSystem>Bot</operatingSystem> 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 40be69f616..7a6a077d72 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 @@ -57,7 +57,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> @@ -155,7 +155,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> @@ -253,7 +253,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml index a8c4567b81..5ccbf5c52e 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml @@ -43,7 +43,7 @@ <metrics> <nb_visits_0> <name>Desktop (Visits)</name> - <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.png</logo> <min>0</min> <max>1</max> </nb_visits_0> 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 d7ecc8aaf0..daa2a07dfb 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -52,7 +52,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 0e6b621ee2..f659b76b1c 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 @@ -550,7 +550,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -575,7 +575,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> Desktop </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -697,7 +697,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index 1bafbae6e3..9fa6be9dba 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -194,7 +194,7 @@ <quantity>1</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> <timestamp>1267893633</timestamp> </row> </actionDetails> 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 62850e83c2..2241669839 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 0033c0f4a0..44103e5874 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 @@ -25,7 +25,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceOrder.gif</icon> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> </row> <row> @@ -40,7 +40,7 @@ <itemDetails> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceOrder.gif</icon> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> </row> </actionDetails> @@ -53,13 +53,13 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> <visitEcommerceStatus>ordered</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>363</visitDuration> @@ -78,7 +78,7 @@ <languageCode>pl</languageCode> <language>Polish</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -263,7 +263,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> </row> </actionDetails> @@ -276,13 +276,13 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>1</daysSinceLastEcommerceOrder> <visitDuration>1081</visitDuration> @@ -301,7 +301,7 @@ <languageCode>pl</languageCode> <language>Polish</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 a1632970fc..3e5ecdd07a 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -123,7 +123,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> </row> </actionDetails> @@ -136,13 +136,13 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>2</visitCount> <visitEcommerceStatus>abandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.png</visitEcommerceStatusIcon> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>721</visitDuration> @@ -161,7 +161,7 @@ <languageCode>pl</languageCode> <language>Polish</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -324,7 +324,7 @@ <quantity>6</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceOrder.gif</icon> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> </row> <row> @@ -353,7 +353,7 @@ <quantity>1</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceOrder.gif</icon> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> </row> <row> @@ -473,7 +473,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> </row> </actionDetails> @@ -486,13 +486,13 @@ <userId /> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3961</visitDuration> @@ -511,7 +511,7 @@ <languageCode>pl</languageCode> <language>Polish</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -743,7 +743,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 0c89298696..dfbffe728e 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 @@ -711,7 +711,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.png'> Desktop </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -833,7 +833,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 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 d69417fefd..b24f59a94f 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 @@ -14,7 +14,7 @@ <pageId>5</pageId> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -52,7 +52,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -173,7 +173,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -355,7 +355,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 d69417fefd..b24f59a94f 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 @@ -14,7 +14,7 @@ <pageId>5</pageId> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -52,7 +52,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -173,7 +173,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -355,7 +355,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 fd338a4b66..944f4331fb 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 @@ -67,7 +67,7 @@ <pageId>5</pageId> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -105,7 +105,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -226,7 +226,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index d69417fefd..b24f59a94f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -14,7 +14,7 @@ <pageId>5</pageId> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -52,7 +52,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -173,7 +173,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -355,7 +355,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index d69417fefd..b24f59a94f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -14,7 +14,7 @@ <pageId>5</pageId> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -52,7 +52,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -173,7 +173,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -355,7 +355,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index fd338a4b66..944f4331fb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -67,7 +67,7 @@ <pageId>5</pageId> <interactionPosition /> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> </actionDetails> @@ -105,7 +105,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -226,7 +226,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> |