diff options
| author | diosmosis <benaka@piwik.pro> | 2014-12-08 08:38:44 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-12-08 08:38:44 +0300 |
| commit | fa367aa6dc0a65ea9f776fd04a23cacd8e8038f8 (patch) | |
| tree | 019ad54b4579c8a5814b86f1ab8bc01b0803ac23 /tests | |
| parent | fa21cdf57c73347e97415d0d3ac943559bdf007c (diff) | |
Refs #6795, add --iis-map-field option to allow users of log importer script to parse log files created using the IIS Advanced Logging module. Includes tests for such a case (including python unit test + PHP System test).
Diffstat (limited to 'tests')
69 files changed, 2015 insertions, 477 deletions
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index e72708a11d..326eded8b4 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -27,6 +27,7 @@ class ManySitesImportedLogs extends Fixture public $segments = null; // should be array mapping segment name => segment definition public $addSegments = false; + public $includeIisWithCustom = false; public static function createAccessInstance() { @@ -111,6 +112,10 @@ class ManySitesImportedLogs extends Fixture $this->logVisitsWithAllEnabled(); $this->replayLogFile(); $this->logCustomFormat(); + + if ($this->includeIisWithCustom) { + $this->logIisWithCustomFormat(); + } } private function setupSegments() @@ -229,4 +234,17 @@ class ManySitesImportedLogs extends Fixture self::executeLogImporter($logFile, $opts); } + + private function logIisWithCustomFormat() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log'; + + $opts = array('--idsite' => $this->idSite, + '--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,); + + self::executeLogImporter($logFile, $opts); + } }
\ No newline at end of file diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 693b76e280..a2d6a6327a 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -758,12 +758,18 @@ class Fixture extends \PHPUnit_Framework_Assert . '--url="' . self::getRootUrl() . 'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files ; - foreach ($options as $name => $value) { - $cmd .= $name; - if ($value !== false) { - $cmd .= '="' . $value . '"'; + foreach ($options as $name => $values) { + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $value) { + $cmd .= $name; + if ($value !== false) { + $cmd .= '="' . $value . '"'; + } + $cmd .= ' '; } - $cmd .= ' '; } $cmd .= '"' . $logFile . '" 2>&1'; diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index 44c6b7b0b9..ae98fff219 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -102,4 +102,5 @@ class ImportLogsTest extends SystemTestCase } } -ImportLogsTest::$fixture = new ManySitesImportedLogs();
\ No newline at end of file +ImportLogsTest::$fixture = new ManySitesImportedLogs(); +ImportLogsTest::$fixture->includeIisWithCustom = 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 77e2b64918..6bddc34c80 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -2,16 +2,17 @@ <result> <row> <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>180</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>50%</bounce_rate> + <exit_rate>50%</exit_rate> <subtable> <row> <label> URL = http://piwik.net/moved-permanently</label> @@ -28,23 +29,57 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> + <row> + <label> URL = http://piwik.net/Topic/hw43061</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> </subtable> </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</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> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</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 2d81bb9f19..34ede98abf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -22,41 +22,21 @@ <avg_time_generation>0.177</avg_time_generation> </row> <row> - <label> Log Analytics - Analytics - Piwik</label> + <label>301</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> - <min_time_generation>0.145</min_time_generation> - <max_time_generation>0.145</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</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> - <avg_time_generation>0.145</avg_time_generation> - </row> - <row> - <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> <sum_time_spent>180</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_nb_visits>2</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>50%</bounce_rate> + <exit_rate>50%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> @@ -74,27 +54,61 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> + <row> + <label> URL = http://piwik.net/Topic/hw43061</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> </subtable> </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</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>1</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</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> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -114,6 +128,27 @@ </subtable> </row> <row> + <label> Log Analytics - Analytics - Piwik</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.145</min_time_generation> + <max_time_generation>0.145</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>2</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> + <avg_time_generation>0.145</avg_time_generation> + </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 8845a80655..571104d49e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -509,6 +509,56 @@ </subtable> </row> <row> + <label>hello</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>world</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/6,681965</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://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>hosting</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -611,6 +661,40 @@ </subtable> </row> <row> + <label>Products</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/theProduct</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://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -773,6 +857,40 @@ </subtable> </row> <row> + <label>Topic</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/hw43061</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://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</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 b7cbdc125b..276835546d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -886,6 +886,60 @@ </subtable> </row> <row> + <label>hello</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>world</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/6,681965</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://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>hosting</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1000,6 +1054,44 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/theProduct</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://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1166,6 +1258,44 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</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://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</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 f1b90a5e1d..359024222a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -1,44 +1,70 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>307</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <label>301</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>180</sum_time_spent> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> + <entry_sum_visit_length>182</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>50%</bounce_rate> + <exit_rate>50%</exit_rate> <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Topic/hw43061</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>0%</bounce_rate> + <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</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> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -58,6 +84,30 @@ </subtable> </row> <row> + <label>307</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label> URL = http://piwik.net/temp-redirect</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> + </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.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml index 867e27cd0d..e92f88170b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -22,73 +22,78 @@ <avg_time_generation>0.177</avg_time_generation> </row> <row> - <label> Log Analytics - Analytics - Piwik</label> + <label>301</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> - <min_time_generation>0.145</min_time_generation> - <max_time_generation>0.145</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</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> - <avg_time_generation>0.145</avg_time_generation> - </row> - <row> - <label>307</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <sum_time_spent>180</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>2</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> + <entry_sum_visit_length>182</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>50%</bounce_rate> + <exit_rate>50%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Topic/hw43061</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>0%</bounce_rate> + <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</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>1</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</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> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -108,6 +113,55 @@ </subtable> </row> <row> + <label> Log Analytics - Analytics - Piwik</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.145</min_time_generation> + <max_time_generation>0.145</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>2</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> + <avg_time_generation>0.145</avg_time_generation> + </row> + <row> + <label>307</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</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/temp-redirect</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> + </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.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 28acca1242..73eb0a4e7b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -506,6 +506,56 @@ </subtable> </row> <row> + <label>hello</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>world</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/6,681965</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://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>hosting</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -608,6 +658,40 @@ </subtable> </row> <row> + <label>Products</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/theProduct</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://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -770,6 +854,40 @@ </subtable> </row> <row> + <label>Topic</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/hw43061</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://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</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 7721a10da1..9c72bb4a22 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -877,6 +877,60 @@ </subtable> </row> <row> + <label>hello</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>world</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/6,681965</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://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>hosting</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -991,6 +1045,44 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/theProduct</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://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1157,6 +1249,44 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</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://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</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 143229b5e7..c2d09b9558 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,26 +2,27 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>20</nb_visits> - <nb_hits>20</nb_hits> + <nb_visits>21</nb_visits> + <nb_hits>21</nb_hits> <sum_time_spent>0</sum_time_spent> - <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> <row> <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>180</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>50%</bounce_rate> + <exit_rate>50%</exit_rate> <subtable> <row> <label> URL = http://piwik.net/moved-permanently</label> @@ -38,47 +39,57 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> - </subtable> - </row> - <row> - <label>307</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> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Topic/hw43061</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>0%</bounce_rate> + <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</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> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -98,6 +109,30 @@ </subtable> </row> <row> + <label>307</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label> URL = http://piwik.net/temp-redirect</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> + </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.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 509723308f..748064246b 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>21</nb_visits> - <nb_hits>30</nb_hits> + <nb_visits>22</nb_visits> + <nb_hits>31</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>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> @@ -36,41 +36,21 @@ <avg_time_generation>0.177</avg_time_generation> </row> <row> - <label> Log Analytics - Analytics - Piwik</label> + <label>301</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> - <min_time_generation>0.145</min_time_generation> - <max_time_generation>0.145</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</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> - <avg_time_generation>0.145</avg_time_generation> - </row> - <row> - <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> <sum_time_spent>180</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_nb_visits>2</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>50%</bounce_rate> + <exit_rate>50%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> @@ -88,69 +68,124 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> + <row> + <label> URL = http://piwik.net/Topic/hw43061</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> </subtable> </row> <row> - <label>307</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <label>404</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> - <exit_nb_visits>1</exit_nb_visits> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> + <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/hello/world/6,681965</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>0%</bounce_rate> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + <row> + <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</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> </subtable> </row> <row> - <label>404</label> + <label> Log Analytics - Analytics - Piwik</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.145</min_time_generation> + <max_time_generation>0.145</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>2</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> + <avg_time_generation>0.145</avg_time_generation> + </row> + <row> + <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</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>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> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> + <label> URL = http://piwik.net/temp-redirect</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> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> 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 c3f7304c25..8a94ddc971 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -522,6 +522,56 @@ </subtable> </row> <row> + <label>hello</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>world</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/6,681965</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://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>hosting</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -624,6 +674,40 @@ </subtable> </row> <row> + <label>Products</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/theProduct</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://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -786,6 +870,40 @@ </subtable> </row> <row> + <label>Topic</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/hw43061</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://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</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 aaabfb8fc3..1331341d0e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -951,6 +951,60 @@ </subtable> </row> <row> + <label>hello</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>world</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <subtable> + <row> + <label>/6,681965</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://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>hosting</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1065,6 +1119,44 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/theProduct</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://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1231,6 +1323,44 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</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>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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</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://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</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 c8388c1f4d..8ea3b42ae1 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>26</nb_pageviews> - <nb_uniq_pageviews>26</nb_uniq_pageviews> + <nb_pageviews>29</nb_pageviews> + <nb_uniq_pageviews>29</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 a87ec05ee3..d6fa032f4d 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>50</nb_pageviews> - <nb_uniq_pageviews>44</nb_uniq_pageviews> + <nb_pageviews>53</nb_pageviews> + <nb_uniq_pageviews>47</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 6f8a9a4c98..5deb55d67b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,28 +2,28 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>29</nb_actions> + <nb_actions>32</nb_actions> <subtable> <row> <label>200</label> - <nb_visits>23</nb_visits> - <nb_actions>25</nb_actions> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <nb_visits>24</nb_visits> + <nb_actions>26</nb_actions> + <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>307</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <label>404</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>404</label> + <label>307</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> 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 38d80d2b64..2fa0bdd6a2 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>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>27</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <bounce_count>25</bounce_count> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> @@ -24,4 +24,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> </row> + <row> + <label>Samsung</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo> + </row> </result>
\ No newline at end of file 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 bb6679c971..327a80e10d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -23,6 +23,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Blink (Chrome, Opera)</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> 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 8723d1a05f..11bca766d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Chrome</label> + <nb_visits>7</nb_visits> + <nb_actions>7</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> <label>Internet Explorer</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> @@ -13,18 +25,6 @@ <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - </row> - <row> <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -84,4 +84,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> + <row> + <label>Chrome Mobile</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CM.gif</logo> + </row> </result>
\ No newline at end of file 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 80d06470a3..e87b26d95f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -109,6 +109,42 @@ <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome 37.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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> + <label>Chrome 41.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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> + <label>Chrome Mobile 39.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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CM.gif</logo> + </row> + <row> <label>Internet Explorer 6.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> 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 8723d1a05f..11bca766d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Chrome</label> + <nb_visits>7</nb_visits> + <nb_actions>7</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> <label>Internet Explorer</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> @@ -13,18 +25,6 @@ <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - </row> - <row> <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -84,4 +84,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> + <row> + <label>Chrome Mobile</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CM.gif</logo> + </row> </result>
\ No newline at end of file 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 b9bf650ebc..caab5513f5 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>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>27</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <bounce_count>25</bounce_count> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -22,4 +22,15 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>GALAXY S5</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> + <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__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 62d091d83d..540b36d936 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -13,6 +13,18 @@ <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> + <label>Mac</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/MAC.gif</logo> + </row> + <row> <label>Windows</label> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> @@ -25,26 +37,14 @@ <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> - <label>Mac</label> - <nb_visits>6</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> - </row> - <row> <label>Android</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> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.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 7cad47e0a1..e9ef7d5e25 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -49,6 +49,18 @@ <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> + <label>Mac 10.10</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> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/MAC.gif</logo> + </row> + <row> <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -61,6 +73,18 @@ <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> + <label>Android 4.4</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/AND.gif</logo> + </row> + <row> <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> 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 0a059a62d6..783076988c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,39 +2,39 @@ <result> <row> <label>Desktop</label> - <nb_visits>23</nb_visits> - <nb_actions>26</nb_actions> + <nb_visits>25</nb_visits> + <nb_actions>28</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>21</bounce_count> - <nb_visits_converted>22</nb_visits_converted> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <bounce_count>23</bounce_count> + <nb_visits_converted>24</nb_visits_converted> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Smartphone</label> + <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>1</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> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> - <label>Smartphone</label> + <label>Unknown</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> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Tablet</label> 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 1ba1449d50..485a73a99d 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>24</nb_conversions> + <nb_conversions>27</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 0a94d5f36d..d1e9091dc3 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>25</nb_conversions> + <nb_conversions>28</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 4c6855264a..6a201ece3a 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>25</nb_conversions> - <nb_visits_converted>25</nb_visits_converted> - <revenue>125</revenue> - <conversion_rate>92.59%</conversion_rate> + <nb_conversions>28</nb_conversions> + <nb_visits_converted>28</nb_visits_converted> + <revenue>140</revenue> + <conversion_rate>93.33%</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 93c0819d6c..7b38717520 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,312 @@ </row> <row> <idSite>1</idSite> + <idVisit>42</idVisit> + <visitIp>70.95.0.0</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>58</goalPageId> + + <url>http://piwik.net/Products/theProduct</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/Products/theProduct</url> + <pageTitle /> + <pageIdAction>55</pageIdAction> + + <pageId>58</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>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Smartphone</deviceType> + <operatingSystem>Android</operatingSystem> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome Mobile 39.0</browser> + <browserName>Chrome Mobile</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CM.gif</browserIcon> + <browserCode>CM</browserCode> + <browserVersion>39.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>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>17:00:00</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>43</idVisit> + <visitIp>70.95.32.0</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>59</goalPageId> + + <url>http://piwik.net/Topic/hw43061</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/Topic/hw43061</url> + <pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061</pageTitle> + <pageIdAction>57</pageIdAction> + + <pageId>59</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>301</customVariablePageValue1> + </row> + </customVariables> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 41.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>41.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>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>17:00:00</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>44</idVisit> + <visitIp>173.5.0.0</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>60</goalPageId> + + <url>http://piwik.net/hello/world/6,681965</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/hello/world/6,681965</url> + <pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965</pageTitle> + <pageIdAction>59</pageIdAction> + + <pageId>60</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>404</customVariablePageValue1> + </row> + </customVariables> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 37.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>37.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>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>17:00:00</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>26</idVisit> <visitIp>0.0.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 eb2209a224..a28ca5d931 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>27</nb_visits> - <nb_actions>30</nb_actions> - <nb_pageviews>26</nb_pageviews> - <revenue>125</revenue> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> + <nb_pageviews>29</nb_pageviews> + <revenue>140</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 1fb93e2a2a..23fff27538 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>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>26</nb_pageviews> - <revenue>125</revenue> + <nb_pageviews>29</nb_pageviews> + <revenue>140</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 8cc6494492..7b9d3fe496 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>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</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> + <bounce_count>28</bounce_count> + <nb_visits_converted>28</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</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 80a6349ac1..32aa8bed30 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>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>31</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> + <bounce_count>26</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>23</nb_conversions> - <nb_visits_converted>23</nb_visits_converted> - <revenue>115</revenue> + <nb_conversions>26</nb_conversions> + <nb_visits_converted>26</nb_visits_converted> + <revenue>130</revenue> </row> </goals> - <nb_conversions>23</nb_conversions> - <revenue>115</revenue> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_conversions>26</nb_conversions> + <revenue>130</revenue> + <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__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index a14f0cec91..78d72bc110 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>22</nb_visits> - <nb_actions>25</nb_actions> + <nb_visits>25</nb_visits> + <nb_actions>28</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>20</bounce_count> + <bounce_count>23</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>20</nb_conversions> - <nb_visits_converted>20</nb_visits_converted> - <revenue>100</revenue> + <nb_conversions>23</nb_conversions> + <nb_visits_converted>23</nb_visits_converted> + <revenue>115</revenue> </row> </goals> - <nb_conversions>20</nb_conversions> - <revenue>100</revenue> - <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <nb_conversions>23</nb_conversions> + <revenue>115</revenue> + <sum_daily_nb_uniq_visitors>25</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 23e244b751..0e38b2873c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -21,6 +21,26 @@ <code>Asia</code> </row> <row> + <label>North America</label> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>8</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> + </row> + </goals> + <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>North America</code> + </row> + <row> <label>Unknown</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> @@ -41,26 +61,6 @@ <code>Unknown</code> </row> <row> - <label>North America</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> - </row> - </goals> - <nb_conversions>5</nb_conversions> - <revenue>25</revenue> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <code>North America</code> - </row> - <row> <label>South America</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> 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 ce5523efde..a0f51627f5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -24,6 +24,29 @@ <logoHeight>11</logoHeight> </row> <row> + <label>United States</label> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>8</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> + </row> + </goals> + <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>us</code> + <logo>plugins/UserCountry/images/flags/us.png</logo> + <logoWidth>16</logoWidth> + <logoHeight>11</logoHeight> + </row> + <row> <label>Unknown</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> @@ -47,29 +70,6 @@ <logoHeight>11</logoHeight> </row> <row> - <label>United States</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> - </row> - </goals> - <nb_conversions>5</nb_conversions> - <revenue>25</revenue> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> - </row> - <row> <label>Brazil</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> 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 4067fb2618..f9c0be1893 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>22</nb_visits> - <nb_actions>25</nb_actions> + <nb_visits>25</nb_visits> + <nb_actions>28</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>20</bounce_count> + <bounce_count>23</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>20</nb_conversions> - <nb_visits_converted>20</nb_visits_converted> - <revenue>100</revenue> + <nb_conversions>23</nb_conversions> + <nb_visits_converted>23</nb_visits_converted> + <revenue>115</revenue> </row> </goals> - <nb_conversions>20</nb_conversions> - <revenue>100</revenue> - <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <nb_conversions>23</nb_conversions> + <revenue>115</revenue> + <sum_daily_nb_uniq_visitors>25</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 bb6679c971..327a80e10d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -23,6 +23,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Blink (Chrome, Opera)</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> 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 80d06470a3..e87b26d95f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -109,6 +109,42 @@ <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome 37.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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> + <label>Chrome 41.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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> + <label>Chrome Mobile 39.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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CM.gif</logo> + </row> + <row> <label>Internet Explorer 6.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> 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 8723d1a05f..11bca766d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Chrome</label> + <nb_visits>7</nb_visits> + <nb_actions>7</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> <label>Internet Explorer</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> @@ -13,18 +25,6 @@ <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - </row> - <row> <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -84,4 +84,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> + <row> + <label>Chrome Mobile</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CM.gif</logo> + </row> </result>
\ No newline at end of file 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 446d719865..9232fa9e36 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -34,6 +34,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Mac / Chrome / unknown</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -67,7 +78,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Bot / Unknown / unknown</label> + <label>Android / Chrome Mobile / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -78,7 +89,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>GNU/Linux / Chrome / unknown</label> + <label>Bot / Unknown / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -89,7 +100,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Mac / Chrome / unknown</label> + <label>GNU/Linux / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_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 fc37ec8a8f..49ec41496f 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>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</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> + <bounce_count>28</bounce_count> + <nb_visits_converted>28</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</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 1f8c578db7..d00f93cf7f 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>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</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> + <bounce_count>28</bounce_count> + <nb_visits_converted>28</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</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 0a059a62d6..783076988c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,39 +2,39 @@ <result> <row> <label>Desktop</label> - <nb_visits>23</nb_visits> - <nb_actions>26</nb_actions> + <nb_visits>25</nb_visits> + <nb_actions>28</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>21</bounce_count> - <nb_visits_converted>22</nb_visits_converted> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <bounce_count>23</bounce_count> + <nb_visits_converted>24</nb_visits_converted> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Smartphone</label> + <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>1</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> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> - <label>Smartphone</label> + <label>Unknown</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> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Tablet</label> 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 62d091d83d..540b36d936 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -13,6 +13,18 @@ <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> + <label>Mac</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/MAC.gif</logo> + </row> + <row> <label>Windows</label> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> @@ -25,26 +37,14 @@ <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> - <label>Mac</label> - <nb_visits>6</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> - </row> - <row> <label>Android</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> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.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 7cad47e0a1..e9ef7d5e25 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -49,6 +49,18 @@ <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> + <label>Mac 10.10</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> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/MAC.gif</logo> + </row> + <row> <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -61,6 +73,18 @@ <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> + <label>Android 4.4</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> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/AND.gif</logo> + </row> + <row> <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index d1f2bda02f..a96d5feb81 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -3,43 +3,43 @@ <row> <label>Cookie</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>8%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>8%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>8%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/gears.gif</logo> </row> <row> <label>Pdf</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> </row> <row> 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 659d5beea1..e59c5a160a 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>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>31</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <bounce_count>26</bounce_count> + <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__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index 1a729a8e26..5135ceaa11 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -12,13 +12,13 @@ </row> <row> <label>Wednesday</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_actions>2</nb_actions> + <nb_visits>5</nb_visits> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_actions>5</nb_actions> <nb_users>0</nb_users> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> <day_of_week>3</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 427319a89f..c20a34497c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -189,13 +189,13 @@ </row> <row> <label>17h</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <bounce_count>6</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</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 515e54eb3b..7e4e54213f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -243,23 +243,23 @@ </row> <row> <label>17h</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> + <bounce_count>6</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <goals> <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> + <nb_conversions>5</nb_conversions> + <nb_visits_converted>5</nb_visits_converted> + <revenue>25</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>5</nb_conversions> + <revenue>25</revenue> </row> <row> <label>18h</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 c47de22fc4..6f887b9935 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>26</nb_visits> + <nb_visits>29</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 c7ed81d100..80b54d1042 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>30</nb_visits> + <nb_visits>33</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 0830ca0d10..cb3e8985be 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>27</nb_visits> + <nb_visits>30</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 d7672ae30c..bc773ab9f4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,8 +2,8 @@ <result> <row> <label>1 visit</label> - <nb_visits>33</nb_visits> - <nb_visits_percentage>83%</nb_visits_percentage> + <nb_visits>36</nb_visits> + <nb_visits_percentage>84%</nb_visits_percentage> </row> <row> <label>2 visits</label> @@ -18,7 +18,7 @@ <row> <label>4 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2%</nb_visits_percentage> </row> <row> <label>5 visits</label> @@ -33,7 +33,7 @@ <row> <label>7 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2%</nb_visits_percentage> </row> <row> <label>8 visits</label> @@ -58,7 +58,7 @@ <row> <label>51-100 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2%</nb_visits_percentage> </row> <row> <label>101-200 visits</label> 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 4e6a9ab29e..c74b0bb7c6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 page</label> - <nb_visits>25</nb_visits> + <nb_visits>28</nb_visits> </row> <row> <label>2 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 11e27426c0..a3860bf722 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 page</label> - <nb_visits>34</nb_visits> + <nb_visits>37</nb_visits> </row> <row> <label>2 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 a64c14a967..e7620aff16 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>25</nb_visits> + <nb_visits>28</nb_visits> </row> <row> <label>11-30s</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 a0cba6d294..c95a6c1698 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>35</nb_visits> + <nb_visits>38</nb_visits> </row> <row> <label>11-30s</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 3fb9469667..95aa700980 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>30</result>
\ No newline at end of file +<result>33</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index 4c77f1f6e6..ed30e7d83c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>25</result>
\ No newline at end of file +<result>28</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 40bd2e592a..3fb9469667 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>27</result>
\ No newline at end of file +<result>30</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 4c77f1f6e6..ed30e7d83c 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>25</result>
\ No newline at end of file +<result>28</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 40bd2e592a..3fb9469667 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>27</result>
\ No newline at end of file +<result>30</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 327d564f47..21695253cd 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>27</nb_uniq_visitors> + <nb_uniq_visitors>30</nb_uniq_visitors> <nb_users>0</nb_users> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> - <nb_visits_converted>25</nb_visits_converted> - <bounce_count>25</bounce_count> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> + <nb_visits_converted>28</nb_visits_converted> + <bounce_count>28</bounce_count> <sum_visit_length>305</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>93%</bounce_rate> <nb_actions_per_visit>1.1</nb_actions_per_visit> - <avg_time_on_site>11</avg_time_on_site> + <avg_time_on_site>10</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 0fb183d46f..2c5c48e71f 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>27</nb_visits> - <nb_actions>30</nb_actions> - <nb_pageviews>26</nb_pageviews> - <revenue>125</revenue> - <nb_conversions>25</nb_conversions> + <nb_visits>30</nb_visits> + <nb_actions>33</nb_actions> + <nb_pageviews>29</nb_pageviews> + <revenue>140</revenue> + <nb_conversions>28</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.3%</visits_evolution> - <actions_evolution>-66.7%</actions_evolution> - <pageviews_evolution>-61.5%</pageviews_evolution> - <revenue_evolution>-96%</revenue_evolution> - <nb_conversions_evolution>-96%</nb_conversions_evolution> + <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> <group /> <main_url>http://piwik.net</main_url> <idsite>1</idsite> diff --git a/tests/resources/access-logs/fake_logs_custom_iis.log b/tests/resources/access-logs/fake_logs_custom_iis.log new file mode 100644 index 0000000000..73797b64dd --- /dev/null +++ b/tests/resources/access-logs/fake_logs_custom_iis.log @@ -0,0 +1,7 @@ +#Software: IIS Advanced Logging Module +#Version: 1.0 +#Start-Date: 2014-11-18 00:00:00.128 +#Fields: date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS +2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 - "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109 +2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 - "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0 +2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359 |