diff options
110 files changed, 962 insertions, 526 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ba272105e4..73b01fece3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' ### Breaking Changes * The event `User.getLanguage` has been removed. * The following deprecated event has been removed: `TaskScheduler.getScheduledTasks` +* Special handling for operating system `Windows` has been removed. Like other operating systems all versions will now only be reported as `Windows` with versions like `XP`, `7`, `8`, etc. +* Reporting for operating systems has been adjusted to report information according to browser information. Visitor details now contain: `operatingSystemName`, `operatingSystemIcon`, `operatingSystemCode` and `operatingSystemVersion` * The `Piwik\Registry` class has been removed in favor of using the container: * `Registry::get('auth')` is replaced by `StaticContainer::get('Piwik\Auth')` * `Registry::set('auth', $auth)` is replaced by `StaticContainer::getContainer()->set('Piwik\Auth', $auth)` @@ -29,6 +31,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' ### Library updates * Updated AngularJS from 1.2.26 to 1.2.28 +* Updated piwik/device-detector from 2.8 to 3.0 ## Piwik 2.10.0 diff --git a/composer.json b/composer.json index 87a6b2b0d7..c2ae42073a 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "symfony/console": "~2.6", "tedivm/jshrink": "~0.5.1", "mustangostang/spyc": "~0.5.0", - "piwik/device-detector": "~2.0", + "piwik/device-detector": "~3.0", "piwik/decompress": "~0.1.1", "piwik/network": "~0.1.0", "piwik/cache": "~0.2", diff --git a/composer.lock b/composer.lock index 184c208ac3..5f18cf40e2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "09ced245f00415f5fe13703565767884", + "hash": "01f7386402708d6090fd0b87d9d408ce", "packages": [ { "name": "container-interop/container-interop", @@ -598,24 +598,27 @@ }, { "name": "piwik/device-detector", - "version": "2.8.1", + "version": "3.0", "source": { "type": "git", "url": "https://github.com/piwik/device-detector.git", - "reference": "adf8f5b775273f9d2ffb6203ca04d629c9791019" + "reference": "a5f58033107262f5067b9cdfb3751816a5d3dc87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/device-detector/zipball/adf8f5b775273f9d2ffb6203ca04d629c9791019", - "reference": "adf8f5b775273f9d2ffb6203ca04d629c9791019", + "url": "https://api.github.com/repos/piwik/device-detector/zipball/a5f58033107262f5067b9cdfb3751816a5d3dc87", + "reference": "a5f58033107262f5067b9cdfb3751816a5d3dc87", "shasum": "" }, "require": { "mustangostang/spyc": "*", - "php": ">=5.3.1" + "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "4.0.*" + "phpunit/phpunit": "4.1.*" + }, + "suggest": { + "doctrine/cache": "Can directly be used for caching purpose" }, "type": "library", "autoload": { @@ -641,7 +644,7 @@ "parser", "useragent" ], - "time": "2015-01-09 20:24:08" + "time": "2015-01-31 20:48:03" }, { "name": "piwik/ini", @@ -2216,7 +2219,6 @@ "facebook/xhprof": 20 }, "prefer-stable": false, - "prefer-lowest": false, "platform": { "php": ">=5.3.3" }, diff --git a/core/DeviceDetectorCache.php b/core/DeviceDetectorCache.php index c337b1b0a4..7cf2a15226 100644 --- a/core/DeviceDetectorCache.php +++ b/core/DeviceDetectorCache.php @@ -18,7 +18,7 @@ use Exception; * * Static caching speeds up multiple detections in one request, which is the case when sending bulk requests */ -class DeviceDetectorCache implements \DeviceDetector\Cache\CacheInterface +class DeviceDetectorCache implements \DeviceDetector\Cache\Cache { protected static $staticCache = array(); @@ -28,7 +28,7 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\CacheInterface public function __construct($ttl = 300) { $this->ttl = (int) $ttl; - $this->cache = PiwikCache::getLazyCache(); + $this->cache = PiwikCache::getEagerCache(); } /** @@ -37,7 +37,7 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\CacheInterface * @param string $id The cache entry ID * @return array|bool False on error, or array the cache content */ - public function get($id) + public function fetch($id) { if (empty($id)) { return false; @@ -47,6 +47,10 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\CacheInterface return self::$staticCache[$id]; } + if (!$this->cache->contains($id)) { + return false; + } + return $this->cache->fetch($id); } @@ -58,7 +62,7 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\CacheInterface * @throws \Exception * @return bool True if the entry was succesfully stored */ - public function set($id, $content) + public function save($id, $content, $ttl=0) { if (empty($id)) { return false; @@ -69,4 +73,25 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\CacheInterface return $this->cache->save($id, $content, $this->ttl); } + public function contains($id) + { + return !empty(self::$staticCache[$id]) && $this->cache->contains($id); + } + + public function delete($id) + { + if (empty($id)) { + return false; + } + + unset(self::$staticCache[$id]); + + return $this->cache->delete($id); + } + + public function flushAll() + { + return $this->cache->flushAll(); + } + } diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 95459f0177..21e3a4f8a3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -51,8 +51,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +151,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 95459f0177..21e3a4f8a3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -51,8 +51,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +151,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 95459f0177..21e3a4f8a3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -51,8 +51,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +151,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 95459f0177..21e3a4f8a3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -51,8 +51,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +151,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 95459f0177..21e3a4f8a3 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -51,8 +51,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +151,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index 00263a9a2c..3c6da50e62 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -92,8 +92,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/DevicesDetection/Columns/Os.php b/plugins/DevicesDetection/Columns/Os.php index affce6cd6e..f8c66bee3f 100644 --- a/plugins/DevicesDetection/Columns/Os.php +++ b/plugins/DevicesDetection/Columns/Os.php @@ -25,7 +25,7 @@ class Os extends Base $segment = new Segment(); $segment->setSegment('operatingSystemCode'); $segment->setName('DevicesDetection_ColumnOperatingSystem'); - $segment->setAcceptedValues('WXP, WI7, MAC, LIN, AND, IPD, etc.'); + $segment->setAcceptedValues('WIN, MAC, LIN, AND, IPD, etc.'); $this->addSegment($segment); } diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 6b4e57fe65..8dde8e8e40 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -49,8 +49,10 @@ class DevicesDetection extends \Piwik\Plugin $visitor['deviceType'] = $instance->getDeviceType(); $visitor['operatingSystem'] = $instance->getOperatingSystem(); - $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); + $visitor['operatingSystemName'] = $instance->getOperatingSystemName(); $visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon(); + $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); + $visitor['operatingSystemVersion'] = $instance->getOperatingSystemVersion(); $visitor['browserFamily'] = $instance->getBrowserEngine(); $visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription(); $visitor['browser'] = $instance->getBrowser(); diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php index aa5b16c2ae..25d7a5a89a 100644 --- a/plugins/DevicesDetection/Visitor.php +++ b/plugins/DevicesDetection/Visitor.php @@ -31,9 +31,19 @@ class Visitor public function getOperatingSystem() { + return getOsFullName($this->details['config_os'] . ";" . $this->details['config_os_version']); + } + + public function getOperatingSystemName() + { return getOsFullName($this->details['config_os']); } + public function getOperatingSystemVersion() + { + return $this->details['config_os_version']; + } + public function getOperatingSystemIcon() { return getOsLogo($this->details['config_os']); diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 8ab0ffe925..5ca421abe9 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -132,7 +132,8 @@ function getDeviceTypeLabel($label) 'tv' => 'DevicesDetection_TV', 'car browser' => 'DevicesDetection_CarBrowser', 'smart display' => 'DevicesDetection_SmartDisplay', - 'camera' => 'DevicesDetection_Camera' + 'camera' => 'DevicesDetection_Camera', + 'portable media player' => 'DevicesDetection_PortableMediaPlayer', ); $deviceTypes = DeviceParser::getAvailableDeviceTypes(); @@ -240,6 +241,19 @@ function _mapLegacyOsShortCodes($shortCode) 'DSI' => 'NDS', // Nintendo DSi => Nintendo Mobile 'PSV' => 'PSP', // PlayStation Vita => PlayStation Portable 'MAE' => 'SMG', // Maemo => MeeGo + 'W10' => 'WIN', + 'W2K' => 'WIN', + 'W31' => 'WIN', + 'WI7' => 'WIN', + 'WI8' => 'WIN', + 'W81' => 'WIN', + 'W95' => 'WIN', + 'W98' => 'WIN', + 'WME' => 'WIN', + 'WNT' => 'WIN', + 'WS3' => 'WIN', + 'WVI' => 'WIN', + 'WXP' => 'WIN', //'VMS' => '', // OpenVMS => ?? ); return array_key_exists($shortCode, $legacyShortCodes) ? $legacyShortCodes[$shortCode] : $shortCode; diff --git a/plugins/DevicesDetection/images/brand/Barnes_&_Noble.ico b/plugins/DevicesDetection/images/brand/Barnes_&_Noble.ico Binary files differnew file mode 100644 index 0000000000..2eb62cb8e1 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Barnes_&_Noble.ico diff --git a/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico b/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico Binary files differnew file mode 100644 index 0000000000..393f1ca49d --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico diff --git a/plugins/DevicesDetection/images/brand/Compaq.ico b/plugins/DevicesDetection/images/brand/Compaq.ico Binary files differnew file mode 100644 index 0000000000..b0738259bd --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Compaq.ico diff --git a/plugins/DevicesDetection/images/brand/ConCorde.ico b/plugins/DevicesDetection/images/brand/ConCorde.ico Binary files differnew file mode 100644 index 0000000000..27efdbab49 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/ConCorde.ico diff --git a/plugins/DevicesDetection/images/brand/Coolpad.ico b/plugins/DevicesDetection/images/brand/Coolpad.ico Binary files differnew file mode 100644 index 0000000000..75caa69358 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Coolpad.ico diff --git a/plugins/DevicesDetection/images/brand/Crius_Mea.ico b/plugins/DevicesDetection/images/brand/Crius_Mea.ico Binary files differnew file mode 100644 index 0000000000..4c3473a737 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Crius_Mea.ico diff --git a/plugins/DevicesDetection/images/brand/Danew.ico b/plugins/DevicesDetection/images/brand/Danew.ico Binary files differnew file mode 100644 index 0000000000..373eded938 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Danew.ico diff --git a/plugins/DevicesDetection/images/brand/Easypix.ico b/plugins/DevicesDetection/images/brand/Easypix.ico Binary files differnew file mode 100644 index 0000000000..a14cd928ba --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Easypix.ico diff --git a/plugins/DevicesDetection/images/brand/Evertek.ico b/plugins/DevicesDetection/images/brand/Evertek.ico Binary files differnew file mode 100644 index 0000000000..c09bf2c331 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Evertek.ico diff --git a/plugins/DevicesDetection/images/brand/Fujitsu.ico b/plugins/DevicesDetection/images/brand/Fujitsu.ico Binary files differnew file mode 100644 index 0000000000..e2ac9cae5c --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Fujitsu.ico diff --git a/plugins/DevicesDetection/images/brand/Gigabyte.ico b/plugins/DevicesDetection/images/brand/Gigabyte.ico Binary files differnew file mode 100644 index 0000000000..ced0200cd8 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Gigabyte.ico diff --git a/plugins/DevicesDetection/images/brand/Gigaset.ico b/plugins/DevicesDetection/images/brand/Gigaset.ico Binary files differnew file mode 100644 index 0000000000..5ad69fb6d2 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Gigaset.ico diff --git a/plugins/DevicesDetection/images/brand/MSI.ico b/plugins/DevicesDetection/images/brand/MSI.ico Binary files differnew file mode 100644 index 0000000000..88cb1029d8 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/MSI.ico diff --git a/plugins/DevicesDetection/images/brand/Nikon.ico b/plugins/DevicesDetection/images/brand/Nikon.ico Binary files differnew file mode 100644 index 0000000000..99d714d1bd --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Nikon.ico diff --git a/plugins/DevicesDetection/images/brand/Quechua.ico b/plugins/DevicesDetection/images/brand/Quechua.ico Binary files differnew file mode 100644 index 0000000000..b720b484b0 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Quechua.ico diff --git a/plugins/DevicesDetection/images/brand/SFR.ico b/plugins/DevicesDetection/images/brand/SFR.ico Binary files differnew file mode 100644 index 0000000000..59a47182cc --- /dev/null +++ b/plugins/DevicesDetection/images/brand/SFR.ico diff --git a/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico b/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico Binary files differnew file mode 100644 index 0000000000..7ea787c5ba --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico diff --git a/plugins/DevicesDetection/images/brand/Tolino.ico b/plugins/DevicesDetection/images/brand/Tolino.ico Binary files differnew file mode 100644 index 0000000000..23b44b02b7 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Tolino.ico diff --git a/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico Binary files differnew file mode 100644 index 0000000000..44e87d65ed --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico diff --git a/plugins/DevicesDetection/images/brand/bq.ico b/plugins/DevicesDetection/images/brand/bq.ico Binary files differnew file mode 100644 index 0000000000..088f3d1144 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/bq.ico diff --git a/plugins/DevicesDetection/images/browsers/MU.gif b/plugins/DevicesDetection/images/browsers/MU.gif Binary files differnew file mode 100644 index 0000000000..bdc98c5f0c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MU.gif diff --git a/plugins/DevicesDetection/images/os/W10.gif b/plugins/DevicesDetection/images/os/W10.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/W10.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W2K.gif b/plugins/DevicesDetection/images/os/W2K.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/W2K.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W61.gif b/plugins/DevicesDetection/images/os/W61.gif Binary files differdeleted file mode 100644 index 773c4d48d1..0000000000 --- a/plugins/DevicesDetection/images/os/W61.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W65.gif b/plugins/DevicesDetection/images/os/W65.gif Binary files differdeleted file mode 100644 index 773c4d48d1..0000000000 --- a/plugins/DevicesDetection/images/os/W65.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W75.gif b/plugins/DevicesDetection/images/os/W75.gif Binary files differdeleted file mode 100644 index 3ca9cebca0..0000000000 --- a/plugins/DevicesDetection/images/os/W75.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W81.gif b/plugins/DevicesDetection/images/os/W81.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/W81.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W95.gif b/plugins/DevicesDetection/images/os/W95.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/W95.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W98.gif b/plugins/DevicesDetection/images/os/W98.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/W98.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WI7.gif b/plugins/DevicesDetection/images/os/WI7.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WI7.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WI8.gif b/plugins/DevicesDetection/images/os/WI8.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/WI8.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WME.gif b/plugins/DevicesDetection/images/os/WME.gif Binary files differdeleted file mode 100644 index 1ba0336426..0000000000 --- a/plugins/DevicesDetection/images/os/WME.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WNT.gif b/plugins/DevicesDetection/images/os/WNT.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/WNT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WP7.gif b/plugins/DevicesDetection/images/os/WP7.gif Binary files differdeleted file mode 100644 index 3ca9cebca0..0000000000 --- a/plugins/DevicesDetection/images/os/WP7.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WS3.gif b/plugins/DevicesDetection/images/os/WS3.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WS3.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WVI.gif b/plugins/DevicesDetection/images/os/WVI.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WVI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WXP.gif b/plugins/DevicesDetection/images/os/WXP.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WXP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json index 30019fe2fc..ab955f8201 100644 --- a/plugins/DevicesDetection/lang/en.json +++ b/plugins/DevicesDetection/lang/en.json @@ -30,6 +30,7 @@ "PluginDescription": "This plugin provides extended information about mobile devices, such as Brand (manufacturer), Model (device version), better Device type detection (tv, consoles, smart phones, desktop, etc) and more. This plugin adds a new report in 'Visitors > Devices'.", "SmartDisplay": "Smart display", "Smartphone": "Smartphone", + "PortableMediaPlayer": "Portable media player", "submenu": "Devices", "Tablet": "Tablet", "TV": "Tv", diff --git a/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js b/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js index f4c1580622..bd2cd2da49 100644 --- a/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js +++ b/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js @@ -22,8 +22,8 @@ describe("SimpleUITest", function () { }); it('should load a simple page by its module and action and take a full screenshot', function (done) { - var screenshotName = 'simple_page'; - // will take a screenshot and store it in "processed-ui-screenshots/SimpleUITest_simple_page.png" + var screenshotName = 'simplePage'; + // will take a screenshot and store it in "processed-ui-screenshots/SimpleUITest_simplePage.png" var urlToTest = "?" + generalParams + "&module=ExamplePlugin&action=index"; expect.screenshot(screenshotName).to.be.capture(function (page) { @@ -32,8 +32,8 @@ describe("SimpleUITest", function () { }); it('should load a simple page by its module and action and take a partial screenshot', function (done) { - var screenshotName = 'simple_page_partial'; - // will take a screenshot and store it in "processed-ui-screenshots/SimpleUITest_simple_page_partial.png" + var screenshotName = 'simplePagePartial'; + // will take a screenshot and store it in "processed-ui-screenshots/SimpleUITest_simplePagePartial.png" var contentSelector = '#root,.expandDataTableFooterDrawer'; // take a screenshot only of the content of this CSS/jQuery selector var urlToTest = "?" + generalParams + "&module=ExamplePlugin&action=index"; diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simple_page.png b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png Binary files differindex 7b84c80fc1..7b84c80fc1 100644 --- a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simple_page.png +++ b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simple_page_partial.png b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png Binary files differindex 386280a3b8..386280a3b8 100644 --- a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simple_page_partial.png +++ b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png 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 4b8cd5dc87..3c9365b4ce 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 @@ -63,9 +63,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.8</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> @@ -164,8 +166,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> @@ -264,8 +268,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> @@ -364,8 +370,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -464,8 +472,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -564,8 +574,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> @@ -664,8 +676,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -763,9 +777,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Smartphone</deviceType> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> + <operatingSystem>Android 2.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> @@ -863,9 +879,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> 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 70aeea0120..8a840dd7e4 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 @@ -227,8 +227,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -335,8 +337,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> @@ -447,9 +451,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -568,9 +574,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -696,9 +704,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -801,8 +811,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemName>Bot</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -905,8 +917,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -999,8 +1013,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -1102,9 +1118,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Smartphone</deviceType> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> + <operatingSystem>Android 2.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> @@ -1206,9 +1224,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> 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 a8529ea68d..e9f7b16d67 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -58,8 +58,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> @@ -204,8 +206,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -327,8 +331,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -464,8 +470,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -587,8 +595,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -741,8 +751,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -864,8 +876,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1001,8 +1015,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1124,8 +1140,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1278,8 +1296,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1401,8 +1421,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1538,8 +1560,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1675,8 +1699,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -1790,8 +1816,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1913,8 +1941,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -2067,8 +2097,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -2221,8 +2253,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -2336,8 +2370,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -2459,8 +2495,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -2596,8 +2634,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -2733,8 +2773,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -2870,8 +2912,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -2999,8 +3043,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -3122,8 +3168,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -3245,8 +3293,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -3368,8 +3418,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -3491,8 +3543,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -3645,8 +3699,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -3799,8 +3855,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -3953,8 +4011,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -4099,8 +4159,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -4222,8 +4284,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -4345,8 +4409,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -4468,8 +4534,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -4591,8 +4659,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml index 1e74517256..f32d4c4dc1 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>WXP</row> + <row>WIN</row> <row>UNK</row> </result>
\ No newline at end of file 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 1851d9513b..926d5d5b89 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -50,8 +50,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -151,8 +153,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -325,8 +329,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -426,8 +432,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -777,8 +785,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -878,8 +888,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -975,8 +987,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1145,8 +1159,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1242,8 +1258,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1589,8 +1607,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 1851d9513b..926d5d5b89 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -50,8 +50,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -151,8 +153,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -325,8 +329,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -426,8 +432,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -777,8 +785,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -878,8 +888,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -975,8 +987,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1145,8 +1159,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1242,8 +1258,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1589,8 +1607,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 822cd87824..47cdeba55f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Windows</label> + <nb_visits>11</nb_visits> + <nb_actions>12</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>10</bounce_count> + <nb_visits_converted>11</nb_visits_converted> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + </row> + <row> <label>Mac</label> <nb_visits>9</nb_visits> <nb_actions>12</nb_actions> @@ -25,18 +37,6 @@ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> - <label>Windows</label> - <nb_visits>11</nb_visits> - <nb_actions>12</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>242</sum_visit_length> - <bounce_count>10</bounce_count> - <nb_visits_converted>11</nb_visits_converted> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> - </row> - <row> <label>Android</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index e99fb79fdb..bc39002b6b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -58,7 +58,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> <label>Android 2.3</label> 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 ab85ae8d4a..f0b75e7e3d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -71,4 +71,9 @@ <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index cbd4ccf119..fc02d32884 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -67,8 +67,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 8.1</operatingSystem> - <operatingSystemCode>W81</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/W81.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> @@ -206,8 +208,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> @@ -315,8 +319,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> @@ -465,9 +471,11 @@ <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.9</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> @@ -580,8 +588,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> @@ -705,9 +715,11 @@ <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.9</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> @@ -838,9 +850,11 @@ <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.9</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> @@ -961,8 +975,10 @@ <referrerSearchEngineIcon /> <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemName>Android</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> @@ -1075,8 +1091,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> @@ -1246,8 +1264,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows 8</operatingSystem> - <operatingSystemCode>WI8</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI8.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> @@ -1364,8 +1384,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> @@ -1490,8 +1512,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> @@ -1787,8 +1811,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -1892,8 +1918,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion /> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -2014,8 +2042,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows</operatingSystem> - <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> @@ -2118,9 +2148,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.10</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> @@ -2241,9 +2273,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Smartphone</deviceType> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> + <operatingSystem>Android 4.4</operatingSystem> + <operatingSystemName>Android</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 39.0</browser> @@ -2346,9 +2380,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.10</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> @@ -2459,8 +2495,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> @@ -2576,8 +2614,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> @@ -2710,8 +2750,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 39.0</browser> @@ -2805,8 +2847,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -2899,8 +2943,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -3002,9 +3048,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -3128,9 +3176,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -3261,9 +3311,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -3370,8 +3422,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemName>Bot</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -3478,8 +3532,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -3575,8 +3631,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -3682,9 +3740,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Smartphone</deviceType> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> + <operatingSystem>Android 2.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> @@ -3790,9 +3850,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> @@ -3899,8 +3961,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> @@ -4003,8 +4067,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -4107,8 +4173,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> @@ -4211,8 +4279,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -4315,8 +4385,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -4419,8 +4491,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -4523,8 +4597,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -4627,8 +4703,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -4730,9 +4808,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.8</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> @@ -4835,8 +4915,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> @@ -4939,8 +5021,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> @@ -5043,8 +5127,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -5147,8 +5233,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> @@ -5251,8 +5339,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> @@ -5355,8 +5445,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemName>GNU/Linux</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> @@ -5458,9 +5550,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Smartphone</deviceType> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> + <operatingSystem>Android 2.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> @@ -5562,9 +5656,11 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> - <operatingSystem>Mac</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml index 1a87007b73..3a11507be4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Windows / Internet Explorer / unknown</label> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>6</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>GNU/Linux / Epiphany / unknown</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -23,17 +34,6 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows 7 / Internet Explorer / unknown</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> <label>Mac / Chrome / unknown</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> @@ -56,18 +56,18 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Android / Android Browser / unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Windows / Chrome / unknown</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>GNU/Linux / Firefox / unknown</label> + <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -78,7 +78,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows 7 / Chrome / unknown</label> + <label>GNU/Linux / Firefox / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -133,29 +133,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows / Internet Explorer / unknown</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>242</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>Windows XP / Chrome / 1280x800</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>Windows XP / Chrome / unknown</label> + <label>Windows / Chrome / 1280x800</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -166,7 +144,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows XP / Internet Explorer / 1024x768</label> + <label>Windows / Internet Explorer / 1024x768</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index 1a87007b73..3a11507be4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Windows / Internet Explorer / unknown</label> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>6</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>GNU/Linux / Epiphany / unknown</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -23,17 +34,6 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows 7 / Internet Explorer / unknown</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> <label>Mac / Chrome / unknown</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> @@ -56,18 +56,18 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Android / Android Browser / unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Windows / Chrome / unknown</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>GNU/Linux / Firefox / unknown</label> + <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -78,7 +78,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows 7 / Chrome / unknown</label> + <label>GNU/Linux / Firefox / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -133,29 +133,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows / Internet Explorer / unknown</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>242</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>Windows XP / Chrome / 1280x800</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>Windows XP / Chrome / unknown</label> + <label>Windows / Chrome / 1280x800</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -166,7 +144,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Windows XP / Internet Explorer / 1024x768</label> + <label>Windows / Internet Explorer / 1024x768</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index ab85ae8d4a..f0b75e7e3d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -71,4 +71,9 @@ <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 822cd87824..47cdeba55f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Windows</label> + <nb_visits>11</nb_visits> + <nb_actions>12</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>10</bounce_count> + <nb_visits_converted>11</nb_visits_converted> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + </row> + <row> <label>Mac</label> <nb_visits>9</nb_visits> <nb_actions>12</nb_actions> @@ -25,18 +37,6 @@ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> - <label>Windows</label> - <nb_visits>11</nb_visits> - <nb_actions>12</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>242</sum_visit_length> - <bounce_count>10</bounce_count> - <nb_visits_converted>11</nb_visits_converted> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> - </row> - <row> <label>Android</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index e99fb79fdb..bc39002b6b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -58,7 +58,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> <label>Android 2.3</label> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 0d6e1866ed..7bfd771393 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -94,8 +94,8 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> @@ -215,8 +215,8 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> @@ -336,8 +336,8 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> @@ -457,8 +457,8 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> @@ -609,8 +609,8 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> @@ -761,8 +761,8 @@ <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> 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 42810b5d2b..13a602c5e9 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 @@ -70,8 +70,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -227,8 +229,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -350,8 +354,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -507,8 +513,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -630,8 +638,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -787,8 +797,10 @@ <referrerSearchEngineIcon /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> @@ -902,8 +914,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 3b9733610e..aad2221cad 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 @@ -60,8 +60,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> @@ -211,8 +213,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -336,8 +340,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -477,8 +483,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -602,8 +610,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -761,8 +771,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -886,8 +898,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 daa7378e3b..e2655f545e 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 @@ -104,8 +104,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -229,8 +231,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -388,8 +392,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -529,8 +535,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -654,8 +662,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -779,8 +789,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -894,8 +906,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> 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 3b9733610e..aad2221cad 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 @@ -60,8 +60,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> @@ -211,8 +213,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -336,8 +340,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -477,8 +483,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -602,8 +610,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -761,8 +771,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -886,8 +898,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 ad4765cb3e..fd578a862c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -60,8 +60,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> @@ -211,8 +213,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -336,8 +340,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -477,8 +483,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -602,8 +610,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -761,8 +771,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -886,8 +898,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1027,8 +1041,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1152,8 +1168,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -1311,8 +1329,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index b749f9ebe4..4b9b40aeea 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 4429d16888..2080d81278 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index d1aae4191e..df75b8253a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -51,4 +51,9 @@ <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml index 1a63f1933a..318d2a3375 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Windows XP / Firefox / 1024x768</label> + <label>Windows / Firefox / 1024x768</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml index 1a63f1933a..318d2a3375 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Windows XP / Firefox / 1024x768</label> + <label>Windows / Firefox / 1024x768</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml index d1aae4191e..df75b8253a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml @@ -51,4 +51,9 @@ <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml index b749f9ebe4..4b9b40aeea 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml index 4429d16888..2080d81278 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 4c8451e2d8..59b8d0aee1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index d5c916aa6c..452580c138 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 782397bace..0eb81a014d 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 @@ -52,4 +52,9 @@ <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index d2dc8b28a9..22c0fc786e 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 @@ -61,8 +61,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -256,8 +258,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml index 7ce7628e83..f5eb1b4a1f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Windows XP / Firefox / 1024x768</label> + <label>Windows / Firefox / 1024x768</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml index 782397bace..0eb81a014d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml @@ -52,4 +52,9 @@ <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml index 4c8451e2d8..59b8d0aee1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index d5c916aa6c..452580c138 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 35d6ab1523..788e394e76 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 @@ -49,8 +49,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemName>Bot</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> @@ -156,8 +158,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemName>Bot</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> 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 da6d7b5331..1306581590 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 @@ -54,8 +54,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> - <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> @@ -146,8 +148,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> - <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> @@ -238,8 +242,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> - <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> 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 541ee8e70a..a6b84490de 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -49,8 +49,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 88350c305f..519512fcf8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -92,8 +92,8 @@ Windowsmedia,0,0% Visitor Configuration label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown / Unknown / 800x300,8,40,0%,5,00:15:01,0% -Windows XP / Firefox / 1024x768,2,2,0%,1,00:00:00,100% -Windows XP / Opera / 800x300,1,1,0%,1,00:00:00,100% +Windows / Firefox / 1024x768,2,2,0%,1,00:00:00,100% +Windows / Opera / 800x300,1,1,0%,1,00:00:00,100% Browser language label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 37aa7952b2..b765ca6ef2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -5040,7 +5040,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5133,7 +5133,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 b20a867002..7bdeab9d38 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 @@ -2159,7 +2159,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Windows XP / Firefox / 1024x768 </td> + Windows / Firefox / 1024x768 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 </td> @@ -2182,7 +2182,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;"> - Windows XP / Opera / 800x300 </td> + Windows / Opera / 800x300 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4933,7 +4933,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 src='plugins/DevicesDetection/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5020,7 +5020,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 src='plugins/DevicesDetection/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows XP </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_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 10e7fd78e3..152da458e3 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -134,7 +134,7 @@ <category>Visit</category> <name>Device type</name> <segment>deviceType</segment> - <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera</acceptedValues> + <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player</acceptedValues> </row> <row> <type>dimension</type> @@ -148,7 +148,7 @@ <category>Visit</category> <name>Operating system</name> <segment>operatingSystemCode</segment> - <acceptedValues>WXP, WI7, MAC, LIN, AND, IPD, etc.</acceptedValues> + <acceptedValues>WIN, MAC, LIN, AND, IPD, etc.</acceptedValues> </row> <row> <type>dimension</type> 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 055d71f03c..aeb3df32fc 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 d08b661442..ad7b5f05e4 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 @@ -76,8 +76,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -289,8 +291,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 84daaca05a..fde6f79018 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -154,8 +154,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -491,8 +493,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -714,8 +718,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index cc59cc4ac5..1cf8d1b08f 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -90,7 +90,7 @@ Windowsmedia,0,0% Visitor Configuration label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows XP / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20% +Windows / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20% Browser language label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 34dfb95a22..835fdc6e71 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -6704,7 +6704,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6772,7 +6772,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 09d60cd7a6..7792107689 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 @@ -2173,7 +2173,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;"> - Windows XP / Firefox / 1024x768 </td> + Windows / Firefox / 1024x768 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 5 </td> @@ -6470,7 +6470,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 src='plugins/DevicesDetection/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6532,7 +6532,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 src='plugins/DevicesDetection/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WIN.gif'> Windows XP </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 35c5260100..a7230abb14 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 @@ -49,8 +49,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> @@ -164,8 +166,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> @@ -338,8 +342,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 35c5260100..a7230abb14 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 @@ -49,8 +49,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> @@ -164,8 +166,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> @@ -338,8 +342,10 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 730b17d9ed..583e3bcb75 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 @@ -95,8 +95,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> @@ -211,8 +213,10 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 4bd5f17d6b6e5398cd98de270f2d5b0164c14aa +Subproject 5d9d1d6691b4f0ebeb0496c3daa077d59200a9d diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js index 652b00568e..e615c80777 100644 --- a/tests/lib/screenshot-testing/support/page-renderer.js +++ b/tests/lib/screenshot-testing/support/page-renderer.js @@ -172,7 +172,16 @@ PageRenderer.prototype._load = function (url, callback) { } this._recreateWebPage(); // calling open a second time never calls the callback - this.webpage.open(url, callback); + this.webpage.open(url, function (status) { + this.evaluate(function () { + var $ = window.jQuery; + $('html').addClass('uiTest'); + }); + + if (callback) { + callback(status); + } + }); }; PageRenderer.prototype._evaluate = function (impl, callback) { |
