diff options
| author | BeezyT <timo@ezdesign.de> | 2011-10-31 11:14:51 +0400 |
|---|---|---|
| committer | BeezyT <timo@ezdesign.de> | 2011-10-31 11:14:51 +0400 |
| commit | f82388f491d893532a72a174e579a53154915c2c (patch) | |
| tree | 34a4cc92f9b8a54222018fd8597c774f0599e2ee | |
| parent | fe392d39192cfce3dd8b2f5fa99e8a253623692a (diff) | |
refs #1454 new action metrics are only accessed by actions plugin, bounce rate fix, changed color of second line chart series, updated expected test files
git-svn-id: http://dev.piwik.org/svn/trunk@5393 59fd770c-687e-43c8-a1e3-f5a4ff64c105
70 files changed, 364 insertions, 228 deletions
diff --git a/core/ArchiveProcessing/Day.php b/core/ArchiveProcessing/Day.php index c22cf2ac7c..ce71034ecd 100644 --- a/core/ArchiveProcessing/Day.php +++ b/core/ArchiveProcessing/Day.php @@ -80,7 +80,7 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing sum(log_visit.visit_total_actions) as nb_actions, max(log_visit.visit_total_actions) as max_actions, sum(log_visit.visit_total_time) as sum_visit_length, - sum(case log_visit.visit_total_actions when 1 then 1 else 0 end) as bounce_count, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as bounce_count, sum(case log_visit.visit_goal_converted when 1 then 1 else 0 end) as nb_visits_converted "; $from = "log_visit"; @@ -373,7 +373,7 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing sum(log_visit.visit_total_actions) as `". Piwik_Archive::INDEX_NB_ACTIONS ."`, max(log_visit.visit_total_actions) as `". Piwik_Archive::INDEX_MAX_ACTIONS ."`, sum(log_visit.visit_total_time) as `". Piwik_Archive::INDEX_SUM_VISIT_LENGTH ."`, - sum(case log_visit.visit_total_actions when 1 then 1 else 0 end) as `". Piwik_Archive::INDEX_BOUNCE_COUNT ."`, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `". Piwik_Archive::INDEX_BOUNCE_COUNT ."`, sum(case log_visit.visit_goal_converted when 1 then 1 else 0 end) as `". Piwik_Archive::INDEX_NB_VISITS_CONVERTED ."`"; $from = "log_visit"; diff --git a/core/Visualization/Chart/Evolution.php b/core/Visualization/Chart/Evolution.php index 1bc92aa386..3251171b7e 100644 --- a/core/Visualization/Chart/Evolution.php +++ b/core/Visualization/Chart/Evolution.php @@ -19,7 +19,7 @@ class Piwik_Visualization_Chart_Evolution extends Piwik_Visualization_Chart { - protected $seriesColors = array('#5170AE', '#CC3399', '#9933CC', '#80a033', '#FD9816', + protected $seriesColors = array('#5170AE','#F29007', '#CC3399', '#9933CC', '#80a033', '#246AD2', '#FD16EA', '#49C100'); function customizeChartProperties() diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index ed76c4c504..37d9789710 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -48,6 +48,25 @@ class Piwik_Actions_API return $this->getPageTitles( $idSite, $period, $date, $segment, $expanded, $idSubtable ); } + public function getActionCounts( $idSite, $period, $date, $segment = false) + { + Piwik::checkUserHasViewAccess( $idSite ); + + $metrics = array( + 'Actions_nb_pageviews' => 'nb_pageviews', + 'Actions_nb_uniq_pageviews' => 'nb_uniq_pageviews', + 'Actions_nb_downloads' => 'nb_downloads', + 'Actions_nb_uniq_downloads' => 'nb_uniq_downloads', + 'Actions_nb_outlinks' => 'nb_outlinks', + 'Actions_nb_uniq_outlinks' => 'nb_uniq_outlinks' + ); + + $archive = Piwik_Archive::build( $idSite, $period, $date, $segment ); + $table = $archive->getDataTableFromNumeric(array_keys($metrics)); + $table->filter('ReplaceColumnNames', array($metrics)); + return $table; + } + public function getPageUrls( $idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false ) { $dataTable = Piwik_Archive::getDataTableFromArchive('Actions_actions_url', $idSite, $period, $date, $segment, $expanded, $idSubtable ); diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index e20437ba57..209f441a2c 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -291,12 +291,12 @@ class Piwik_Actions extends Piwik_Plugin $archiveProcessing->archiveDataTable($dataTableToSum, self::$invalidSummedColumnNameToRenamedNameForPeriodArchive, $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation); $archiveProcessing->archiveNumericValuesSum(array( - 'nb_pageviews', - 'nb_uniq_pageviews', - 'nb_downloads', - 'nb_uniq_downloads', - 'nb_outlinks', - 'nb_uniq_outlinks' + 'Actions_nb_pageviews', + 'Actions_nb_uniq_pageviews', + 'Actions_nb_downloads', + 'Actions_nb_uniq_downloads', + 'Actions_nb_outlinks', + 'Actions_nb_uniq_outlinks' )); } @@ -373,7 +373,7 @@ class Piwik_Actions extends Piwik_Plugin count(*) as `". Piwik_Archive::INDEX_PAGE_ENTRY_NB_VISITS ."`, sum(log_visit.visit_total_actions) as `". Piwik_Archive::INDEX_PAGE_ENTRY_NB_ACTIONS ."`, sum(log_visit.visit_total_time) as `". Piwik_Archive::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH ."`, - sum(case log_visit.visit_total_actions when 1 then 1 else 0 end) as `". Piwik_Archive::INDEX_PAGE_ENTRY_BOUNCE_COUNT ."`"; + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `". Piwik_Archive::INDEX_PAGE_ENTRY_BOUNCE_COUNT ."`"; $from = "log_visit"; @@ -475,24 +475,24 @@ class Piwik_Actions extends Piwik_Plugin $this->deleteInvalidSummedColumnsFromDataTable($dataTable); $s = $dataTable->getSerialized( $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation ); $archiveProcessing->insertBlobRecord('Actions_actions_url', $s); - $archiveProcessing->insertNumericRecord('nb_pageviews', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS))); - $archiveProcessing->insertNumericRecord('nb_uniq_pageviews', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS))); + $archiveProcessing->insertNumericRecord('Actions_nb_pageviews', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS))); + $archiveProcessing->insertNumericRecord('Actions_nb_uniq_pageviews', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS))); destroy($dataTable); $dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_DOWNLOAD]); $this->deleteInvalidSummedColumnsFromDataTable($dataTable); $s = $dataTable->getSerialized($this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation ); $archiveProcessing->insertBlobRecord('Actions_downloads', $s); - $archiveProcessing->insertNumericRecord('nb_downloads', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS))); - $archiveProcessing->insertNumericRecord('nb_uniq_downloads', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS))); + $archiveProcessing->insertNumericRecord('Actions_nb_downloads', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS))); + $archiveProcessing->insertNumericRecord('Actions_nb_uniq_downloads', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS))); destroy($dataTable); $dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_OUTLINK]); $this->deleteInvalidSummedColumnsFromDataTable($dataTable); $s = $dataTable->getSerialized( $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation ); $archiveProcessing->insertBlobRecord('Actions_outlink', $s); - $archiveProcessing->insertNumericRecord('nb_outlinks', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS))); - $archiveProcessing->insertNumericRecord('nb_uniq_outlinks', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS))); + $archiveProcessing->insertNumericRecord('Actions_nb_outlinks', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS))); + $archiveProcessing->insertNumericRecord('Actions_nb_uniq_outlinks', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS))); destroy($dataTable); $dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_ACTION_NAME]); diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php index c58264f80e..d731a428be 100644 --- a/plugins/VisitFrequency/VisitFrequency.php +++ b/plugins/VisitFrequency/VisitFrequency.php @@ -105,7 +105,7 @@ class Piwik_VisitFrequency extends Piwik_Plugin sum(log_visit.visit_total_actions) as nb_actions_returning, max(log_visit.visit_total_actions) as max_actions_returning, sum(log_visit.visit_total_time) as sum_visit_length_returning, - sum(case log_visit.visit_total_actions when 1 then 1 else 0 end) as bounce_count_returning, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as bounce_count_returning, sum(case log_visit.visit_goal_converted when 1 then 1 else 0 end) as nb_visits_converted_returning"; $from = "log_visit"; diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 63dd059c77..cdd688d275 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -40,9 +40,11 @@ class Piwik_VisitsSummary_API $columns = Piwik::getArrayFromApiParameter($columns); $countColumnsRequested = count($columns); + $allColumns = true; $bounceRateRequested = $actionsPerVisitRequested = $averageVisitDurationRequested = false; if(!empty($columns)) { + $allColumns = false; if(($bounceRateRequested = array_search('bounce_rate', $columns)) !== false) { $columns = array('nb_visits', 'bounce_count'); @@ -63,18 +65,10 @@ class Piwik_VisitsSummary_API 'nb_visits', 'nb_uniq_visitors', 'nb_actions', - // hits, downloads and outlinks are archived by the actions plugin - // nevertheless, we can use them directly - 'nb_pageviews', - 'nb_uniq_pageviews', - 'nb_downloads', - 'nb_uniq_downloads', - 'nb_outlinks', - 'nb_uniq_outlinks', 'nb_visits_converted', 'bounce_count', 'sum_visit_length', - 'max_actions', + 'max_actions' ); if(!Piwik::isUniqueVisitorsEnabled($period)) { @@ -100,6 +94,10 @@ class Piwik_VisitsSummary_API $dataTable->filter('ColumnCallbackAddColumnQuotient', array('avg_time_on_site', 'sum_visit_length', 'nb_visits', 0)); } + // include action counts from actions plugin + $actionCounts = Piwik_API_Proxy::getInstance()->call('Piwik_Actions_API', 'getActionCounts', compact('idSite', 'period', 'date', 'segment')); + $this->mergeDataTables($dataTable, $actionCounts); + // If only a computed metrics was requested, we delete other metrics // that we selected only to process this one metric if($countColumnsRequested == 1 @@ -111,6 +109,51 @@ class Piwik_VisitsSummary_API return $dataTable; } + /** + * merge the columns of two data tables + * used to add the action counts to the visits summary + * manipulates the first table + */ + private function mergeDataTables($table1, $table2, $allColumns=true, $columns=array()) + { + // handle table arrays + if ($table1 instanceof Piwik_DataTable_Array && $table2 instanceof Piwik_DataTable_Array) + { + $subTables2 = $table2->getArray(); + foreach ($table1->getArray() as $index => $subTable1) + { + $subTable2 = $subTables2[$index]; + $this->mergeDataTables($subTable1, $subTable2); + } + return; + } + + $firstRow2 = $table2->getFirstRow(); + if (!$firstRow2) + { + // nothing to add + return; + } + + $firstRow1 = $table1->getFirstRow(); + if (!$firstRow1) + { + // first table has no row yet + $firstRow1 = new Piwik_DataTable_Row; + $table1->addRow($firstRow1); + } + + foreach ($firstRow2->getColumns() as $metric => $value) + { + if (!$allColumns && !in_array($metric, $columns)) + { + // only add the columns that have been requested + continue; + } + $firstRow1->setColumn($metric, $value); + } + } + protected function getNumeric( $idSite, $period, $date, $segment, $toFetch ) { Piwik::checkUserHasViewAccess( $idSite ); diff --git a/tests/integration/Main.test.php b/tests/integration/Main.test.php index 7ce2b1b7bc..a733029ebb 100644 --- a/tests/integration/Main.test.php +++ b/tests/integration/Main.test.php @@ -953,8 +953,11 @@ class Test_Piwik_Integration_Main extends Test_Integration $tests = array( // 4 blobs for the Actions plugin, 7 blogs for UserSettings 'archive_blob_2010_12' => (4 + 7) * 2, - // (VisitsSummary 5 metrics + 1 flag - no Unique visitors for range) + 2 Flags archive Actions/UserSettings + (Frequency 5 metrics + 1 flag) * 2 segments - 'archive_numeric_2010_12' => (6 + 2 + 6) * 2, + // (VisitsSummary 5 metrics + 1 flag - no Unique visitors for range) + // + 1 flag archive UserSettings + // + (Actions 1 flag + 2 metrics - pageviews, unique pageviews) + // + (Frequency 5 metrics + 1 flag) * 2 segments + 'archive_numeric_2010_12' => (6 + 1 + 3 + 6) * 2, // all "Range" records are in December 'archive_blob_2011_01' => 0, diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getActionCounts_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getActionCounts_day.xml new file mode 100644 index 0000000000..c8ea778d2d --- /dev/null +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getActionCounts_day.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> + <nb_downloads>1</nb_downloads> + <nb_uniq_downloads>1</nb_uniq_downloads> + <nb_outlinks>1</nb_outlinks> + <nb_uniq_outlinks>1</nb_uniq_outlinks> +</result>
\ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml index 0ded9a1e6c..492ab851ef 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>6</nb_actions> - <nb_pageviews>4</nb_pageviews> - <nb_uniq_pageviews>4</nb_uniq_pageviews> - <nb_downloads>1</nb_downloads> - <nb_uniq_downloads>1</nb_uniq_downloads> - <nb_outlinks>1</nb_outlinks> - <nb_uniq_outlinks>1</nb_uniq_outlinks> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length>1621</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>811</avg_time_on_site> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> + <nb_downloads>1</nb_downloads> + <nb_uniq_downloads>1</nb_uniq_downloads> + <nb_outlinks>1</nb_outlinks> + <nb_uniq_outlinks>1</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getActionCounts_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getActionCounts_day.xml new file mode 100644 index 0000000000..c8ea778d2d --- /dev/null +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getActionCounts_day.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> + <nb_downloads>1</nb_downloads> + <nb_uniq_downloads>1</nb_uniq_downloads> + <nb_outlinks>1</nb_outlinks> + <nb_uniq_outlinks>1</nb_uniq_outlinks> +</result>
\ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml index 0ded9a1e6c..492ab851ef 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>6</nb_actions> - <nb_pageviews>4</nb_pageviews> - <nb_uniq_pageviews>4</nb_uniq_pageviews> - <nb_downloads>1</nb_downloads> - <nb_uniq_downloads>1</nb_uniq_downloads> - <nb_outlinks>1</nb_outlinks> - <nb_uniq_outlinks>1</nb_uniq_outlinks> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length>1621</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>811</avg_time_on_site> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> + <nb_downloads>1</nb_downloads> + <nb_uniq_downloads>1</nb_uniq_downloads> + <nb_outlinks>1</nb_outlinks> + <nb_uniq_outlinks>1</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml index 3babb5e07a..bff821f798 100644 --- a/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>1</nb_actions> - <nb_pageviews>1</nb_pageviews> - <nb_uniq_pageviews>1</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length>1084</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>1084</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__VisitsSummary.get_day.xml index 8aa738b5f0..a58d5f4cfd 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__VisitsSummary.get_day.xml @@ -4,20 +4,18 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_visits_converted>1</nb_visits_converted> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>1</nb_pageviews> - <nb_uniq_pageviews>1</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_visits_converted>1</nb_visits_converted> @@ -25,12 +23,12 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>361</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> </result> <result date="2010-01-05"> <max_actions>5</max_actions> <nb_actions>5</nb_actions> - <nb_pageviews>5</nb_pageviews> - <nb_uniq_pageviews>3</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_visits_converted>1</nb_visits_converted> @@ -38,6 +36,8 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>902</avg_time_on_site> + <nb_pageviews>5</nb_pageviews> + <nb_uniq_pageviews>3</nb_uniq_pageviews> </result> <result date="2010-01-06" /> <result date="2010-01-07" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml index c22681497c..9532385564 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml @@ -4,14 +4,14 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_visits_converted>1</nb_visits_converted> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result idSite="2" /> </results>
\ No newline at end of file diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml index 546db6a5ca..3ed22d72c6 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml @@ -4,8 +4,6 @@ <bounce_count>1</bounce_count> <max_actions>5</max_actions> <nb_actions>8</nb_actions> - <nb_pageviews>8</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_visits_converted>3</nb_visits_converted> @@ -13,12 +11,12 @@ <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> <avg_time_on_site>421</avg_time_on_site> + <nb_pageviews>8</nb_pageviews> + <nb_uniq_pageviews>6</nb_uniq_pageviews> </result> <result idSite="2"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_visits_converted>1</nb_visits_converted> @@ -26,5 +24,7 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> </results>
\ No newline at end of file diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml index e470d7406f..efb13dad5e 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml @@ -4,13 +4,13 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result idSite="2" /> </results>
\ No newline at end of file diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml index a490fc73db..cbcead8726 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml @@ -4,25 +4,25 @@ <bounce_count>1</bounce_count> <max_actions>5</max_actions> <nb_actions>8</nb_actions> - <nb_pageviews>8</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> <avg_time_on_site>421</avg_time_on_site> + <nb_pageviews>8</nb_pageviews> + <nb_uniq_pageviews>6</nb_uniq_pageviews> </result> <result idSite="2"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> </results>
\ No newline at end of file diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml index c94dd78fdd..7e2ffd33af 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -60,13 +60,13 @@ <result prettyDate="Sunday 3 January 2010"> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> @@ -75,13 +75,13 @@ <result prettyDate="Monday 4 January 2010"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>1</nb_pageviews> - <nb_uniq_pageviews>1</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>00:06:01</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> @@ -90,13 +90,13 @@ <result prettyDate="Tuesday 5 January 2010"> <max_actions>5</max_actions> <nb_actions>5</nb_actions> - <nb_pageviews>5</nb_pageviews> - <nb_uniq_pageviews>3</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> + <nb_pageviews>5</nb_pageviews> + <nb_uniq_pageviews>3</nb_uniq_pageviews> <nb_downloads>0</nb_downloads> <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml index 8473b6a51e..94fd4fa534 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml @@ -5,37 +5,37 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>1</nb_pageviews> - <nb_uniq_pageviews>1</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>361</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>361</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> </result> <result date="2010-01-05"> <max_actions>5</max_actions> <nb_actions>5</nb_actions> - <nb_pageviews>5</nb_pageviews> - <nb_uniq_pageviews>3</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>901</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>901</avg_time_on_site> + <nb_pageviews>5</nb_pageviews> + <nb_uniq_pageviews>3</nb_uniq_pageviews> </result> <result date="2010-01-06" /> <result date="2010-01-07" /> @@ -47,14 +47,14 @@ <result date="2010-01-04"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-05" /> <result date="2010-01-06" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml index f0d00b73d9..0175b73e17 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml @@ -5,14 +5,14 @@ <bounce_count>1</bounce_count> <max_actions>5</max_actions> <nb_actions>8</nb_actions> - <nb_pageviews>8</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> <avg_time_on_site>421</avg_time_on_site> + <nb_pageviews>8</nb_pageviews> + <nb_uniq_pageviews>6</nb_uniq_pageviews> </result> <result date="2010-02" /> <result date="2010-03" /> @@ -25,14 +25,14 @@ <result date="2010-01"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-02" /> <result date="2010-03" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml index a417fa937b..c354a6dae0 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml @@ -5,25 +5,25 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04 to 2010-01-10"> <max_actions>5</max_actions> <nb_actions>7</nb_actions> - <nb_pageviews>6</nb_pageviews> - <nb_uniq_pageviews>4</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>3.5</nb_actions_per_visit> <avg_time_on_site>631</avg_time_on_site> + <nb_pageviews>6</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> </result> <result date="2010-01-11 to 2010-01-17" /> <result date="2010-01-18 to 2010-01-24" /> @@ -36,14 +36,14 @@ <result date="2010-01-04 to 2010-01-10"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-11 to 2010-01-17" /> <result date="2010-01-18 to 2010-01-24" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml index bbcb8b075c..6a7a406f76 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml @@ -5,13 +5,13 @@ <bounce_count>1</bounce_count> <max_actions>5</max_actions> <nb_actions>8</nb_actions> - <nb_pageviews>8</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> <nb_visits>3</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> <avg_time_on_site>421</avg_time_on_site> + <nb_pageviews>8</nb_pageviews> + <nb_uniq_pageviews>6</nb_uniq_pageviews> </result> <result date="2011" /> <result date="2012" /> @@ -24,13 +24,13 @@ <result date="2010"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2011" /> <result date="2012" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml index f19c625fef..d924536df7 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml @@ -4,37 +4,37 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04"> <max_actions>2</max_actions> <nb_actions>2</nb_actions> - <nb_pageviews>1</nb_pageviews> - <nb_uniq_pageviews>1</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>361</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>361</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> </result> <result date="2010-01-05"> <max_actions>5</max_actions> <nb_actions>5</nb_actions> - <nb_pageviews>5</nb_pageviews> - <nb_uniq_pageviews>3</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>901</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>901</avg_time_on_site> + <nb_pageviews>5</nb_pageviews> + <nb_uniq_pageviews>3</nb_uniq_pageviews> </result> <result date="2010-01-06" /> <result date="2010-01-07" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml index 3dd4a80710..f8fc4e291d 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml @@ -4,14 +4,14 @@ <bounce_count>1</bounce_count> <max_actions>5</max_actions> <nb_actions>8</nb_actions> - <nb_pageviews>8</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> <avg_time_on_site>421</avg_time_on_site> + <nb_pageviews>8</nb_pageviews> + <nb_uniq_pageviews>6</nb_uniq_pageviews> </result> <result date="2010-02" /> <result date="2010-03" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml index ff18ca13fd..2e30bcad67 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml @@ -4,25 +4,25 @@ <bounce_count>1</bounce_count> <max_actions>1</max_actions> <nb_actions>1</nb_actions> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04 to 2010-01-10"> <max_actions>5</max_actions> <nb_actions>7</nb_actions> - <nb_pageviews>6</nb_pageviews> - <nb_uniq_pageviews>4</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>3.5</nb_actions_per_visit> <avg_time_on_site>631</avg_time_on_site> + <nb_pageviews>6</nb_pageviews> + <nb_uniq_pageviews>4</nb_uniq_pageviews> </result> <result date="2010-01-11 to 2010-01-17" /> <result date="2010-01-18 to 2010-01-24" /> diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml index 597ff7918b..b61eafa285 100644 --- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml +++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml @@ -4,13 +4,13 @@ <bounce_count>1</bounce_count> <max_actions>5</max_actions> <nb_actions>8</nb_actions> - <nb_pageviews>8</nb_pageviews> - <nb_uniq_pageviews>6</nb_uniq_pageviews> <nb_visits>3</nb_visits> <sum_visit_length>1262</sum_visit_length> <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> <avg_time_on_site>421</avg_time_on_site> + <nb_pageviews>8</nb_pageviews> + <nb_uniq_pageviews>6</nb_uniq_pageviews> </result> <result date="2011" /> <result date="2012" /> diff --git a/tests/integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv Binary files differindex 069b2f3c6b..74c4f7d494 100644 --- a/tests/integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv +++ b/tests/integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv diff --git a/tests/integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv Binary files differindex 4f2b3dfac9..b654cde939 100644 --- a/tests/integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv +++ b/tests/integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv diff --git a/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv Binary files differindex 99b51f65db..7a19c4a33e 100644 --- a/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv +++ b/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv diff --git a/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv Binary files differindex 8d654779a6..8292407dc9 100644 --- a/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv +++ b/tests/integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv diff --git a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differindex f8d2887fdb..e9bf1d8d32 100644 --- a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv diff --git a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv Binary files differindex 95eb2740ef..977e448ecc 100644 --- a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv +++ b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml index ed13c53143..28a8eb61e1 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>9</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>4682</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4.5</nb_actions_per_visit> <avg_time_on_site>2341</avg_time_on_site> + <nb_pageviews>9</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml index 0aabe2a406..1351a1c172 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>4</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>721</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>721</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml index 0aabe2a406..1351a1c172 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>4</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>721</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>721</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml index ed13c53143..5fe2b2bfab 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>9</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>4682</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4.5</nb_actions_per_visit> <avg_time_on_site>2341</avg_time_on_site> + <nb_pageviews>0</nb_pageviews> + <nb_uniq_pageviews>0</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml index 0aabe2a406..e0e9f0bff6 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>4</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>721</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>721</avg_time_on_site> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml index 0aabe2a406..e0e9f0bff6 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>4</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>721</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>721</avg_time_on_site> + <nb_pageviews>4</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml index c9c4851e2e..3fcff6514e 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>6</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>3961</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>6</nb_actions_per_visit> <avg_time_on_site>3961</avg_time_on_site> + <nb_pageviews>6</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml index 0aabe2a406..1351a1c172 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>4</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>721</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>721</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml index f6bea13ecd..d752a1076c 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml @@ -3,17 +3,17 @@ <nb_visits>3</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>6</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>2</nb_visits_converted> - <bounce_count>0</bounce_count> + <bounce_count>1</bounce_count> <sum_visit_length>2165</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> + <bounce_rate>33%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>722</avg_time_on_site> + <nb_pageviews>6</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml index c9c4851e2e..3fcff6514e 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>6</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>3961</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>6</nb_actions_per_visit> <avg_time_on_site>3961</avg_time_on_site> + <nb_pageviews>6</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml index 89bbe56759..38dffdb8fa 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>3</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>13</nb_actions> - <nb_pageviews>13</nb_pageviews> - <nb_uniq_pageviews>3</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>2</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>5403</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>4.3</nb_actions_per_visit> <avg_time_on_site>1801</avg_time_on_site> + <nb_pageviews>13</nb_pageviews> + <nb_uniq_pageviews>3</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getActionCounts_day.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getActionCounts_day.xml new file mode 100644 index 0000000000..106f23f16b --- /dev/null +++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getActionCounts_day.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="2009-01-04" /> + <result date="2009-01-05" /> + <result date="2009-01-06" /> + <result date="2009-01-07" /> + <result date="2009-01-08" /> + <result date="2009-01-09" /> + <result date="2009-01-10" /> +</results>
\ No newline at end of file diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getActionCounts_week.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getActionCounts_week.xml new file mode 100644 index 0000000000..915e319c6e --- /dev/null +++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getActionCounts_week.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="2008-12-29 to 2009-01-04" /> + <result date="2009-01-05 to 2009-01-11" /> + <result date="2009-01-12 to 2009-01-18" /> + <result date="2009-01-19 to 2009-01-25" /> + <result date="2009-01-26 to 2009-02-01" /> + <result date="2009-02-02 to 2009-02-08" /> + <result date="2009-02-09 to 2009-02-15" /> +</results>
\ No newline at end of file diff --git a/tests/integration/expected/test_noVisit__Actions.getActionCounts_day.xml b/tests/integration/expected/test_noVisit__Actions.getActionCounts_day.xml new file mode 100644 index 0000000000..4a78de72f1 --- /dev/null +++ b/tests/integration/expected/test_noVisit__Actions.getActionCounts_day.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_pageviews>0</nb_pageviews> + <nb_uniq_pageviews>0</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> +</result>
\ No newline at end of file diff --git a/tests/integration/expected/test_noVisit__VisitsSummary.get_day.xml b/tests/integration/expected/test_noVisit__VisitsSummary.get_day.xml index 85dd084b69..30232cf13e 100644 --- a/tests/integration/expected/test_noVisit__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_noVisit__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>0</nb_visits> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_actions>0</nb_actions> - <nb_pageviews>0</nb_pageviews> - <nb_uniq_pageviews>0</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>0</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>0</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> + <nb_pageviews>0</nb_pageviews> + <nb_uniq_pageviews>0</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml b/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml index 29d972ff8a..a7ba6461bd 100644 --- a/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml +++ b/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml @@ -9,4 +9,10 @@ <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>1.5</nb_actions_per_visit> <avg_time_on_site>181</avg_time_on_site> + <nb_pageviews>9</nb_pageviews> + <nb_uniq_pageviews>9</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index 1dc2ea5e28..06fc85eab1 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -59,9 +59,9 @@ <row> <label>France</label> <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> + <nb_actions>4</nb_actions> <revenue>$ 1000</revenue> - <nb_actions_per_visit>1.67</nb_actions_per_visit> + <nb_actions_per_visit>1.33</nb_actions_per_visit> <avg_time_on_site>00:02:01</avg_time_on_site> <bounce_rate>66.67%</bounce_rate> </row> diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml index f85b390fa8..c910d2c315 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml @@ -3,7 +3,7 @@ <row> <label>VisitorType</label> <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> + <nb_actions>4</nb_actions> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>2</bounce_count> @@ -26,7 +26,7 @@ <row> <label>LoggedOut</label> <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -69,7 +69,7 @@ <row> <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml index db3f2ae897..3f04d303d9 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml @@ -2,7 +2,7 @@ <result> <row> <visits>3</visits> - <actions>5</actions> + <actions>4</actions> <visitsConverted>2</visitsConverted> </row> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 014329e271..a67f20f2f7 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -98,7 +98,7 @@ <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <actions>1</actions> + <actions>0</actions> <actionDetails> <row> <type>goal</type> diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml index 3e886744fd..dc7a402dbc 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - + <nb_actions>4</nb_actions> + <nb_visits_converted>2</nb_visits_converted> <bounce_count>2</bounce_count> <sum_visit_length>364</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> + <nb_actions_per_visit>1.3</nb_actions_per_visit> <avg_time_on_site>121</avg_time_on_site> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>1</nb_outlinks> + <nb_uniq_outlinks>1</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml b/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml index c7e5b05225..baea841871 100644 --- a/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml @@ -3,12 +3,6 @@ <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>1</nb_actions> - <nb_pageviews>1</nb_pageviews> - <nb_uniq_pageviews>1</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <nb_uniq_downloads>0</nb_uniq_downloads> - <nb_outlinks>0</nb_outlinks> - <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_visits_converted>1</nb_visits_converted> <bounce_count>1</bounce_count> <sum_visit_length>1120</sum_visit_length> @@ -16,4 +10,10 @@ <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>1120</avg_time_on_site> + <nb_pageviews>1</nb_pageviews> + <nb_uniq_pageviews>1</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> </result>
\ No newline at end of file diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml index e3b0ff54bc..fae2e3bb4f 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml @@ -9,7 +9,7 @@ <nb_actions>4</nb_actions> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -32,7 +32,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -75,7 +75,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -93,7 +93,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml index 0a5455e52e..395b460444 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml @@ -8,7 +8,7 @@ <nb_actions>4</nb_actions> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -31,7 +31,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -74,7 +74,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -92,7 +92,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml index 4fb6d1f920..b4ae2c2ca4 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml @@ -2,20 +2,20 @@ <results> <result idSite="1"> <result date="2010-01-03"> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <max_actions>3</max_actions> <nb_actions>4</nb_actions> - <nb_outlinks>1</nb_outlinks> - <nb_pageviews>3</nb_pageviews> - <nb_uniq_outlinks>1</nb_uniq_outlinks> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_visits_converted>2</nb_visits_converted> <sum_visit_length>364</sum_visit_length> - <bounce_rate>33%</bounce_rate> + <bounce_rate>67%</bounce_rate> <nb_actions_per_visit>1.3</nb_actions_per_visit> <avg_time_on_site>121</avg_time_on_site> + <nb_outlinks>1</nb_outlinks> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_outlinks>1</nb_uniq_outlinks> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04" /> <result date="2010-01-05" /> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml index 456c897496..72e3adcddb 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml @@ -2,20 +2,20 @@ <results> <result idSite="1"> <result date="2009-12-28 to 2010-01-03"> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <max_actions>3</max_actions> <nb_actions>4</nb_actions> - <nb_outlinks>1</nb_outlinks> - <nb_pageviews>3</nb_pageviews> - <nb_uniq_outlinks>1</nb_uniq_outlinks> - <nb_uniq_pageviews>2</nb_uniq_pageviews> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_visits_converted>2</nb_visits_converted> <sum_visit_length>364</sum_visit_length> - <bounce_rate>33%</bounce_rate> + <bounce_rate>67%</bounce_rate> <nb_actions_per_visit>1.3</nb_actions_per_visit> <avg_time_on_site>121</avg_time_on_site> + <nb_outlinks>1</nb_outlinks> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_outlinks>1</nb_uniq_outlinks> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04 to 2010-01-10" /> <result date="2010-01-11 to 2010-01-17" /> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml index e3b0ff54bc..fae2e3bb4f 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml @@ -9,7 +9,7 @@ <nb_actions>4</nb_actions> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -32,7 +32,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -75,7 +75,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -93,7 +93,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml index 0a5455e52e..395b460444 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml @@ -8,7 +8,7 @@ <nb_actions>4</nb_actions> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -31,7 +31,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -74,7 +74,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -92,7 +92,7 @@ <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml index 978a4d7c7e..b4ae2c2ca4 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml @@ -2,16 +2,20 @@ <results> <result idSite="1"> <result date="2010-01-03"> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <max_actions>3</max_actions> <nb_actions>4</nb_actions> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_visits_converted>2</nb_visits_converted> <sum_visit_length>364</sum_visit_length> - <bounce_rate>33%</bounce_rate> + <bounce_rate>67%</bounce_rate> <nb_actions_per_visit>1.3</nb_actions_per_visit> <avg_time_on_site>121</avg_time_on_site> + <nb_outlinks>1</nb_outlinks> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_outlinks>1</nb_uniq_outlinks> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04" /> <result date="2010-01-05" /> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml index 50551de244..72e3adcddb 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml @@ -2,16 +2,20 @@ <results> <result idSite="1"> <result date="2009-12-28 to 2010-01-03"> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <max_actions>3</max_actions> <nb_actions>4</nb_actions> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_visits_converted>2</nb_visits_converted> <sum_visit_length>364</sum_visit_length> - <bounce_rate>33%</bounce_rate> + <bounce_rate>67%</bounce_rate> <nb_actions_per_visit>1.3</nb_actions_per_visit> <avg_time_on_site>121</avg_time_on_site> + <nb_outlinks>1</nb_outlinks> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_outlinks>1</nb_uniq_outlinks> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04 to 2010-01-10" /> <result date="2010-01-11 to 2010-01-17" /> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml index d6f61bf5f7..c8238f9053 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml @@ -11,6 +11,8 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>364</avg_time_on_site> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04" /> <result date="2010-01-05" /> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml index f3290d9479..6f3784be46 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml @@ -11,6 +11,8 @@ <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>364</avg_time_on_site> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> </result> <result date="2010-01-04 to 2010-01-10" /> <result date="2010-01-11 to 2010-01-17" /> diff --git a/tests/integration/processed/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/integration/processed/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv Binary files differindex 069b2f3c6b..74c4f7d494 100644 --- a/tests/integration/processed/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv +++ b/tests/integration/processed/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv diff --git a/tests/integration/processed/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/integration/processed/test_csvExport_xp0__VisitsSummary.get_day.csv Binary files differindex 4f2b3dfac9..b654cde939 100644 --- a/tests/integration/processed/test_csvExport_xp0__VisitsSummary.get_day.csv +++ b/tests/integration/processed/test_csvExport_xp0__VisitsSummary.get_day.csv diff --git a/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv Binary files differindex 99b51f65db..7a19c4a33e 100644 --- a/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv +++ b/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv diff --git a/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv Binary files differindex 8d654779a6..8292407dc9 100644 --- a/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv +++ b/tests/integration/processed/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv diff --git a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differindex f8d2887fdb..e9bf1d8d32 100644 --- a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv diff --git a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv Binary files differindex 95eb2740ef..977e448ecc 100644 --- a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv +++ b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv |