diff options
| author | MichaelHeerklotz <michael.heerklotz@web.de> | 2019-11-08 06:25:20 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-11-08 06:25:20 +0300 |
| commit | ea5a14bdf8aa9608cdc2ab7d5c8236a5ff1eb3e2 (patch) | |
| tree | 1bfa77aad668a61f0db3159fc8fa63c6a389156a /tests | |
| parent | a6e68de3aef8daa0978edabbf867e5a86bfc6dac (diff) | |
UserID no longer overwrites VisitorId (#14360)
* UserID no longer overwrites VisitorId
* Update piwik-php-tracker package
* Update matomo-php-tracker again.
* Fixing test.
* Add changelog note.
Diffstat (limited to 'tests')
55 files changed, 971 insertions, 879 deletions
diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php index eb0d14701c..b182324bb6 100644 --- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php +++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php @@ -108,9 +108,8 @@ class FewVisitsWithSetVisitorId extends Fixture // Set User ID $t->setUserId($userId); - // User ID takes precedence over any previously set Visitor ID - $this->assertEquals($t->getUserIdHashed($userId), $t->getVisitorId()); - $this->assertEquals('9395988394d4568d', $t->getVisitorId()); + // User ID does not take precedence over any previously set Visitor ID + $this->assertEquals($generatedVisitorId, $t->getVisitorId()); $this->assertEquals($userId, $t->getUserId()); // Track a pageview with this user id @@ -124,7 +123,7 @@ class FewVisitsWithSetVisitorId extends Fixture // A NEW VISIT WITH A SET USER ID // Change User ID -> This will create a new visit $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.2)->getDatetime()); - $t->setNewVisitorId(); + $t->setVisitorId('2f16b4d842cc294d'); $secondUserId = 'new-email@example.com'; $t->setUserId($secondUserId); self::checkResponse($t->doTrackPageView('a new user id was set -> new visit')); @@ -132,6 +131,7 @@ class FewVisitsWithSetVisitorId extends Fixture // A NEW VISIT BY THE SAME USER // Few hours later, the same user ID comes in from a different place and computer $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + $t->setVisitorId('7dcebef4faef4969'); // set manually so tests are not random $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(5)->getDatetime()); // Make sure the computer and IP look really different from previous visit $t->setIp('67.51.31.21'); @@ -176,6 +176,7 @@ class FewVisitsWithSetVisitorId extends Fixture // Set User ID to a known user id $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + $t->setVisitorId('7dcebef4faef4325'); // set manually so tests are not random $t->setForceVisitDateTime($oneWeekLater->getDatetime()); $t->setUrl('http://example.org/index.htm'); $t->setUserId(self::USER_ID_EXAMPLE_COM); @@ -186,7 +187,7 @@ class FewVisitsWithSetVisitorId extends Fixture $t->setUrl('http://example.org/index.htm'); $userId = 'new-user-id@one-weeklater'; $t->setUserId($userId); - $t->setVisitorId('6ccebef4faef4969'); // this should be ignored and User ID prevail + $t->setVisitorId('6ccebef4faef4969'); // this should not be ignored self::checkResponse($t->doTrackPageView('A page view by ' . $userId)); $t->setForceVisitDateTime($oneWeekLater->addHour(0.8)->getDatetime()); diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index be1eb7f4f0..34c354e286 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -17,42 +17,42 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <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>2</sum_daily_exit_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <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> - <segment>entryPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> + <avg_time_generation>0.359</avg_time_generation> + <segment>entryPageTitle==404%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fhello.example.com%25252Fhello%25252Fworld%25252F6%25252C681965</segment> </row> <row> - <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> - <nb_visits>2</nb_visits> + <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>2</nb_hits_with_time_generation> - <min_time_generation>0.359</min_time_generation> - <max_time_generation>0.359</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> <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>2</exit_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>0.359</avg_time_generation> - <segment>entryPageTitle==404%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fhello.example.com%25252Fhello%25252Fworld%25252F6%25252C681965</segment> + <avg_time_generation>0</avg_time_generation> + <segment>entryPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> </row> <row> <label> 301/URL = http://piwik.net/moved-permanently</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml index 4d75a9ba1d..3ec86690bb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -28,33 +28,6 @@ <segment>entryPageTitle==Liberate%2BWeb%2BAnalytics%2B-%2BAnalytics%2B-%2BPiwik</segment> </row> <row> - <label> 301/URL = http://example.hello.com/Topic/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_bandwidth>0</avg_bandwidth> - <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> - <segment>entryPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> - </row> - <row> <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -109,6 +82,33 @@ <segment>entryPageTitle==Log%2BAnalytics%2B-%2BAnalytics%2B-%2BPiwik</segment> </row> <row> + <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>entryPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> + </row> + <row> <label> 301/URL = http://piwik.net/moved-permanently</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 8d119590f5..0cfecc7ed4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -814,55 +814,6 @@ </subtable> </row> <row> - <label>Topic</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>50%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> - <subtable> - <row> - <label>/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</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>50%</exit_rate> - <url>http://example.hello.com/Topic/hw43061</url> - <segment>entryPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> - </row> - </subtable> - </row> - <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1255,7 +1206,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1279,7 +1230,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1513,6 +1464,55 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://example.hello.com/Topic/hw43061</url> + <segment>entryPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index 28dbc3ca65..8957a52a12 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -1224,55 +1224,6 @@ </subtable> </row> <row> - <label>Topic</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>50%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> - <subtable> - <row> - <label>/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</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>50%</exit_rate> - <url>http://example.hello.com/Topic/hw43061</url> - <segment>entryPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> - </row> - </subtable> - </row> - <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1669,7 +1620,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1693,7 +1644,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1927,6 +1878,55 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://example.hello.com/Topic/hw43061</url> + <segment>entryPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index 54bdb14b5a..52d09d2f61 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -17,42 +17,42 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <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>2</sum_daily_exit_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <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> - <segment>exitPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> + <avg_time_generation>0.359</avg_time_generation> + <segment>exitPageTitle==404%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fhello.example.com%25252Fhello%25252Fworld%25252F6%25252C681965</segment> </row> <row> - <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> - <nb_visits>2</nb_visits> + <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>2</nb_hits_with_time_generation> - <min_time_generation>0.359</min_time_generation> - <max_time_generation>0.359</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> <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>2</exit_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>0.359</avg_time_generation> - <segment>exitPageTitle==404%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fhello.example.com%25252Fhello%25252Fworld%25252F6%25252C681965</segment> + <avg_time_generation>0</avg_time_generation> + <segment>exitPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> </row> <row> <label> 302/URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml index 9b9a189959..7e35295ca6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -28,33 +28,6 @@ <segment>exitPageTitle==Liberate%2BWeb%2BAnalytics%2B-%2BAnalytics%2B-%2BPiwik</segment> </row> <row> - <label> 301/URL = http://example.hello.com/Topic/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_bandwidth>0</avg_bandwidth> - <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> - <segment>exitPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> - </row> - <row> <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -109,6 +82,33 @@ <segment>exitPageTitle==Log%2BAnalytics%2B-%2BAnalytics%2B-%2BPiwik</segment> </row> <row> + <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>exitPageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> + </row> + <row> <label> 302/URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 25eefab31c..5aeee704d9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -811,55 +811,6 @@ </subtable> </row> <row> - <label>Topic</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>50%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> - <subtable> - <row> - <label>/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</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>50%</exit_rate> - <url>http://example.hello.com/Topic/hw43061</url> - <segment>exitPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> - </row> - </subtable> - </row> - <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1249,7 +1200,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1273,7 +1224,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1507,6 +1458,55 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://example.hello.com/Topic/hw43061</url> + <segment>exitPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index b658a97611..11e3c16f70 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -1247,55 +1247,6 @@ </subtable> </row> <row> - <label>Topic</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>50%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> - <subtable> - <row> - <label>/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</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>50%</exit_rate> - <url>http://example.hello.com/Topic/hw43061</url> - <segment>exitPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> - </row> - </subtable> - </row> - <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1683,7 +1634,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1707,7 +1658,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1941,6 +1892,55 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://example.hello.com/Topic/hw43061</url> + <segment>exitPageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 9654a8bea1..6e16854e66 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -21,13 +21,13 @@ <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> </row> <row> - <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -37,42 +37,42 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <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>2</sum_daily_exit_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <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> - <segment>pageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> + <avg_time_generation>0.359</avg_time_generation> + <segment>pageTitle==404%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fhello.example.com%25252Fhello%25252Fworld%25252F6%25252C681965</segment> </row> <row> - <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> - <nb_visits>2</nb_visits> + <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>2</nb_hits_with_time_generation> - <min_time_generation>0.359</min_time_generation> - <max_time_generation>0.359</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> <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>2</exit_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>0.359</avg_time_generation> - <segment>pageTitle==404%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fhello.example.com%25252Fhello%25252Fworld%25252F6%25252C681965</segment> + <avg_time_generation>0</avg_time_generation> + <segment>pageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> </row> <row> <label> 301/URL = http://piwik.net/moved-permanently</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 7a2b586b55..01f878da0f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -48,33 +48,6 @@ <segment>pageTitle==Liberate%2BWeb%2BAnalytics%2B-%2BAnalytics%2B-%2BPiwik</segment> </row> <row> - <label> 301/URL = http://example.hello.com/Topic/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_bandwidth>0</avg_bandwidth> - <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> - <segment>pageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> - </row> - <row> <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -129,6 +102,33 @@ <segment>pageTitle==Log%2BAnalytics%2B-%2BAnalytics%2B-%2BPiwik</segment> </row> <row> + <label> 301/URL = http://example.hello.com/Topic/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageTitle==301%252FURL%2B%253D%2Bhttp%25253A%25252F%25252Fexample.hello.com%25252FTopic%25252Fhw43061</segment> + </row> + <row> <label> 301/URL = http://piwik.net/moved-permanently</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index 754ca3b6e8..46c3703ced 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -832,55 +832,6 @@ </subtable> </row> <row> - <label>Topic</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>50%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> - <subtable> - <row> - <label>/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</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>50%</exit_rate> - <url>http://example.hello.com/Topic/hw43061</url> - <segment>pageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> - </row> - </subtable> - </row> - <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1296,7 +1247,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1320,7 +1271,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1554,6 +1505,55 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://example.hello.com/Topic/hw43061</url> + <segment>pageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 9e9ec0bdcf..bb4af64079 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -1268,55 +1268,6 @@ </subtable> </row> <row> - <label>Topic</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>50%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> - <subtable> - <row> - <label>/hw43061</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <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>2</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>50%</exit_rate> - <url>http://example.hello.com/Topic/hw43061</url> - <segment>pageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> - </row> - </subtable> - </row> - <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1776,7 +1727,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -1800,7 +1751,7 @@ <min_bandwidth /> <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> @@ -2034,6 +1985,55 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FTopic</segment> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://example.hello.com/Topic/hw43061</url> + <segment>pageUrl==http%253A%252F%252Fexample.hello.com%252FTopic%252Fhw43061</segment> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index 474c99ecab..cc20a7ee96 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_pageviews>45</nb_pageviews> - <nb_uniq_pageviews>44</nb_uniq_pageviews> + <nb_uniq_pageviews>43</nb_uniq_pageviews> <nb_downloads>4</nb_downloads> <nb_uniq_downloads>4</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml index a450cb30d1..336dc58a1b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_pageviews>69</nb_pageviews> - <nb_uniq_pageviews>62</nb_uniq_pageviews> + <nb_uniq_pageviews>61</nb_uniq_pageviews> <nb_downloads>5</nb_downloads> <nb_uniq_downloads>5</nb_uniq_downloads> <nb_outlinks>1</nb_outlinks> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 97e53dc19c..c4b0cacda8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -157,19 +157,19 @@ <label>User Name</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>2</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>5</sum_visit_length> + <bounce_count>1</bounce_count> <nb_visits_converted>3</nb_visits_converted> <goals> <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <slots> @@ -184,19 +184,10 @@ <label>user1</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>1</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>4</sum_visit_length> + <bounce_count>0</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <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>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> </row> 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 57215855b7..5d10bbb81e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -25,10 +25,10 @@ <row> <label>Apple</label> <nb_visits>18</nb_visits> - <nb_actions>22</nb_actions> + <nb_actions>23</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>307</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>309</sum_visit_length> + <bounce_count>14</bounce_count> <nb_visits_converted>17</nb_visits_converted> <goals> <row idgoal='1'> @@ -40,7 +40,7 @@ <nb_conversions>17</nb_conversions> <revenue>85</revenue> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/Morpheus/icons/dist/brand/Apple.png</logo> <segment>deviceBrand==Apple</segment> </row> @@ -69,8 +69,8 @@ <row> <label>Samsung</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 f2f0322122..d53a0dfeab 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -28,9 +28,9 @@ <label>Blink (Chrome, Opera)</label> <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>4</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>6</sum_visit_length> + <bounce_count>3</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> 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 8bfbbdd2e0..41e39d8828 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -15,13 +15,13 @@ <row> <label>Chrome</label> <nb_visits>10</nb_visits> - <nb_actions>11</nb_actions> + <nb_actions>12</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>9</bounce_count> + <sum_visit_length>4</sum_visit_length> + <bounce_count>8</bounce_count> <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> @@ -87,8 +87,8 @@ <row> <label>Chrome Mobile</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 db9282fc2c..68ab3e527b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -146,21 +146,21 @@ <row> <label>Chrome 41.0</label> <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==41.0</segment> <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Chrome Mobile 39.0</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 92e83d1cd4..2bc6b9c3ac 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -16,13 +16,13 @@ <row> <label>Chrome</label> <nb_visits>10</nb_visits> - <nb_actions>11</nb_actions> + <nb_actions>12</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>9</bounce_count> + <sum_visit_length>4</sum_visit_length> + <bounce_count>8</bounce_count> <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> <segment>browserCode==CH</segment> </row> @@ -94,8 +94,8 @@ <row> <label>Chrome Mobile</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 0deef753e6..1daf9d2766 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -24,10 +24,10 @@ <row> <label>Apple - Generic Desktop</label> <nb_visits>17</nb_visits> - <nb_actions>21</nb_actions> + <nb_actions>22</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>307</sum_visit_length> - <bounce_count>14</bounce_count> + <sum_visit_length>309</sum_visit_length> + <bounce_count>13</bounce_count> <nb_visits_converted>16</nb_visits_converted> <goals> <row idgoal='1'> @@ -39,7 +39,7 @@ <nb_conversions>16</nb_conversions> <revenue>80</revenue> <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <segment>deviceBrand==Apple;deviceModel==generic+desktop</segment> </row> <row> @@ -108,8 +108,8 @@ <row> <label>Samsung - GALAXY S5</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 ebfe76d92e..4376e34ff3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -3,13 +3,13 @@ <row> <label>Mac</label> <nb_visits>17</nb_visits> - <nb_actions>21</nb_actions> + <nb_actions>22</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>307</sum_visit_length> - <bounce_count>14</bounce_count> + <sum_visit_length>309</sum_visit_length> + <bounce_count>13</bounce_count> <nb_visits_converted>16</nb_visits_converted> <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> <row> @@ -39,8 +39,8 @@ <row> <label>Android</label> <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>3</max_actions> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>3</nb_visits_converted> 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 05c44600ef..da83acba74 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -42,13 +42,13 @@ <row> <label>Mac 10.10</label> <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> + <nb_actions>6</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>3</bounce_count> + <sum_visit_length>4</sum_visit_length> + <bounce_count>2</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment> <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> @@ -94,8 +94,8 @@ <row> <label>Android 4.4</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 02eb4a929d..4895b203ae 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -3,10 +3,10 @@ <row> <label>Desktop</label> <nb_visits>36</nb_visits> - <nb_actions>41</nb_actions> + <nb_actions>42</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>549</sum_visit_length> - <bounce_count>32</bounce_count> + <sum_visit_length>551</sum_visit_length> + <bounce_count>31</bounce_count> <nb_visits_converted>35</nb_visits_converted> <goals> <row idgoal='1'> @@ -18,15 +18,15 @@ <nb_conversions>35</nb_conversions> <revenue>175</revenue> <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <sum_daily_nb_users>3</sum_daily_nb_users> <segment>deviceType==desktop</segment> <logo>plugins/Morpheus/icons/dist/devices/desktop.png</logo> </row> <row> <label>Smartphone</label> <nb_visits>4</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>3</max_actions> + <nb_actions>5</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> 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 b40487874b..eded5b66a7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -2315,7 +2315,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>62</idVisit> + <idVisit>63</idVisit> <visitIp>192.0.2.10</visitIp> @@ -2577,7 +2577,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>61</idVisit> + <idVisit>62</idVisit> <visitIp>172.20.1.0</visitIp> @@ -2925,31 +2925,6 @@ </row> <row> <type>action</type> - <url>http://example.hello.com/Topic/hw43061</url> - <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> - <pageIdAction>58</pageIdAction> - - - <pageId>81</pageId> - <bandwidth /> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> - <title>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</title> - <subtitle>http://example.hello.com/Topic/hw43061</subtitle> - <icon /> - <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> - - <customVariables> - <row> - <customVariablePageName1>HTTP-code</customVariablePageName1> - <customVariablePageValue1>301</customVariablePageValue1> - </row> - </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> - </row> - <row> - <type>action</type> <url>http://xzy.example.com/Products/theProduct</url> <pageTitle /> <pageIdAction>56</pageIdAction> @@ -2959,7 +2934,7 @@ <bandwidth /> <generationTimeMilliseconds>109</generationTimeMilliseconds> <generationTime>0.11s</generationTime> - <interactionPosition>3</interactionPosition> + <interactionPosition>2</interactionPosition> <title /> <subtitle>http://xzy.example.com/Products/theProduct</subtitle> <icon /> @@ -3009,8 +2984,8 @@ <visitDuration>2</visitDuration> <visitDurationPretty>2s</visitDurationPretty> <searches>0</searches> - <actions>3</actions> - <interactions>3</interactions> + <actions>2</actions> + <interactions>2</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>example.com</referrerName> @@ -3073,31 +3048,31 @@ <row> <idSite>1</idSite> <idVisit>59</idVisit> - <visitIp>173.5.0.0</visitIp> + <visitIp>70.95.32.0</visitIp> <actionDetails> <row> <type>action</type> - <url>http://hello.example.com/hello/world/6,681965</url> - <pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle> - <pageIdAction>60</pageIdAction> + <url>http://example.hello.com/Topic/hw43061</url> + <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> + <pageIdAction>58</pageIdAction> - <pageId>82</pageId> + <pageId>81</pageId> <bandwidth /> - <generationTimeMilliseconds>359</generationTimeMilliseconds> - <generationTime>0.36s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> <interactionPosition>1</interactionPosition> - <title>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</title> - <subtitle>http://hello.example.com/hello/world/6,681965</subtitle> + <title>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</title> + <subtitle>http://example.hello.com/Topic/hw43061</subtitle> <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> - <customVariablePageValue1>404</customVariablePageValue1> + <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> @@ -3108,15 +3083,46 @@ <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>82</goalPageId> + <goalPageId>81</goalPageId> - <url>http://hello.example.com/hello/world/6,681965</url> + <url>http://example.hello.com/Topic/hw43061</url> <icon>plugins/Morpheus/images/goal.png</icon> <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($5 revenue)</subtitle> </row> + <row> + <type>action</type> + <url>http://example.hello.com/Topic/hw43061</url> + <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> + <pageIdAction>58</pageIdAction> + + + <pageId>92</pageId> + <bandwidth /> + <interactionPosition>2</interactionPosition> + <title>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</title> + <subtitle>http://example.hello.com/Topic/hw43061</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <customVariables> + <row> + <customVariablePageName1>Generation Time</customVariablePageName1> + <customVariablePageValue1>0</customVariablePageValue1> + </row> + <row> + <customVariablePageName2>Windows Status Code</customVariablePageName2> + <customVariablePageValue2>42</customVariablePageValue2> + </row> + <row> + <customVariablePageName3>HTTP-code</customVariablePageName3> + <customVariablePageValue3>301</customVariablePageValue3> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> </actionDetails> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> @@ -3132,7 +3138,7 @@ - <userId /> + <userId>user1</userId> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3142,11 +3148,11 @@ <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>2</visitDuration> + <visitDurationPretty>2s</visitDurationPretty> <searches>0</searches> - <actions>1</actions> - <interactions>1</interactions> + <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3170,11 +3176,11 @@ <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> - <browser>Chrome 37.0</browser> + <browser>Chrome 41.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> - <browserVersion>37.0</browserVersion> + <browserVersion>41.0</browserVersion> <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> @@ -3197,6 +3203,10 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <customVariables> + <row> + <customVariableName1>User Name</customVariableName1> + <customVariableValue1>user1</customVariableValue1> + </row> </customVariables> <resolution>unknown</resolution> <plugins /> @@ -3216,13 +3226,11 @@ <pageIdAction>60</pageIdAction> - <pageId>93</pageId> + <pageId>82</pageId> <bandwidth /> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> <generationTimeMilliseconds>359</generationTimeMilliseconds> <generationTime>0.36s</generationTime> - <interactionPosition>2</interactionPosition> + <interactionPosition>1</interactionPosition> <title>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</title> <subtitle>http://hello.example.com/hello/world/6,681965</subtitle> <icon /> @@ -3230,41 +3238,8 @@ <customVariables> <row> - <customVariablePageName1>Generation Time</customVariablePageName1> - <customVariablePageValue1>359</customVariablePageValue1> - </row> - <row> - <customVariablePageName2>Windows Status Code</customVariablePageName2> - <customVariablePageValue2>24</customVariablePageValue2> - </row> - <row> - <customVariablePageName3>HTTP-code</customVariablePageName3> - <customVariablePageValue3>404</customVariablePageValue3> - </row> - </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> - </row> - <row> - <type>action</type> - <url>http://hello.example.com/hello/from/another/world/6,681965</url> - <pageTitle /> - <pageIdAction>61</pageIdAction> - - - <pageId>83</pageId> - <bandwidth /> - <generationTimeMilliseconds>359</generationTimeMilliseconds> - <generationTime>0.36s</generationTime> - <interactionPosition>1</interactionPosition> - <title /> - <subtitle>http://hello.example.com/hello/from/another/world/6,681965</subtitle> - <icon /> - <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> - - <customVariables> - <row> <customVariablePageName1>HTTP-code</customVariablePageName1> - <customVariablePageValue1>200</customVariablePageValue1> + <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> @@ -3275,9 +3250,9 @@ <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>83</goalPageId> + <goalPageId>82</goalPageId> - <url>http://hello.example.com/hello/from/another/world/6,681965</url> + <url>http://hello.example.com/hello/world/6,681965</url> <icon>plugins/Morpheus/images/goal.png</icon> <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> @@ -3299,9 +3274,9 @@ - <userId>user2</userId> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> <visitCount>1</visitCount> @@ -3309,11 +3284,11 @@ <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>1</visitDuration> - <visitDurationPretty>1s</visitDurationPretty> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> - <actions>2</actions> - <interactions>2</interactions> + <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3360,7 +3335,7 @@ <location>United States</location> <latitude>38</latitude> <longitude>-97</longitude> - <visitLocalTime>17:30:00</visitLocalTime> + <visitLocalTime>17:00:00</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <customVariables> @@ -3371,38 +3346,67 @@ </row> <row> <idSite>1</idSite> - <idVisit>67</idVisit> - <visitIp>70.95.32.0</visitIp> + <idVisit>61</idVisit> + <visitIp>173.5.0.0</visitIp> <actionDetails> <row> <type>action</type> - <url>http://example.hello.com/Topic/hw43061</url> - <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> - <pageIdAction>58</pageIdAction> + <url>http://hello.example.com/hello/world/6,681965</url> + <pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle> + <pageIdAction>60</pageIdAction> - <pageId>92</pageId> + <pageId>93</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> - <title>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</title> - <subtitle>http://example.hello.com/Topic/hw43061</subtitle> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <generationTimeMilliseconds>359</generationTimeMilliseconds> + <generationTime>0.36s</generationTime> + <interactionPosition>2</interactionPosition> + <title>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</title> + <subtitle>http://hello.example.com/hello/world/6,681965</subtitle> <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> - <customVariablePageValue1>0</customVariablePageValue1> + <customVariablePageValue1>359</customVariablePageValue1> </row> <row> <customVariablePageName2>Windows Status Code</customVariablePageName2> - <customVariablePageValue2>42</customVariablePageValue2> + <customVariablePageValue2>24</customVariablePageValue2> </row> <row> <customVariablePageName3>HTTP-code</customVariablePageName3> - <customVariablePageValue3>301</customVariablePageValue3> + <customVariablePageValue3>404</customVariablePageValue3> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://hello.example.com/hello/from/another/world/6,681965</url> + <pageTitle /> + <pageIdAction>61</pageIdAction> + + + <pageId>83</pageId> + <bandwidth /> + <generationTimeMilliseconds>359</generationTimeMilliseconds> + <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://hello.example.com/hello/from/another/world/6,681965</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> @@ -3413,9 +3417,9 @@ <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>92</goalPageId> + <goalPageId>83</goalPageId> - <url>http://example.hello.com/Topic/hw43061</url> + <url>http://hello.example.com/hello/from/another/world/6,681965</url> <icon>plugins/Morpheus/images/goal.png</icon> <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> @@ -3437,9 +3441,9 @@ - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <userId>user2</userId> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> <visitCount>1</visitCount> @@ -3447,11 +3451,11 @@ <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> - <actions>1</actions> - <interactions>1</interactions> + <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3475,11 +3479,11 @@ <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> - <browser>Chrome 41.0</browser> + <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> - <browserVersion>41.0</browserVersion> + <browserVersion>37.0</browserVersion> <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> @@ -3498,14 +3502,10 @@ <location>United States</location> <latitude>38</latitude> <longitude>-97</longitude> - <visitLocalTime>17:00:00</visitLocalTime> + <visitLocalTime>17:30:00</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <customVariables> - <row> - <customVariableName1>User Name</customVariableName1> - <customVariableValue1>user1</customVariableValue1> - </row> </customVariables> <resolution>unknown</resolution> <plugins /> @@ -3831,7 +3831,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>65</idVisit> + <idVisit>66</idVisit> <visitIp>72.45.67.32</visitIp> @@ -3963,7 +3963,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>66</idVisit> + <idVisit>67</idVisit> <visitIp>73.77.55.45</visitIp> @@ -4095,14 +4095,14 @@ </row> <row> <idSite>1</idSite> - <idVisit>64</idVisit> + <idVisit>65</idVisit> <visitIp>192.0.2.222</visitIp> <actionDetails> <row> <type>event</type> - <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url> + <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?__?key=value</url> <pageIdAction>66</pageIdAction> @@ -4212,14 +4212,14 @@ </row> <row> <idSite>1</idSite> - <idVisit>63</idVisit> + <idVisit>64</idVisit> <visitIp>192.0.2.147</visitIp> <actionDetails> <row> <type>event</type> - <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url> + <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?__?key=value</url> <pageIdAction>66</pageIdAction> @@ -5580,7 +5580,7 @@ <row> <idSite>1</idSite> <idVisit>17</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>50.112.0.11</visitIp> <actionDetails> @@ -5687,17 +5687,17 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>California</region> + <regionCode>CA</regionCode> + <city>San Jose</city> + <location>San Jose, California, United States</location> + <latitude>45.870000</latitude> + <longitude>-119.688000</longitude> <visitLocalTime>15:31:05</visitLocalTime> <visitLocalHour>15</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -5710,7 +5710,7 @@ <row> <idSite>1</idSite> <idVisit>16</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>50.112.0.28</visitIp> <actionDetails> @@ -5817,17 +5817,17 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>California</region> + <regionCode>CA</regionCode> + <city>San Jose</city> + <location>San Jose, California, United States</location> + <latitude>45.870000</latitude> + <longitude>-119.688000</longitude> <visitLocalTime>13:49:46</visitLocalTime> <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -6490,7 +6490,7 @@ <row> <idSite>1</idSite> <idVisit>10</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>79.125.0.21</visitIp> <actionDetails> @@ -6597,17 +6597,17 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Ireland</country> + <countryCode>ie</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/ie.png</countryFlag> <region /> <regionCode /> <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <location>Ireland</location> + <latitude>53</latitude> + <longitude>-8</longitude> <visitLocalTime>18:03:40</visitLocalTime> <visitLocalHour>18</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> 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 b10f479041..f474e66f38 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -3,8 +3,8 @@ <row> <label>example.com</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 ddc49a471d..fc719074f4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -3,10 +3,10 @@ <row> <label>Direct Entry</label> <nb_visits>40</nb_visits> - <nb_actions>45</nb_actions> + <nb_actions>46</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>549</sum_visit_length> - <bounce_count>36</bounce_count> + <sum_visit_length>551</sum_visit_length> + <bounce_count>35</bounce_count> <nb_visits_converted>36</nb_visits_converted> <goals> <row idgoal='1'> @@ -18,14 +18,14 @@ <nb_conversions>36</nb_conversions> <revenue>180</revenue> <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <sum_daily_nb_users>3</sum_daily_nb_users> <segment>referrerType==direct</segment> </row> <row> <label>Websites</label> <nb_visits>4</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>3</max_actions> + <nb_actions>5</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> @@ -45,8 +45,8 @@ <row> <label>example.com</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 371ad3f5be..a09aab8a71 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -3,8 +3,8 @@ <row> <label>example.com</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> @@ -24,8 +24,8 @@ <row> <label>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 952351cc06..063b04c95c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -36,13 +36,13 @@ <row> <label>Mac / Chrome / unknown</label> <nb_visits>5</nb_visits> - <nb_actions>6</nb_actions> + <nb_actions>7</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>4</bounce_count> + <sum_visit_length>4</sum_visit_length> + <bounce_count>3</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>Unknown / Unknown / unknown</label> @@ -91,8 +91,8 @@ <row> <label>Android / Chrome Mobile / unknown</label> <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> 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 053fc1c19c..45cff0dd1e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -5,8 +5,8 @@ <nb_visits>42</nb_visits> <nb_actions>49</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>551</sum_visit_length> - <bounce_count>37</bounce_count> + <sum_visit_length>553</sum_visit_length> + <bounce_count>36</bounce_count> <nb_visits_converted>38</nb_visits_converted> <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>3</sum_daily_nb_users> 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 e6b75c9866..61f36ed9ad 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,23 +2,23 @@ <result> <row> <label>Unknown</label> - <nb_visits>33</nb_visits> - <nb_actions>40</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>38</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>551</sum_visit_length> - <bounce_count>28</bounce_count> - <nb_visits_converted>29</nb_visits_converted> + <sum_visit_length>553</sum_visit_length> + <bounce_count>25</bounce_count> + <nb_visits_converted>27</nb_visits_converted> <goals> <row idgoal='1'> - <nb_conversions>29</nb_conversions> - <nb_visits_converted>29</nb_visits_converted> - <revenue>145</revenue> + <nb_conversions>27</nb_conversions> + <nb_visits_converted>27</nb_visits_converted> + <revenue>135</revenue> </row> </goals> - <nb_conversions>29</nb_conversions> - <revenue>145</revenue> - <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>3</sum_daily_nb_users> + <nb_conversions>27</nb_conversions> + <revenue>135</revenue> + <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> @@ -86,6 +86,35 @@ <logo>plugins/Morpheus/icons/dist/flags/sg.png</logo> </row> <row> + <label>San Jose, California, United States</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> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>10</revenue> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <lat>45.87</lat> + <long>-119.688</long> + <segment>city==San+Jose;regionCode==CA;countryCode==us</segment> + <city_name>San Jose</city_name> + <region>CA</region> + <country>us</country> + <country_name>United States</country_name> + <region_name>California</region_name> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> + </row> + <row> <label>Igloolik, Nunavut, Canada</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> 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 701962b16d..c929d3638a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -23,44 +23,44 @@ </row> <row> <label>North America</label> - <nb_visits>12</nb_visits> - <nb_actions>15</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>10</bounce_count> - <nb_visits_converted>12</nb_visits_converted> + <nb_visits>14</nb_visits> + <nb_actions>17</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>6</sum_visit_length> + <bounce_count>11</bounce_count> + <nb_visits_converted>14</nb_visits_converted> <goals> <row idgoal='1'> - <nb_conversions>12</nb_conversions> - <nb_visits_converted>12</nb_visits_converted> - <revenue>60</revenue> + <nb_conversions>14</nb_conversions> + <nb_visits_converted>14</nb_visits_converted> + <revenue>70</revenue> </row> </goals> - <nb_conversions>12</nb_conversions> - <revenue>60</revenue> - <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_conversions>14</nb_conversions> + <revenue>70</revenue> + <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>North America</code> </row> <row> <label>Unknown</label> - <nb_visits>9</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> <max_actions>2</max_actions> <sum_visit_length>242</sum_visit_length> - <bounce_count>8</bounce_count> - <nb_visits_converted>7</nb_visits_converted> + <bounce_count>5</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> <goals> <row idgoal='1'> - <nb_conversions>7</nb_conversions> - <nb_visits_converted>7</nb_visits_converted> - <revenue>35</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <nb_conversions>4</nb_conversions> + <revenue>20</revenue> <code>Unknown</code> </row> <row> @@ -85,6 +85,27 @@ <code>South America</code> </row> <row> + <label>Europe</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> + <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>Europe</code> + </row> + <row> <label>Oceania</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index c4e56922dc..ea6c73fac1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -26,23 +26,23 @@ </row> <row> <label>United States</label> - <nb_visits>11</nb_visits> - <nb_actions>14</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>9</bounce_count> - <nb_visits_converted>11</nb_visits_converted> + <nb_visits>13</nb_visits> + <nb_actions>16</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>6</sum_visit_length> + <bounce_count>10</bounce_count> + <nb_visits_converted>13</nb_visits_converted> <goals> <row idgoal='1'> - <nb_conversions>11</nb_conversions> - <nb_visits_converted>11</nb_visits_converted> - <revenue>55</revenue> + <nb_conversions>13</nb_conversions> + <nb_visits_converted>13</nb_visits_converted> + <revenue>65</revenue> </row> </goals> - <nb_conversions>11</nb_conversions> - <revenue>55</revenue> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_conversions>13</nb_conversions> + <revenue>65</revenue> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>us</code> <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> <segment>countryCode==us</segment> @@ -50,23 +50,23 @@ </row> <row> <label>Unknown</label> - <nb_visits>9</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> <max_actions>2</max_actions> <sum_visit_length>242</sum_visit_length> - <bounce_count>8</bounce_count> - <nb_visits_converted>7</nb_visits_converted> + <bounce_count>5</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> <goals> <row idgoal='1'> - <nb_conversions>7</nb_conversions> - <nb_visits_converted>7</nb_visits_converted> - <revenue>35</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <nb_conversions>4</nb_conversions> + <revenue>20</revenue> <code>xx</code> <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> <segment>countryCode==xx</segment> @@ -160,6 +160,30 @@ <logoHeight>16</logoHeight> </row> <row> + <label>Ireland</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> + <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>ie</code> + <logo>plugins/Morpheus/icons/dist/flags/ie.png</logo> + <segment>countryCode==ie</segment> + <logoHeight>16</logoHeight> + </row> + <row> <label>South Korea</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> 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 e52ca0ecb1..39535fab28 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>8</result>
\ No newline at end of file +<result>9</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 fa4ee926cd..80d3f88924 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,23 +2,23 @@ <result> <row> <label>Unknown</label> - <nb_visits>36</nb_visits> - <nb_actions>43</nb_actions> + <nb_visits>34</nb_visits> + <nb_actions>41</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>551</sum_visit_length> - <bounce_count>31</bounce_count> - <nb_visits_converted>32</nb_visits_converted> + <sum_visit_length>553</sum_visit_length> + <bounce_count>28</bounce_count> + <nb_visits_converted>30</nb_visits_converted> <goals> <row idgoal='1'> - <nb_conversions>32</nb_conversions> - <nb_visits_converted>32</nb_visits_converted> - <revenue>160</revenue> + <nb_conversions>30</nb_conversions> + <nb_visits_converted>30</nb_visits_converted> + <revenue>150</revenue> </row> </goals> - <nb_conversions>32</nb_conversions> - <revenue>160</revenue> - <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>3</sum_daily_nb_users> + <nb_conversions>30</nb_conversions> + <revenue>150</revenue> + <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> @@ -52,6 +52,32 @@ <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> </row> <row> + <label>California, United States</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> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>10</revenue> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>regionCode==CA;countryCode==us</segment> + <region>CA</region> + <country>us</country> + <country_name>United States</country_name> + <region_name>California</region_name> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> + </row> + <row> <label>New Jersey, United States</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml index 255255c504..2534a6173c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>user1</label> + <nb_visits>2</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>4</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + + </row> + <row> <label>commonuser</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -13,18 +25,6 @@ </row> <row> - <label>user1</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> - - </row> - <row> <label>user2</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml index c7ee31e0be..7c402950bf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml @@ -5,8 +5,8 @@ <nb_visits>44</nb_visits> <nb_actions>51</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>551</sum_visit_length> - <bounce_count>39</bounce_count> + <sum_visit_length>553</sum_visit_length> + <bounce_count>38</bounce_count> <nb_visits_converted>40</nb_visits_converted> <sum_daily_nb_uniq_visitors>42</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>3</sum_daily_nb_users> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml index c8f5f737d3..c2696d3fc2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml @@ -5,8 +5,8 @@ <nb_visits>44</nb_visits> <nb_actions>51</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>551</sum_visit_length> - <bounce_count>39</bounce_count> + <sum_visit_length>553</sum_visit_length> + <bounce_count>38</bounce_count> <nb_visits_converted>40</nb_visits_converted> <sum_daily_nb_uniq_visitors>42</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>3</sum_daily_nb_users> 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 f4ed2f3a4b..f16e86021a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -22,8 +22,8 @@ <nb_uniq_visitors>5</nb_uniq_visitors> <nb_actions>10</nb_actions> <nb_users>2</nb_users> - <sum_visit_length>4</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>6</sum_visit_length> + <bounce_count>4</bounce_count> <nb_visits_converted>7</nb_visits_converted> <day_of_week>3</day_of_week> </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 1352c26a3e..2d4d9f99c0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -208,9 +208,9 @@ <label>17</label> <nb_visits>8</nb_visits> <nb_actions>11</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>6</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>6</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> 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 5233831eed..e4cab0eb15 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -289,9 +289,9 @@ <label>17</label> <nb_visits>8</nb_visits> <nb_actions>11</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>6</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>6</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> 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 b86736af7d..8827da6b88 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,17 +2,17 @@ <result> <row> <label>1 page</label> - <nb_visits>39</nb_visits> + <nb_visits>38</nb_visits> <segment>actions==1</segment> </row> <row> <label>2 pages</label> - <nb_visits>3</nb_visits> + <nb_visits>5</nb_visits> <segment>actions==2</segment> </row> <row> <label>3 pages</label> - <nb_visits>2</nb_visits> + <nb_visits>1</nb_visits> <segment>actions==3</segment> </row> <row> 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 20babec054..4432d4bc29 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,17 +2,17 @@ <result> <row> <label>1 page</label> - <nb_visits>48</nb_visits> + <nb_visits>47</nb_visits> <segment>actions==1</segment> </row> <row> <label>2 pages</label> - <nb_visits>5</nb_visits> + <nb_visits>7</nb_visits> <segment>actions==2</segment> </row> <row> <label>3 pages</label> - <nb_visits>3</nb_visits> + <nb_visits>2</nb_visits> <segment>actions==3</segment> </row> <row> 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 f24432d1a4..962fbe983a 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>39</result>
\ No newline at end of file +<result>38</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index 9ce15e5960..f57cd7bd3f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>9 min 11s</result>
\ No newline at end of file +<result>9 min 13s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml index c3d46f00fb..75a3ca20a8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>551</result>
\ No newline at end of file +<result>553</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 2547adbd57..a10316cbc6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -5,10 +5,10 @@ <nb_visits>44</nb_visits> <nb_actions>51</nb_actions> <nb_visits_converted>40</nb_visits_converted> - <bounce_count>39</bounce_count> - <sum_visit_length>551</sum_visit_length> + <bounce_count>38</bounce_count> + <sum_visit_length>553</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>89%</bounce_rate> + <bounce_rate>86%</bounce_rate> <nb_actions_per_visit>1.2</nb_actions_per_visit> <avg_time_on_site>13</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index 6879b1166d..9e872153c0 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -73,7 +73,7 @@ </row> <row> <idVisit>3</idVisit> - <visitorId>9395988394d4568d</visitorId> + <visitorId>6be121d126d93581</visitorId> <actionDetails> <row> <type>action</type> @@ -103,8 +103,6 @@ <serverTimePretty>Mar 6, 2010 13:22:33</serverTimePretty> <pageId>5</pageId> <bandwidth /> - <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> <interactionPosition>2</interactionPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> @@ -113,6 +111,15 @@ <timestamp>1267881753</timestamp> <bandwidth_pretty>0 M</bandwidth_pretty> </row> + </actionDetails> + <lastActionDateTime>2010-03-06 13:22:33</lastActionDateTime> + <userId>email@example.com</userId> + <actions>2</actions> + </row> + <row> + <idVisit>4</idVisit> + <visitorId>6ccebef4faef4969</visitorId> + <actionDetails> <row> <type>action</type> <url>http://example.org/index.htm</url> @@ -122,7 +129,7 @@ <serverTimePretty>Mar 6, 2010 13:28:33</serverTimePretty> <pageId>6</pageId> <bandwidth /> - <interactionPosition>3</interactionPosition> + <interactionPosition>1</interactionPosition> <title>second page</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -133,11 +140,11 @@ </actionDetails> <lastActionDateTime>2010-03-06 13:28:33</lastActionDateTime> <userId>email@example.com</userId> - <actions>3</actions> + <actions>1</actions> </row> <row> - <idVisit>4</idVisit> - <visitorId>c9ade7a5a103b2ed</visitorId> + <idVisit>5</idVisit> + <visitorId>2f16b4d842cc294d</visitorId> <actionDetails> <row> <type>action</type> @@ -163,66 +170,59 @@ </row> <row> <idVisit>6</idVisit> - <visitorId>5e15b4d842cc294d</visitorId> + <visitorId>7dcebef4faef4969</visitorId> <actionDetails> <row> <type>action</type> <url>http://example.org/home</url> - <pageTitle>pageview - should not be tracked by our user id but in a new visit</pageTitle> + <pageTitle>same user id was set -> this is the same unique user</pageTitle> <pageIdAction>10</pageIdAction> - <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> - <pageId>10</pageId> + <serverTimePretty>Mar 6, 2010 16:22:33</serverTimePretty> + <pageId>8</pageId> <bandwidth /> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> <interactionPosition>1</interactionPosition> - <title>pageview - should not be tracked by our user id but in a new visit</title> + <title>same user id was set -> this is the same unique user</title> <subtitle>http://example.org/home</subtitle> <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> - <timestamp>1267892913</timestamp> + <timestamp>1267892553</timestamp> <bandwidth_pretty>0 M</bandwidth_pretty> </row> - </actionDetails> - <lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime> - <userId /> - <actions>1</actions> - </row> - <row> - <idVisit>5</idVisit> - <visitorId>c9ade7a5a103b2ed</visitorId> - <actionDetails> <row> <type>action</type> <url>http://example.org/home</url> - <pageTitle>same user id was set -> this is the same unique user</pageTitle> + <pageTitle>second pageview - by this user id</pageTitle> <pageIdAction>10</pageIdAction> - <serverTimePretty>Mar 6, 2010 16:22:33</serverTimePretty> - <pageId>8</pageId> + <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> + <pageId>9</pageId> <bandwidth /> - <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> - <title>same user id was set -> this is the same unique user</title> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <interactionPosition>2</interactionPosition> + <title>second pageview - by this user id</title> <subtitle>http://example.org/home</subtitle> <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> - <timestamp>1267892553</timestamp> + <timestamp>1267892913</timestamp> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> <url>http://example.org/home</url> - <pageTitle>second pageview - by this user id</pageTitle> + <pageTitle>pageview - should not be tracked by our user id but in a new visit</pageTitle> <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> - <pageId>9</pageId> + <pageId>10</pageId> <bandwidth /> <timeSpent>721</timeSpent> <timeSpentPretty>12 min 1s</timeSpentPretty> - <interactionPosition>2</interactionPosition> - <title>second pageview - by this user id</title> + <interactionPosition>3</interactionPosition> + <title>pageview - should not be tracked by our user id but in a new visit</title> <subtitle>http://example.org/home</subtitle> <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> @@ -271,11 +271,11 @@ </actionDetails> <lastActionDateTime>2010-03-06 16:40:33</lastActionDateTime> <userId>new-email@example.com</userId> - <actions>2</actions> + <actions>3</actions> </row> <row> <idVisit>7</idVisit> - <visitorId>9395988394d4568d</visitorId> + <visitorId>7dcebef4faef4325</visitorId> <actionDetails> <row> <type>action</type> @@ -301,7 +301,7 @@ </row> <row> <idVisit>8</idVisit> - <visitorId>72d4b5565daf5546</visitorId> + <visitorId>6ccebef4faef4969</visitorId> <actionDetails> <row> <type>action</type> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml index ca85e8dede..84fa6eb257 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_uniq_visitors>6</nb_uniq_visitors> <nb_users>2</nb_users> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count>3</bounce_count> - <sum_visit_length>1983</sum_visit_length> + <sum_visit_length>1623</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>331</avg_time_on_site> + <avg_time_on_site>271</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml index 7731535795..da9ac2d0e5 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_uniq_visitors>7</nb_uniq_visitors> <nb_users>3</nb_users> <nb_visits>8</nb_visits> <nb_actions>12</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count>5</bounce_count> - <sum_visit_length>1983</sum_visit_length> + <sum_visit_length>1623</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>63%</bounce_rate> <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>248</avg_time_on_site> + <avg_time_on_site>203</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml index ca85e8dede..84fa6eb257 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_uniq_visitors>6</nb_uniq_visitors> <nb_users>2</nb_users> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count>3</bounce_count> - <sum_visit_length>1983</sum_visit_length> + <sum_visit_length>1623</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>331</avg_time_on_site> + <avg_time_on_site>271</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml index 84850ee827..06d0514996 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml @@ -4,9 +4,9 @@ <nb_actions>12</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count>5</bounce_count> - <sum_visit_length>1983</sum_visit_length> + <sum_visit_length>1623</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>63%</bounce_rate> <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>248</avg_time_on_site> + <avg_time_on_site>203</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml index 01fd8ff974..c61ad5dc70 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml @@ -4,12 +4,12 @@ <nb_visits_converted>1</nb_visits_converted> <revenue>0</revenue> <conversion_rate>50%</conversion_rate> - <nb_conversions_new_visit>0</nb_conversions_new_visit> - <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit> + <nb_conversions_new_visit>1</nb_conversions_new_visit> + <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit> <revenue_new_visit>0</revenue_new_visit> - <conversion_rate_new_visit>0%</conversion_rate_new_visit> - <nb_conversions_returning_visit>1</nb_conversions_returning_visit> - <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit> + <conversion_rate_new_visit>50%</conversion_rate_new_visit> + <nb_conversions_returning_visit>0</nb_conversions_returning_visit> + <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> - <conversion_rate_returning_visit>100%</conversion_rate_returning_visit> + <conversion_rate_returning_visit>0%</conversion_rate_returning_visit> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml index 969fd130e8..52352bd106 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_uniq_visitors>2</nb_uniq_visitors> <nb_users>1</nb_users> <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> + <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length>1081</sum_visit_length> - <max_actions>2</max_actions> + <max_actions>3</max_actions> <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>1.5</nb_actions_per_visit> + <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>541</avg_time_on_site> </result>
\ No newline at end of file |