From 4b4bd25ae13c4538a9e92f9980eaba6d08152c70 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Fri, 10 Oct 2014 18:43:52 +0200
Subject: [PATCH] small cleanup in tests: - renamed code coverage tests units
to new structure - removed processed system test files from git, added to
.gitignore
---
.gitignore | 2 +-
.travis.yml | 12 +-
...CustomVariables.getCustomVariables_day.xml | 395 ------------------
...ionTest__Live.getLastVisitsDetails_day.xml | 176 --------
...CustomVariables.getCustomVariables_day.xml | 395 ------------------
...temTest__Live.getLastVisitsDetails_day.xml | 176 --------
.../System/processed/test___API.get_day.xml | 30 --
.../test___Goals.getItemsSku_day.xml | 12 -
...est___UserSettings.getLanguageCode_day.xml | 157 -------
.../test___UserSettings.getLanguage_day.xml | 135 ------
tests/PHPUnit/phpunit.xml.dist | 1 +
tests/travis/travis.sh | 10 +-
12 files changed, 13 insertions(+), 1488 deletions(-)
delete mode 100644 plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml
delete mode 100644 plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
delete mode 100644 plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
delete mode 100644 plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
delete mode 100644 plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml
delete mode 100644 plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml
delete mode 100644 plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguageCode_day.xml
delete mode 100644 plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguage_day.xml
diff --git a/.gitignore b/.gitignore
index a121288446..e1be781d50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ php_errors.log
*.tmp
*.pyc
.DS_Store
-processed/*xml
/bootstrap.php
/build
@@ -22,6 +21,7 @@ processed/*xml
/plugins/*.zip
/plugins/ImageGraph/fonts/unifont.ttf
/plugins/ImageGraph/fonts/unifont.ttf.zip
+/plugins/*/tests/System/processed
/robots.txt
/tmp/
/vendor/
diff --git a/.travis.yml b/.travis.yml
index 8290476d33..8df1bf946a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,19 +43,19 @@ matrix:
- php: hhvm
- php: 5.6
- php: 5.4
- env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Core
+ env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Sytem
- php: 5.4
- env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Plugins
+ env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
- php: 5.4
- env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=System
+ env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Unit
include:
# Code Coverage
- php: 5.4
- env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Core
+ env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Sytem
- php: 5.4
- env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Plugins
+ env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
- php: 5.4
- env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=System
+ env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Unit
exclude:
# Javascript tests need to run only on one PHP version
- php: 5.4
diff --git a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml
deleted file mode 100644
index 1ecaf61b08..0000000000
--- a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Name_PAGE_1</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_2</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_3</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE3</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_4</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_5</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_6</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE6</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_7</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE7</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_8</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE8</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_3</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT3</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_6</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT6</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_7</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT7</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_8</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT8</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
deleted file mode 100644
index a02dc66b3a..0000000000
--- a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
-
- <actionDetails>
- <row>
- <type>goal</type>
- <goalName>triggered js</goalName>
- <goalId>1</goalId>
- <revenue>0</revenue>
- <goalPageId />
-
- <url>http://localhost</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
- </row>
- <row>
- <type>action</type>
- <url>http://localhost</url>
- <pageTitle>Profile page</pageTitle>
- <pageIdAction>2</pageIdAction>
-
- <pageId>1</pageId>
- <customVariables>
- <row>
- <customVariablePageName1>Name_PAGE_1</customVariablePageName1>
- <customVariablePageValue1>Val_PAGE1</customVariablePageValue1>
- </row>
- <row>
- <customVariablePageName2>Name_PAGE_2</customVariablePageName2>
- <customVariablePageValue2>Val_PAGE2</customVariablePageValue2>
- </row>
- <row>
- <customVariablePageName3>Name_PAGE_3</customVariablePageName3>
- <customVariablePageValue3>Val_PAGE3</customVariablePageValue3>
- </row>
- <row>
- <customVariablePageName4>Name_PAGE_4</customVariablePageName4>
- <customVariablePageValue4>Val_PAGE4</customVariablePageValue4>
- </row>
- <row>
- <customVariablePageName5>Name_PAGE_5</customVariablePageName5>
- <customVariablePageValue5>Val_PAGE5</customVariablePageValue5>
- </row>
- <row>
- <customVariablePageName6>Name_PAGE_6</customVariablePageName6>
- <customVariablePageValue6>Val_PAGE6</customVariablePageValue6>
- </row>
- <row>
- <customVariablePageName7>Name_PAGE_7</customVariablePageName7>
- <customVariablePageValue7>Val_PAGE7</customVariablePageValue7>
- </row>
- <row>
- <customVariablePageName8>Name_PAGE_8</customVariablePageName8>
- <customVariablePageValue8>Val_PAGE8</customVariablePageValue8>
- </row>
- </customVariables>
- <icon />
- </row>
- </actionDetails>
- <goalConversions>1</goalConversions>
- <siteCurrency>USD</siteCurrency>
- <siteCurrencySymbol>$</siteCurrencySymbol>
-
-
-
-
- <searches>0</searches>
- <actions>1</actions>
- <userId />
- <visitorType>new</visitorType>
- <visitorTypeIcon />
- <visitConverted>1</visitConverted>
- <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
- <visitCount>1</visitCount>
-
- <visitEcommerceStatus>none</visitEcommerceStatus>
- <visitEcommerceStatusIcon />
- <daysSinceFirstVisit>0</daysSinceFirstVisit>
- <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <visitDuration>4</visitDuration>
- <visitDurationPretty>4s</visitDurationPretty>
- <customVariables>
- <row>
- <customVariableName1>Name_VISIT_1</customVariableName1>
- <customVariableValue1>Val_VISIT1</customVariableValue1>
- </row>
- <row>
- <customVariableName2>Name_VISIT_2</customVariableName2>
- <customVariableValue2>Val_VISIT2</customVariableValue2>
- </row>
- <row>
- <customVariableName3>Name_VISIT_3</customVariableName3>
- <customVariableValue3>Val_VISIT3</customVariableValue3>
- </row>
- <row>
- <customVariableName4>Name_VISIT_4</customVariableName4>
- <customVariableValue4>Val_VISIT4</customVariableValue4>
- </row>
- <row>
- <customVariableName5>Name_VISIT_5</customVariableName5>
- <customVariableValue5>Val_VISIT5</customVariableValue5>
- </row>
- <row>
- <customVariableName6>Name_VISIT_6</customVariableName6>
- <customVariableValue6>Val_VISIT6</customVariableValue6>
- </row>
- <row>
- <customVariableName7>Name_VISIT_7</customVariableName7>
- <customVariableValue7>Val_VISIT7</customVariableValue7>
- </row>
- <row>
- <customVariableName8>Name_VISIT_8</customVariableName8>
- <customVariableValue8>Val_VISIT8</customVariableValue8>
- </row>
- </customVariables>
- <deviceType>Desktop</deviceType>
- <events>0</events>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
- <referrerType>search</referrerType>
- <referrerTypeName>Search Engines</referrerTypeName>
- <referrerName>Google</referrerName>
- <referrerKeyword>this keyword should be ranked</referrerKeyword>
- <referrerKeywordPosition>1</referrerKeywordPosition>
- <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
- <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
- <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <continent>Europe</continent>
- <continentCode>eur</continentCode>
- <country>France</country>
- <countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
- <region />
- <regionCode />
- <city />
- <location>France</location>
- <latitude />
- <longitude />
- <operatingSystem>Windows XP</operatingSystem>
- <operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemShortName>Win XP</operatingSystemShortName>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
- <screenType>normal</screenType>
- <resolution>1024x768</resolution>
- <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
- <visitLocalTime>12:34:06</visitLocalTime>
- <visitLocalHour>12</visitLocalHour>
- <daysSinceLastVisit>0</daysSinceLastVisit>
-
-
-
-
-
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
deleted file mode 100644
index 1ecaf61b08..0000000000
--- a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Name_PAGE_1</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_2</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_3</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE3</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_4</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_5</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_6</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE6</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_7</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE7</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_PAGE_8</label>
- <nb_actions>1</nb_actions>
- <subtable>
- <row>
- <label>Val_PAGE8</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_3</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT3</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_6</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT6</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_7</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT7</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
- <row>
- <label>Name_VISIT_8</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- <subtable>
- <row>
- <label>Val_VISIT8</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>0</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>0</revenue>
- </row>
- </subtable>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
deleted file mode 100644
index a61cb11554..0000000000
--- a/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
-
- <actionDetails>
- <row>
- <type>goal</type>
- <goalName>triggered js</goalName>
- <goalId>1</goalId>
- <revenue>0</revenue>
- <goalPageId />
-
- <url>http://localhost</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
- </row>
- <row>
- <type>action</type>
- <url>http://localhost</url>
- <pageTitle>Profile page</pageTitle>
- <pageIdAction>2</pageIdAction>
-
- <pageId>1</pageId>
- <customVariables>
- <row>
- <customVariablePageName1>Name_PAGE_1</customVariablePageName1>
- <customVariablePageValue1>Val_PAGE1</customVariablePageValue1>
- </row>
- <row>
- <customVariablePageName2>Name_PAGE_2</customVariablePageName2>
- <customVariablePageValue2>Val_PAGE2</customVariablePageValue2>
- </row>
- <row>
- <customVariablePageName3>Name_PAGE_3</customVariablePageName3>
- <customVariablePageValue3>Val_PAGE3</customVariablePageValue3>
- </row>
- <row>
- <customVariablePageName4>Name_PAGE_4</customVariablePageName4>
- <customVariablePageValue4>Val_PAGE4</customVariablePageValue4>
- </row>
- <row>
- <customVariablePageName5>Name_PAGE_5</customVariablePageName5>
- <customVariablePageValue5>Val_PAGE5</customVariablePageValue5>
- </row>
- <row>
- <customVariablePageName6>Name_PAGE_6</customVariablePageName6>
- <customVariablePageValue6>Val_PAGE6</customVariablePageValue6>
- </row>
- <row>
- <customVariablePageName7>Name_PAGE_7</customVariablePageName7>
- <customVariablePageValue7>Val_PAGE7</customVariablePageValue7>
- </row>
- <row>
- <customVariablePageName8>Name_PAGE_8</customVariablePageName8>
- <customVariablePageValue8>Val_PAGE8</customVariablePageValue8>
- </row>
- </customVariables>
- <icon />
- </row>
- </actionDetails>
- <goalConversions>1</goalConversions>
- <siteCurrency>USD</siteCurrency>
- <siteCurrencySymbol>$</siteCurrencySymbol>
-
-
-
-
- <searches>0</searches>
- <actions>1</actions>
- <userId />
- <visitorType>new</visitorType>
- <visitorTypeIcon />
- <visitConverted>1</visitConverted>
- <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
- <visitCount>1</visitCount>
-
- <visitEcommerceStatus>none</visitEcommerceStatus>
- <visitEcommerceStatusIcon />
- <daysSinceFirstVisit>0</daysSinceFirstVisit>
- <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <visitDuration>4</visitDuration>
- <visitDurationPretty>4s</visitDurationPretty>
- <customVariables>
- <row>
- <customVariableName1>Name_VISIT_1</customVariableName1>
- <customVariableValue1>Val_VISIT1</customVariableValue1>
- </row>
- <row>
- <customVariableName2>Name_VISIT_2</customVariableName2>
- <customVariableValue2>Val_VISIT2</customVariableValue2>
- </row>
- <row>
- <customVariableName3>Name_VISIT_3</customVariableName3>
- <customVariableValue3>Val_VISIT3</customVariableValue3>
- </row>
- <row>
- <customVariableName4>Name_VISIT_4</customVariableName4>
- <customVariableValue4>Val_VISIT4</customVariableValue4>
- </row>
- <row>
- <customVariableName5>Name_VISIT_5</customVariableName5>
- <customVariableValue5>Val_VISIT5</customVariableValue5>
- </row>
- <row>
- <customVariableName6>Name_VISIT_6</customVariableName6>
- <customVariableValue6>Val_VISIT6</customVariableValue6>
- </row>
- <row>
- <customVariableName7>Name_VISIT_7</customVariableName7>
- <customVariableValue7>Val_VISIT7</customVariableValue7>
- </row>
- <row>
- <customVariableName8>Name_VISIT_8</customVariableName8>
- <customVariableValue8>Val_VISIT8</customVariableValue8>
- </row>
- </customVariables>
- <deviceType>Desktop</deviceType>
- <events>0</events>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
- <referrerType>search</referrerType>
- <referrerTypeName>Search Engines</referrerTypeName>
- <referrerName>Google</referrerName>
- <referrerKeyword>this keyword should be ranked</referrerKeyword>
- <referrerKeywordPosition>1</referrerKeywordPosition>
- <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
- <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
- <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <continent>Europe</continent>
- <continentCode>eur</continentCode>
- <country>France</country>
- <countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
- <region />
- <regionCode />
- <city />
- <location>France</location>
- <latitude />
- <longitude />
- <operatingSystem>Windows XP</operatingSystem>
- <operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemShortName>Win XP</operatingSystemShortName>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
- <screenType>normal</screenType>
- <resolution>1024x768</resolution>
- <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
- <visitLocalTime>12:34:06</visitLocalTime>
- <visitLocalHour>12</visitLocalHour>
- <daysSinceLastVisit>0</daysSinceLastVisit>
-
-
-
-
-
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml b/plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml
deleted file mode 100644
index 1cfef75f4b..0000000000
--- a/plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_users>0</nb_users>
- <nb_actions>4</nb_actions>
- <max_actions>2</max_actions>
- <bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2</nb_actions_per_visit>
- <avg_time_on_site>632</avg_time_on_site>
- <nb_visits_returning>0</nb_visits_returning>
- <nb_actions_returning>0</nb_actions_returning>
- <nb_uniq_visitors_returning>0</nb_uniq_visitors_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
- <nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
- <avg_time_on_site_returning>0</avg_time_on_site_returning>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <conversion_rate>50</conversion_rate>
- <revenue>2541</revenue>
- <nb_pageviews>3</nb_pageviews>
- <nb_uniq_pageviews>3</nb_uniq_pageviews>
- <nb_downloads>0</nb_downloads>
- <nb_uniq_downloads>0</nb_uniq_downloads>
- <nb_outlinks>0</nb_outlinks>
- <nb_uniq_outlinks>0</nb_uniq_outlinks>
- <nb_searches>1</nb_searches>
- <nb_keywords>1</nb_keywords>
- <avg_time_generation>0</avg_time_generation>
-</result>
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml b/plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml
deleted file mode 100644
index ba820ed649..0000000000
--- a/plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>SKU_ID</label>
- <revenue>25641</revenue>
- <quantity>33</quantity>
- <orders>1</orders>
- <avg_price>777</avg_price>
- <avg_quantity>33</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguageCode_day.xml b/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguageCode_day.xml
deleted file mode 100644
index 689e3d7d37..0000000000
--- a/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguageCode_day.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Polish (pl)</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>English - United States (en-us)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>French - Belgium (fr-be)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Arabic - Qatar (ar-qa)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Czech - Czech Republic (cs-cz)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>German (de)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Greek - Greece (el-gr)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Basque - Spain (eu-es)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>French (fr)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>French - Switzerland (fr-ch)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Serbian - Serbia Montenegro (sr-cs)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Thai (th)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Unknown - Liberia (xx-lr)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Chinese - Singapore (zh-sg)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
-</result>
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguage_day.xml b/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguage_day.xml
deleted file mode 100644
index 6bb328c660..0000000000
--- a/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguage_day.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Polish</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>English</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>French</label>
- <nb_uniq_visitors>3</nb_uniq_visitors>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Arabic</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Czech</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>German</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Greek</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Basque</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Serbian</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Thai</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Unknown</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
- <row>
- <label>Chinese</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist
index a900ce40df..2a8179aee4 100644
--- a/tests/PHPUnit/phpunit.xml.dist
+++ b/tests/PHPUnit/phpunit.xml.dist
@@ -72,6 +72,7 @@
<directory suffix=".php">../../plugins/*/Updates</directory>
<directory suffix=".php">../../plugins/*/libs</directory>
<directory suffix=".php">../../plugins/*/tests</directory>
+ <directory suffix=".php">../../plugins/*/Test</directory>
</exclude>
</whitelist>
</filter>
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index 71859ea70e..a996c46ee9 100755
--- a/tests/travis/travis.sh
+++ b/tests/travis/travis.sh
@@ -70,14 +70,14 @@ else
if [ "$COVERAGE" = "System" ]
then
echo "Executing non System tests in test suite SystemTests..."
- phpunit --configuration phpunit.xml --testsuite SystemTests --exclude-group System --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml || true
- elif [ "$COVERAGE" = "Core" ]
+ phpunit --configuration phpunit.xml --testsuite SystemTests --exclude-group System --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-system.xml || true
+ elif [ "$COVERAGE" = "Unit" ]
then
echo "Executing tests in test suite UnitTests..."
- phpunit --configuration phpunit.xml --testsuite UnitTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-core.xml || true
- elif [ "$COVERAGE" = "Plugins" ]
+ phpunit --configuration phpunit.xml --testsuite UnitTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-unit.xml || true
+ elif [ "$COVERAGE" = "Integration" ]
then
echo "Executing tests in test suite IntegrationTests..."
- phpunit --configuration phpunit.xml --testsuite IntegrationTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-plugins.xml || true
+ phpunit --configuration phpunit.xml --testsuite IntegrationTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml || true
fi;
fi
\ No newline at end of file
--
GitLab