From 5dca1a29bd36a17911406b9348cf9982484dbde9 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka.moorthi@gmail.com>
Date: Wed, 27 Feb 2013 02:04:54 +0000
Subject: [PATCH] Refs #3632, add integration test for import script replay
tracking.
---
misc/log-analytics/import_logs.py | 3 +-
tests/PHPUnit/Integration/ImportLogsTest.php | 19 +++++
...Logs__Actions.getEntryPageTitles_month.xml | 34 +++++++++
...rtLogs__Actions.getEntryPageUrls_month.xml | 36 +++++++++
...tLogs__Actions.getExitPageTitles_month.xml | 34 +++++++++
...ortLogs__Actions.getExitPageUrls_month.xml | 36 +++++++++
...mportLogs__Actions.getPageTitles_month.xml | 34 +++++++++
...t_ImportLogs__Actions.getPageUrl_month.xml | 21 ++++-
..._ImportLogs__Actions.getPageUrls_month.xml | 36 +++++++++
.../test_ImportLogs__Actions.get_month.xml | 4 +-
...stomVariables.getCustomVariables_month.xml | 76 +++++++++++++++++++
...tLogs__Goals.getDaysToConversion_month.xml | 4 +-
...portLogs__Goals.getItemsCategory_month.xml | 12 ++-
...t_ImportLogs__Goals.getItemsName_month.xml | 12 ++-
...st_ImportLogs__Goals.getItemsSku_month.xml | 12 ++-
...__Goals.getVisitsUntilConversion_month.xml | 2 +-
.../test_ImportLogs__Goals.get_month.xml | 8 +-
...st_ImportLogs__MultiSites.getAll_month.xml | 8 +-
...st_ImportLogs__MultiSites.getOne_month.xml | 8 +-
...ImportLogs__Provider.getProvider_month.xml | 10 +--
...test_ImportLogs__Referers.getAll_month.xml | 41 +++++++++-
....getNumberOfDistinctWebsitesUrls_month.xml | 2 +-
...rers.getNumberOfDistinctWebsites_month.xml | 2 +-
...ortLogs__Referers.getRefererType_month.xml | 56 ++++++++++++++
...ImportLogs__Referers.getWebsites_month.xml | 63 ++++++++++++++-
..._ImportLogs__UserCountry.getCity_month.xml | 18 ++---
...rtLogs__UserCountry.getContinent_month.xml | 18 ++---
...portLogs__UserCountry.getCountry_month.xml | 18 ++---
...mportLogs__UserCountry.getRegion_month.xml | 18 ++---
...ogs__UserSettings.getBrowserType_month.xml | 10 +--
...__UserSettings.getBrowserVersion_month.xml | 36 ++++++---
...ortLogs__UserSettings.getBrowser_month.xml | 32 ++++----
...s__UserSettings.getConfiguration_month.xml | 20 +++++
...rtLogs__UserSettings.getLanguage_month.xml | 10 +--
..._UserSettings.getMobileVsDesktop_month.xml | 10 +--
...rtLogs__UserSettings.getOSFamily_month.xml | 22 +++---
...t_ImportLogs__UserSettings.getOS_month.xml | 22 ++++--
...portLogs__UserSettings.getPlugin_month.xml | 52 ++++++-------
...Logs__UserSettings.getResolution_month.xml | 20 +++++
...Logs__UserSettings.getWideScreen_month.xml | 22 ++++++
...t_ImportLogs__VisitFrequency.get_month.xml | 14 ++--
...rtLogs__VisitTime.getByDayOfWeek_month.xml | 6 +-
....getVisitInformationPerLocalTime_month.xml | 22 +++---
...getVisitInformationPerServerTime_month.xml | 19 +++--
...getNumberOfVisitsByDaysSinceLast_month.xml | 4 +-
...st.getNumberOfVisitsByVisitCount_month.xml | 2 +-
...nterest.getNumberOfVisitsPerPage_month.xml | 2 +-
...etNumberOfVisitsPerVisitDuration_month.xml | 2 +-
...rtLogs__VisitsSummary.getActions_month.xml | 2 +-
...gs__VisitsSummary.getBounceCount_month.xml | 2 +-
..._VisitsSummary.getUniqueVisitors_month.xml | 2 +-
...VisitsSummary.getVisitsConverted_month.xml | 2 +-
...ortLogs__VisitsSummary.getVisits_month.xml | 2 +-
...st_ImportLogs__VisitsSummary.get_month.xml | 14 ++--
tests/resources/fake_logs_replay.log | 6 ++
55 files changed, 809 insertions(+), 193 deletions(-)
create mode 100644 tests/resources/fake_logs_replay.log
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index b48fe9b4a9..031a1e9eae 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -1348,6 +1348,7 @@ class Parser(object):
hits = []
for lineno, line in enumerate(file):
+ print("LINE: " + line)
try:
line = line.decode(config.options.encoding)
except UnicodeDecodeError:
@@ -1449,7 +1450,7 @@ class Parser(object):
except UnicodeDecodeError:
invalid_line(line, 'invalid encoding')
continue
-
+ print("SUCCESSFUL PARSE")
# Check if the hit must be excluded.
if all((method(hit) for method in self.check_methods)):
hits.append(hit)
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
index 7722eb3a10..fa9bc5013e 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -102,6 +102,7 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase
{
self::logVisitsWithStaticResolver(self::$tokenAuth);
self::logVisitsWithAllEnabled(self::$tokenAuth);
+ self::replayLogFile(self::$tokenAuth);
}
/**
@@ -155,6 +156,23 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase
self::executeLogImporter($logFile, $opts);
}
+ public static $output;
+ /**
+ * Logs a couple visit using log entries that are tracking requests to a piwik.php file.
+ * Adds two visits to idSite=1 and two to non-existant sites.
+ */
+ protected static function replayLogFile( $token_auth )
+ {
+ $logFile = PIWIK_INCLUDE_PATH.'/tests/resources/fake_logs_replay.log';
+
+ $opts = array('--token-auth' => $token_auth,
+ '--recorders' => '4',
+ '--recorder-max-payload-size' => '2',
+ '--replay-tracking' => false);
+
+ self::executeLogImporter($logFile, $opts);
+ echo print_r(self::$output, true);
+ }
protected static function executeLogImporter( $logFile, $options )
{
@@ -181,6 +199,7 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase
// run the command
exec($cmd, $output, $result);
+ self::$output = $output;
if ($result !== 0)
{
throw new Exception("log importer failed: ".implode("\n", $output)."\n\ncommand used: $cmd");
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
index 3be030ce1b..77e2b64918 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
@@ -96,4 +96,38 @@
</row>
</subtable>
</row>
+ <row>
+ <label> incredible title!</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
+ <row>
+ <label> Piwik Forums</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 34d9de8cb2..bc73f49c8b 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -388,6 +388,24 @@
<exit_rate>100%</exit_rate>
<url>http://piwik.net/</url>
</row>
+ <row>
+ <label>/index.htm</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/index.htm</url>
+ </row>
<row>
<label>/moved-permanently</label>
<nb_visits>1</nb_visits>
@@ -404,6 +422,24 @@
<exit_rate>0%</exit_rate>
<url>http://piwik.net/moved-permanently</url>
</row>
+ <row>
+ <label>/register.php?0,approve=9a94a02145599</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+ </row>
<row>
<label>/to-an-error</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
index 16cbe295ee..f1b90a5e1d 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
@@ -90,4 +90,38 @@
</row>
</subtable>
</row>
+ <row>
+ <label> incredible title!</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
+ <row>
+ <label> Piwik Forums</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 6157951c30..45f6b4c156 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -388,6 +388,42 @@
<exit_rate>100%</exit_rate>
<url>http://piwik.net/</url>
</row>
+ <row>
+ <label>/index.htm</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/index.htm</url>
+ </row>
+ <row>
+ <label>/register.php?0,approve=9a94a02145599</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+ </row>
<row>
<label>/temp-redirect</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 65f4da611c..2d7babf5e2 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -130,4 +130,38 @@
</row>
</subtable>
</row>
+ <row>
+ <label> incredible title!</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
+ <row>
+ <label> Piwik Forums</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml
index c234bed59e..c5d48fa621 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml
@@ -1,2 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>/index.htm</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/index.htm</url>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index d42c3b62f9..83ebace1e2 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -388,6 +388,24 @@
<exit_rate>100%</exit_rate>
<url>http://piwik.net/</url>
</row>
+ <row>
+ <label>/index.htm</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/index.htm</url>
+ </row>
<row>
<label>/moved-permanently</label>
<nb_visits>1</nb_visits>
@@ -404,6 +422,24 @@
<exit_rate>0%</exit_rate>
<url>http://piwik.net/moved-permanently</url>
</row>
+ <row>
+ <label>/register.php?0,approve=9a94a02145599</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+ </row>
<row>
<label>/temp-redirect</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
index 0cb16f1ed7..d6bddb919f 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>22</nb_pageviews>
- <nb_uniq_pageviews>22</nb_uniq_pageviews>
+ <nb_pageviews>24</nb_pageviews>
+ <nb_uniq_pageviews>24</nb_uniq_pageviews>
<nb_downloads>3</nb_downloads>
<nb_uniq_downloads>3</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 16b68fd747..dac2ed1a3f 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -116,4 +116,80 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Forum status</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>Anonymous</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>VisitorType</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>NewLoggedOut</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index 6de32dd474..e6257ea020 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>21</nb_conversions>
+ <nb_conversions>22</nb_conversions>
</row>
<row>
<label>1 day</label>
@@ -54,6 +54,6 @@
</row>
<row>
<label>365+ days</label>
- <nb_conversions>0</nb_conversions>
+ <nb_conversions>1</nb_conversions>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
index c234bed59e..89122851de 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
@@ -1,2 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>Electronics & Cameras</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_price>0</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml
index c234bed59e..161d8ffeae 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml
@@ -1,2 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>PRODUCT name</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_price>0</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml
index c234bed59e..c5ee399492 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml
@@ -1,2 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>SKU2</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_price>0</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index eafb511671..126898a098 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>21</nb_conversions>
+ <nb_conversions>23</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
index 3480f5fdaf..487d2fe91c 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>21</nb_conversions>
- <nb_visits_converted>21</nb_visits_converted>
- <conversion_rate>95.45</conversion_rate>
- <revenue>105</revenue>
+ <nb_conversions>23</nb_conversions>
+ <nb_visits_converted>23</nb_visits_converted>
+ <conversion_rate>95.83</conversion_rate>
+ <revenue>115</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
index 99048045e3..d8817d7cd6 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
- <nb_pageviews>22</nb_pageviews>
- <revenue>105</revenue>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
+ <nb_pageviews>24</nb_pageviews>
+ <revenue>115</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 40187c1ae4..30ec637970 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
- <nb_pageviews>22</nb_pageviews>
- <revenue>105</revenue>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
+ <nb_pageviews>24</nb_pageviews>
+ <revenue>115</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
index 8313b82936..5eec41dedf 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>20</bounce_count>
- <nb_visits_converted>21</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
+ <bounce_count>22</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<url>http://piwik.org/faq/general/#faq_52</url>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getAll_month.xml
index c234bed59e..5366ba283b 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getAll_month.xml
@@ -1,2 +1,41 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>sn110w.snt110.mail.live.com</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <referrer_type>3</referrer_type>
+ </row>
+ <row>
+ <label>piwik.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <referrer_type>3</referrer_type>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsitesUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsitesUrls_month.xml
index f5722c2b94..13002b2017 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsitesUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsitesUrls_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>0</result>
\ No newline at end of file
+<result>2</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsites_month.xml
index f5722c2b94..13002b2017 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsites_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getNumberOfDistinctWebsites_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>0</result>
\ No newline at end of file
+<result>2</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
index 4acaf6cf58..2af36d17dd 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
@@ -18,4 +18,60 @@
<revenue>105</revenue>
<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
</row>
+ <row>
+ <label>Websites</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>piwik.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>sn110w.snt110.mail.live.com</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getWebsites_month.xml
index c234bed59e..51a1e169f8 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getWebsites_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getWebsites_month.xml
@@ -1,2 +1,63 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>piwik.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>http://piwik.org/contribute%</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>sn110w.snt110.mail.live.com</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 70685acddb..146a03b570 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>18</nb_visits>
- <nb_actions>21</nb_actions>
+ <nb_visits>20</nb_visits>
+ <nb_actions>23</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>16</bounce_count>
+ <bounce_count>18</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>17</nb_conversions>
- <nb_visits_converted>17</nb_visits_converted>
- <revenue>85</revenue>
+ <nb_conversions>19</nb_conversions>
+ <nb_visits_converted>19</nb_visits_converted>
+ <revenue>95</revenue>
</row>
</goals>
- <nb_conversions>17</nb_conversions>
- <revenue>85</revenue>
- <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
+ <nb_conversions>19</nb_conversions>
+ <revenue>95</revenue>
+ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<city_name>Unknown</city_name>
<city>xx</city>
<region>xx</region>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 5247313589..90e9302ad7 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -21,21 +21,21 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
+ <bounce_count>7</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>5</nb_conversions>
- <nb_visits_converted>5</nb_visits_converted>
- <revenue>25</revenue>
+ <nb_conversions>7</nb_conversions>
+ <nb_visits_converted>7</nb_visits_converted>
+ <revenue>35</revenue>
</row>
</goals>
- <nb_conversions>5</nb_conversions>
- <revenue>25</revenue>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <nb_conversions>7</nb_conversions>
+ <revenue>35</revenue>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<code>Unknown</code>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 06961e716c..64fc19dca9 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -24,21 +24,21 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
+ <bounce_count>7</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>5</nb_conversions>
- <nb_visits_converted>5</nb_visits_converted>
- <revenue>25</revenue>
+ <nb_conversions>7</nb_conversions>
+ <nb_visits_converted>7</nb_visits_converted>
+ <revenue>35</revenue>
</row>
</goals>
- <nb_conversions>5</nb_conversions>
- <revenue>25</revenue>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <nb_conversions>7</nb_conversions>
+ <revenue>35</revenue>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<code>xx</code>
<logo>plugins/UserCountry/flags/xx.png</logo>
<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 7452c8fa2e..537d511755 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>18</nb_visits>
- <nb_actions>21</nb_actions>
+ <nb_visits>20</nb_visits>
+ <nb_actions>23</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>16</bounce_count>
+ <bounce_count>18</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>17</nb_conversions>
- <nb_visits_converted>17</nb_visits_converted>
- <revenue>85</revenue>
+ <nb_conversions>19</nb_conversions>
+ <nb_visits_converted>19</nb_visits_converted>
+ <revenue>95</revenue>
</row>
</goals>
- <nb_conversions>17</nb_conversions>
- <revenue>85</revenue>
- <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
+ <nb_conversions>19</nb_conversions>
+ <revenue>95</revenue>
+ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<region>xx</region>
<country>xx</country>
<country_name>Unknown</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index 7326a8c90e..915be1564a 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>WebKit (Safari, Chrome)</label>
- <nb_visits>15</nb_visits>
- <nb_actions>18</nb_actions>
+ <nb_visits>17</nb_visits>
+ <nb_actions>20</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>13</bounce_count>
- <nb_visits_converted>14</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors>
+ <bounce_count>15</bounce_count>
+ <nb_visits_converted>16</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
<shortLabel>Webkit</shortLabel>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index 101fd920bb..ff0876738d 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>Chrome 11.0</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <shortLabel>Chrome 11.0</shortLabel>
+ </row>
<row>
<label>Epiphany 2.30</label>
<nb_visits>5</nb_visits>
@@ -12,18 +24,6 @@
<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
<shortLabel>Epiphany 2.30</shortLabel>
</row>
- <row>
- <label>Chrome 11.0</label>
- <nb_visits>4</nb_visits>
- <nb_actions>7</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>3</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
- <shortLabel>Chrome 11.0</shortLabel>
- </row>
<row>
<label>Internet Explorer 10.6</label>
<nb_visits>3</nb_visits>
@@ -96,4 +96,16 @@
<logo>plugins/UserSettings/images/browsers/SF.gif</logo>
<shortLabel>Safari 4.0</shortLabel>
</row>
+ <row>
+ <label>Safari 5.0</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/browsers/SF.gif</logo>
+ <shortLabel>Safari 5.0</shortLabel>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index ea27472629..d470f4f74f 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>Chrome</label>
+ <nb_visits>9</nb_visits>
+ <nb_actions>12</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>8</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ </row>
<row>
<label>Epiphany</label>
<nb_visits>5</nb_visits>
@@ -11,17 +22,6 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
</row>
- <row>
- <label>Chrome</label>
- <nb_visits>8</nb_visits>
- <nb_actions>11</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>7</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
- </row>
<row>
<label>Internet Explorer</label>
<nb_visits>5</nb_visits>
@@ -46,13 +46,13 @@
</row>
<row>
<label>Safari</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/SF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 71f44fe212..837580ece3 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -70,4 +70,24 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
+ <row>
+ <label>Mac OS / Safari / 1024x768</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Windows XP / Chrome / 1280x800</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index 38b8a1a452..619432c8a6 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -2,12 +2,12 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>20</bounce_count>
- <nb_visits_converted>21</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
+ <bounce_count>22</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index 3bf521f051..da48305153 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Desktop</label>
- <nb_visits>20</nb_visits>
- <nb_actions>23</nb_actions>
+ <nb_visits>22</nb_visits>
+ <nb_actions>25</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>18</bounce_count>
- <nb_visits_converted>19</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <bounce_count>20</bounce_count>
+ <nb_visits_converted>21</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/screens/normal.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 12afdb5adc..6779e9aa40 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -13,24 +13,24 @@
</row>
<row>
<label>Windows</label>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
+ <nb_visits>8</nb_visits>
+ <nb_actions>8</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>7</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <bounce_count>8</bounce_count>
+ <nb_visits_converted>8</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/WXP.gif</logo>
</row>
<row>
<label>Mac</label>
- <nb_visits>5</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>9</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <bounce_count>4</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
index 834b99cbf1..3f6f85b4f4 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -26,13 +26,13 @@
</row>
<row>
<label>Mac OS</label>
- <nb_visits>5</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>9</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <bounce_count>4</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
<shortLabel>Mac OS</shortLabel>
</row>
@@ -48,4 +48,16 @@
<logo>plugins/UserSettings/images/os/AND.gif</logo>
<shortLabel>Android</shortLabel>
</row>
+ <row>
+ <label>Windows XP</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <shortLabel>Win XP</shortLabel>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index 92546ec333..95676b0900 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -2,40 +2,46 @@
<result>
<row>
<label>Cookie</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
+ <nb_visits>2</nb_visits>
+ <nb_visits_percentage>10.5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
- <row>
- <label>Director</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/director.gif</logo>
- </row>
<row>
<label>Flash</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
+ <nb_visits>2</nb_visits>
+ <nb_visits_percentage>10.5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
- <row>
- <label>Gears</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/gears.gif</logo>
- </row>
<row>
<label>Java</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
+ <nb_visits>2</nb_visits>
+ <nb_visits_percentage>10.5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
+ <row>
+ <label>Director</label>
+ <nb_visits>1</nb_visits>
+ <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <logo>plugins/UserSettings/images/plugins/director.gif</logo>
+ </row>
+ <row>
+ <label>Gears</label>
+ <nb_visits>1</nb_visits>
+ <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <logo>plugins/UserSettings/images/plugins/gears.gif</logo>
+ </row>
<row>
<label>Pdf</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
+ <nb_visits>1</nb_visits>
+ <nb_visits_percentage>5.3%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
+ <row>
+ <label>Windowsmedia</label>
+ <nb_visits>1</nb_visits>
+ <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
+ </row>
<row>
<label>Quicktime</label>
<nb_visits>0</nb_visits>
@@ -54,10 +60,4 @@
<nb_visits_percentage>0%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
</row>
- <row>
- <label>Windowsmedia</label>
- <nb_visits>0</nb_visits>
- <nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index d72a720892..8748a04c89 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -10,4 +10,24 @@
<nb_visits_converted>21</nb_visits_converted>
<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
</row>
+ <row>
+ <label>1024x768</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>1280x800</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
index ba8027ec22..5637d8a458 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
@@ -11,4 +11,26 @@
<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/screens/unknown.gif</logo>
</row>
+ <row>
+ <label>Normal</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/screens/normal.gif</logo>
+ </row>
+ <row>
+ <label>Wide</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/screens/wide.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
index a1c52e41ac..136fde3415 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits_returning>0</nb_visits_returning>
- <nb_actions_returning>0</nb_actions_returning>
- <max_actions_returning>0</max_actions_returning>
+ <nb_visits_returning>1</nb_visits_returning>
+ <nb_actions_returning>1</nb_actions_returning>
+ <max_actions_returning>1</max_actions_returning>
<sum_visit_length_returning>0</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
- <nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
+ <bounce_count_returning>1</bounce_count_returning>
+ <nb_visits_converted_returning>1</nb_visits_converted_returning>
+ <bounce_rate_returning>100%</bounce_rate_returning>
+ <nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
<avg_time_on_site_returning>0</avg_time_on_site_returning>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 7629519923..f06bbb064a 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -12,7 +12,11 @@
</row>
<row>
<label>Wednesday</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>2</nb_visits>
+ <bounce_count>2</bounce_count>
+ <nb_actions>2</nb_actions>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits_converted>2</nb_visits_converted>
<day_of_week>3</day_of_week>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index f3a2a11be0..0492e7e2a6 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -82,13 +82,13 @@
</row>
<row>
<label>8h</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>9h</label>
@@ -122,13 +122,13 @@
</row>
<row>
<label>12h</label>
- <nb_visits>0</nb_visits>
- <nb_actions>0</nb_actions>
- <max_actions>0</max_actions>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>0</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>13h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 9cdec99708..beae477c35 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -42,13 +42,22 @@
</row>
<row>
<label>4h</label>
- <nb_visits>0</nb_visits>
- <nb_actions>0</nb_actions>
- <max_actions>0</max_actions>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>0</bounce_count>
+ <bounce_count>2</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>5h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 173db63250..0721d82d14 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>22</nb_visits>
+ <nb_visits>23</nb_visits>
</row>
<row>
<label>0 days</label>
@@ -58,6 +58,6 @@
</row>
<row>
<label>365+ days</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>1</nb_visits>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index a5e21f1080..9398bbf528 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>22</nb_visits>
+ <nb_visits>24</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index bb68bd0e63..a3bde0ed6d 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>20</nb_visits>
+ <nb_visits>22</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index c4c524be4d..2c6a690369 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>20</nb_visits>
+ <nb_visits>22</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 4c77f1f6e6..40bd2e592a 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>27</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 150341e14d..8ed00bd628 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>20</result>
\ No newline at end of file
+<result>22</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 8ed00bd628..5154fe8a28 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>22</result>
\ No newline at end of file
+<result>24</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 738d0b74ef..f832b0e0c7 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>21</result>
\ No newline at end of file
+<result>23</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 8ed00bd628..5154fe8a28 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>22</result>
\ No newline at end of file
+<result>24</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 3383576955..7eea85710e 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>22</nb_uniq_visitors>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
- <nb_visits_converted>21</nb_visits_converted>
- <bounce_count>20</bounce_count>
+ <nb_uniq_visitors>24</nb_uniq_visitors>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
+ <nb_visits_converted>23</nb_visits_converted>
+ <bounce_count>22</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>91%</bounce_rate>
+ <bounce_rate>92%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>14</avg_time_on_site>
+ <avg_time_on_site>13</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/resources/fake_logs_replay.log b/tests/resources/fake_logs_replay.log
new file mode 100644
index 0000000000..a9d0a19237
--- /dev/null
+++ b/tests/resources/fake_logs_replay.log
@@ -0,0 +1,6 @@
+- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=1&rec=1&apiv=1&rand=1636495582&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU2%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
+- - - [15/Aug/2012:06:30:13 +0200] "GET /piwik.php?action_name=Piwik%20Forums&idsite=1&rec=1&r=136285&h=8&m=0&s=47&url=http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599&urlref=http%3A%2F%2Fsn110w.snt110.mail.live.com%2Fmail%2FInboxLight.aspx%3Fn%3D184083971&_id=0290799d35c0f2ba&_idts=1306645141&_idvc=1&_idn=0&_refts=0&_viewts=1306645141&pdf=1&qt=0&realp=0&wma=1&dir=1&fla=1&java=1&gears=1&ag=0&res=1280x800&cookie=1&_cvar=%7B%223%22%3A%5B%22Forum%20status%22%2C%22Anonymous%22%5D%7D HTTP/1.1" 200 43 "http://forum.piwik.org/register.php?0,approve=9a94a02145599" "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.71 Safari/534.24"
+- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=2&rec=1&apiv=1&rand=837354687&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU+VERY+nice+indeed%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Another+Product+page+with+no+category&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
+175.41.192.40 - - [09/Aug/2012:10:10:38 +0200] "GET /blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=3&rec=1&apiv=1&rand=1976958961&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Looking+at+Electronics+%26+Cameras+page+with+a+page+level+custom+variable&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
+175.41.192.40 - - [09/Aug/2012:10:11:30 +0200] "GET /faq/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
\ No newline at end of file
--
GitLab