diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-05-07 09:24:04 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-05-07 09:24:04 +0400 |
| commit | 096f8904eba39dd35e29dacea6f103576580f807 (patch) | |
| tree | 862b1cfdc1fc31143ce751ec670eed0c3f6f5adf /tests | |
| parent | 56554b56911a1aacc155e0f837ddd12671db2f84 (diff) | |
Fixing build
refs #3913 Fixes API for dashboards + disabling Dashboard API tests for now
Diffstat (limited to 'tests')
78 files changed, 874 insertions, 778 deletions
diff --git a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php new file mode 100644 index 0000000000..1d36404c8b --- /dev/null +++ b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php @@ -0,0 +1,54 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +/** + * Import a same visitor, over three different days, in reverse chronological order + * useful to test there are three visits are created for this visitor, as expected + * + */ +class Test_Piwik_Fixture_VisitOverSeveralDaysImportedLogs extends Test_Piwik_BaseFixture +{ + public $dateTime = '2013-04-07 19:00:00'; + public $idSite = 1; + + public function setUp() + { + $this->setUpWebsitesAndGoals(); + $this->trackVisits(); + } + + public function tearDown() + { + // empty + } + + public function setUpWebsitesAndGoals() + { + self::createWebsite($this->dateTime); + } + + private function trackVisits() + { + $this->logFromLogFileReverseVisitOrder(); + } + + /** + * Logs a couple visits for the site we created w/ all log importer options + * enabled. Visits are for Aug 11 of 2012. + */ + private function logFromLogFileReverseVisitOrder() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs_visits_in_reverse_chronological_order.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth(),); + + self::executeLogImporter($logFile, $opts); + } + +} diff --git a/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php b/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php new file mode 100644 index 0000000000..c68e30f1fc --- /dev/null +++ b/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php @@ -0,0 +1,43 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +class Test_Piwik_Integration_OneVisitor_SeveralDays_ImportedInRandomOrderTest extends IntegrationTestCase +{ + public static $fixture = null; // initialized below class definition + + /** + * @dataProvider getApiForTesting + * @group Integration + * @group OneVisitor_SeveralDays_ImportedInRandomOrder + */ + public function testApi($api, $params) + { + $this->runApiTests($api, $params); + } + + public function getApiForTesting() + { + return array( + // This should show 1 visit on 3 different days + array('Live.getLastVisitsDetails', array( + 'idSite' => '1', + 'date' => self::$fixture->dateTime, + 'periods' => 'month', + 'testSuffix' => '_shouldShowOneVisit_InEachOfThreeDays', + 'otherRequestParameters' => array('hideColumns' => 'visitorId') + + )), + ); + } + + + +} + +Test_Piwik_Integration_OneVisitor_SeveralDays_ImportedInRandomOrderTest::$fixture = new Test_Piwik_Fixture_VisitOverSeveralDaysImportedLogs(); + diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml index f4fb13bd4d..b7011954cf 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml @@ -2,7 +2,7 @@ <result> <row> <idSite>1</idSite> - <idVisit>27</idVisit> + <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> <visitorType>new</visitorType> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml index 261327f8d0..1099070756 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml @@ -2,5 +2,4 @@ <result> <row>1</row> <row>2</row> - <row>3</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml index 0e3245bec0..8cecee1da9 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>14</nb_visits> - <nb_actions>14</nb_actions> - <nb_visits_converted>14</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>2900</sum_visit_length> + <nb_visits>26</nb_visits> + <nb_actions>26</nb_actions> + <nb_visits_converted>26</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>5800</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>207</avg_time_on_site> + <avg_time_on_site>223</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml index ce63144a3b..c5a7afa2b4 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml @@ -2,10 +2,10 @@ <result> <row>Stratford-upon-Avon</row> <row>Vancouver</row> + <row>Besançon</row> <row>Nuneaton and Bedworth</row> <row>London</row> - <row>Hluboká nad Vltavou</row> - <row>Besançon</row> <row>Lhasa</row> + <row>Hluboká nad Vltavou</row> <row>not a city</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml index 1b299addfd..3608a3232b 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>10</nb_visits> - <nb_actions>15</nb_actions> + <nb_actions>13</nb_actions> <nb_visits_converted>10</nb_visits_converted> <bounce_count>7</bounce_count> - <sum_visit_length>2537</sum_visit_length> - <max_actions>3</max_actions> + <sum_visit_length>4705</sum_visit_length> + <max_actions>2</max_actions> <bounce_rate>70%</bounce_rate> - <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>254</avg_time_on_site> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>471</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml index 1d9f90e821..9824f121bf 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>19</nb_visits> - <nb_actions>31</nb_actions> - <nb_visits_converted>19</nb_visits_converted> - <bounce_count>10</bounce_count> - <sum_visit_length>5795</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>53%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>305</avg_time_on_site> + <nb_visits>22</nb_visits> + <nb_actions>29</nb_actions> + <nb_visits_converted>22</nb_visits_converted> + <bounce_count>15</bounce_count> + <sum_visit_length>10495</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>68%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>477</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml index 620d22f23c..c67ed4dbc9 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>gb</row> - <row>ru</row> <row>ca</row> - <row>xx</row> - <row>mk</row> <row>fr</row> + <row>ru</row> <row>it</row> + <row>id</row> <row>ti</row> + <row>xx</row> + <row>mk</row> <row>us</row> - <row>id</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml index c159bea68c..3608a3232b 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>10</nb_visits> - <nb_actions>17</nb_actions> + <nb_actions>13</nb_actions> <nb_visits_converted>10</nb_visits_converted> - <bounce_count>5</bounce_count> - <sum_visit_length>1089</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>109</avg_time_on_site> + <bounce_count>7</bounce_count> + <sum_visit_length>4705</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>70%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>471</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml index a9974ffdf6..a51820f4d7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>26</nb_visits> + <nb_visits>34</nb_visits> <nb_actions>43</nb_actions> - <nb_visits_converted>26</nb_visits_converted> - <bounce_count>13</bounce_count> - <sum_visit_length>8333</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>321</avg_time_on_site> + <nb_visits_converted>34</nb_visits_converted> + <bounce_count>25</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>458</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml index a9974ffdf6..a51820f4d7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>26</nb_visits> + <nb_visits>34</nb_visits> <nb_actions>43</nb_actions> - <nb_visits_converted>26</nb_visits_converted> - <bounce_count>13</bounce_count> - <sum_visit_length>8333</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>321</avg_time_on_site> + <nb_visits_converted>34</nb_visits_converted> + <bounce_count>25</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>458</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml index 59f83afa72..b72146a986 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>29</nb_actions> + <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>9</bounce_count> - <sum_visit_length>8</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>53%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> + <bounce_count>17</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml index 59f83afa72..b72146a986 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>29</nb_actions> + <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>9</bounce_count> - <sum_visit_length>8</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>53%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> + <bounce_count>17</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml index cd71c5c600..88dae8fd6c 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>4</nb_visits> - <nb_actions>7</nb_actions> + <nb_actions>4</nb_actions> <nb_visits_converted>4</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>3</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>25%</bounce_rate> - <nb_actions_per_visit>1.8</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <bounce_count>4</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml index 28cc9efad5..a9d41ed7b5 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>9</nb_visits> - <nb_actions>22</nb_actions> + <nb_actions>18</nb_actions> <nb_visits_converted>9</nb_visits_converted> <bounce_count>0</bounce_count> - <sum_visit_length>5429</sum_visit_length> - <max_actions>3</max_actions> + <sum_visit_length>9765</sum_visit_length> + <max_actions>2</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2.4</nb_actions_per_visit> - <avg_time_on_site>603</avg_time_on_site> + <nb_actions_per_visit>2</nb_actions_per_visit> + <avg_time_on_site>1085</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml index cd71c5c600..88dae8fd6c 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>4</nb_visits> - <nb_actions>7</nb_actions> + <nb_actions>4</nb_actions> <nb_visits_converted>4</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>3</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>25%</bounce_rate> - <nb_actions_per_visit>1.8</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <bounce_count>4</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml index 751c0c27bc..f61eea9527 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>5</nb_visits> + <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_visits_converted>5</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>728</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>40%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>146</avg_time_on_site> + <nb_visits_converted>8</nb_visits_converted> + <bounce_count>8</bounce_count> + <sum_visit_length>2900</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>363</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml index 751c0c27bc..f61eea9527 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>5</nb_visits> + <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_visits_converted>5</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>728</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>40%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>146</avg_time_on_site> + <nb_visits_converted>8</nb_visits_converted> + <bounce_count>8</bounce_count> + <sum_visit_length>2900</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>363</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml index 2526263baf..5a5c28de26 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>34</nb_actions> + <nb_actions>26</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>24%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>490</avg_time_on_site> + <bounce_count>8</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>47%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>916</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml index 2526263baf..5a5c28de26 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>34</nb_actions> + <nb_actions>26</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>24%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>490</avg_time_on_site> + <bounce_count>8</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>47%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>916</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml index 2526263baf..5a5c28de26 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>34</nb_actions> + <nb_actions>26</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>24%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>490</avg_time_on_site> + <bounce_count>8</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>47%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>916</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml index 14faab994a..b72146a986 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>9</nb_visits> - <nb_actions>9</nb_actions> - <nb_visits_converted>9</nb_visits_converted> - <bounce_count>9</bounce_count> + <nb_visits>17</nb_visits> + <nb_actions>17</nb_actions> + <nb_visits_converted>17</nb_visits_converted> + <bounce_count>17</bounce_count> <sum_visit_length>0</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml index 724075c272..7ace3fcbe7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> - <nb_visits_converted>10</nb_visits_converted> - <bounce_count>10</bounce_count> + <nb_visits>18</nb_visits> + <nb_actions>18</nb_actions> + <nb_visits_converted>18</nb_visits_converted> + <bounce_count>18</bounce_count> <sum_visit_length>0</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml index d0706b262e..9916600524 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>Space Quest XII</row> <row>It's <script> pitch black...</row> + <row>Space Quest XII</row> <row>It's pitch black...</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml index 4cd6c8c576..b72146a986 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>4</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>2900</sum_visit_length> + <nb_visits>17</nb_visits> + <nb_actions>17</nb_actions> + <nb_visits_converted>17</nb_visits_converted> + <bounce_count>17</bounce_count> + <sum_visit_length>0</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>725</avg_time_on_site> + <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml index 162ce8a72b..4d3c877fce 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>http://piwik.net/space/quest/iv</row> <row>http://piwik.net/grue/lair</row> + <row>http://piwik.net/space/quest/iv</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml index 4cd6c8c576..7ace3fcbe7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>4</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>2900</sum_visit_length> + <nb_visits>18</nb_visits> + <nb_actions>18</nb_actions> + <nb_visits_converted>18</nb_visits_converted> + <bounce_count>18</bounce_count> + <sum_visit_length>0</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>725</avg_time_on_site> + <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml index bb23f68008..4e3932b3a5 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml @@ -2,8 +2,8 @@ <result> <row>49.250000</row> <row>123.456001</row> - <row>124.456001</row> <row>47.249001</row> + <row>124.456001</row> <row>29.650000</row> <row>1.000000</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml index 05e3e19194..5d8d56f176 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>3</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>7</nb_actions> - <nb_visits_converted>3</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>3</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2.3</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <nb_visits_converted>6</nb_visits_converted> + <bounce_count>5</bounce_count> + <sum_visit_length>2535</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>83%</bounce_rate> + <nb_actions_per_visit>1.2</nb_actions_per_visit> + <avg_time_on_site>423</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml index 5e43d5d315..94553b31e2 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml @@ -2,8 +2,8 @@ <result> <row>-123.133003</row> <row>21.320999</row> - <row>22.231001</row> <row>6.018000</row> + <row>22.231001</row> <row>91.099998</row> <row>2.000000</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml index 59f83afa72..b72146a986 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>29</nb_actions> + <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>9</bounce_count> - <sum_visit_length>8</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>53%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> + <bounce_count>17</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml index 2526263baf..5a5c28de26 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>17</nb_visits> - <nb_actions>34</nb_actions> + <nb_actions>26</nb_actions> <nb_visits_converted>17</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>24%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>490</avg_time_on_site> + <bounce_count>8</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>47%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>916</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml index a9974ffdf6..a51820f4d7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>26</nb_visits> + <nb_visits>34</nb_visits> <nb_actions>43</nb_actions> - <nb_visits_converted>26</nb_visits_converted> - <bounce_count>13</bounce_count> - <sum_visit_length>8333</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>321</avg_time_on_site> + <nb_visits_converted>34</nb_visits_converted> + <bounce_count>25</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>458</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml index 8261244cc9..68a8855109 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>P3</row> - <row>66</row> <row>BC</row> - <row>H9</row> - <row>G5</row> + <row>66</row> + <row>P3</row> <row>A6</row> + <row>H9</row> <row>1</row> + <row>G5</row> <row>CA</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml index e7a2197c1a..5d8d56f176 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>6</nb_visits> - <nb_actions>11</nb_actions> + <nb_actions>7</nb_actions> <nb_visits_converted>6</nb_visits_converted> - <bounce_count>3</bounce_count> - <sum_visit_length>3</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>1.8</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <bounce_count>5</bounce_count> + <sum_visit_length>2535</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>83%</bounce_rate> + <nb_actions_per_visit>1.2</nb_actions_per_visit> + <avg_time_on_site>423</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml index 7d41cbbc1e..8cecee1da9 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>18</nb_visits> - <nb_actions>22</nb_actions> - <nb_visits_converted>18</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>2904</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>78%</bounce_rate> - <nb_actions_per_visit>1.2</nb_actions_per_visit> - <avg_time_on_site>161</avg_time_on_site> + <nb_visits>26</nb_visits> + <nb_actions>26</nb_actions> + <nb_visits_converted>26</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>5800</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>223</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml index 28cc9efad5..a9d41ed7b5 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>9</nb_visits> - <nb_actions>22</nb_actions> + <nb_actions>18</nb_actions> <nb_visits_converted>9</nb_visits_converted> <bounce_count>0</bounce_count> - <sum_visit_length>5429</sum_visit_length> - <max_actions>3</max_actions> + <sum_visit_length>9765</sum_visit_length> + <max_actions>2</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2.4</nb_actions_per_visit> - <avg_time_on_site>603</avg_time_on_site> + <nb_actions_per_visit>2</nb_actions_per_visit> + <avg_time_on_site>1085</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml index 02a51f80fb..6f1f745437 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>25</nb_visits> - <nb_actions>42</nb_actions> - <nb_visits_converted>25</nb_visits_converted> - <bounce_count>12</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>48%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>333</avg_time_on_site> + <nb_visits>30</nb_visits> + <nb_actions>39</nb_actions> + <nb_visits_converted>30</nb_visits_converted> + <bounce_count>21</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>70%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>519</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml index 72a9bf5dea..f782fd5e14 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>0</row> - <row>1</row> <row>1085</row> <row>725</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml index 724075c272..7ace3fcbe7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> - <nb_visits_converted>10</nb_visits_converted> - <bounce_count>10</bounce_count> + <nb_visits>18</nb_visits> + <nb_actions>18</nb_actions> + <nb_visits_converted>18</nb_visits_converted> + <bounce_count>18</bounce_count> <sum_visit_length>0</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml index fabf23f0cd..e71397f869 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>1.2.4.3</row> <row>194.57.91.215</row> - <row>1.2.4.2</row> - <row>1.2.4.0</row> + <row>::ffff:137.82.130.49</row> <row>1.2.4.1</row> - <row>1.2.4.4</row> - <row>1.2.4.8</row> - <row>1.2.4.7</row> - <row>1.2.4.6</row> - <row>1.2.4.5</row> + <row>137.82.0.0</row> + <row>103.29.196.229</row> <row>151.100.101.92</row> <row>137.82.130.0</row> - <row>137.82.0.0</row> + <row>1.2.4.0</row> <row>2001:db8:85a3::8a2e:370:7334</row> + <row>1.2.4.2</row> + <row>1.2.4.7</row> + <row>1.2.4.8</row> + <row>1.2.4.6</row> + <row>1.2.4.5</row> + <row>1.2.4.3</row> + <row>1.2.4.4</row> <row>113.62.1.1</row> - <row>103.29.196.229</row> - <row>::ffff:137.82.130.49</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml index 358d3a0162..869e6db0ce 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>1</sum_visit_length> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <nb_visits_converted>3</nb_visits_converted> + <bounce_count>2</bounce_count> + <sum_visit_length>1085</sum_visit_length> <max_actions>2</max_actions> - <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <bounce_rate>67%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>362</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml index 03424fccbc..e8f2b55d88 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> + <nb_visits>35</nb_visits> <nb_actions>44</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>1.6</nb_actions_per_visit> - <avg_time_on_site>309</avg_time_on_site> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>26</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>74%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>445</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml index cf7fd5e1a4..7ace3fcbe7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>18</nb_visits> - <nb_actions>30</nb_actions> + <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> - <bounce_count>10</bounce_count> - <sum_visit_length>8</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>56%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> + <bounce_count>18</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml index 2d985a9a67..8a4e8dcb1e 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml @@ -1,13 +1,21 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>a9b7ba70783b617e</row> + <row>908c9a564a864265</row> + <row>d0fb963ff976f9c3</row> <row>b8c37e33defde51c</row> - <row>aa68c75c4a77c87f</row> + <row>ffc58105bf6f8a91</row> + <row>a9b7ba70783b617e</row> + <row>1bd69c7df3112fb9</row> + <row>e93028bdc1aacdfb</row> + <row>08f90c1a41715536</row> + <row>d806ca13ca3449af</row> <row>fba9d88164f3e2d9</row> - <row>fed33392d3a48aa1</row> - <row>2387337ba1e0b024</row> - <row>1587965fb4d4b5af</row> - <row>d7322ed717dedf1e</row> <row>9246444d94f081e3</row> + <row>d7322ed717dedf1e</row> + <row>1587965fb4d4b5af</row> + <row>2387337ba1e0b024</row> + <row>fed33392d3a48aa1</row> + <row>a4380923dd651c19</row> + <row>aa68c75c4a77c87f</row> <row>fed33392d3a48ab2</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml index 48825a55d1..e512678946 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>5</nb_visits> - <nb_actions>12</nb_actions> - <nb_visits_converted>5</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>1088</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>20%</bounce_rate> - <nb_actions_per_visit>2.4</nb_actions_per_visit> - <avg_time_on_site>218</avg_time_on_site> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <nb_visits_converted>2</nb_visits_converted> + <bounce_count>2</bounce_count> + <sum_visit_length>725</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>363</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml index 02a51f80fb..6f1f745437 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>25</nb_visits> - <nb_actions>42</nb_actions> - <nb_visits_converted>25</nb_visits_converted> - <bounce_count>12</bounce_count> - <sum_visit_length>8333</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>48%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>333</avg_time_on_site> + <nb_visits>30</nb_visits> + <nb_actions>39</nb_actions> + <nb_visits_converted>30</nb_visits_converted> + <bounce_count>21</bounce_count> + <sum_visit_length>15565</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>70%</bounce_rate> + <nb_actions_per_visit>1.3</nb_actions_per_visit> + <avg_time_on_site>519</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Dashboard.getUserDashboards.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Dashboard.getUserDashboards.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Dashboard.getUserDashboards.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index f4fb13bd4d..b7011954cf 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -2,7 +2,7 @@ <result> <row> <idSite>1</idSite> - <idVisit>27</idVisit> + <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> <visitorType>new</visitorType> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 29f5758280..3380851d2c 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -2,16 +2,16 @@ <result> <row> <label>Unknown</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> <max_actions>2</max_actions> <sum_visit_length>3980</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> <row idgoal='2'> <nb_conversions>4</nb_conversions> @@ -19,8 +19,8 @@ <revenue>20</revenue> </row> </goals> - <nb_conversions>9</nb_conversions> - <revenue>45</revenue> + <nb_conversions>12</nb_conversions> + <revenue>60</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <city_name>Unknown</city_name> <city>xx</city> @@ -31,11 +31,42 @@ <logo>plugins/UserCountry/flags/xx.png</logo> </row> <row> + <label>Vancouver, British Columbia, Canada</label> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> + </row> + <row idgoal='2'> + <nb_conversions>3</nb_conversions> + <nb_visits_converted>3</nb_visits_converted> + <revenue>15</revenue> + </row> + </goals> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <lat>49.25</lat> + <long>-123.133</long> + <city_name>Vancouver</city_name> + <region>BC</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>British Columbia</region_name> + <logo>plugins/UserCountry/flags/ca.png</logo> + </row> + <row> <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -62,35 +93,35 @@ <logo>plugins/UserCountry/flags/gb.png</logo> </row> <row> - <label>Vancouver, British Columbia, Canada</label> - <nb_visits>3</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <label>Besançon, Franche-Comte, France</label> + <nb_visits>2</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>1085</sum_visit_length> + <bounce_count>1</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <lat>49.25</lat> - <long>-123.133</long> - <city_name>Vancouver</city_name> - <region>BC</region> - <country>ca</country> - <country_name>Canada</country_name> - <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/flags/ca.png</logo> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <lat>47.249</lat> + <long>6.018</long> + <city_name>Besançon</city_name> + <region>A6</region> + <country>fr</country> + <country_name>France</country_name> + <region_name>Franche-Comte</region_name> + <logo>plugins/UserCountry/flags/fr.png</logo> </row> <row> <label>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</label> @@ -122,12 +153,43 @@ <logo>plugins/UserCountry/flags/ru.png</logo> </row> <row> + <label>Lhasa, Unknown, Tibet</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> + </row> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <lat>29.65</lat> + <long>91.1</long> + <city_name>Lhasa</city_name> + <region>1</region> + <country>ti</country> + <country_name>Tibet</country_name> + <region_name>Unknown</region_name> + <logo>plugins/UserCountry/flags/ti.png</logo> + </row> + <row> <label>London, London, City of, United Kingdom</label> <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>1</bounce_count> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -153,10 +215,10 @@ <row> <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>1</bounce_count> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -267,68 +329,6 @@ <logo>plugins/UserCountry/flags/gb.png</logo> </row> <row> - <label>Besançon, Franche-Comte, France</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>0</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> - </row> - <row idgoal='2'> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <lat>47.249</lat> - <long>6.018</long> - <city_name>Besançon</city_name> - <region>A6</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> - </row> - <row> - <label>Lhasa, Unknown, Tibet</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>725</sum_visit_length> - <bounce_count>1</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> - </row> - <row idgoal='2'> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <lat>29.65</lat> - <long>91.1</long> - <city_name>Lhasa</city_name> - <region>1</region> - <country>ti</country> - <country_name>Tibet</country_name> - <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/ti.png</logo> - </row> - <row> <label>not a city, California, United States</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml index b77648c14e..42b0859fe3 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml @@ -2,16 +2,16 @@ <result> <row> <label>Europe</label> - <nb_visits>19</nb_visits> - <nb_actions>31</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>5795</sum_visit_length> - <bounce_count>10</bounce_count> + <nb_visits>22</nb_visits> + <nb_actions>29</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>10495</sum_visit_length> + <bounce_count>15</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>19</nb_conversions> - <nb_visits_converted>19</nb_visits_converted> - <revenue>95</revenue> + <nb_conversions>22</nb_conversions> + <nb_visits_converted>22</nb_visits_converted> + <revenue>110</revenue> </row> <row idgoal='2'> <nb_conversions>11</nb_conversions> @@ -19,23 +19,23 @@ <revenue>55</revenue> </row> </goals> - <nb_conversions>30</nb_conversions> - <revenue>150</revenue> + <nb_conversions>33</nb_conversions> + <revenue>165</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <code>Europe</code> </row> <row> <label>North America</label> - <nb_visits>4</nb_visits> + <nb_visits>7</nb_visits> <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>1</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>6</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>4</nb_conversions> - <nb_visits_converted>4</nb_visits_converted> - <revenue>20</revenue> + <nb_conversions>7</nb_conversions> + <nb_visits_converted>7</nb_visits_converted> + <revenue>35</revenue> </row> <row idgoal='2'> <nb_conversions>3</nb_conversions> @@ -43,12 +43,36 @@ <revenue>15</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <nb_conversions>10</nb_conversions> + <revenue>50</revenue> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <code>North America</code> </row> <row> + <label>Asia</label> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>1450</sum_visit_length> + <bounce_count>4</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> + </row> + <row idgoal='2'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>6</nb_conversions> + <revenue>30</revenue> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <code>Asia</code> + </row> + <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> @@ -72,28 +96,4 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>Unknown</code> </row> - <row> - <label>Asia</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>1450</sum_visit_length> - <bounce_count>2</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> - </row> - <row idgoal='2'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> - </row> - </goals> - <nb_conversions>4</nb_conversions> - <revenue>20</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <code>Asia</code> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index 55bc1f2f57..23e5a5d78b 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -3,10 +3,10 @@ <row> <label>United Kingdom</label> <nb_visits>10</nb_visits> - <nb_actions>17</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>1089</sum_visit_length> - <bounce_count>5</bounce_count> + <nb_actions>13</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>4705</sum_visit_length> + <bounce_count>7</bounce_count> <goals> <row idgoal='1'> <nb_conversions>10</nb_conversions> @@ -28,71 +28,71 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Russian Federation</label> - <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> + <label>Canada</label> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>1810</sum_visit_length> - <bounce_count>3</bounce_count> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>4</nb_conversions> - <nb_visits_converted>4</nb_visits_converted> - <revenue>20</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> <row idgoal='2'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> + <nb_conversions>3</nb_conversions> + <nb_visits_converted>3</nb_visits_converted> + <revenue>15</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <code>ru</code> - <logo>plugins/UserCountry/flags/ru.png</logo> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <code>ca</code> + <logo>plugins/UserCountry/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Canada</label> - <nb_visits>3</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <label>France</label> + <nb_visits>4</nb_visits> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> <row idgoal='2'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> </goals> <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <code>ca</code> - <logo>plugins/UserCountry/flags/ca.png</logo> + <code>fr</code> + <logo>plugins/UserCountry/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>France</label> - <nb_visits>2</nb_visits> + <label>Russian Federation</label> + <nb_visits>4</nb_visits> <nb_actions>5</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>1086</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>1810</sum_visit_length> + <bounce_count>3</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> <row idgoal='2'> <nb_conversions>2</nb_conversions> @@ -100,16 +100,16 @@ <revenue>10</revenue> </row> </goals> - <nb_conversions>4</nb_conversions> - <revenue>20</revenue> + <nb_conversions>6</nb_conversions> + <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <code>ru</code> + <logo>plugins/UserCountry/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Macedonia, the Former Yugoslav Republic of</label> + <label>Indonesia</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -130,13 +130,13 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>mk</code> - <logo>plugins/UserCountry/flags/mk.png</logo> + <code>id</code> + <logo>plugins/UserCountry/flags/id.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Unknown</label> + <label>Italy</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -157,23 +157,23 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>xx</code> - <logo>plugins/UserCountry/flags/xx.png</logo> + <code>it</code> + <logo>plugins/UserCountry/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Indonesia</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>Macedonia, the Former Yugoslav Republic of</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>725</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> @@ -181,26 +181,26 @@ <revenue>5</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>id</code> - <logo>plugins/UserCountry/flags/id.png</logo> + <code>mk</code> + <logo>plugins/UserCountry/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Italy</label> - <nb_visits>1</nb_visits> + <label>Tibet</label> + <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>1085</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> @@ -208,26 +208,26 @@ <revenue>5</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>it</code> - <logo>plugins/UserCountry/flags/it.png</logo> + <code>ti</code> + <logo>plugins/UserCountry/flags/ti.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Tibet</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>725</sum_visit_length> + <label>Unknown</label> + <nb_visits>2</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>1085</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> @@ -235,11 +235,11 @@ <revenue>5</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>ti</code> - <logo>plugins/UserCountry/flags/ti.png</logo> + <code>xx</code> + <logo>plugins/UserCountry/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index f879c9d3e5..732a818b90 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -1,12 +1,40 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Warwickshire, United Kingdom</label> - <nb_visits>6</nb_visits> + <label>Unknown</label> + <nb_visits>8</nb_visits> <nb_actions>11</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>3</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>3980</sum_visit_length> + <bounce_count>5</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> + </row> + <row idgoal='2'> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> + </row> + </goals> + <nb_conversions>12</nb_conversions> + <revenue>60</revenue> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <region>xx</region> + <country>xx</country> + <country_name>Unknown</country_name> + <region_name>Unknown</region_name> + <logo>plugins/UserCountry/flags/xx.png</logo> + </row> + <row> + <label>British Columbia, Canada</label> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> <nb_conversions>6</nb_conversions> @@ -22,39 +50,39 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <region>P3</region> - <country>gb</country> - <country_name>United Kingdom</country_name> - <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <region>BC</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>British Columbia</region_name> + <logo>plugins/UserCountry/flags/ca.png</logo> </row> <row> - <label>Unknown</label> - <nb_visits>5</nb_visits> + <label>Warwickshire, United Kingdom</label> + <nb_visits>6</nb_visits> <nb_actions>8</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>3980</sum_visit_length> - <bounce_count>2</bounce_count> + <sum_visit_length>2895</sum_visit_length> + <bounce_count>4</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> <row idgoal='2'> - <nb_conversions>4</nb_conversions> - <nb_visits_converted>4</nb_visits_converted> - <revenue>20</revenue> + <nb_conversions>3</nb_conversions> + <nb_visits_converted>3</nb_visits_converted> + <revenue>15</revenue> </row> </goals> <nb_conversions>9</nb_conversions> <revenue>45</revenue> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <region>xx</region> - <country>xx</country> - <country_name>Unknown</country_name> - <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <region>P3</region> + <country>gb</country> + <country_name>United Kingdom</country_name> + <region_name>Warwickshire</region_name> + <logo>plugins/UserCountry/flags/gb.png</logo> </row> <row> <label>Saint Petersburg City, Russian Federation</label> @@ -85,32 +113,32 @@ <logo>plugins/UserCountry/flags/ru.png</logo> </row> <row> - <label>British Columbia, Canada</label> - <nb_visits>3</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <label>Unknown, Tibet</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <region>BC</region> - <country>ca</country> - <country_name>Canada</country_name> - <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/flags/ca.png</logo> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <region>1</region> + <country>ti</country> + <country_name>Tibet</country_name> + <region_name>Unknown</region_name> + <logo>plugins/UserCountry/flags/ti.png</logo> </row> <row> <label>Miravci, Macedonia, the Former Yugoslav Republic of</label> @@ -141,7 +169,7 @@ <logo>plugins/UserCountry/flags/mk.png</logo> </row> <row> - <label>Kent, United Kingdom</label> + <label>Franche-Comte, France</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -162,18 +190,18 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <region>G5</region> - <country>gb</country> - <country_name>United Kingdom</country_name> - <region_name>Kent</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <region>A6</region> + <country>fr</country> + <country_name>France</country_name> + <region_name>Franche-Comte</region_name> + <logo>plugins/UserCountry/flags/fr.png</logo> </row> <row> - <label>London, City of, United Kingdom</label> + <label>Kent, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> + <sum_visit_length>1085</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -190,52 +218,24 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <region>H9</region> + <region>G5</region> <country>gb</country> <country_name>United Kingdom</country_name> - <region_name>London, City of</region_name> + <region_name>Kent</region_name> <logo>plugins/UserCountry/flags/gb.png</logo> </row> <row> - <label>Unknown, Tibet</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>London, City of, United Kingdom</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>725</sum_visit_length> - <bounce_count>1</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> - </row> - <row idgoal='2'> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <region>1</region> - <country>ti</country> - <country_name>Tibet</country_name> - <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/ti.png</logo> - </row> - <row> - <label>Franche-Comte, France</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>0</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> @@ -243,14 +243,14 @@ <revenue>5</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <region>A6</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <region>H9</region> + <country>gb</country> + <country_name>United Kingdom</country_name> + <region_name>London, City of</region_name> + <logo>plugins/UserCountry/flags/gb.png</logo> </row> <row> <label>California, United States</label> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index f07a79dad9..09d2946e4c 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -3,9 +3,9 @@ <row> <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml index 9d701c191f..6e7c025abc 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml @@ -3,9 +3,9 @@ <row> <label>Europe</label> <nb_visits>4</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index 003f6b0af1..76773f515c 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -3,9 +3,9 @@ <row> <label>United Kingdom</label> <nb_visits>4</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index 51f7a0efb4..f65ff3cdd7 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -3,9 +3,9 @@ <row> <label>Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index edc146a42e..e46b5eae05 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -3,10 +3,10 @@ <row> <label>United Kingdom</label> <nb_visits>10</nb_visits> - <nb_actions>17</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>1089</sum_visit_length> - <bounce_count>5</bounce_count> + <nb_actions>13</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>4705</sum_visit_length> + <bounce_count>7</bounce_count> <goals> <row idgoal='1'> <nb_conversions>10</nb_conversions> @@ -28,12 +28,12 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Russian Federation</label> + <label>France</label> <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> + <nb_actions>6</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>1810</sum_visit_length> - <bounce_count>3</bounce_count> + <sum_visit_length>2170</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>4</nb_conversions> @@ -49,23 +49,23 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <code>ru</code> - <logo>plugins/UserCountry/flags/ru.png</logo> + <code>fr</code> + <logo>plugins/UserCountry/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>France</label> - <nb_visits>2</nb_visits> + <label>Russian Federation</label> + <nb_visits>4</nb_visits> <nb_actions>5</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>1086</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>1810</sum_visit_length> + <bounce_count>3</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> <row idgoal='2'> <nb_conversions>2</nb_conversions> @@ -73,21 +73,21 @@ <revenue>10</revenue> </row> </goals> - <nb_conversions>4</nb_conversions> - <revenue>20</revenue> + <nb_conversions>6</nb_conversions> + <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <code>ru</code> + <logo>plugins/UserCountry/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Macedonia, the Former Yugoslav Republic of</label> + <label>Italy</label> <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>725</sum_visit_length> - <bounce_count>2</bounce_count> + <nb_actions>3</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>1085</sum_visit_length> + <bounce_count>1</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -103,23 +103,23 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>mk</code> - <logo>plugins/UserCountry/flags/mk.png</logo> + <code>it</code> + <logo>plugins/UserCountry/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>Italy</label> - <nb_visits>1</nb_visits> + <label>Macedonia, the Former Yugoslav Republic of</label> + <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>1085</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> @@ -127,11 +127,11 @@ <revenue>5</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>3</nb_conversions> + <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>it</code> - <logo>plugins/UserCountry/flags/it.png</logo> + <code>mk</code> + <logo>plugins/UserCountry/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index 15277712f8..ba85b508bd 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -2,16 +2,16 @@ <result> <row> <label>Vancouver, British Columbia, Canada</label> - <nb_visits>3</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> <row idgoal='2'> <nb_conversions>3</nb_conversions> @@ -19,9 +19,9 @@ <revenue>15</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <lat>49.25</lat> <long>-123.133</long> <city_name>Vancouver</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml index a96be46a85..029b0fe2fb 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml @@ -2,16 +2,16 @@ <result> <row> <label>North America</label> - <nb_visits>3</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> <row idgoal='2'> <nb_conversions>3</nb_conversions> @@ -19,9 +19,9 @@ <revenue>15</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <code>North America</code> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index 33e6aefbdf..f67ae5b363 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -2,16 +2,16 @@ <result> <row> <label>Canada</label> - <nb_visits>3</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> <row idgoal='2'> <nb_conversions>3</nb_conversions> @@ -19,9 +19,9 @@ <revenue>15</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <code>ca</code> <logo>plugins/UserCountry/flags/ca.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 6c790beddb..a5bb4e2c8a 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -2,16 +2,16 @@ <result> <row> <label>British Columbia, Canada</label> - <nb_visits>3</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>7</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>2</max_actions> + <sum_visit_length>2535</sum_visit_length> + <bounce_count>5</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> <row idgoal='2'> <nb_conversions>3</nb_conversions> @@ -19,9 +19,9 @@ <revenue>15</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <nb_conversions>9</nb_conversions> + <revenue>45</revenue> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index f39b1e6c27..ac9bdf27b9 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -3,9 +3,9 @@ <row> <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> + <nb_actions>6</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2170</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -34,10 +34,10 @@ <row> <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>1</bounce_count> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>725</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml index 674f4d6f56..411b7b32c4 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml @@ -3,10 +3,10 @@ <row> <label>Europe</label> <nb_visits>6</nb_visits> - <nb_actions>11</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>3</bounce_count> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2895</sum_visit_length> + <bounce_count>4</bounce_count> <goals> <row idgoal='1'> <nb_conversions>6</nb_conversions> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 7ea54f11f5..51f6210d7a 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -3,10 +3,10 @@ <row> <label>United Kingdom</label> <nb_visits>6</nb_visits> - <nb_actions>11</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>3</bounce_count> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2895</sum_visit_length> + <bounce_count>4</bounce_count> <goals> <row idgoal='1'> <nb_conversions>6</nb_conversions> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 3f59ad407d..dafd5b7d22 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -3,10 +3,10 @@ <row> <label>Warwickshire, United Kingdom</label> <nb_visits>6</nb_visits> - <nb_actions>11</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>3</bounce_count> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2895</sum_visit_length> + <bounce_count>4</bounce_count> <goals> <row idgoal='1'> <nb_conversions>6</nb_conversions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Dashboard.getUserDashboards.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Dashboard.getUserDashboards.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Dashboard.getUserDashboards.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Dashboard.getUserDashboards.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Dashboard.getUserDashboards.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Dashboard.getUserDashboards.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Dashboard.getUserDashboards.xml b/tests/PHPUnit/Integration/expected/test_noVisit__Dashboard.getUserDashboards.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/Integration/expected/test_noVisit__Dashboard.getUserDashboards.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index e4ca79e01f..717b9966e9 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -232,6 +232,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase public static $defaultApiNotToCall = array( 'LanguagesManager', 'DBStats', + 'Dashboard', 'UsersManager', 'SitesManager', 'ExampleUI', |