diff options
69 files changed, 1147 insertions, 208 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 8d5afccc17..7b51d2e282 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -191,11 +191,11 @@ class IisFormat(RegexFormat): fields = { 'date': '(?P<date>^\d+[-\d+]+', - 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together + 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together not sure how to fix ATM. 'cs-uri-stem': '(?P<path>/\S*)', 'cs-uri-query': '(?P<query_string>\S*)', 'c-ip': '"?(?P<ip>[\d*.]*)"?', - 'cs(User-Agent)': '(?P<user_agent>".*?"|\S+)', # TODO: must remove quotes if found. also benchmark regex. + 'cs(User-Agent)': '(?P<user_agent>".*?"|\S+)', # TODO: also benchmark regex. 'cs(Referer)': '(?P<referrer>\S+)', 'sc-status': '(?P<status>\d+)', 'sc-bytes': '(?P<length>\S+)', diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 326eded8b4..1249a57334 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -28,6 +28,7 @@ class ManySitesImportedLogs extends Fixture public $addSegments = false; public $includeIisWithCustom = false; + public $includeNetscaler = false; public static function createAccessInstance() { @@ -116,6 +117,10 @@ class ManySitesImportedLogs extends Fixture if ($this->includeIisWithCustom) { $this->logIisWithCustomFormat(); } + + if ($this->includeNetscaler) { + $this->logNetscaler(); + } } private function setupSegments() @@ -243,7 +248,19 @@ class ManySitesImportedLogs extends Fixture '--token-auth' => self::getTokenAuth(), '--iis-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host'), '--enable-http-errors' => false, - '--enable-http-redirects' => false,); + '--enable-http-redirects' => false); + + self::executeLogImporter($logFile, $opts); + } + + private function logNetscaler() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_netscaler.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth(), + '--iis-map-field' => array(), + '--enable-http-redirects' => false); self::executeLogImporter($logFile, $opts); } diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index ae98fff219..b13317b68f 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -103,4 +103,5 @@ class ImportLogsTest extends SystemTestCase } ImportLogsTest::$fixture = new ManySitesImportedLogs(); -ImportLogsTest::$fixture->includeIisWithCustom = true;
\ No newline at end of file +ImportLogsTest::$fixture->includeIisWithCustom = true; +ImportLogsTest::$fixture->includeNetscaler = true;
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index 6bddc34c80..020761177c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -99,6 +99,39 @@ </subtable> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</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>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> <label>500</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml index 34ede98abf..760d1e36f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -149,6 +149,43 @@ <avg_time_generation>0.145</avg_time_generation> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</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>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> <label>500</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 571104d49e..422bfa8942 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -389,6 +389,86 @@ <url>http://piwik.net/</url> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index 276835546d..0f3aa66b95 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -647,6 +647,90 @@ </subtable> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index 359024222a..a58e9b42ed 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -84,6 +84,39 @@ </subtable> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</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>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml index e92f88170b..682edbd2ba 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -134,6 +134,43 @@ <avg_time_generation>0.145</avg_time_generation> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</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>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 73eb0a4e7b..47a40e19e2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -389,6 +389,83 @@ <url>http://piwik.net/</url> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_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>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index 9c72bb4a22..ce178ffc4b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -647,6 +647,87 @@ </subtable> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_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>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index c2d09b9558..590338f7e9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,10 +2,10 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>21</nb_visits> - <nb_hits>21</nb_hits> + <nb_visits>22</nb_visits> + <nb_hits>22</nb_hits> <sum_time_spent>0</sum_time_spent> - <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -109,6 +109,39 @@ </subtable> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</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>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 748064246b..57201f6135 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,13 +2,13 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>22</nb_visits> - <nb_hits>31</nb_hits> + <nb_visits>23</nb_visits> + <nb_hits>32</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>10</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -163,6 +163,43 @@ <avg_time_generation>0.145</avg_time_generation> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</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>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index 8a94ddc971..f06bc16d8e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -389,6 +389,99 @@ <url>http://piwik.net/</url> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_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>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 1331341d0e..7f92f111a8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -647,6 +647,103 @@ </subtable> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_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>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index 8ea3b42ae1..b3451748fd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>29</nb_pageviews> - <nb_uniq_pageviews>29</nb_uniq_pageviews> + <nb_pageviews>31</nb_pageviews> + <nb_uniq_pageviews>31</nb_uniq_pageviews> <nb_downloads>4</nb_downloads> <nb_uniq_downloads>4</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml index d6fa032f4d..b1758df9dd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>53</nb_pageviews> - <nb_uniq_pageviews>47</nb_uniq_pageviews> + <nb_pageviews>55</nb_pageviews> + <nb_uniq_pageviews>49</nb_uniq_pageviews> <nb_downloads>5</nb_downloads> <nb_uniq_downloads>5</nb_uniq_downloads> <nb_outlinks>1</nb_outlinks> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 5deb55d67b..22d47b36a9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>32</nb_actions> + <nb_actions>34</nb_actions> <subtable> <row> <label>200</label> - <nb_visits>24</nb_visits> - <nb_actions>26</nb_actions> - <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors> + <nb_visits>25</nb_visits> + <nb_actions>27</nb_actions> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> @@ -23,6 +23,12 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + </row> + <row> <label>307</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 2fa0bdd6a2..5c617d6f7b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>32</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>25</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <nb_visits_converted>26</nb_visits_converted> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index 327a80e10d..e633e41334 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -13,13 +13,13 @@ </row> <row> <label>Trident (IE)</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 11bca766d0..bb10be5333 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -14,13 +14,13 @@ </row> <row> <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index e87b26d95f..9e0f3a5f5d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -156,4 +156,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> + <row> + <label>Internet Explorer 8.0</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 11bca766d0..bb10be5333 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -14,13 +14,13 @@ </row> <row> <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index caab5513f5..0f2787c966 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>32</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>25</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <nb_visits_converted>26</nb_visits_converted> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 540b36d936..ce61cb8132 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -26,13 +26,13 @@ </row> <row> <label>Windows</label> - <nb_visits>9</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>10</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <nb_visits_converted>10</nb_visits_converted> + <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index e9ef7d5e25..4b74318cfa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -120,4 +120,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> + <row> + <label>Windows</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/WIN.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 783076988c..3dea432561 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>23</bounce_count> - <nb_visits_converted>24</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index 485a73a99d..8c1697b221 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0 days</label> - <nb_conversions>27</nb_conversions> + <nb_conversions>28</nb_conversions> </row> <row> <label>1 day</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index d1e9091dc3..970c5a295d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_conversions>28</nb_conversions> + <nb_conversions>29</nb_conversions> </row> <row> <label>2 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml index 6a201ece3a..35d78ccc17 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_conversions>28</nb_conversions> - <nb_visits_converted>28</nb_visits_converted> - <revenue>140</revenue> - <conversion_rate>93.33%</conversion_rate> + <nb_conversions>29</nb_conversions> + <nb_visits_converted>29</nb_visits_converted> + <revenue>145</revenue> + <conversion_rate>93.55%</conversion_rate> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 7b38717520..597edb27da 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1789,6 +1789,125 @@ </row> <row> <idSite>1</idSite> + <idVisit>45</idVisit> + <visitIp>172.20.1.0</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + <pageTitle>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</pageTitle> + <pageIdAction>61</pageIdAction> + + <pageId>61</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>302</customVariablePageValue1> + </row> + </customVariables> + <timeSpent>240</timeSpent> + <timeSpentPretty>4 min 0s</timeSpentPretty> + <icon /> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>61</goalPageId> + + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + <pageTitle /> + <pageIdAction>62</pageIdAction> + + <pageId>62</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>2</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>242</visitDuration> + <visitDurationPretty>4 min 2s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <operatingSystem>Windows</operatingSystem> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WIN.gif</operatingSystemIcon> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 8.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>8.0</browserVersion> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>11:55:13</visitLocalTime> + <visitLocalHour>11</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>42</idVisit> <visitIp>70.95.0.0</visitIp> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index a28ca5d931..e8065d52ef 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,10 +2,10 @@ <result> <row> <label>Piwik test</label> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> - <nb_pageviews>29</nb_pageviews> - <revenue>140</revenue> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> + <nb_pageviews>31</nb_pageviews> + <revenue>145</revenue> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index 23fff27538..ee1db378e4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>29</nb_pageviews> - <revenue>140</revenue> + <nb_pageviews>31</nb_pageviews> + <revenue>145</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml index 7b9d3fe496..a640dc2c7d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>28</bounce_count> - <nb_visits_converted>28</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url /> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index 32aa8bed30..833b95476d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Direct Entry</label> - <nb_visits>28</nb_visits> - <nb_actions>31</nb_actions> + <nb_visits>29</nb_visits> + <nb_actions>33</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>26</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>26</nb_conversions> - <nb_visits_converted>26</nb_visits_converted> - <revenue>130</revenue> + <nb_conversions>27</nb_conversions> + <nb_visits_converted>27</nb_visits_converted> + <revenue>135</revenue> </row> </goals> - <nb_conversions>26</nb_conversions> - <revenue>130</revenue> - <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <nb_conversions>27</nb_conversions> + <revenue>135</revenue> + <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index 78d72bc110..8ecf743d81 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>23</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>23</nb_conversions> - <nb_visits_converted>23</nb_visits_converted> - <revenue>115</revenue> + <nb_conversions>24</nb_conversions> + <nb_visits_converted>24</nb_visits_converted> + <revenue>120</revenue> </row> </goals> - <nb_conversions>23</nb_conversions> - <revenue>115</revenue> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_conversions>24</nb_conversions> + <revenue>120</revenue> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 0e38b2873c..74286f55c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -42,21 +42,21 @@ </row> <row> <label>Unknown</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>8</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>7</nb_conversions> - <nb_visits_converted>7</nb_visits_converted> - <revenue>35</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <nb_conversions>8</nb_conversions> + <revenue>40</revenue> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>Unknown</code> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index a0f51627f5..16b270d486 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -48,21 +48,21 @@ </row> <row> <label>Unknown</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>8</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>7</nb_conversions> - <nb_visits_converted>7</nb_visits_converted> - <revenue>35</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <nb_conversions>8</nb_conversions> + <revenue>40</revenue> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>xx</code> <logo>plugins/UserCountry/images/flags/xx.png</logo> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index f9c0be1893..46e7ebb0cf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>23</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>23</nb_conversions> - <nb_visits_converted>23</nb_visits_converted> - <revenue>115</revenue> + <nb_conversions>24</nb_conversions> + <nb_visits_converted>24</nb_visits_converted> + <revenue>120</revenue> </row> </goals> - <nb_conversions>23</nb_conversions> - <revenue>115</revenue> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_conversions>24</nb_conversions> + <revenue>120</revenue> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <region>xx</region> <country>xx</country> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index 327a80e10d..e633e41334 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -13,13 +13,13 @@ </row> <row> <label>Trident (IE)</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index e87b26d95f..9e0f3a5f5d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -156,4 +156,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> + <row> + <label>Internet Explorer 8.0</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 11bca766d0..bb10be5333 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -14,13 +14,13 @@ </row> <row> <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index 9232fa9e36..dc61e1f5f9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -122,6 +122,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Windows / Internet Explorer / unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Windows XP / Chrome / 1280x800</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml index 49ec41496f..ece488d72f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown (xx)</label> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>28</bounce_count> - <nb_visits_converted>28</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index d00f93cf7f..084ab04d62 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>28</bounce_count> - <nb_visits_converted>28</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 783076988c..3dea432561 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>23</bounce_count> - <nb_visits_converted>24</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 540b36d936..ce61cb8132 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -26,13 +26,13 @@ </row> <row> <label>Windows</label> - <nb_visits>9</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>10</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <nb_visits_converted>10</nb_visits_converted> + <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index e9ef7d5e25..4b74318cfa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -120,4 +120,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> + <row> + <label>Windows</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/WIN.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml index e59c5a160a..b6ac74ebfb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>unknown</label> - <nb_visits>28</nb_visits> - <nb_actions>31</nb_actions> + <nb_visits>29</nb_visits> + <nb_actions>33</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <bounce_count>26</bounce_count> - <nb_visits_converted>26</nb_visits_converted> - <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <nb_visits_converted>27</nb_visits_converted> + <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index 5135ceaa11..a9ba6ca6cc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -23,13 +23,13 @@ </row> <row> <label>Thursday</label> - <nb_visits>9</nb_visits> - <nb_uniq_visitors>9</nb_uniq_visitors> - <nb_actions>9</nb_actions> + <nb_visits>10</nb_visits> + <nb_uniq_visitors>10</nb_uniq_visitors> + <nb_actions>11</nb_actions> <nb_users>0</nb_users> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>242</sum_visit_length> <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> + <nb_visits_converted>10</nb_visits_converted> <day_of_week>4</day_of_week> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index c20a34497c..c87485d5b2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -123,13 +123,13 @@ </row> <row> <label>11h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 7e4e54213f..edf1ec12d5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -150,14 +150,23 @@ </row> <row> <label>11h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <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> </row> <row> <label>12h</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 6f887b9935..6fbe7c310c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>29</nb_visits> + <nb_visits>30</nb_visits> </row> <row> <label>0 days</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index 80b54d1042..c859e7d5d3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>33</nb_visits> + <nb_visits>34</nb_visits> </row> <row> <label>0 days</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index cb3e8985be..dcd45b3a61 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>30</nb_visits> + <nb_visits>31</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml index bc773ab9f4..768a0961d2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>36</nb_visits> + <nb_visits>37</nb_visits> <nb_visits_percentage>84%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index c74b0bb7c6..795ab1f55e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -6,7 +6,7 @@ </row> <row> <label>2 pages</label> - <nb_visits>1</nb_visits> + <nb_visits>2</nb_visits> </row> <row> <label>3 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml index a3860bf722..6169ecedc1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -6,7 +6,7 @@ </row> <row> <label>2 pages</label> - <nb_visits>3</nb_visits> + <nb_visits>4</nb_visits> </row> <row> <label>3 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index e7620aff16..1f6410e079 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -22,7 +22,7 @@ </row> <row> <label>4-7 min</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>7-10 min</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index c95a6c1698..c53cacde6f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -22,7 +22,7 @@ </row> <row> <label>4-7 min</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>7-10 min</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml index 95aa700980..8e4b837a62 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>33</result>
\ No newline at end of file +<result>35</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index 0a9c671f55..1df778a05d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>5 min 5s</result>
\ No newline at end of file +<result>9 min 7s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml index df25f1c1f3..38da89c9f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>305</result>
\ No newline at end of file +<result>547</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 3fb9469667..51c650b8b2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>30</result>
\ No newline at end of file +<result>31</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index ed30e7d83c..46af1425a3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>28</result>
\ No newline at end of file +<result>29</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 3fb9469667..51c650b8b2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>30</result>
\ No newline at end of file +<result>31</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml index 21695253cd..113678e090 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>30</nb_uniq_visitors> + <nb_uniq_visitors>31</nb_uniq_visitors> <nb_users>0</nb_users> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> - <nb_visits_converted>28</nb_visits_converted> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> + <nb_visits_converted>29</nb_visits_converted> <bounce_count>28</bounce_count> - <sum_visit_length>305</sum_visit_length> + <sum_visit_length>547</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>93%</bounce_rate> + <bounce_rate>90%</bounce_rate> <nb_actions_per_visit>1.1</nb_actions_per_visit> - <avg_time_on_site>10</avg_time_on_site> + <avg_time_on_site>18</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 2c5c48e71f..3f360d1263 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -3,11 +3,11 @@ <result date="2012-08"> <row> <label>Piwik test</label> - <nb_visits>30</nb_visits> - <nb_actions>33</nb_actions> - <nb_pageviews>29</nb_pageviews> - <revenue>140</revenue> - <nb_conversions>28</nb_conversions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> + <nb_pageviews>31</nb_pageviews> + <revenue>145</revenue> + <nb_conversions>29</nb_conversions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -42,11 +42,11 @@ <nb_pageviews>10</nb_pageviews> <revenue>5</revenue> <nb_conversions>1</nb_conversions> - <visits_evolution>-96.7%</visits_evolution> - <actions_evolution>-69.7%</actions_evolution> - <pageviews_evolution>-65.5%</pageviews_evolution> - <revenue_evolution>-96.4%</revenue_evolution> - <nb_conversions_evolution>-96.4%</nb_conversions_evolution> + <visits_evolution>-96.8%</visits_evolution> + <actions_evolution>-71.4%</actions_evolution> + <pageviews_evolution>-67.7%</pageviews_evolution> + <revenue_evolution>-96.6%</revenue_evolution> + <nb_conversions_evolution>-96.6%</nb_conversions_evolution> <group /> <main_url>http://piwik.net</main_url> <idsite>1</idsite> diff --git a/tests/resources/access-logs/fake_logs_netscaler.log b/tests/resources/access-logs/fake_logs_netscaler.log new file mode 100644 index 0000000000..17035db670 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_netscaler.log @@ -0,0 +1,6 @@ +#Version: 1.0 +#Software: Netscaler Web Logging(NSWL) +#Date: 2014-02-18 11:55:13 +#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer) +2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - +2012-08-16 11:59:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/silentDetection.jsp - 200 310 5609 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) JSESSIONID=7BBF2F11B80261B27D23010421412323 -
\ No newline at end of file |