diff --git a/plugins/DevicePlugins/tests/System/UserSettingsBCTest.php b/plugins/DevicePlugins/tests/System/UserSettingsBCTest.php
deleted file mode 100644
index 1901960abbd85bd7c3d44f0efefc61e93750e7ca..0000000000000000000000000000000000000000
--- a/plugins/DevicePlugins/tests/System/UserSettingsBCTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\DevicePlugins\tests\System;
-
-use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
-
-/**
- * @group DevicePlugins
- * @group DevicePlugins_System
- */
-class UserSettingsBCTest extends SystemTestCase
-{
- /**
- * @var OneVisitorTwoVisits
- */
- public static $fixture;
-
- /**
- * @dataProvider getApiForTesting
- */
- public function test_Api($api, $params)
- {
- $this->runApiTests($api, $params);
- }
-
- public function getApiForTesting()
- {
- $idSite = self::$fixture->idSite;
- $dateTime = self::$fixture->dateTime;
-
- $api = array(
- 'UserSettings.getPlugin',
- );
-
- $result = array();
-
-
- foreach ($api as $method) {
- list($module, $action) = explode('.', $method);
-
- // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
- // against DevicePlugins & overwrite the module & action w/ otherRequestParameters)
- $result[] = array('DevicePlugins.getPlugin', array('idSite' => $idSite,
- 'date' => $dateTime,
- 'periods' => array('day'),
- 'testSuffix' => $module . '_' . $method . '_',
- 'otherRequestParameters' => array(
- 'method' => $method,
- ),
- ));
-
- // api metadata tests
- $result[] = array('API.getMetadata', array(
- 'idSite' => $idSite,
- 'date' => $dateTime,
- 'apiModule' => $module,
- 'apiAction' => $action,
- 'testSuffix' => $module . '_' . $method . '_',
- ));
- }
-
- return $result;
- }
-
- public static function getPathToTestDirectory()
- {
- return dirname(__FILE__);
- }
-}
-
-UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml
deleted file mode 100644
index a1ab29592e1fcbc90db21032a2671c5410f0002e..0000000000000000000000000000000000000000
--- a/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Browser Plugins</name>
- <module>DevicePlugins</module>
- <action>getPlugin</action>
- <dimension>Plugin</dimension>
- <documentation>This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.</documentation>
- <metrics>
- <nb_visits>Visits</nb_visits>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- </metricsDocumentation>
- <processedMetrics>
- <nb_visits_percentage>% Visits</nb_visits_percentage>
- </processedMetrics>
- <constantRowsCount>1</constantRowsCount>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicePlugins&apiAction=getPlugin&period=day&date=2010-03-06</imageGraphUrl>
- <uniqueId>DevicePlugins_getPlugin</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicePlugins.getPlugin_day.xml b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicePlugins.getPlugin_day.xml
deleted file mode 100644
index 72728977e1a14514399c39119d67ece38f14a71c..0000000000000000000000000000000000000000
--- a/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicePlugins.getPlugin_day.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php b/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php
deleted file mode 100644
index e86887780d63cefac9d26c0d49f0ad831a9a0300..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\DevicesDetection\tests\System;
-
-use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
-
-/**
- * @group DevicesDetection
- * @group DevicesDetection_System
- */
-class UserSettingsBCTest extends SystemTestCase
-{
- /**
- * @var OneVisitorTwoVisits
- */
- public static $fixture;
-
- /**
- * @dataProvider getApiForTesting
- */
- public function test_Api($api, $params)
- {
- $this->runApiTests($api, $params);
- }
-
- public function getApiForTesting()
- {
- $idSite = self::$fixture->idSite;
- $dateTime = self::$fixture->dateTime;
-
- $api = array(
- 'UserSettings.getBrowser',
- 'UserSettings.getBrowserVersion',
- 'UserSettings.getMobileVsDesktop',
- 'UserSettings.getOS',
- 'UserSettings.getOSFamily',
- 'UserSettings.getBrowserType',
- );
-
- $result = array();
-
-
- foreach ($api as $method) {
- list($module, $action) = explode('.', $method);
-
- // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
- // against DevicesDetection & overwrite the module & action w/ otherRequestParameters)
- $result[] = array('DevicesDetection.getBrowsers', array('idSite' => $idSite,
- 'date' => $dateTime,
- 'periods' => array('day'),
- 'testSuffix' => $module . '_' . $method . '_',
- 'otherRequestParameters' => array(
- 'method' => $method,
- ),
- ));
-
- // api metadata tests
- $result[] = array('API.getMetadata', array(
- 'idSite' => $idSite,
- 'date' => $dateTime,
- 'apiModule' => $module,
- 'apiAction' => $action,
- 'testSuffix' => $module . '_' . $method . '_',
- ));
- }
-
- return $result;
- }
-
- public static function getPathToTestDirectory()
- {
- return dirname(__FILE__);
- }
-}
-
-UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___API.getMetadata_day.xml
deleted file mode 100644
index 00bd3aad0ada7898f8b13acd6d2ba6ce44b22b72..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___API.getMetadata_day.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Browser engines</name>
- <module>DevicesDetection</module>
- <action>getBrowserEngines</action>
- <dimension>Browser engine</dimension>
- <documentation>This report shows your visitors' browsers broken down into browser engines. <br /> The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.</documentation>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserEngines&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserEngines&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getBrowserEngines</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___DevicesDetection.getBrowsers_day.xml
deleted file mode 100644
index 7e5e262294b635bb177510b24ec335698c9d7336..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___DevicesDetection.getBrowsers_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Gecko (Firefox)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <segment>browserEngine==Gecko</segment>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___API.getMetadata_day.xml
deleted file mode 100644
index 8c027b02072f1997af600d338e01a7176d1671b0..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___API.getMetadata_day.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Browser version</name>
- <module>DevicesDetection</module>
- <action>getBrowserVersions</action>
- <dimension>Browser version</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Browsers</name>
- <module>DevicesDetection</module>
- <action>getBrowsers</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___DevicesDetection.getBrowsers_day.xml
deleted file mode 100644
index 3c2fe50a07e7aecd2dc8a8f511ad9244e19a8218..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___DevicesDetection.getBrowsers_day.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Firefox 3.6</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <segment>browserCode==FF;browserVersion==3.6</segment>
- <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___API.getMetadata_day.xml
deleted file mode 100644
index fa0ddd6acf336aafd59556514684b0b1e9383806..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___API.getMetadata_day.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Browsers</name>
- <module>DevicesDetection</module>
- <action>getBrowsers</action>
- <dimension>Browser</dimension>
- <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Browser version</name>
- <module>DevicesDetection</module>
- <action>getBrowserVersions</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getBrowsers</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___DevicesDetection.getBrowsers_day.xml
deleted file mode 100644
index 68128919afa8a1571728e089d355d13f1c34d8e7..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___DevicesDetection.getBrowsers_day.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Firefox</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
- <segment>browserCode==FF</segment>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml
deleted file mode 100644
index cf3cc410024653eda988d63378e6600b13a56c49..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Devices</subcategory>
- <name>Device type</name>
- <module>DevicesDetection</module>
- <action>getType</action>
- <dimension>Device type</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- </processedMetrics>
- <metricsGoal>
- <nb_conversions>Conversions</nb_conversions>
- <revenue>Revenue</revenue>
- </metricsGoal>
- <processedMetricsGoal>
- <revenue_per_visit>Revenue per Visit</revenue_per_visit>
- </processedMetricsGoal>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getType&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getType&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getType</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml
deleted file mode 100644
index b04af03db4c8c2fef645553bcd37eee674a3a537..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Desktop</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='2'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>1</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>1</revenue>
- <segment>deviceType==desktop</segment>
- <logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
- </row>
- <row>
- <label>Camera</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==camera</segment>
- <logo>plugins/DevicesDetection/images/screens/camera.png</logo>
- </row>
- <row>
- <label>Car browser</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==car+browser</segment>
- <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
- </row>
- <row>
- <label>Console</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==console</segment>
- <logo>plugins/DevicesDetection/images/screens/console.gif</logo>
- </row>
- <row>
- <label>Feature phone</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==feature+phone</segment>
- <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
- </row>
- <row>
- <label>Phablet</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==phablet</segment>
- <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
- </row>
- <row>
- <label>Portable media player</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==portable+media+player</segment>
- <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
- </row>
- <row>
- <label>Smart display</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==smart+display</segment>
- <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
- </row>
- <row>
- <label>Smartphone</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==smartphone</segment>
- <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
- </row>
- <row>
- <label>Tablet</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==tablet</segment>
- <logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
- </row>
- <row>
- <label>Tv</label>
- <nb_visits>0</nb_visits>
- <segment>deviceType==tv</segment>
- <logo>plugins/DevicesDetection/images/screens/tv.png</logo>
- </row>
- <row>
- <label>Unknown</label>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>42</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>42</revenue>
- <nb_visits>0</nb_visits>
- <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___API.getMetadata_day.xml
deleted file mode 100644
index ac3c2586dc484fe8ae3bc0bf0d17652a6f1e7aad..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___API.getMetadata_day.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Operating System families</name>
- <module>DevicesDetection</module>
- <action>getOsFamilies</action>
- <dimension>Operating system family</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Operating System versions</name>
- <module>DevicesDetection</module>
- <action>getOsVersions</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getOsFamilies</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___DevicesDetection.getBrowsers_day.xml
deleted file mode 100644
index 1883e1f03ee4f834b04431841fa1bcaa22ca9089..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___DevicesDetection.getBrowsers_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Windows</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___API.getMetadata_day.xml
deleted file mode 100644
index 957d9b88cc1c356695aae68705f95b43096ec9f1..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___API.getMetadata_day.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Operating System versions</name>
- <module>DevicesDetection</module>
- <action>getOsVersions</action>
- <dimension>Operating System versions</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Operating System families</name>
- <module>DevicesDetection</module>
- <action>getOsFamilies</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getOsVersions</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___DevicesDetection.getBrowsers_day.xml
deleted file mode 100644
index ee964d53f1eaffd0660eaf46ba2e42f25325a240..0000000000000000000000000000000000000000
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___DevicesDetection.getBrowsers_day.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Windows XP</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
- <logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/Resolution/tests/System/UserSettingsBCTest.php b/plugins/Resolution/tests/System/UserSettingsBCTest.php
deleted file mode 100644
index beae888701e876c87dae8d8ce73a964b5ae24cb9..0000000000000000000000000000000000000000
--- a/plugins/Resolution/tests/System/UserSettingsBCTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\Resolution\tests\System;
-
-use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
-
-/**
- * @group Resolution
- * @group Resolution_System
- */
-class UserSettingsBCTest extends SystemTestCase
-{
- /**
- * @var OneVisitorTwoVisits
- */
- public static $fixture;
-
- /**
- * @dataProvider getApiForTesting
- */
- public function test_Api($api, $params)
- {
- $this->runApiTests($api, $params);
- }
-
- public function getApiForTesting()
- {
- $idSite = self::$fixture->idSite;
- $dateTime = self::$fixture->dateTime;
-
- $api = array(
- 'UserSettings.getResolution',
- 'UserSettings.getConfiguration',
- );
-
- $result = array();
-
-
- foreach ($api as $method) {
- list($module, $action) = explode('.', $method);
-
- // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
- // against Resolution & overwrite the module & action w/ otherRequestParameters)
- $result[] = array('Resolution.getResolution', array('idSite' => $idSite,
- 'date' => $dateTime,
- 'periods' => array('day'),
- 'testSuffix' => $module . '_' . $method . '_',
- 'otherRequestParameters' => array(
- 'method' => $method,
- ),
- ));
-
- // api metadata tests
- $result[] = array('API.getMetadata', array(
- 'idSite' => $idSite,
- 'date' => $dateTime,
- 'apiModule' => $module,
- 'apiAction' => $action,
- 'testSuffix' => $module . '_' . $method . '_',
- ));
- }
-
- return $result;
- }
-
- public static function getPathToTestDirectory()
- {
- return dirname(__FILE__);
- }
-}
-
-UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml
deleted file mode 100644
index 991d2dbc51d9aea0dbf1ca3ed0ff3edd6b593ac5..0000000000000000000000000000000000000000
--- a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Software</subcategory>
- <name>Configurations</name>
- <module>Resolution</module>
- <action>getConfiguration</action>
- <dimension>Configuration</dimension>
- <documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Screen Resolution</name>
- <module>Resolution</module>
- <action>getResolution</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>Resolution_getConfiguration</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___Resolution.getResolution_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___Resolution.getResolution_day.xml
deleted file mode 100644
index a4804d3e5dc7b6e50bdb9f2bf97b69f410f9ae8e..0000000000000000000000000000000000000000
--- a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___Resolution.getResolution_day.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Windows / Firefox / 1024x768</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml
deleted file mode 100644
index c0f69291259124f367164db24e35ba684f03558e..0000000000000000000000000000000000000000
--- a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Devices</subcategory>
- <name>Screen Resolution</name>
- <module>Resolution</module>
- <action>getResolution</action>
- <dimension>Resolution</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Configurations</name>
- <module>Resolution</module>
- <action>getConfiguration</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>Resolution_getResolution</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___Resolution.getResolution_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___Resolution.getResolution_day.xml
deleted file mode 100644
index 2d976569580c5522bf1a049765be128e69cea26b..0000000000000000000000000000000000000000
--- a/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___Resolution.getResolution_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>1024x768</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <segment>resolution==1024x768</segment>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/System/UserSettingsBCTest.php b/plugins/UserLanguage/tests/System/UserSettingsBCTest.php
deleted file mode 100644
index 208048b8ccf79814a65444d7c04243b4dcca3c73..0000000000000000000000000000000000000000
--- a/plugins/UserLanguage/tests/System/UserSettingsBCTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\UserLanguage\tests\System;
-
-use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
-
-/**
- * @group UserLanguage
- * @group UserLanguage_System
- */
-class UserSettingsBCTest extends SystemTestCase
-{
- /**
- * @var OneVisitorTwoVisits
- */
- public static $fixture;
-
- /**
- * @dataProvider getApiForTesting
- */
- public function test_Api($api, $params)
- {
- $this->runApiTests($api, $params);
- }
-
- public function getApiForTesting()
- {
- $idSite = self::$fixture->idSite;
- $dateTime = self::$fixture->dateTime;
-
- $api = array(
- 'UserSettings.getLanguage',
- 'UserSettings.getLanguageCode',
- );
-
- $result = array();
-
- foreach ($api as $method) {
- list($module, $action) = explode('.', $method);
-
- // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
- // against UserLanguage & overwrite the module & action w/ otherRequestParameters)
- $result[] = array('UserLanguage.getLanguage', array('idSite' => $idSite,
- 'date' => $dateTime,
- 'periods' => array('day'),
- 'testSuffix' => $module . '_' . $method . '_',
- 'otherRequestParameters' => array(
- 'method' => $method,
- ),
- ));
-
- // api metadata tests
- $result[] = array('API.getMetadata', array(
- 'idSite' => $idSite,
- 'date' => $dateTime,
- 'apiModule' => $module,
- 'apiAction' => $action,
- 'testSuffix' => $module . '_' . $method . '_',
- ));
- }
-
- return $result;
- }
-
- public static function getPathToTestDirectory()
- {
- return dirname(__FILE__);
- }
-}
-
-UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml
deleted file mode 100644
index 609bf27f42d4bb75b155ee139b408f09241c83ba..0000000000000000000000000000000000000000
--- a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Locations</subcategory>
- <name>Language code</name>
- <module>UserLanguage</module>
- <action>getLanguageCode</action>
- <dimension>Language</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Browser language</name>
- <module>UserLanguage</module>
- <action>getLanguage</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserLanguage&apiAction=getLanguageCode&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserLanguage&apiAction=getLanguageCode&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>UserLanguage_getLanguageCode</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___UserLanguage.getLanguage_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___UserLanguage.getLanguage_day.xml
deleted file mode 100644
index de31fc9d359ef1474002fc6334ea4f81862898f6..0000000000000000000000000000000000000000
--- a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___UserLanguage.getLanguage_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>French (fr)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <segment>languageCode==fr</segment>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml
deleted file mode 100644
index 5dd35140ad6dfd06a65c9a44e0f1f43665a34ad5..0000000000000000000000000000000000000000
--- a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <category>Visitors</category>
- <subcategory>Locations</subcategory>
- <name>Browser language</name>
- <module>UserLanguage</module>
- <action>getLanguage</action>
- <dimension>Language</dimension>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <relatedReports>
- <row>
- <name>Language code</name>
- <module>UserLanguage</module>
- <action>getLanguageCode</action>
- </row>
- </relatedReports>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserLanguage&apiAction=getLanguage&period=day&date=2010-03-06</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserLanguage&apiAction=getLanguage&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
- <uniqueId>UserLanguage_getLanguage</uniqueId>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___UserLanguage.getLanguage_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___UserLanguage.getLanguage_day.xml
deleted file mode 100644
index 2e95d73c83758e43789f5032db344f0b2cc2d4f6..0000000000000000000000000000000000000000
--- a/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___UserLanguage.getLanguage_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>French</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>8</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>7</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <segment>languageCode==fr,languageCode=@fr-</segment>
- </row>
-</result>
\ No newline at end of file