From 9f790f6cf03af740d03d0a032b23ee8bc578ed32 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Wed, 21 Jan 2015 21:52:43 +0100
Subject: [PATCH] fixed some tests
---
...ITest__Live.getLastVisitsDetails_range.xml | 140 ++++++++---
...mEvents__Live.getLastVisitsDetails_day.xml | 40 +++-
...vents__Live.getLastVisitsDetails_month.xml | 40 +++-
...__DevicesDetection.getOsFamilies_month.xml | 24 +-
...tLogs__Live.getLastVisitsDetails_range.xml | 220 +++++++++++++-----
...ogs__Resolution.getConfiguration_month.xml | 64 ++---
...s__UserSettings.getConfiguration_month.xml | 64 ++---
...rtLogs__UserSettings.getOSFamily_month.xml | 24 +-
...eTest__Live.getLastVisitsDetails_month.xml | 40 +++-
...isits__Resolution.getConfiguration_day.xml | 2 +-
...its__UserSettings.getConfiguration_day.xml | 2 +-
...Support__Live.getLastVisitsDetails_day.xml | 8 +-
...ort__UserSettings.getConfiguration_day.xml | 2 +-
...ecified__Live.getLastVisitsDetails_day.xml | 8 +-
...eDays__Live.getLastVisitsDetails_month.xml | 12 +-
...nesTest__Live.getLastVisitsDetails_day.xml | 4 +-
...dReports.generateReport_month.original.csv | 4 +-
...Reports.generateReport_month.original.html | 4 +-
...Ordered__Live.getLastVisitsDetails_day.xml | 8 +-
...thItems__Live.getLastVisitsDetails_day.xml | 12 +-
...edReports.generateReport_week.original.csv | 2 +-
...dReports.generateReport_week.original.html | 2 +-
...tadataAndNormalAPI__Live.getLastVisits.xml | 12 +-
...alAPI__Live.getLastVisitsDetails_range.xml | 12 +-
...taAndNormalAPI__Live.getVisitorProfile.xml | 8 +-
25 files changed, 491 insertions(+), 267 deletions(-)
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 4a98e4f841..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 2d0d364cb7..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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 2d0d364cb7..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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 932360de02..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,5 +1,17 @@
<?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>
@@ -24,18 +36,6 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<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/WIN.gif</logo>
- </row>
<row>
<label>Android</label>
<nb_visits>3</nb_visits>
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 9da45b6562..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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,5 +1,16 @@
<?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>
@@ -22,17 +33,6 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<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>
@@ -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,5 +1,16 @@
<?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>
@@ -22,17 +33,6 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<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>
@@ -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.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 932360de02..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,5 +1,17 @@
<?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>
@@ -24,18 +36,6 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<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/WIN.gif</logo>
- </row>
<row>
<label>Android</label>
<nb_visits>3</nb_visits>
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 05f6aff074..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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__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_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index c1efc85539..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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_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 527e80c89b..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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 e02c0bb402..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>WIN</operatingSystemCode>
+ <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 18ea02d6f8..1ab9c0e278 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,1,2,0%,2,00:06:01,0%
-Windows XP / Opera / 800x300,1,1,0%,1,00:00:00,100%
+Windows / Firefox / 1024x768,1,2,0%,2,00:06:01,0%
+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_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 281b79477e..2bc0107006 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;">
1
</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>
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 fed02e3d8a..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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 4ef78b147b..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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_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 03b067e735..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>
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 ff1865261a..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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 ff1865261a..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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 f100345db1..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>WIN</operatingSystemCode>
+ <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>WIN</operatingSystemCode>
+ <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>
--
GitLab