diff options
| author | diosmosis <benaka@piwik.pro> | 2015-01-10 11:45:50 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-01-10 11:46:57 +0300 |
| commit | 5e04ab1f73c1fa0753f3f6629547cab905f05efc (patch) | |
| tree | 74af0f7633d436aa51be9f2ce0a253851981b769 /tests | |
| parent | 531bd7d409df61247ae4fded65fa1d1db05784f4 (diff) | |
Fixes #6919, do not check for host in regex group in log importer if format has no regex. Also add nginx json log to log importer system test.
Diffstat (limited to 'tests')
70 files changed, 610 insertions, 283 deletions
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 42b02ce0db..5dbeb1e85c 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -31,6 +31,7 @@ class ManySitesImportedLogs extends Fixture public $includeNetscaler = false; public $includeCloudfront = false; public $includeCloudfrontRtmp = false; + public $includeNginxJson = false; public static function createAccessInstance() { @@ -131,6 +132,10 @@ class ManySitesImportedLogs extends Fixture if ($this->includeCloudfrontRtmp) { $this->logCloudfrontRtmp(); } + + if ($this->includeNginxJson) { + $this->logNginxJsonLog(); + } } private function setupSegments() @@ -294,4 +299,13 @@ class ManySitesImportedLogs extends Fixture return self::executeLogImporter($logFile, $opts); } + + private function logNginxJsonLog() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_nginx_json.log'; + + $opts = array('--token-auth' => self::getTokenAuth()); + + return self::executeLogImporter($logFile, $opts); + } }
\ No newline at end of file diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index 5de667fb5c..5b512b69e2 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -107,4 +107,5 @@ ImportLogsTest::$fixture = new ManySitesImportedLogs(); ImportLogsTest::$fixture->includeIisWithCustom = true; ImportLogsTest::$fixture->includeNetscaler = true; ImportLogsTest::$fixture->includeCloudfront = true; -ImportLogsTest::$fixture->includeCloudfrontRtmp = true;
\ No newline at end of file +ImportLogsTest::$fixture->includeCloudfrontRtmp = true; +ImportLogsTest::$fixture->includeNginxJson = 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 1e6f6a255d..1478adad3c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -384,24 +384,24 @@ </row> <row> <label>/index</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> + <nb_visits>3</nb_visits> + <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <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>3</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> + <entry_bounce_count>3</entry_bounce_count> + <exit_nb_visits>3</exit_nb_visits> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>3</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</avg_time_generation> + <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> </row> <row> 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 0b50d71afa..9cf9c560b7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -344,24 +344,24 @@ </row> <row> <label>/index</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>7</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>34</sum_time_spent> - <nb_hits_with_time_generation>3</nb_hits_with_time_generation> - <min_time_generation>0.058</min_time_generation> + <nb_hits_with_time_generation>4</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> <max_time_generation>0.292</max_time_generation> - <entry_nb_visits>6</entry_nb_visits> - <entry_nb_actions>9</entry_nb_actions> + <entry_nb_visits>7</entry_nb_visits> + <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>44</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>6</avg_time_on_page> - <bounce_rate>67%</bounce_rate> - <exit_rate>67%</exit_rate> - <avg_time_generation>0.177</avg_time_generation> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>7</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>5</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>5</avg_time_on_page> + <bounce_rate>71%</bounce_rate> + <exit_rate>71%</exit_rate> + <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> </row> <row> 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 456545a404..1522a10280 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -384,24 +384,24 @@ </row> <row> <label>/index</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> + <nb_visits>3</nb_visits> + <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <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>3</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> + <entry_bounce_count>3</entry_bounce_count> + <exit_nb_visits>3</exit_nb_visits> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>3</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</avg_time_generation> + <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> </row> <row> 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 0333b89144..2eebd3928d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -344,24 +344,24 @@ </row> <row> <label>/index</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>7</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>34</sum_time_spent> - <nb_hits_with_time_generation>3</nb_hits_with_time_generation> - <min_time_generation>0.058</min_time_generation> + <nb_hits_with_time_generation>4</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> <max_time_generation>0.292</max_time_generation> - <entry_nb_visits>6</entry_nb_visits> - <entry_nb_actions>9</entry_nb_actions> + <entry_nb_visits>7</entry_nb_visits> + <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>44</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>6</avg_time_on_page> - <bounce_rate>67%</bounce_rate> - <exit_rate>67%</exit_rate> - <avg_time_generation>0.177</avg_time_generation> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>7</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>5</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>5</avg_time_on_page> + <bounce_rate>71%</bounce_rate> + <exit_rate>71%</exit_rate> + <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> </row> <row> 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 0fe5e0f680..1b30d46416 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>24</nb_visits> - <nb_hits>24</nb_hits> + <nb_visits>25</nb_visits> + <nb_hits>25</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>3</nb_hits_with_time_generation> + <nb_hits_with_time_generation>4</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>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.156</avg_time_generation> + <avg_time_generation>0.118</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 1a9344607d..77a8d309dd 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>25</nb_visits> - <nb_hits>34</nb_hits> + <nb_visits>26</nb_visits> + <nb_hits>35</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>13</nb_hits_with_time_generation> + <nb_hits_with_time_generation>14</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>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>26</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.333</avg_time_generation> + <avg_time_generation>0.31</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 cbdc5cc10c..9f210503b1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -384,24 +384,24 @@ </row> <row> <label>/index</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> + <nb_visits>3</nb_visits> + <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <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>3</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> + <entry_bounce_count>3</entry_bounce_count> + <exit_nb_visits>3</exit_nb_visits> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>3</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</avg_time_generation> + <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> </row> <row> 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 086a61b4f5..1d66cacbe9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -344,24 +344,24 @@ </row> <row> <label>/index</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>7</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>34</sum_time_spent> - <nb_hits_with_time_generation>3</nb_hits_with_time_generation> - <min_time_generation>0.058</min_time_generation> + <nb_hits_with_time_generation>4</nb_hits_with_time_generation> + <min_time_generation>0.001</min_time_generation> <max_time_generation>0.292</max_time_generation> - <entry_nb_visits>6</entry_nb_visits> - <entry_nb_actions>9</entry_nb_actions> + <entry_nb_visits>7</entry_nb_visits> + <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>44</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>6</avg_time_on_page> - <bounce_rate>67%</bounce_rate> - <exit_rate>67%</exit_rate> - <avg_time_generation>0.177</avg_time_generation> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>7</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>5</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>5</avg_time_on_page> + <bounce_rate>71%</bounce_rate> + <exit_rate>71%</exit_rate> + <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> </row> <row> 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 2bfcebff1f..150bdad025 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>33</nb_pageviews> - <nb_uniq_pageviews>33</nb_uniq_pageviews> + <nb_pageviews>34</nb_pageviews> + <nb_uniq_pageviews>34</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.208</avg_time_generation> + <avg_time_generation>0.166</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 a555907e63..2e427656e4 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>57</nb_pageviews> - <nb_uniq_pageviews>51</nb_uniq_pageviews> + <nb_pageviews>58</nb_pageviews> + <nb_uniq_pageviews>52</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.285</avg_time_generation> + <avg_time_generation>0.273</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 4214925c47..0461769807 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>38</nb_actions> + <nb_actions>39</nb_actions> <subtable> <row> <label>200</label> - <nb_visits>29</nb_visits> - <nb_actions>31</nb_actions> - <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>32</nb_actions> + <sum_daily_nb_uniq_visitors>30</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 6fd6bdf02b..d587d75574 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>31</nb_visits> - <nb_actions>35</nb_actions> + <nb_visits>32</nb_visits> + <nb_actions>36</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>28</bounce_count> - <nb_visits_converted>27</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <bounce_count>29</bounce_count> + <nb_visits_converted>28</nb_visits_converted> + <sum_daily_nb_uniq_visitors>31</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 f57f78606c..afbf0a71a9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -35,13 +35,13 @@ </row> <row> <label>Blink (Chrome, Opera)</label> - <nb_visits>3</nb_visits> - <nb_actions>4</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>5</nb_actions> <max_actions>2</max_actions> <sum_visit_length>3</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>3</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</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__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index d0c894d25c..300d043e61 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Chrome</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>1</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</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/browsers/CH.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index bcc37fcec6..e7eab96c0e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -121,6 +121,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome 39.0</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + </row> + <row> <label>Chrome Mobile 39.0</label> <nb_visits>1</nb_visits> <nb_actions>2</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 d0c894d25c..300d043e61 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Chrome</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>1</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</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/browsers/CH.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 199e2ae68f..46bc313815 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>31</nb_visits> - <nb_actions>35</nb_actions> + <nb_visits>32</nb_visits> + <nb_actions>36</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>28</bounce_count> - <nb_visits_converted>27</nb_visits_converted> - <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <bounce_count>29</bounce_count> + <nb_visits_converted>28</nb_visits_converted> + <sum_daily_nb_uniq_visitors>31</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 6837e44818..822cd87824 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -26,13 +26,13 @@ </row> <row> <label>Windows</label> - <nb_visits>10</nb_visits> - <nb_actions>11</nb_actions> + <nb_visits>11</nb_visits> + <nb_actions>12</nb_actions> <max_actions>2</max_actions> <sum_visit_length>242</sum_visit_length> - <bounce_count>9</bounce_count> - <nb_visits_converted>10</nb_visits_converted> - <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <bounce_count>10</bounce_count> + <nb_visits_converted>11</nb_visits_converted> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 06b7964798..e99fb79fdb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -49,6 +49,18 @@ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> + <label>Windows XP</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + </row> + <row> <label>Android 2.3</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -73,18 +85,6 @@ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> - <label>Windows XP</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> - </row> - <row> <label>Android 4.4</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 9e7d544aec..ab85ae8d4a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>27</nb_visits> - <nb_actions>31</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>32</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>24</bounce_count> - <nb_visits_converted>26</nb_visits_converted> - <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> + <bounce_count>25</bounce_count> + <nb_visits_converted>27</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index f79d26674b..f809173bb4 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>29</nb_conversions> + <nb_conversions>30</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 1f6c128fbc..680f349ccc 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>30</nb_conversions> + <nb_conversions>31</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 93be92ec99..279193ac22 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>30</nb_conversions> - <nb_visits_converted>30</nb_visits_converted> - <revenue>150</revenue> - <conversion_rate>88.24%</conversion_rate> + <nb_conversions>31</nb_conversions> + <nb_visits_converted>31</nb_visits_converted> + <revenue>155</revenue> + <conversion_rate>88.57%</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 b3ca8650ca..cbd4ccf119 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -2645,6 +2645,111 @@ </row> <row> <idSite>1</idSite> + <idVisit>49</idVisit> + <visitIp>72.45.67.32</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>67</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> + <type>action</type> + <url>http://piwik.net/</url> + <pageTitle /> + <pageIdAction>5</pageIdAction> + + <pageId>67</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> + + + + + <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> + <searches>0</searches> + <actions>1</actions> + <referrerType>website</referrerType> + <referrerTypeName>Websites</referrerTypeName> + <referrerName>www.test.nl</referrerName> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl>https://www.test.nl/</referrerUrl> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 39.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>39.0</browserVersion> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>Nunavut</region> + <regionCode>NU</regionCode> + <city>Igloolik</city> + <location>Igloolik, Nunavut, Canada</location> + <latitude>69.400002</latitude> + <longitude>-81.800003</longitude> + <visitLocalTime>12:20:31</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>48</idVisit> <visitIp>192.0.2.222</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 275d1499ce..f886378415 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>34</nb_visits> - <nb_actions>39</nb_actions> - <nb_pageviews>33</nb_pageviews> - <revenue>150</revenue> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> + <nb_pageviews>34</nb_pageviews> + <revenue>155</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 fb7252904e..9e5b8fea23 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>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>33</nb_pageviews> - <revenue>150</revenue> + <nb_pageviews>34</nb_pageviews> + <revenue>155</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 76382aadab..114584b2a0 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>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>30</bounce_count> - <nb_visits_converted>30</nb_visits_converted> - <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <bounce_count>31</bounce_count> + <nb_visits_converted>31</nb_visits_converted> + <sum_daily_nb_uniq_visitors>34</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.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml index 8ddde34007..a867c32924 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -1,6 +1,26 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>www.test.nl</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <referer_type>3</referer_type> + </row> + <row> <label>sn110w.snt110.mail.live.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml index 15ef03fb49..6593897748 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>3</result>
\ No newline at end of file +<result>4</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml index 15ef03fb49..6593897748 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>3</result>
\ No newline at end of file +<result>4</result>
\ No newline at end of file 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 0f1dfce4ff..023263f93e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -22,21 +22,21 @@ </row> <row> <label>Websites</label> - <nb_visits>3</nb_visits> - <nb_actions>4</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>5</nb_actions> <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>3</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> </goals> - <nb_conversions>3</nb_conversions> - <revenue>15</revenue> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <nb_conversions>4</nb_conversions> + <revenue>20</revenue> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> @@ -96,6 +96,25 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>www.test.nl</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> </subtable> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 0abe37b28d..c821ba7a36 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -96,4 +96,36 @@ </row> </subtable> </row> + <row> + <label>www.test.nl</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <subtable> + <row> + <label>https://www.test.nl/</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml index de82b8409f..1a87007b73 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -155,6 +155,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Windows XP / Chrome / 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>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Windows XP / Internet Explorer / 1024x768</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml index a8dc2aedb4..221b657148 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>unknown</label> - <nb_visits>32</nb_visits> - <nb_actions>37</nb_actions> + <nb_visits>33</nb_visits> + <nb_actions>38</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>28</bounce_count> - <nb_visits_converted>28</nb_visits_converted> - <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> + <bounce_count>29</bounce_count> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>32</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__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index eca5acdf70..9cc9b9f08b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -54,4 +54,31 @@ <region_name>Virginia</region_name> <logo>plugins/UserCountry/images/flags/us.png</logo> </row> + <row> + <label>Igloolik, Nunavut, Canada</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <lat>69.4</lat> + <long>-81.8</long> + <city_name>Igloolik</city_name> + <region>NU</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>Nunavut</region_name> + <logo>plugins/UserCountry/images/flags/ca.png</logo> + </row> </result>
\ No newline at end of file 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 eeb3aa43cf..4c91a66de1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -43,21 +43,21 @@ </row> <row> <label>North America</label> - <nb_visits>8</nb_visits> - <nb_actions>9</nb_actions> + <nb_visits>9</nb_visits> + <nb_actions>10</nb_actions> <max_actions>2</max_actions> <sum_visit_length>3</sum_visit_length> - <bounce_count>7</bounce_count> + <bounce_count>8</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> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <code>North America</code> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index b88e3fec30..71bd1968c4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -108,4 +108,27 @@ <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> + <row> + <label>Canada</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <code>ca</code> + <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logoWidth>16</logoWidth> + <logoHeight>11</logoHeight> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml index 17feb622cc..3cc2819f51 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>5</result>
\ No newline at end of file +<result>6</result>
\ No newline at end of file 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 e758c3e8aa..d85339344f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -49,4 +49,28 @@ <region_name>Virginia</region_name> <logo>plugins/UserCountry/images/flags/us.png</logo> </row> + <row> + <label>Nunavut, Canada</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <region>NU</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>Nunavut</region_name> + <logo>plugins/UserCountry/images/flags/ca.png</logo> + </row> </result>
\ No newline at end of file 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 f57f78606c..afbf0a71a9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -35,13 +35,13 @@ </row> <row> <label>Blink (Chrome, Opera)</label> - <nb_visits>3</nb_visits> - <nb_actions>4</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>5</nb_actions> <max_actions>2</max_actions> <sum_visit_length>3</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>3</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</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__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index bcc37fcec6..e7eab96c0e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -121,6 +121,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome 39.0</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + </row> + <row> <label>Chrome Mobile 39.0</label> <nb_visits>1</nb_visits> <nb_actions>2</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 d0c894d25c..300d043e61 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Chrome</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>1</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</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/browsers/CH.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index de82b8409f..1a87007b73 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -155,6 +155,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Windows XP / Chrome / 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>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Windows XP / Internet Explorer / 1024x768</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml index 3acd2a06f0..55b8fea073 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>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>30</bounce_count> - <nb_visits_converted>30</nb_visits_converted> - <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <bounce_count>31</bounce_count> + <nb_visits_converted>31</nb_visits_converted> + <sum_daily_nb_uniq_visitors>34</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 6405f7bd2d..b8dd5583e4 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>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>30</bounce_count> - <nb_visits_converted>30</nb_visits_converted> - <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <bounce_count>31</bounce_count> + <nb_visits_converted>31</nb_visits_converted> + <sum_daily_nb_uniq_visitors>34</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 9e7d544aec..ab85ae8d4a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>27</nb_visits> - <nb_actions>31</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>32</nb_actions> <max_actions>3</max_actions> <sum_visit_length>548</sum_visit_length> - <bounce_count>24</bounce_count> - <nb_visits_converted>26</nb_visits_converted> - <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> + <bounce_count>25</bounce_count> + <nb_visits_converted>27</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 6837e44818..822cd87824 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -26,13 +26,13 @@ </row> <row> <label>Windows</label> - <nb_visits>10</nb_visits> - <nb_actions>11</nb_actions> + <nb_visits>11</nb_visits> + <nb_actions>12</nb_actions> <max_actions>2</max_actions> <sum_visit_length>242</sum_visit_length> - <bounce_count>9</bounce_count> - <nb_visits_converted>10</nb_visits_converted> - <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <bounce_count>10</bounce_count> + <nb_visits_converted>11</nb_visits_converted> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 06b7964798..e99fb79fdb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -49,6 +49,18 @@ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> + <label>Windows XP</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> + </row> + <row> <label>Android 2.3</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -73,18 +85,6 @@ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> - <label>Windows XP</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> - </row> - <row> <label>Android 4.4</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> 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 a8dc2aedb4..221b657148 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>32</nb_visits> - <nb_actions>37</nb_actions> + <nb_visits>33</nb_visits> + <nb_actions>38</nb_actions> <max_actions>3</max_actions> <sum_visit_length>550</sum_visit_length> - <bounce_count>28</bounce_count> - <nb_visits_converted>28</nb_visits_converted> - <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> + <bounce_count>29</bounce_count> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>32</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 ff49f519f0..68146f90f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -2,7 +2,13 @@ <result> <row> <label>Monday</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> <day_of_week>1</day_of_week> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index c46f15ceec..72650afa13 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -134,13 +134,13 @@ </row> <row> <label>12h</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_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>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 78e6f4a198..9fee38a9a6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -179,14 +179,23 @@ </row> <row> <label>12h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> + <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>13h</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 08e1ba1474..47a2f53bfe 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>32</nb_visits> + <nb_visits>33</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 6ed9ca578e..731eda4177 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>36</nb_visits> + <nb_visits>37</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 e841131a55..e855ce559d 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>34</nb_visits> + <nb_visits>35</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 debbd57d3c..b661b86d45 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>40</nb_visits> + <nb_visits>41</nb_visits> <nb_visits_percentage>85%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index a564cebf19..5d7a5da04d 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>30</nb_visits> + <nb_visits>31</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 1680ea4edd..a2fc0d31e4 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>39</nb_visits> + <nb_visits>40</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 c6fee8cb76..12c0275f6c 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>31</nb_visits> + <nb_visits>32</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 06c5465555..d7958450bf 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>41</nb_visits> + <nb_visits>42</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 f24432d1a4..a59088da03 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>39</result>
\ No newline at end of file +<result>40</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 3fb9469667..51c650b8b2 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>30</result>
\ No newline at end of file +<result>31</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 95aa700980..5c61a82137 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>33</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.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index 3fb9469667..51c650b8b2 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>30</result>
\ No newline at end of file +<result>31</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 5c61a82137..8e4b837a62 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>34</result>
\ No newline at end of file +<result>35</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml index dafccfd4dd..866786c235 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>33</nb_uniq_visitors> + <nb_uniq_visitors>34</nb_uniq_visitors> <nb_users>2</nb_users> - <nb_visits>34</nb_visits> - <nb_actions>39</nb_actions> - <nb_visits_converted>30</nb_visits_converted> - <bounce_count>30</bounce_count> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> + <nb_visits_converted>31</nb_visits_converted> + <bounce_count>31</bounce_count> <sum_visit_length>550</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>88%</bounce_rate> + <bounce_rate>89%</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 96ce816d2e..500cb04dce 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>34</nb_visits> - <nb_actions>39</nb_actions> - <nb_pageviews>33</nb_pageviews> - <revenue>150</revenue> - <nb_conversions>30</nb_conversions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> + <nb_pageviews>34</nb_pageviews> + <revenue>155</revenue> + <nb_conversions>31</nb_conversions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -43,10 +43,10 @@ <revenue>5</revenue> <nb_conversions>1</nb_conversions> <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> + <actions_evolution>-75%</actions_evolution> + <pageviews_evolution>-70.6%</pageviews_evolution> + <revenue_evolution>-96.8%</revenue_evolution> + <nb_conversions_evolution>-96.8%</nb_conversions_evolution> <group /> <main_url>http://piwik.net</main_url> <idsite>1</idsite> diff --git a/tests/resources/access-logs/fake_logs_nginx_json.log b/tests/resources/access-logs/fake_logs_nginx_json.log new file mode 100644 index 0000000000..4cf39dfbb0 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_nginx_json.log @@ -0,0 +1 @@ +{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file |