From dedaf6b3e9a184937539e181c64b80c1db04a0c7 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 24 Dec 2019 05:15:26 -0800 Subject: MergeDataTables does not correctly merge if table2 has more data than table1 (#15294) * update submodules to fix build * Handle DataTable Maps in VisitFrequency API and in DataTable merger, make sure to correctly copy child datatables. * fix some tests * Copy metadata over. * Updated expected test results. * Adding unit tests. --- core/DataTable/Renderer.php | 2 +- plugins/API/DataTable/MergeDataTables.php | 35 +- plugins/AnonymousPiwikUsageMeasurement | 2 +- plugins/CustomDimensions | 2 +- ...eduledReports.generateReport_week.original.html | 2 +- plugins/MarketingCampaignsReporting | 2 +- plugins/VisitFrequency/API.php | 9 +- ...XTest_multipleDates__VisitFrequency.get_day.xml | 22 +- ...st_multipleOldNew__VisitFrequency.get_month.xml | 25 +- ...AgainstLongMultiple__VisitFrequency.get_day.xml | 447 +++- ...ultipleMultiPeriods__VisitFrequency.get_day.xml | 2242 +++++++++++++++++++- ...test_OneVisitorTwoVisits_csv__API.get_month.csv | Bin 3568 -> 4048 bytes ...firstSite_lastN__API.getProcessedReport_day.xml | 139 +- ...sites_differentDays__VisitFrequency.get_day.xml | 117 +- ...tes_differentDays__VisitFrequency.get_month.xml | 56 +- ...ites_differentDays__VisitFrequency.get_week.xml | 69 +- ...ites_differentDays__VisitFrequency.get_year.xml | 50 +- ...rentDays_idSiteOne___VisitFrequency.get_day.xml | 94 +- ...ntDays_idSiteOne___VisitFrequency.get_month.xml | 33 +- ...entDays_idSiteOne___VisitFrequency.get_week.xml | 46 +- ...entDays_idSiteOne___VisitFrequency.get_year.xml | 29 +- ...duledReports.generateReport_month.original.html | 2 +- ...oVisit_PeriodIsLast__VisitFrequency.get_day.xml | 10 +- ...Visit_PeriodIsLast__VisitFrequency.get_week.xml | 10 +- 24 files changed, 3413 insertions(+), 32 deletions(-) diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 8b69608edf..d1940d041d 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -124,7 +124,7 @@ abstract class Renderer extends BaseFactory /** * Set the DataTable to be rendered * - * @param DataTable|Simple|DataTable\Map $table table to be rendered + * @param DataTableInterface $table table to be rendered * @throws Exception */ public function setTable($table) diff --git a/plugins/API/DataTable/MergeDataTables.php b/plugins/API/DataTable/MergeDataTables.php index b26f153c53..fba6e58ba9 100644 --- a/plugins/API/DataTable/MergeDataTables.php +++ b/plugins/API/DataTable/MergeDataTables.php @@ -13,9 +13,8 @@ use Piwik\DataTable; class MergeDataTables { - /** - * Merge the columns of two data tables. + * Merge the columns of two data tables. Only takes into consideration the first row of each table. * Manipulates the first table. * * @param DataTable|DataTable\Map $table1 The table to eventually filter. @@ -25,13 +24,14 @@ class MergeDataTables { // handle table arrays if ($table1 instanceof DataTable\Map && $table2 instanceof DataTable\Map) { - $subTables2 = $table2->getDataTables(); - foreach ($table1->getDataTables() as $index => $subTable1) { - if (!array_key_exists($index, $subTables2)) { - // occurs when archiving starts on dayN and continues into dayN+1, see https://github.com/piwik/piwik/issues/5168#issuecomment-50959925 - continue; + $subTables1 = $table1->getDataTables(); + foreach ($table2->getDataTables() as $index => $subTable2) { + if (!array_key_exists($index, $subTables1)) { + $subTable1 = $this->makeNewDataTable($subTable2); + $table1->addTable($subTable1, $index); + } else { + $subTable1 = $subTables1[$index]; } - $subTable2 = $subTables2[$index]; $this->mergeDataTables($subTable1, $subTable2); } return; @@ -52,4 +52,23 @@ class MergeDataTables } } + private function makeNewDataTable(DataTable\DataTableInterface $subTable2) + { + if ($subTable2 instanceof DataTable\Map) { + $result = new DataTable\Map(); + $result->setKeyName($subTable2->getKeyName()); + return $result; + } else if ($subTable2 instanceof DataTable\Simple) { + $result = new DataTable\Simple(); + $result->setAllTableMetadata($subTable2->getAllTableMetadata()); + return $result; + } else if ($subTable2 instanceof DataTable) { + $result = new DataTable(); + $result->setAllTableMetadata($subTable2->getAllTableMetadata()); + return $result; + } else { + throw new \Exception("Unknown datatable type: " . get_class($subTable2)); + } + } + } \ No newline at end of file diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement index 51ee90dde9..49427328cc 160000 --- a/plugins/AnonymousPiwikUsageMeasurement +++ b/plugins/AnonymousPiwikUsageMeasurement @@ -1 +1 @@ -Subproject commit 51ee90dde9831449a1d632a5d8532d79858e555a +Subproject commit 49427328cc2d6e0987cedda0b122c5fad2a7bf50 diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions index 70d45d15d4..9071760360 160000 --- a/plugins/CustomDimensions +++ b/plugins/CustomDimensions @@ -1 +1 @@ -Subproject commit 70d45d15d4a9b208b8723ee4dc7eca7b85812826 +Subproject commit 90717603607edfc0df076dea2878f66efdaf92c6 diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 598d6dd399..c7af4c27f7 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -4780,7 +4780,7 @@ diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting index ea5fdafe4b..a51d226289 160000 --- a/plugins/MarketingCampaignsReporting +++ b/plugins/MarketingCampaignsReporting @@ -1 +1 @@ -Subproject commit ea5fdafe4bf0b2a641348aff5825cd7387372af9 +Subproject commit a51d2262899c5adde96217d5b37e38d23335234d diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php index f44d624402..854b0de5f5 100644 --- a/plugins/VisitFrequency/API.php +++ b/plugins/VisitFrequency/API.php @@ -9,8 +9,8 @@ namespace Piwik\Plugins\VisitFrequency; use Piwik\API\Request; -use Piwik\Archive; use Piwik\DataTable; +use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\API\DataTable\MergeDataTables; use Piwik\Plugins\VisitsSummary\API as APIVisitsSummary; @@ -49,7 +49,12 @@ class API extends \Piwik\Plugin\API $columns = Piwik::getArrayFromApiParameter($columns); /** @var \Piwik\DataTable\DataTableInterface $resultSet */ - $resultSet = new DataTable\Simple(); + if (Period::isMultiplePeriod($date, $period)) { + $resultSet = new DataTable\Map(); + $resultSet->setKeyName('period'); + } else { + $resultSet = new DataTable\Simple(); + } foreach ($visitTypes as $columnSuffix => $visitorTypeSegment) { $modifiedSegment = $this->appendVisitorTypeSegment($segment, $visitorTypeSegment); diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml index c234bed59e..866fe9a5b5 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml @@ -1,2 +1,22 @@ - \ No newline at end of file + + + + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml index c234bed59e..0868a583a2 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml @@ -1,2 +1,25 @@ - \ No newline at end of file + + + 0 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__VisitFrequency.get_day.xml index c234bed59e..7103db936d 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__VisitFrequency.get_day.xml @@ -1,2 +1,447 @@ - \ No newline at end of file + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-12 + Sunday, August 12, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 11 + 0 + 11 + 11 + 11 + 11 + 0 + 1 + 100% + 1 + 0 + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-13 + Monday, August 13, 2012 + (August 13 – 14, 2012) (All visits) + -1 + + + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-13 + Monday, August 13, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 8 + 0 + 8 + 8 + 8 + 8 + 0 + 1 + 100% + 1 + 0 + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 13 – 14, 2012) (All visits) + -1 + + + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 11 + 1 + 11 + 14 + 9 + 9 + 305 + 3 + 82% + 1.3 + 28 + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + 0 + 0 + 0% + + All visits + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-13,2012-08-14 + August 13 – 14, 2012 + (August 13 – 14, 2012) (All visits) + -1 + + + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + + All visits + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + + All visits + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + + All visits + day + 2012-08-13,2012-08-14 + August 13 – 14, 2012 + (August 13 – 14, 2012) (All visits) + -1 + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__VisitFrequency.get_day.xml index c234bed59e..89d75609f7 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__VisitFrequency.get_day.xml @@ -1,2 +1,2242 @@ - \ No newline at end of file + + + 11 + 0 + 11 + 11 + 11 + 11 + 0 + 1 + 100% + 1 + 0 + + + 11 + 0 + 11 + 11 + 11 + 11 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + + All visits + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 2 + 0 + 2 + 2 + 2 + 2 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 11 + 0 + 11 + 11 + 11 + 11 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 2 + 0 + 2 + 2 + 2 + 2 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-09 + Thursday, August 9, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-12 + Sunday, August 12, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12 + Sunday, August 12, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12 + Sunday, August 12, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + 8 + 0 + 8 + 8 + 8 + 8 + 0 + 1 + 100% + 1 + 0 + + + 8 + 0 + 8 + 8 + 8 + 8 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + + All visits + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 3 + 0 + 3 + 3 + 3 + 3 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 8 + 0 + 8 + 8 + 8 + 8 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 3 + 0 + 3 + 3 + 3 + 3 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-10 + Friday, August 10, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-13 + Monday, August 13, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-13 + Monday, August 13, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-13 + Monday, August 13, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + 11 + 1 + 11 + 14 + 9 + 9 + 305 + 3 + 82% + 1.3 + 28 + + + 11 + 1 + 11 + 14 + 9 + 9 + 305 + 3 + 82% + 1.3 + 28 + 0 + 0 + 0% + + All visits + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 11 + 1 + 11 + 14 + 9 + 9 + 305 + 3 + 82% + 1.3 + 28 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + + All visits + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-11 + Saturday, August 11, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + 0 + 0 + 0% + + All visits + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12 + Sunday, August 12, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + + All visits + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + +100% + -100% + +100% + -100% + +100% + -100% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-13 + Monday, August 13, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-13 + Monday, August 13, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-13 + Monday, August 13, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-13 + Monday, August 13, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-13 + Monday, August 13, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-13 + Monday, August 13, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-14 + Tuesday, August 14, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + + All visits + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + + All visits + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-15 + Wednesday, August 15, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + + All visits + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + -100% + +100% + -100% + +100% + -100% + +100% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + +0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-16 + Thursday, August 16, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-16 + Thursday, August 16, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-16 + Thursday, August 16, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-16 + Thursday, August 16, 2012 + (August 9 – 16, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-16 + Thursday, August 16, 2012 + (August 9 – 16, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-16 + Thursday, August 16, 2012 + (August 9 – 16, 2012) (browserCode==ie) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + + All visits + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (All visits) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Dff + browserCode==ff + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ff) + -1 + + + 0 + 0 + 0% + 0 + 0 + 0% + browserCode%3D%3Die + browserCode==ie + day + 2012-08-12,2012-08-15 + August 12 – 15, 2012 + (August 12 – 15, 2012) (browserCode==ie) + -1 + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv index b88579e9dc..4bf360776a 100644 Binary files a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml index 1cbd29b47c..e1323cb324 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -50,8 +50,143 @@ Avg. Actions per New Visit Bounce Rate for New Visits - - + + + 2 + 0 + 2 + 2 + 1 + 100% + 1 + 00:00:00 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + 1 + 0 + 1 + 1 + 1 + 100% + 1 + 00:00:00 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + 1 + 0 + 1 + 5 + 5 + 0% + 5 + 00:15:01 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + 1 + 0 + 1 + 5 + 5 + 0% + 5 + 00:15:01 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + 1 + 0 + 1 + 5 + 5 + 0% + 5 + 00:15:01 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + 1 + 0 + 1 + 5 + 5 + 0% + 5 + 00:15:01 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + 1 + 0 + 1 + 5 + 5 + 0% + 5 + 00:15:01 + 0 + 0 + 0 + 0 + 0 + 00:00:00 + 0 + 0% + + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml index c234bed59e..edf9ab6424 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml @@ -1,2 +1,117 @@ - \ No newline at end of file + + + + 2 + 0 + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + + + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 1 + 100% + 1 + 0 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + + + + 1 + 0 + 1 + 3 + 0 + 0 + 1 + 3 + 0% + 3 + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml index c234bed59e..1f47da714e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml @@ -1,2 +1,56 @@ - \ No newline at end of file + + + + 2 + 0 + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + 2 + 0 + 9 + 41 + 0 + 1 + 7208 + 5 + 11% + 4.6 + 801 + + + + + + + + + + + 1 + 0 + 1 + 3 + 0 + 0 + 1 + 3 + 0% + 3 + 1 + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml index c234bed59e..882222bccc 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml @@ -1,2 +1,69 @@ - \ No newline at end of file + + + + 2 + 0 + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + + + 2 + 0 + 7 + 31 + 0 + 1 + 5406 + 5 + 14% + 4.4 + 772 + + + 1 + 0 + 2 + 10 + 0 + 0 + 1802 + 5 + 0% + 5 + 901 + + + + + + + + + + 1 + 0 + 1 + 3 + 0 + 0 + 1 + 3 + 0% + 3 + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml index c234bed59e..c74cbd4a36 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml @@ -1,2 +1,50 @@ - \ No newline at end of file + + + + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + 9 + 41 + 0 + 1 + 7208 + 5 + 11% + 4.6 + 801 + + + + + + + + + + + 1 + 3 + 0 + 0 + 1 + 3 + 0% + 3 + 1 + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml index c234bed59e..9265ec61ae 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml @@ -1,2 +1,94 @@ - \ No newline at end of file + + + 2 + 0 + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + + + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 1 + 100% + 1 + 0 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + + 1 + 0 + 1 + 5 + 0 + 0 + 901 + 5 + 0% + 5 + 901 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml index c234bed59e..5dbf1082e6 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml @@ -1,2 +1,33 @@ - \ No newline at end of file + + + 2 + 0 + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + 2 + 0 + 9 + 41 + 0 + 1 + 7208 + 5 + 11% + 4.6 + 801 + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml index c234bed59e..4f0d3baa56 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml @@ -1,2 +1,46 @@ - \ No newline at end of file + + + 2 + 0 + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + + + 2 + 0 + 7 + 31 + 0 + 1 + 5406 + 5 + 14% + 4.4 + 772 + + + 1 + 0 + 2 + 10 + 0 + 0 + 1802 + 5 + 0% + 5 + 901 + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml index c234bed59e..fb4b769b94 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml @@ -1,2 +1,29 @@ - \ No newline at end of file + + + 2 + 2 + 0 + 2 + 0 + 1 + 100% + 1 + 0 + 9 + 41 + 0 + 1 + 7208 + 5 + 11% + 4.6 + 801 + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index b17ed4ddde..c39b46a30b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -5068,7 +5068,7 @@ diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml index c234bed59e..2cc0e6ed4e 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml @@ -1,2 +1,10 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml index c234bed59e..e0d8bf88a0 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml @@ -1,2 +1,10 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file -- cgit v1.2.3