updated tests

9 files changed, 65 insertions, 2 deletions

diff --git a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
index d6f2742da5..f0f64bf021 100644
--- a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
+++ b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
@@ -35,7 +35,7 @@ class OneVisitorLongUrlsTruncatedTest extends SystemTestCase
             'Actions.getPageUrls',
 
             // Specifically testing getPlugin filter_truncate works
-            'UserSettings.getPlugin');
+            'DevicePlugins.getPlugin');
 
         return array(
             array($apiToCall, array('idSite'                 => self::$fixture->idSite,
diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
index 1122a59c90..fdd32288a8 100755
--- a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
@@ -34,7 +34,7 @@ class OneVisitorTwoVisitsWithCookieSupportTest extends SystemTestCase
     {
         $apiToCall = array(
             'VisitTime', 'VisitsSummary', 'VisitorInterest', 'VisitFrequency', 'UserSettings', 'DevicesDetection',
-            'UserCountry', 'Referrers', 'Provider', 'Goals', 'CustomVariables', 'CoreAdminHome',
+            'UserCountry', 'Referrers', 'Provider', 'Goals', 'CustomVariables', 'CoreAdminHome', 'DevicePlugins',
             'Actions', 'Live.getLastVisitsDetails');
 
         return array(
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
index 9fd23368c3..9fd23368c3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml
index 72728977e1..72728977e1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml
new file mode 100644
index 0000000000..72728977e1
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Cookie</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
+	</row>
+	<row>
+		<label>Flash</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
+	</row>
+	<row>
+		<label>Java</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
+	</row>
+	<row>
+		<label>Director</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
+	</row>
+	<row>
+		<label>Gears</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
+	</row>
+	<row>
+		<label>Pdf</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
+	</row>
+	<row>
+		<label>Quicktime</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
+	</row>
+	<row>
+		<label>Realplayer</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
+	</row>
+	<row>
+		<label>Silverlight</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
+	</row>
+	<row>
+		<label>Windowsmedia</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml
index 000a410083..000a410083 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_day.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_week.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicePlugins.getPlugin_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicePlugins.getPlugin_day.xml