diff options
71 files changed, 1256 insertions, 370 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index dfd8236d4a..889353377b 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -254,8 +254,6 @@ class W3cExtendedFormat(RegexFormat): regex = '\S+' full_regex.append(regex) full_regex = '\s+'.join(full_regex) - logging.debug(full_regex) - logging.debug(first_line) self.regex = re.compile(full_regex) file.seek(0) @@ -1392,8 +1390,15 @@ class Recorder(object): ) if hit.generation_time_milli > 0: - args['gt_ms'] = hit.generation_time_milli - logging.debug(args) + args['gt_ms'] = int(hit.generation_time_milli) + + if hit.event_category and hit.event_action: + args['e_c'] = hit.event_category + args['e_a'] = hit.event_action + + if hit.event_name: + args['e_n'] = hit.event_name + return args def _record_hits(self, hits): @@ -1583,7 +1588,7 @@ class Parser(object): else: match = candidate_format.check_format(lineOrFile) except Exception, e: - logging.debug(str(e)) + logging.debug('Error in format checking: %s', str(e)) pass if match: @@ -1790,9 +1795,14 @@ class Parser(object): # add event info try: + hit.event_category = hit.event_action = hit.event_name = None + hit.event_category = format.get('event_category') hit.event_action = format.get('event_action') + hit.event_name = format.get('event_name') + if hit.event_name == '-': + hit.event_name = None except: pass diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 6e0051c5ed..39e4bc7dbb 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -342,7 +342,7 @@ def test_iis_custom_format(): import_logs.config.options.enable_http_redirects = True import_logs.config.options.enable_http_errors = True import_logs.config.options.replay_tracking = False - # import_logs.config.options.w3c_time_taken_in_millisecs = True test that even w/o this, we get the right format + # import_logs.config.options.w3c_time_taken_in_millisecs = True test that even w/o this, we get the right values import_logs.parser.parse(file_) hits = [hit.__dict__ for hit in Recorder.recorders] diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 7642befc16..0603ae4d4b 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -29,6 +29,8 @@ class ManySitesImportedLogs extends Fixture public $addSegments = false; public $includeIisWithCustom = false; public $includeNetscaler = false; + public $includeCloudfront = false; + public $includeCloudfrontRtmp = false; public static function createAccessInstance() { @@ -121,6 +123,14 @@ class ManySitesImportedLogs extends Fixture if ($this->includeNetscaler) { $this->logNetscaler(); } + + if ($this->includeCloudfront) { + $this->logCloudfront(); + } + + if ($this->includeCloudfrontRtmp) { + $this->logCloudfrontRtmp(); + } } private function setupSegments() @@ -264,4 +274,24 @@ class ManySitesImportedLogs extends Fixture return self::executeLogImporter($logFile, $opts); } + + private function logCloudfront() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth()); + + return self::executeLogImporter($logFile, $opts); + } + + private function logCloudfrontRtmp() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth()); + + return 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 8a1673538d..a2d6a6327a 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -776,8 +776,6 @@ class Fixture extends \PHPUnit_Framework_Assert // run the command exec($cmd, $output, $result); - echo "$cmd - \n"; - echo implode("\n", $output)."\n"; if ($result !== 0) { throw new Exception("log importer failed: " . implode("\n", $output) . "\n\ncommand used: $cmd"); } diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index b13317b68f..5de667fb5c 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -20,6 +20,7 @@ use Piwik\Tests\Fixtures\ManySitesImportedLogs; */ class ImportLogsTest extends SystemTestCase { + /** @var ManySitesImportedLogs */ public static $fixture = null; // initialized below class definition /** @@ -104,4 +105,6 @@ class ImportLogsTest extends SystemTestCase ImportLogsTest::$fixture = new ManySitesImportedLogs(); ImportLogsTest::$fixture->includeIisWithCustom = true; -ImportLogsTest::$fixture->includeNetscaler = true;
\ No newline at end of file +ImportLogsTest::$fixture->includeNetscaler = true; +ImportLogsTest::$fixture->includeCloudfront = true; +ImportLogsTest::$fixture->includeCloudfrontRtmp = true;
\ No newline at end of file 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 6ae99318f0..1e6f6a255d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -1129,4 +1129,66 @@ </row> </subtable> </row> + <row> + <label>view</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>my</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>/file.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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> + <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> + <avg_time_generation>0.001</avg_time_generation> + <url>http://piwik.net/view/my/file.html</url> + </row> + </subtable> + </row> + </subtable> + </row> </result>
\ No newline at end of file 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 cce26eeec7..0b50d71afa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -1470,4 +1470,66 @@ </row> </subtable> </row> + <row> + <label>view</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>my</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>/file.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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> + <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> + <avg_time_generation>0.001</avg_time_generation> + <url>http://piwik.net/view/my/file.html</url> + </row> + </subtable> + </row> + </subtable> + </row> </result>
\ No newline at end of file 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 f3ebc92964..456545a404 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -1113,4 +1113,66 @@ </row> </subtable> </row> + <row> + <label>view</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>my</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>/file.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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> + <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> + <avg_time_generation>0.001</avg_time_generation> + <url>http://piwik.net/view/my/file.html</url> + </row> + </subtable> + </row> + </subtable> + </row> </result>
\ No newline at end of file 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 63c3d594e0..0333b89144 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -1449,6 +1449,68 @@ </subtable> </row> <row> + <label>view</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>my</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>/file.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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> + <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> + <avg_time_generation>0.001</avg_time_generation> + <url>http://piwik.net/view/my/file.html</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>what-is-piwisk</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 7ecefada55..0fe5e0f680 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,17 +2,17 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>23</nb_visits> - <nb_hits>23</nb_hits> + <nb_visits>24</nb_visits> + <nb_hits>24</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>2</nb_hits_with_time_generation> - <min_time_generation>0.109</min_time_generation> + <nb_hits_with_time_generation>3</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> <max_time_generation>0.359</max_time_generation> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.234</avg_time_generation> + <avg_time_generation>0.156</avg_time_generation> </row> <row> <label>301</label> 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 690c2e28a0..1a9344607d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,17 +2,17 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>24</nb_visits> - <nb_hits>33</nb_hits> + <nb_visits>25</nb_visits> + <nb_hits>34</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>12</nb_hits_with_time_generation> - <min_time_generation>0.023</min_time_generation> + <nb_hits_with_time_generation>13</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> <max_time_generation>1.324</max_time_generation> - <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.361</avg_time_generation> + <avg_time_generation>0.333</avg_time_generation> </row> <row> <label> Liberate Web Analytics - Analytics - Piwik</label> 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 c7ae80a454..cbdc5cc10c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -1188,4 +1188,66 @@ </row> </subtable> </row> + <row> + <label>view</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>my</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>/file.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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> + <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> + <avg_time_generation>0.001</avg_time_generation> + <url>http://piwik.net/view/my/file.html</url> + </row> + </subtable> + </row> + </subtable> + </row> </result>
\ No newline at end of file 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 3434158d1f..086a61b4f5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -1578,6 +1578,68 @@ </subtable> </row> <row> + <label>view</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>my</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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.001</avg_time_generation> + <subtable> + <row> + <label>/file.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> + <max_time_generation>0.001</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> + <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> + <avg_time_generation>0.001</avg_time_generation> + <url>http://piwik.net/view/my/file.html</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>what-is-piwisk</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 18b7f289f6..2bfcebff1f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>32</nb_pageviews> - <nb_uniq_pageviews>32</nb_uniq_pageviews> + <nb_pageviews>33</nb_pageviews> + <nb_uniq_pageviews>33</nb_uniq_pageviews> <nb_downloads>4</nb_downloads> <nb_uniq_downloads>4</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> - <avg_time_generation>0.277</avg_time_generation> + <avg_time_generation>0.208</avg_time_generation> </result>
\ No newline at end of file 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 0fc359540d..a555907e63 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>56</nb_pageviews> - <nb_uniq_pageviews>50</nb_uniq_pageviews> + <nb_pageviews>57</nb_pageviews> + <nb_uniq_pageviews>51</nb_uniq_pageviews> <nb_downloads>5</nb_downloads> <nb_uniq_downloads>5</nb_uniq_downloads> <nb_outlinks>1</nb_outlinks> <nb_uniq_outlinks>1</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> - <avg_time_generation>0.298</avg_time_generation> + <avg_time_generation>0.285</avg_time_generation> </result>
\ No newline at end of file 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 491523012e..4214925c47 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>35</nb_actions> + <nb_actions>38</nb_actions> <subtable> <row> <label>200</label> - <nb_visits>26</nb_visits> - <nb_actions>28</nb_actions> - <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> + <nb_visits>29</nb_visits> + <nb_actions>31</nb_actions> + <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> 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 34fadbbd57..6fd6bdf02b 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>28</nb_visits> - <nb_actions>32</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>25</bounce_count> - <nb_visits_converted>26</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <bounce_count>28</bounce_count> + <nb_visits_converted>27</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index 147f52ac7c..f57f78606c 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>Unknown</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>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Blink (Chrome, Opera)</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> @@ -34,17 +45,6 @@ <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> - <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>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> <label>Gecko (Firefox)</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 82fd2a7603..d0c894d25c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -49,19 +49,19 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> - <label>Android Browser</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Unknown</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>2</bounce_count> + <bounce_count>5</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> - <label>Firefox</label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -70,19 +70,19 @@ <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/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> - <label>Unknown</label> + <label>Firefox</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>1</nb_visits_converted> + <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/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Chrome Mobile</label> 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 90f330a5e5..bcc37fcec6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -37,6 +37,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Unknown</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>2</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/DevicesDetection/images/browsers/UNK.gif</logo> + </row> + <row> <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -97,18 +109,6 @@ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> - <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>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/browsers/UNK.gif</logo> - </row> - <row> <label>Chrome 11.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 82fd2a7603..d0c894d25c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -49,19 +49,19 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> - <label>Android Browser</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Unknown</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>2</bounce_count> + <bounce_count>5</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> - <label>Firefox</label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -70,19 +70,19 @@ <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/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> - <label>Unknown</label> + <label>Firefox</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>1</nb_visits_converted> + <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/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Chrome Mobile</label> 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 d0be913ad2..199e2ae68f 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>28</nb_visits> - <nb_actions>32</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>35</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>25</bounce_count> - <nb_visits_converted>26</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <bounce_count>28</bounce_count> + <nb_visits_converted>27</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index cfa8579474..6837e44818 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Mac</label> + <nb_visits>9</nb_visits> + <nb_actions>12</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>306</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>8</nb_visits_converted> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + </row> + <row> <label>GNU/Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> @@ -13,18 +25,6 @@ <logo>plugins/DevicesDetection/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>306</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> - </row> - <row> <label>Windows</label> <nb_visits>10</nb_visits> <nb_actions>11</nb_actions> @@ -49,25 +49,25 @@ <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> - <label>Bot</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>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>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>0</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/os/UNK.gif</logo> </row> <row> - <label>Unknown</label> + <label>Bot</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>0</nb_visits_converted> + <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/os/UNK.gif</logo> 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 636ccfdeb7..06b7964798 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -37,6 +37,18 @@ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> + <label>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>0</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/os/UNK.gif</logo> + </row> + <row> <label>Android 2.3</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -97,7 +109,7 @@ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> - <label>Mac 10.8</label> + <label>Mac</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -109,16 +121,16 @@ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> - <label>Unknown</label> + <label>Mac 10.8</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>0</nb_visits_converted> + <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/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Windows</label> 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 e838256d3f..9e7d544aec 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,17 +2,29 @@ <result> <row> <label>Desktop</label> - <nb_visits>26</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>27</nb_visits> + <nb_actions>31</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <bounce_count>24</bounce_count> + <nb_visits_converted>26</nb_visits_converted> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> + <label>Unknown</label> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> <label>Smartphone</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> @@ -25,18 +37,6 @@ <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> - <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>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/unknown.gif</logo> - </row> - <row> <label>Tablet</label> <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml index c234bed59e..3a93f6652b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml @@ -1,2 +1,38 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result> + <row> + <label>connect</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + <row> + <label>play</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <subtable> + <row> + <label>myvideo</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml index c234bed59e..23e67434b4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml @@ -1,2 +1,38 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result> + <row> + <label>cloudfront_rtmp</label> + <nb_visits>2</nb_visits> + <nb_events>2</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <subtable> + <row> + <label>connect</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + <row> + <label>play</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml index c234bed59e..8c2883c098 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml @@ -1,2 +1,51 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result> + <row> + <label>myvideo</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <subtable> + <row> + <label>play</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Event Name not defined</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <subtable> + <row> + <label>connect</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> +</result>
\ No newline at end of file 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 8c1697b221..f79d26674b 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>28</nb_conversions> + <nb_conversions>29</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 970c5a295d..1f6c128fbc 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>29</nb_conversions> + <nb_conversions>30</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 35d78ccc17..93be92ec99 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>29</nb_conversions> - <nb_visits_converted>29</nb_visits_converted> - <revenue>145</revenue> - <conversion_rate>93.55%</conversion_rate> + <nb_conversions>30</nb_conversions> + <nb_visits_converted>30</nb_visits_converted> + <revenue>150</revenue> + <conversion_rate>88.24%</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 ff63b6a32a..8734e5196a 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,109 @@ </row> <row> <idSite>1</idSite> + <idVisit>46</idVisit> + <visitIp>192.0.2.10</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>64</goalPageId> + + <url>http://piwik.net/view/my/file.html</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/view/my/file.html</url> + <pageTitle /> + <pageIdAction>64</pageIdAction> + + <pageId>64</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <generationTime>0.001s</generationTime> + <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/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>01:13:11</visitLocalTime> + <visitLocalHour>1</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>45</idVisit> <visitIp>172.20.1.0</visitIp> @@ -2488,6 +2591,193 @@ </row> <row> <idSite>1</idSite> + <idVisit>48</idVisit> + <visitIp>192.0.2.222</visitIp> + + <actionDetails> + <row> + <type>event</type> + <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?key=value</url> + <pageIdAction>65</pageIdAction> + + <pageId>66</pageId> + <eventCategory>cloudfront_rtmp</eventCategory> + <eventAction>play</eventAction> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <eventName>myvideo</eventName> + <icon>plugins/Morpheus/images/event.png</icon> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> + <events>1</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>23:51:21</visitLocalTime> + <visitLocalHour>23</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>47</idVisit> + <visitIp>192.0.2.147</visitIp> + + <actionDetails> + <row> + <type>event</type> + <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?key=value</url> + <pageIdAction>65</pageIdAction> + + <pageId>65</pageId> + <eventCategory>cloudfront_rtmp</eventCategory> + <eventAction>connect</eventAction> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <icon>plugins/Morpheus/images/event.png</icon> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> + <events>1</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>23:51:20</visitLocalTime> + <visitLocalHour>23</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>25</idVisit> <visitIp>175.41.192.41</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 d2edd33b60..275d1499ce 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>31</nb_visits> - <nb_actions>36</nb_actions> - <nb_pageviews>32</nb_pageviews> - <revenue>145</revenue> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> + <nb_pageviews>33</nb_pageviews> + <revenue>150</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 79b56ff979..fb7252904e 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>31</nb_visits> - <nb_actions>36</nb_actions> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>32</nb_pageviews> - <revenue>145</revenue> + <nb_pageviews>33</nb_pageviews> + <revenue>150</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 f83cd0a71c..76382aadab 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>31</nb_visits> - <nb_actions>36</nb_actions> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>27</bounce_count> - <nb_visits_converted>29</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <bounce_count>30</bounce_count> + <nb_visits_converted>30</nb_visits_converted> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</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 9b5ba79691..e5e8c8d924 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,22 +2,23 @@ <result> <row> <label>Direct Entry</label> - <nb_visits>29</nb_visits> - <nb_actions>34</nb_actions> + <nb_visits>32</nb_visits> + <nb_actions>37</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>25</bounce_count> + <bounce_count>28</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>27</nb_conversions> - <nb_visits_converted>27</nb_visits_converted> - <revenue>135</revenue> + <nb_conversions>28</nb_conversions> + <nb_visits_converted>28</nb_visits_converted> + <revenue>140</revenue> </row> </goals> - <nb_conversions>27</nb_conversions> - <revenue>135</revenue> - <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <nb_conversions>28</nb_conversions> + <revenue>140</revenue> + <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>Websites</label> 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 dc702824f1..eca5acdf70 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,22 +2,23 @@ <result> <row> <label>Unknown</label> - <nb_visits>26</nb_visits> - <nb_actions>31</nb_actions> + <nb_visits>29</nb_visits> + <nb_actions>34</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>22</bounce_count> + <bounce_count>25</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>24</nb_conversions> - <nb_visits_converted>24</nb_visits_converted> - <revenue>120</revenue> + <nb_conversions>25</nb_conversions> + <nb_visits_converted>25</nb_visits_converted> + <revenue>125</revenue> </row> </goals> - <nb_conversions>24</nb_conversions> - <revenue>120</revenue> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_conversions>25</nb_conversions> + <revenue>125</revenue> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> 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 212e81c785..eeb3aa43cf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -21,31 +21,32 @@ <code>Asia</code> </row> <row> - <label>North America</label> - <nb_visits>8</nb_visits> - <nb_actions>9</nb_actions> + <label>Unknown</label> + <nb_visits>11</nb_visits> + <nb_actions>12</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>7</bounce_count> + <sum_visit_length>242</sum_visit_length> + <bounce_count>10</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>8</nb_conversions> - <nb_visits_converted>8</nb_visits_converted> - <revenue>40</revenue> + <nb_conversions>9</nb_conversions> + <nb_visits_converted>9</nb_visits_converted> + <revenue>45</revenue> </row> </goals> - <nb_conversions>8</nb_conversions> - <revenue>40</revenue> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> - <code>North America</code> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> + <code>Unknown</code> </row> <row> - <label>Unknown</label> + <label>North America</label> <nb_visits>8</nb_visits> <nb_actions>9</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>242</sum_visit_length> + <sum_visit_length>3</sum_visit_length> <bounce_count>7</bounce_count> <goals> <row idgoal='1'> @@ -56,9 +57,9 @@ </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>Unknown</code> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> + <code>North America</code> </row> <row> <label>South America</label> 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 1c82333bf0..b88e3fec30 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -24,34 +24,35 @@ <logoHeight>11</logoHeight> </row> <row> - <label>United States</label> - <nb_visits>8</nb_visits> - <nb_actions>9</nb_actions> + <label>Unknown</label> + <nb_visits>11</nb_visits> + <nb_actions>12</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>7</bounce_count> + <sum_visit_length>242</sum_visit_length> + <bounce_count>10</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>8</nb_conversions> - <nb_visits_converted>8</nb_visits_converted> - <revenue>40</revenue> + <nb_conversions>9</nb_conversions> + <nb_visits_converted>9</nb_visits_converted> + <revenue>45</revenue> </row> </goals> - <nb_conversions>8</nb_conversions> - <revenue>40</revenue> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> - <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> + <code>xx</code> + <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Unknown</label> + <label>United States</label> <nb_visits>8</nb_visits> <nb_actions>9</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>242</sum_visit_length> + <sum_visit_length>3</sum_visit_length> <bounce_count>7</bounce_count> <goals> <row idgoal='1'> @@ -62,10 +63,10 @@ </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>xx</code> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> + <code>us</code> + <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> 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 1149b705a7..e758c3e8aa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,22 +2,23 @@ <result> <row> <label>Unknown</label> - <nb_visits>26</nb_visits> - <nb_actions>31</nb_actions> + <nb_visits>29</nb_visits> + <nb_actions>34</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>22</bounce_count> + <bounce_count>25</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>24</nb_conversions> - <nb_visits_converted>24</nb_visits_converted> - <revenue>120</revenue> + <nb_conversions>25</nb_conversions> + <nb_visits_converted>25</nb_visits_converted> + <revenue>125</revenue> </row> </goals> - <nb_conversions>24</nb_conversions> - <revenue>120</revenue> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <nb_conversions>25</nb_conversions> + <revenue>125</revenue> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> 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 147f52ac7c..f57f78606c 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>Unknown</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>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Blink (Chrome, Opera)</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> @@ -34,17 +45,6 @@ <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> - <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>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> <label>Gecko (Firefox)</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 90f330a5e5..bcc37fcec6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -37,6 +37,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Unknown</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>2</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/DevicesDetection/images/browsers/UNK.gif</logo> + </row> + <row> <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -97,18 +109,6 @@ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> - <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>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/browsers/UNK.gif</logo> - </row> - <row> <label>Chrome 11.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 82fd2a7603..d0c894d25c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -49,19 +49,19 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> - <label>Android Browser</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Unknown</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>2</bounce_count> + <bounce_count>5</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> - <label>Firefox</label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -70,19 +70,19 @@ <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/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> - <label>Unknown</label> + <label>Firefox</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>1</nb_visits_converted> + <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/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Chrome Mobile</label> 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 75d278b51b..de82b8409f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -45,6 +45,17 @@ <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> + <label>Unknown / Unknown / 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>0</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> @@ -111,13 +122,13 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Unknown / Unknown / unknown</label> + <label>Mac / Unknown / unknown</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>0</nb_visits_converted> + <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> 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 8d4b8d074e..3acd2a06f0 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>31</nb_visits> - <nb_actions>36</nb_actions> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>27</bounce_count> - <nb_visits_converted>29</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <bounce_count>30</bounce_count> + <nb_visits_converted>30</nb_visits_converted> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</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 3ed6ff7309..6405f7bd2d 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>31</nb_visits> - <nb_actions>36</nb_actions> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>27</bounce_count> - <nb_visits_converted>29</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <bounce_count>30</bounce_count> + <nb_visits_converted>30</nb_visits_converted> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</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 e838256d3f..9e7d544aec 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,17 +2,29 @@ <result> <row> <label>Desktop</label> - <nb_visits>26</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>27</nb_visits> + <nb_actions>31</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <bounce_count>24</bounce_count> + <nb_visits_converted>26</nb_visits_converted> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> + <label>Unknown</label> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> <label>Smartphone</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> @@ -25,18 +37,6 @@ <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> - <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>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/unknown.gif</logo> - </row> - <row> <label>Tablet</label> <nb_visits>0</nb_visits> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> 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 cfa8579474..6837e44818 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Mac</label> + <nb_visits>9</nb_visits> + <nb_actions>12</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>306</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>8</nb_visits_converted> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + </row> + <row> <label>GNU/Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> @@ -13,18 +25,6 @@ <logo>plugins/DevicesDetection/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>306</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> - </row> - <row> <label>Windows</label> <nb_visits>10</nb_visits> <nb_actions>11</nb_actions> @@ -49,25 +49,25 @@ <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> - <label>Bot</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>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>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>0</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/os/UNK.gif</logo> </row> <row> - <label>Unknown</label> + <label>Bot</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>0</nb_visits_converted> + <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/os/UNK.gif</logo> 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 636ccfdeb7..06b7964798 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -37,6 +37,18 @@ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> + <label>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>0</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/os/UNK.gif</logo> + </row> + <row> <label>Android 2.3</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -97,7 +109,7 @@ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> - <label>Mac 10.8</label> + <label>Mac</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -109,16 +121,16 @@ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> - <label>Unknown</label> + <label>Mac 10.8</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>0</nb_visits_converted> + <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/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Windows</label> 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 a96d5feb81..94bb890a25 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -3,19 +3,19 @@ <row> <label>Cookie</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>8%</nb_visits_percentage> + <nb_visits_percentage>7%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>8%</nb_visits_percentage> + <nb_visits_percentage>7%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>8%</nb_visits_percentage> + <nb_visits_percentage>7%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/java.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 378996fabc..a8dc2aedb4 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>29</nb_visits> - <nb_actions>34</nb_actions> + <nb_visits>32</nb_visits> + <nb_actions>37</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>25</bounce_count> - <nb_visits_converted>27</nb_visits_converted> - <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <bounce_count>28</bounce_count> + <nb_visits_converted>28</nb_visits_converted> + <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</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 4de7a18047..ff49f519f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -23,13 +23,13 @@ </row> <row> <label>Thursday</label> - <nb_visits>10</nb_visits> - <nb_uniq_visitors>10</nb_uniq_visitors> - <nb_actions>11</nb_actions> + <nb_visits>11</nb_visits> + <nb_uniq_visitors>11</nb_uniq_visitors> + <nb_actions>12</nb_actions> <nb_users>0</nb_users> <sum_visit_length>242</sum_visit_length> - <bounce_count>9</bounce_count> - <nb_visits_converted>10</nb_visits_converted> + <bounce_count>10</bounce_count> + <nb_visits_converted>11</nb_visits_converted> <day_of_week>4</day_of_week> </row> <row> @@ -56,7 +56,13 @@ </row> <row> <label>Sunday</label> - <nb_visits>0</nb_visits> + <nb_visits>2</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>0</nb_visits_converted> <day_of_week>7</day_of_week> </row> </result>
\ No newline at end of file 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 dc841363a5..c46f15ceec 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -13,13 +13,13 @@ </row> <row> <label>1h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -255,13 +255,13 @@ </row> <row> <label>23h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</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__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 144d6c4221..78e6f4a198 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -13,14 +13,23 @@ </row> <row> <label>1h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> + <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> </row> <row> <label>2h</label> @@ -363,13 +372,13 @@ </row> <row> <label>23h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</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__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 005a1842ab..08e1ba1474 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>29</nb_visits> + <nb_visits>32</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 a66c195749..6ed9ca578e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>33</nb_visits> + <nb_visits>36</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 dcd45b3a61..e841131a55 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>31</nb_visits> + <nb_visits>34</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 768a0961d2..debbd57d3c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,13 +2,13 @@ <result> <row> <label>1 visit</label> - <nb_visits>37</nb_visits> - <nb_visits_percentage>84%</nb_visits_percentage> + <nb_visits>40</nb_visits> + <nb_visits_percentage>85%</nb_visits_percentage> </row> <row> <label>2 visits</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4%</nb_visits_percentage> </row> <row> <label>3 visits</label> @@ -23,7 +23,7 @@ <row> <label>5 visits</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4%</nb_visits_percentage> </row> <row> <label>6 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 c00b8e2c50..a564cebf19 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>27</nb_visits> + <nb_visits>30</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 95adfb7f9a..1680ea4edd 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>36</nb_visits> + <nb_visits>39</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 1f6410e079..c6fee8cb76 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>28</nb_visits> + <nb_visits>31</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 c53cacde6f..06c5465555 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>38</nb_visits> + <nb_visits>41</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 8af80c337f..f24432d1a4 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>36</result>
\ No newline at end of file +<result>39</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 40bd2e592a..3fb9469667 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>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.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 3fb9469667..95aa700980 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>30</result>
\ No newline at end of file +<result>33</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 46af1425a3..3fb9469667 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>29</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.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 51c650b8b2..5c61a82137 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>31</result>
\ No newline at end of file +<result>34</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 1772684d5e..dafccfd4dd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>30</nb_uniq_visitors> + <nb_uniq_visitors>33</nb_uniq_visitors> <nb_users>2</nb_users> - <nb_visits>31</nb_visits> - <nb_actions>36</nb_actions> - <nb_visits_converted>29</nb_visits_converted> - <bounce_count>27</bounce_count> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> + <nb_visits_converted>30</nb_visits_converted> + <bounce_count>30</bounce_count> <sum_visit_length>550</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>87%</bounce_rate> - <nb_actions_per_visit>1.2</nb_actions_per_visit> - <avg_time_on_site>18</avg_time_on_site> + <bounce_rate>88%</bounce_rate> + <nb_actions_per_visit>1.1</nb_actions_per_visit> + <avg_time_on_site>16</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 bce2027e1c..96ce816d2e 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>31</nb_visits> - <nb_actions>36</nb_actions> - <nb_pageviews>32</nb_pageviews> - <revenue>145</revenue> - <nb_conversions>29</nb_conversions> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> + <nb_pageviews>33</nb_pageviews> + <revenue>150</revenue> + <nb_conversions>30</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.8%</visits_evolution> - <actions_evolution>-72.2%</actions_evolution> - <pageviews_evolution>-68.8%</pageviews_evolution> - <revenue_evolution>-96.6%</revenue_evolution> - <nb_conversions_evolution>-96.6%</nb_conversions_evolution> + <visits_evolution>-97.1%</visits_evolution> + <actions_evolution>-74.4%</actions_evolution> + <pageviews_evolution>-69.7%</pageviews_evolution> + <revenue_evolution>-96.7%</revenue_evolution> + <nb_conversions_evolution>-96.7%</nb_conversions_evolution> <group /> <main_url>http://piwik.net</main_url> <idsite>1</idsite> diff --git a/tests/resources/access-logs/fake_logs_cloudfront.log b/tests/resources/access-logs/fake_logs_cloudfront.log new file mode 100644 index 0000000000..9892dc36af --- /dev/null +++ b/tests/resources/access-logs/fake_logs_cloudfront.log @@ -0,0 +1,3 @@ +#Version: 1.0 +#Fields: date time x-edge-location sc-bytes c-ip cs-method cs(Host) cs-uri-stem sc-status cs(Referer) cs(User-Agent) cs-uri-query cs(Cookie) x-edge-result-type x-edge-request-id x-host-header cs-protocol cs-bytes time-taken +2012-08-23 01:13:11 FRA2 182 192.0.2.10 GET d111111abcdef8.cloudfront.net /view/my/file.html 200 www.displaymyfiles.com Mozilla/4.0%20(compatible;%20MSIE%205.0b1;%20Mac_PowerPC) - zip=98101 RefreshHit MRVMF7KydIvxMWfJIglgwHQwZsbG2IhRJ07sn9AkKUFSHS9EXAMPLE== d111111abcdef8.cloudfront.net http - 0.001 diff --git a/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log b/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log new file mode 100644 index 0000000000..117d747b40 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log @@ -0,0 +1,4 @@ +#Version: 1.0 +#Fields: date time x-edge-location c-ip x-event sc-bytes x-cf-status x-cf-client-id cs-uri-stem cs-uri-query c-referrer x-page-url c-user-agent x-sname x-sname-query x-file-ext x-sid +2012-08-12 23:51:20 SEA4 192.0.2.147 connect 2014 OK bfd8a98bee0840d9b871b7f6ade9908f rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st key=value http://player.longtailvideo.com/player.swf http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204 LNX%2010,0,32,18 - - - - +2012-08-12 23:51:21 SEA4 192.0.2.222 play 3914 OK bfd8a98bee0840d9b871b7f6ade9908f rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st key=value http://player.longtailvideo.com/player.swf http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204 LNX%2010,0,32,18 myvideo p=2&q=4 flv 1 |