From 1f01204edcd063dd336e69510ca50f11b5a2be82 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Thu, 27 Jun 2024 18:09:17 +0200 Subject: [PATCH 01/10] Correctly set column aggegation methods for action reports --- plugins/Actions/API.php | 4 +++- plugins/Actions/Metrics.php | 17 +++++++++++++---- .../Actions/RecordBuilders/ActionReports.php | 6 +++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 06aa2c08131..a705baa7e2d 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -513,11 +513,13 @@ protected function doFilterPageDatatableSearch($callBackParameters, $table, $sea */ private function filterActionsDataTable($dataTable, $isPageTitleType) { + $dataTable->filter(function ($dataTable) { + $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, Metrics::getColumnsAggregationOperation()); + }); // Must be applied before Sort in this case, since the DataTable can contain both int and strings indexes // (in the transition period between pre 1.2 and post 1.2 datatable structure) $dataTable->filter('Piwik\Plugins\Actions\DataTable\Filter\Actions', [$isPageTitleType]); $dataTable->filter('Piwik\Plugins\Goals\DataTable\Filter\CalculateConversionPageRate'); - return $dataTable; } diff --git a/plugins/Actions/Metrics.php b/plugins/Actions/Metrics.php index f8f3521a6b3..f3e3d14d248 100644 --- a/plugins/Actions/Metrics.php +++ b/plugins/Actions/Metrics.php @@ -39,10 +39,19 @@ class Metrics PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, ); - public static $columnsAggregationOperation = array( - PiwikMetrics::INDEX_PAGE_MAX_TIME_GENERATION => 'max', - PiwikMetrics::INDEX_PAGE_MIN_TIME_GENERATION => 'min' - ); + public static function getColumnsAggregationOperation() + { + $operations = []; + $actionMetrics = self::getActionMetrics(); + + foreach ($actionMetrics as $actionMetric => $definition) { + if (!empty($definition['aggregation']) && $definition['aggregation'] !== 'sum') { + $operations[$actionMetric] = $definition['aggregation']; + } + } + + return $operations; + } public static function getActionMetrics() { diff --git a/plugins/Actions/RecordBuilders/ActionReports.php b/plugins/Actions/RecordBuilders/ActionReports.php index 472f9af38d0..911a22e7f18 100644 --- a/plugins/Actions/RecordBuilders/ActionReports.php +++ b/plugins/Actions/RecordBuilders/ActionReports.php @@ -46,9 +46,9 @@ public function getRecordMetadata(ArchiveProcessor $archiveProcessor): array ->setMaxRowsInTable(ArchivingHelper::$maximumRowsInDataTableSiteSearch), Record::make(Record::TYPE_BLOB, Archiver::PAGE_URLS_RECORD_NAME) - ->setBlobColumnAggregationOps(Metrics::$columnsAggregationOperation), + ->setBlobColumnAggregationOps(Metrics::getColumnsAggregationOperation()), Record::make(Record::TYPE_BLOB, Archiver::PAGE_TITLES_RECORD_NAME) - ->setBlobColumnAggregationOps(Metrics::$columnsAggregationOperation), + ->setBlobColumnAggregationOps(Metrics::getColumnsAggregationOperation()), Record::make(Record::TYPE_BLOB, Archiver::DOWNLOADS_RECORD_NAME), Record::make(Record::TYPE_BLOB, Archiver::OUTLINKS_RECORD_NAME), @@ -184,7 +184,7 @@ private function makeReportTables(): array || $type == Action::TYPE_PAGE_TITLE ) { // for page urls and page titles, performance metrics exist and have to be aggregated correctly - $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, Metrics::$columnsAggregationOperation); + $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, Metrics::getColumnsAggregationOperation()); } $result[$type] = $dataTable; From f5b896c23da84e3636a749e7e0d3ce182cda1d93 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Thu, 27 Jun 2024 22:24:47 +0200 Subject: [PATCH 02/10] don't provide a max value if no values are available at all --- core/DataTable/Row.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index 481507abd36..8c09497836d 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -521,7 +521,13 @@ private function getColumnValuesMerged($operation, $thisColumnValue, $columnToSu $newValue = null; break; case 'max': - $newValue = max($thisColumnValue, $columnToSumValue); + if (!$thisColumnValue) { + $newValue = $columnToSumValue; + } elseif (!$columnToSumValue) { + $newValue = $thisColumnValue; + } else { + $newValue = max($thisColumnValue, $columnToSumValue); + } break; case 'min': if (!$thisColumnValue) { From a6c5d20d386a682fde661018ec0e14cc828e7def Mon Sep 17 00:00:00 2001 From: sgiehl Date: Thu, 27 Jun 2024 22:53:13 +0200 Subject: [PATCH 03/10] update expected test files --- ...st_Contents__Actions.getPageUrls_month.xml | 24 +- .../test___Actions.getPageTitles_month.xml | 48 +- .../test___Actions.getPageUrls_day.xml | 48 +- .../test___Actions.getPageUrls_month.xml | 120 ++--- ...ustomEvents__Actions.getPageUrls_month.xml | 48 +- ...onTest_flat__Actions.getPageUrls_month.xml | 48 +- ...vertCompare__Actions.getPageUrls_month.xml | 128 +++--- ...labelFilter__Actions.getPageUrls_month.xml | 24 +- ...eMultiPeriods__Actions.getPageUrls_day.xml | 60 +-- ...ipleCompare__Actions.getPageUrls_month.xml | 136 +++--- ...est_periods__Actions.getPageUrls_month.xml | 120 ++--- ...ainstSingle__Actions.getPageUrls_range.xml | 100 ++-- ...sAndPeriods__Actions.getPageUrls_month.xml | 136 +++--- ...st_segments__Actions.getPageUrls_month.xml | 96 ++-- ...eAgainstRange__Actions.getPageUrls_day.xml | 52 +-- ...ableActions__Actions.getPageUrls_month.xml | 32 +- ...Logs__Actions.getEntryPageTitles_month.xml | 4 +- ...Logs__Actions.getEntryPageTitles_range.xml | 104 ++--- ...rtLogs__Actions.getEntryPageUrls_month.xml | 116 ++--- ...rtLogs__Actions.getEntryPageUrls_range.xml | 426 +++++++++--------- ...tLogs__Actions.getExitPageTitles_month.xml | 4 +- ...tLogs__Actions.getExitPageTitles_range.xml | 104 ++--- ...ortLogs__Actions.getExitPageUrls_month.xml | 116 ++--- ...ortLogs__Actions.getExitPageUrls_range.xml | 426 +++++++++--------- ...mportLogs__Actions.getPageTitles_month.xml | 12 +- ...mportLogs__Actions.getPageTitles_range.xml | 112 ++--- ...st_ImportLogs__Actions.getPageUrls_day.xml | 28 +- ..._ImportLogs__Actions.getPageUrls_month.xml | 116 ++--- ..._ImportLogs__Actions.getPageUrls_range.xml | 426 +++++++++--------- ...teId__Actions.getEntryPageTitles_range.xml | 100 ++-- ...SiteId__Actions.getEntryPageUrls_range.xml | 272 +++++------ ...iteId__Actions.getExitPageTitles_range.xml | 100 ++-- ...dSiteId__Actions.getExitPageUrls_range.xml | 272 +++++------ ...xedSiteId__Actions.getPageTitles_range.xml | 100 ++-- ...FixedSiteId__Actions.getPageUrls_range.xml | 272 +++++------ ...belFilter_dir__Actions.getPageUrls_day.xml | 24 +- ...ter_dir_range__Actions.getPageUrls_day.xml | 24 +- ...electBranch__Actions.getPageTitles_day.xml | 24 +- ...Visits__Actions.getEntryPageTitles_day.xml | 24 +- ...woVisits__Actions.getEntryPageUrls_day.xml | 24 +- ...oVisits__Actions.getExitPageTitles_day.xml | 24 +- ...TwoVisits__Actions.getExitPageUrls_day.xml | 24 +- ...orTwoVisits__Actions.getPageTitles_day.xml | 24 +- ...itorTwoVisits__Actions.getPageUrls_day.xml | 24 +- ..._subtable__API.getProcessedReport_week.xml | 24 +- ...deColumns___API.getProcessedReport_day.xml | 24 +- ...ideColumns___Actions.getPageTitles_day.xml | 24 +- ...upport__Actions.getEntryPageTitles_day.xml | 24 +- ...eSupport__Actions.getEntryPageUrls_day.xml | 24 +- ...Support__Actions.getExitPageTitles_day.xml | 24 +- ...ieSupport__Actions.getExitPageUrls_day.xml | 24 +- ...okieSupport__Actions.getPageTitles_day.xml | 24 +- ...CookieSupport__Actions.getPageUrls_day.xml | 24 +- ...Site_lastN__API.getProcessedReport_day.xml | 22 +- ...Site_lastN__API.getProcessedReport_day.xml | 24 +- ...erentDays__Actions.getPageTitles_month.xml | 144 +++--- ...ferentDays__Actions.getPageTitles_week.xml | 216 ++++----- ...ferentDays__Actions.getPageTitles_year.xml | 144 +++--- ...fferentDays__Actions.getPageUrls_month.xml | 120 ++--- ...ifferentDays__Actions.getPageUrls_week.xml | 192 ++++---- ...ifferentDays__Actions.getPageUrls_year.xml | 120 ++--- ...dSiteOne___Actions.getPageTitles_month.xml | 96 ++-- ...idSiteOne___Actions.getPageTitles_week.xml | 168 +++---- ...idSiteOne___Actions.getPageTitles_year.xml | 96 ++-- ..._idSiteOne___Actions.getPageUrls_month.xml | 72 +-- ...s_idSiteOne___Actions.getPageUrls_week.xml | 144 +++--- ...s_idSiteOne___Actions.getPageUrls_year.xml | 72 +-- 67 files changed, 3196 insertions(+), 3196 deletions(-) diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml index d3bd972e6b5..d6a5388c253 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml @@ -6,23 +6,23 @@ 2 540 2 - 0.033 - 0.033 + 0.0330 + 0.0330 2 - 0.325 - 0.325 + 0.3250 + 0.3250 2 - 0.124 - 0.124 + 0.1240 + 0.1240 2 - 0.356 - 0.356 + 0.3560 + 0.3560 2 - 0.215 - 0.215 + 0.2150 + 0.2150 2 - 0.099 - 0.099 + 0.0990 + 0.0990 0 0 diff --git a/plugins/PagePerformance/tests/System/expected/test___Actions.getPageTitles_month.xml b/plugins/PagePerformance/tests/System/expected/test___Actions.getPageTitles_month.xml index 8e486ea3c0e..8632d5daf68 100644 --- a/plugins/PagePerformance/tests/System/expected/test___Actions.getPageTitles_month.xml +++ b/plugins/PagePerformance/tests/System/expected/test___Actions.getPageTitles_month.xml @@ -6,23 +6,23 @@ 10 0 10 - 0.094 - 0.276 + 0.0000 + 0.0980 10 - 0.496 - 0.801 + 0.0770 + 0.2690 10 - 1.268 - 1.683 + 0.1950 + 0.4120 10 - 4.989 - 5.678 + 0.8990 + 1.3000 10 - 1.464 - 1.683 + 0.1950 + 0.4440 10 - 0.498 - 1.126 + 0.0660 + 0.2580 0 0 @@ -49,23 +49,23 @@ 5 0 5 - 0.132 - 0.132 + 0.0120 + 0.0660 5 - 1.162 - 1.162 + 0.1500 + 0.3550 5 - 1.512 - 1.512 + 0.1360 + 0.4440 5 - 5.549 - 5.549 + 0.8880 + 1.3000 5 - 1.975 - 1.975 + 0.2990 + 0.5120 5 - 1.129 - 1.129 + 0.0990 + 0.3330 0 0 diff --git a/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_day.xml b/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_day.xml index 99b55d31f97..f2cb513445d 100644 --- a/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_day.xml +++ b/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_day.xml @@ -48,23 +48,23 @@ 1 0 1 - 0.012 - 0.012 + 0.0120 + 0.0120 1 - 0.15 - 0.15 + 0.1500 + 0.1500 1 - 0.333 - 0.333 + 0.3330 + 0.3330 1 - 1.101 - 1.101 + 1.1010 + 1.1010 1 - 0.369 - 0.369 + 0.3690 + 0.3690 1 - 0.15 - 0.15 + 0.1500 + 0.1500 0 0 @@ -133,23 +133,23 @@ 1 0 1 - 0.036 - 0.036 + 0.0360 + 0.0360 1 - 0.077 - 0.077 + 0.0770 + 0.0770 1 - 0.412 - 0.412 + 0.4120 + 0.4120 1 - 1.055 - 1.055 + 1.0550 + 1.0550 1 - 0.333 - 0.333 + 0.3330 + 0.3330 1 - 0.077 - 0.077 + 0.0770 + 0.0770 0 0 diff --git a/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_month.xml b/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_month.xml index aa8308340ee..38b5271ccca 100644 --- a/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_month.xml +++ b/plugins/PagePerformance/tests/System/expected/test___Actions.getPageUrls_month.xml @@ -6,23 +6,23 @@ 5 0 5 - 0.205 - 0.205 + 0.0000 + 0.0980 5 - 0.54 - 0.54 + 0.0990 + 0.1320 5 - 1.278 - 1.278 + 0.1990 + 0.2980 5 - 5.311 - 5.311 + 0.8990 + 1.3000 5 - 1.587 - 1.587 + 0.2360 + 0.4120 5 - 0.732 - 0.732 + 0.0660 + 0.2320 0 0 @@ -48,23 +48,23 @@ 5 0 5 - 0.132 - 0.132 + 0.0120 + 0.0660 5 - 1.162 - 1.162 + 0.1500 + 0.3550 5 - 1.512 - 1.512 + 0.1360 + 0.4440 5 - 5.549 - 5.549 + 0.8880 + 1.3000 5 - 1.975 - 1.975 + 0.2990 + 0.5120 5 - 1.129 - 1.129 + 0.0990 + 0.3330 0 0 @@ -92,23 +92,23 @@ 5 0 5 - 0.132 - 0.132 + 0.0120 + 0.0660 5 - 1.162 - 1.162 + 0.1500 + 0.3550 5 - 1.512 - 1.512 + 0.1360 + 0.4440 5 - 5.549 - 5.549 + 0.8880 + 1.3000 5 - 1.975 - 1.975 + 0.2990 + 0.5120 5 - 1.129 - 1.129 + 0.0990 + 0.3330 0 0 @@ -133,23 +133,23 @@ 5 0 5 - 0.165 - 0.165 + 0.0230 + 0.0400 5 - 0.757 - 0.757 + 0.0770 + 0.2690 5 - 1.673 - 1.673 + 0.1950 + 0.4120 5 - 5.356 - 5.356 + 0.9630 + 1.2000 5 - 1.56 - 1.56 + 0.1950 + 0.4440 5 - 0.892 - 0.892 + 0.0770 + 0.2580 0 0 @@ -174,23 +174,23 @@ 5 0 5 - 0.165 - 0.165 + 0.0230 + 0.0400 5 - 0.757 - 0.757 + 0.0770 + 0.2690 5 - 1.673 - 1.673 + 0.1950 + 0.4120 5 - 5.356 - 5.356 + 0.9630 + 1.2000 5 - 1.56 - 1.56 + 0.1950 + 0.4440 5 - 0.892 - 0.892 + 0.0770 + 0.2580 0 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml index 8bb308d80d6..3d987ab8c49 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml @@ -6,23 +6,23 @@ 3 0 3 - 0 - 0 + 0.0000 + 0.0000 3 - 0.91 - 0.91 + 0.4550 + 0.4550 3 - 0.338 - 0.338 + 0.1690 + 0.1690 3 - 0.04 - 0.04 + 0.0200 + 0.0200 3 - 0.198 - 0.198 + 0.0990 + 0.0990 3 - 0.32 - 0.32 + 0.1600 + 0.1600 0 0 @@ -55,23 +55,23 @@ 1 1499 1 - 0.005 - 0.005 + 0.0050 + 0.0050 1 - 0.111 - 0.111 + 0.1110 + 0.1110 1 - 0.245 - 0.245 + 0.2450 + 0.2450 1 - 0.145 - 0.145 + 0.1450 + 0.1450 1 - 0.066 - 0.066 + 0.0660 + 0.0660 1 - 0 - 0 + 0.0000 + 0.0000 0 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml index d21cc9a437e..6503d2d5e9b 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -51,8 +51,8 @@ 0 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -140,10 +140,10 @@ +800% -88.9% +800% - -75% - +300% - -75% - +300% + +0% + +0% + +0% + +0% -88.9% +800% -88.9% @@ -271,8 +271,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -312,8 +312,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -538,8 +538,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -579,8 +579,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -805,8 +805,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -846,8 +846,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -5526,8 +5526,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -5569,8 +5569,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml index 5869f3870f5..ce931ff56cb 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -51,8 +51,8 @@ 11 11 11 - 21444 - 21444 + 3574 + 3574 39314 3574 0 @@ -80,10 +80,10 @@ -72.7% +266.7% -72.7% - +200% - -66.7% - +200% - -66.7% + +0% + +0% + +0% + +0% +266.7% -72.7% +0% @@ -257,8 +257,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -346,8 +346,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -428,8 +428,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -510,8 +510,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -1110,8 +1110,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1151,8 +1151,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1180,10 +1180,10 @@ -75% +300% -75% - +300% - -75% - +300% - -75% + +0% + +0% + +0% + +0% +300% -75% +0% @@ -1217,8 +1217,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -1431,8 +1431,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1577,8 +1577,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2167,8 +2167,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -2208,8 +2208,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -2237,10 +2237,10 @@ -50% +100% -50% - +100% - -50% - +100% - -50% + +0% + +0% + +0% + +0% +100% -50% +0% @@ -2411,8 +2411,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -2497,8 +2497,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3131,8 +3131,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3178,8 +3178,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -8392,8 +8392,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -8431,8 +8431,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -8580,8 +8580,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -8752,8 +8752,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -8788,8 +8788,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -8812,8 +8812,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -8839,8 +8839,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -8878,8 +8878,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -8905,8 +8905,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml index 434700b1ba8..47a73090617 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -51,8 +51,8 @@ 11 11 11 - 21444 - 21444 + 3574 + 3574 39314 3574 0 @@ -105,10 +105,10 @@ +1,000% -90.9% +1,000% - -83.3% - +500% - -83.3% - +500% + +0% + +0% + +0% + +0% -90.9% +1,000% +0% @@ -142,8 +142,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -183,8 +183,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml index 602070c7be4..8d576202a43 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml @@ -8,8 +8,8 @@ 0 14296 4 - 7148 - 7148 + 3574 + 3574 4 4 0 @@ -47,8 +47,8 @@ 4 4 4 - 7148 - 7148 + 3574 + 3574 14296 3574 0 @@ -128,8 +128,8 @@ 4 4 4 - 7148 - 7148 + 3574 + 3574 14296 3574 0 @@ -493,8 +493,8 @@ 0 14296 4 - 7148 - 7148 + 3574 + 3574 4 4 0 @@ -911,8 +911,8 @@ 0 10722 3 - 10722 - 10722 + 3574 + 3574 3 3 0 @@ -950,8 +950,8 @@ 3 3 3 - 10722 - 10722 + 3574 + 3574 10722 3574 0 @@ -977,8 +977,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -1031,8 +1031,8 @@ 3 3 3 - 10722 - 10722 + 3574 + 3574 10722 3574 0 @@ -1092,8 +1092,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -4369,8 +4369,8 @@ 0 10722 3 - 7148 - 7148 + 3574 + 3574 3 3 0 @@ -4408,8 +4408,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -4489,8 +4489,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -5432,8 +5432,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -5471,8 +5471,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -5552,8 +5552,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml index 344dd016791..1e690e7f618 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml @@ -11,8 +11,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -52,8 +52,8 @@ 11 11 11 - 21444 - 21444 + 3574 + 3574 39314 3574 0 @@ -140,8 +140,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -166,10 +166,10 @@ +266.7% -72.7% +266.7% - -66.7% - +200% - -66.7% - +200% + +0% + +0% + +0% + +0% -72.7% +266.7% +0% @@ -367,10 +367,10 @@ +1,000% -90.9% +1,000% - -83.3% - +500% - -83.3% - +500% + +0% + +0% + +0% + +0% -90.9% +1,000% +0% @@ -544,8 +544,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -647,8 +647,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -750,8 +750,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -1428,8 +1428,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1469,8 +1469,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1497,8 +1497,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -1579,10 +1579,10 @@ +300% -75% +300% - -75% - +300% - -75% - +300% + +0% + +0% + +0% + +0% -75% +300% +0% @@ -1957,8 +1957,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2103,8 +2103,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2693,8 +2693,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -2734,8 +2734,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -2821,8 +2821,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -2847,10 +2847,10 @@ +100% -50% +100% - -50% - +100% - -50% - +100% + +0% + +0% + +0% + +0% -50% +100% +0% @@ -3225,8 +3225,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3859,8 +3859,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3906,8 +3906,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -11726,8 +11726,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -11765,8 +11765,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -11828,8 +11828,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12318,8 +12318,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -12354,8 +12354,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12378,8 +12378,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12405,8 +12405,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -12444,8 +12444,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12471,8 +12471,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml index faa7e4d6424..6a33e3420ff 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -51,8 +51,8 @@ 11 11 11 - 21444 - 21444 + 3574 + 3574 39314 3574 0 @@ -79,8 +79,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -105,10 +105,10 @@ +266.7% -72.7% +266.7% - -66.7% - +200% - -66.7% - +200% + +0% + +0% + +0% + +0% -72.7% +266.7% +0% @@ -166,10 +166,10 @@ +1,000% -90.9% +1,000% - -83.3% - +500% - -83.3% - +500% + +0% + +0% + +0% + +0% -90.9% +1,000% +0% @@ -203,8 +203,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -306,8 +306,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -409,8 +409,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -1087,8 +1087,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1128,8 +1128,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1182,10 +1182,10 @@ +300% -75% +300% - -75% - +300% - -75% - +300% + +0% + +0% + +0% + +0% -75% +300% +0% @@ -1289,8 +1289,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1371,8 +1371,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1723,8 +1723,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1764,8 +1764,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1792,8 +1792,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -1818,10 +1818,10 @@ +100% -50% +100% - -50% - +100% - -50% - +100% + +0% + +0% + +0% + +0% -50% +100% +0% @@ -1925,8 +1925,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2353,8 +2353,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2400,8 +2400,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -5959,8 +5959,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -5998,8 +5998,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -6184,8 +6184,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -6220,8 +6220,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -6247,8 +6247,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -6286,8 +6286,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml index c6d8eb613fc..3dbb08a5cf4 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml @@ -7,8 +7,8 @@ 0 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -46,8 +46,8 @@ 10 10 10 - 17870 - 17870 + 3574 + 3574 35740 3574 0 @@ -127,8 +127,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -153,10 +153,10 @@ +233.3% -70% +233.3% - -60% - +150% - -60% - +150% + +0% + +0% + +0% + +0% -70% +233.3% +0% @@ -336,10 +336,10 @@ +900% -90% +900% - -80% - +400% - -80% - +400% + +0% + +0% + +0% + +0% -90% +900% +0% @@ -492,8 +492,8 @@ 0 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -591,8 +591,8 @@ 0 28592 8 - 10722 - 10722 + 3574 + 3574 8 8 0 @@ -690,8 +690,8 @@ 0 28592 8 - 10722 - 10722 + 3574 + 3574 8 8 0 @@ -1334,8 +1334,8 @@ 0 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1373,8 +1373,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1400,8 +1400,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -1480,10 +1480,10 @@ +300% -75% +300% - -75% - +300% - -75% - +300% + +0% + +0% + +0% + +0% -75% +300% +0% @@ -1819,8 +1819,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1960,8 +1960,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2519,8 +2519,8 @@ 0 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -2558,8 +2558,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -2639,8 +2639,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -2665,10 +2665,10 @@ +100% -50% +100% - -50% - +100% - -50% - +100% + +0% + +0% + +0% + +0% -50% +100% +0% @@ -3004,8 +3004,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3606,8 +3606,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3651,8 +3651,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml index 7108ce081c3..144f4cced18 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -51,8 +51,8 @@ 11 11 11 - 21444 - 21444 + 3574 + 3574 39314 3574 0 @@ -139,8 +139,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -165,10 +165,10 @@ +266.7% -72.7% +266.7% - -66.7% - +200% - -66.7% - +200% + +0% + +0% + +0% + +0% -72.7% +266.7% +0% @@ -366,10 +366,10 @@ +1,000% -90.9% +1,000% - -83.3% - +500% - -83.3% - +500% + +0% + +0% + +0% + +0% -90.9% +1,000% +0% @@ -543,8 +543,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -646,8 +646,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -749,8 +749,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -1427,8 +1427,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1468,8 +1468,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1496,8 +1496,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -1578,10 +1578,10 @@ +300% -75% +300% - -75% - +300% - -75% - +300% + +0% + +0% + +0% + +0% -75% +300% +0% @@ -1956,8 +1956,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2102,8 +2102,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -2692,8 +2692,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -2733,8 +2733,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -2820,8 +2820,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -2846,10 +2846,10 @@ +100% -50% +100% - -50% - +100% - -50% - +100% + +0% + +0% + +0% + +0% -50% +100% +0% @@ -3224,8 +3224,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3858,8 +3858,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -3905,8 +3905,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -11725,8 +11725,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -11764,8 +11764,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -11827,8 +11827,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12317,8 +12317,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -12353,8 +12353,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12377,8 +12377,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12404,8 +12404,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -12443,8 +12443,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -12470,8 +12470,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml index baad7235fec..58d58ae4219 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -51,8 +51,8 @@ 11 11 11 - 21444 - 21444 + 3574 + 3574 39314 3574 0 @@ -141,8 +141,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -202,8 +202,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -263,8 +263,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -725,8 +725,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -766,8 +766,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -794,8 +794,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -852,8 +852,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -956,8 +956,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1384,8 +1384,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -1425,8 +1425,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1514,8 +1514,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1950,8 +1950,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -1997,8 +1997,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -4561,8 +4561,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -4600,8 +4600,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -4663,8 +4663,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -4697,8 +4697,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -4733,8 +4733,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -4757,8 +4757,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -4784,8 +4784,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -4823,8 +4823,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 @@ -4850,8 +4850,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 1 1 0 diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml index fc9be1671fb..8275749cafe 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml @@ -7,8 +7,8 @@ 0 10722 3 - 7148 - 7148 + 3574 + 3574 3 3 0 @@ -46,8 +46,8 @@ 3 3 3 - 7148 - 7148 + 3574 + 3574 10722 3574 0 @@ -73,8 +73,8 @@ 10 10 10 - 17870 - 17870 + 3574 + 3574 35740 3574 0 @@ -99,10 +99,10 @@ -70% +233.3% -70% - +150% - -60% - +150% - -60% + +0% + +0% + +0% + +0% +233.3% -70% +0% @@ -711,8 +711,8 @@ 0 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -750,8 +750,8 @@ 2 2 2 - 7148 - 7148 + 3574 + 3574 7148 3574 0 @@ -777,8 +777,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -803,10 +803,10 @@ -50% +100% -50% - +100% - -50% - +100% - -50% + +0% + +0% + +0% + +0% +100% -50% +0% @@ -1161,8 +1161,8 @@ 4 4 4 - 14296 - 14296 + 3574 + 3574 14296 3574 0 @@ -1187,10 +1187,10 @@ -75% +300% -75% - +300% - -75% - +300% - -75% + +0% + +0% + +0% + +0% +300% -75% +0% diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml index 61ba5d29d6e..92e647f92e6 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml @@ -7,8 +7,8 @@ 0 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -46,8 +46,8 @@ 10 10 10 - 17870 - 17870 + 3574 + 3574 35740 3574 0 @@ -153,10 +153,10 @@ +400% -80% +400% - -80% - +400% - -80% - +400% + +0% + +0% + +0% + +0% -80% +400% +0% @@ -336,10 +336,10 @@ +900% -90% +900% - -80% - +400% - -80% - +400% + +0% + +0% + +0% + +0% -90% +900% +0% @@ -492,8 +492,8 @@ 0 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -591,8 +591,8 @@ 0 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index 72b0938c0c6..1bc65524d17 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -49,8 +49,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml index eb622e974b6..f08b09d4027 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 44 @@ -135,8 +135,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -195,23 +195,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -632,23 +632,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -821,23 +821,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index b7c6a264667..06e5af057fe 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -50,8 +50,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -87,8 +87,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -124,8 +124,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -409,8 +409,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -449,8 +449,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -486,8 +486,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -652,8 +652,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -692,8 +692,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -891,12 +891,12 @@ 3 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 8063 3 - 8063 - 8063 + 915 + 3574 3 3 0 @@ -935,8 +935,8 @@ 4 0 4 - 0.718 - 0.718 + 0.3590 + 0.3590 0 0 @@ -975,8 +975,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1012,8 +1012,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1055,8 +1055,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1092,8 +1092,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1129,8 +1129,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1166,8 +1166,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1219,8 +1219,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1259,8 +1259,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1296,8 +1296,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1333,8 +1333,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1670,8 +1670,8 @@ 1 0 1 - 0.009 - 0.009 + 0.0090 + 0.0090 267 1 267 @@ -1710,8 +1710,8 @@ 1 0 1 - 0.009 - 0.009 + 0.0090 + 0.0090 267 1 267 @@ -2124,8 +2124,8 @@ 2 0 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 0 @@ -2164,8 +2164,8 @@ 2 0 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 0 @@ -2685,8 +2685,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -2725,8 +2725,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -2762,8 +2762,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index 7cfc0683343..6288d8fa1bf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -6,27 +6,27 @@ 18 60 1 - 0.01 - 0.01 + 0.0100 + 0.0100 6 - 0.743 - 1.543 + 0.0230 + 1.3240 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 39400 13 - 86 - 86 + 43 + 3574 14 23 54 @@ -69,8 +69,8 @@ 5 - 0.647 - 1.447 + 0.0230 + 1.3240 0 @@ -85,8 +85,8 @@ 35740 10 - 0 - 0 + 3574 + 3574 11 20 54 @@ -121,8 +121,8 @@ 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 @@ -137,8 +137,8 @@ 32166 9 - 0 - 0 + 3574 + 3574 10 19 54 @@ -173,8 +173,8 @@ 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 @@ -189,8 +189,8 @@ 32166 9 - 0 - 0 + 3574 + 3574 10 19 54 @@ -231,8 +231,8 @@ 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 @@ -247,8 +247,8 @@ 3574 1 - 0 - 0 + 3574 + 3574 1 1 0 @@ -283,8 +283,8 @@ 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 @@ -299,8 +299,8 @@ 3574 1 - 0 - 0 + 3574 + 3574 1 1 0 @@ -359,8 +359,8 @@ 3617 2 - 3617 - 3617 + 43 + 3574 2 2 0 @@ -722,23 +722,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -774,23 +774,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -826,23 +826,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -878,23 +878,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -942,27 +942,27 @@ 7 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 3 - 0.117 - 0.117 + 0.0010 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 8235 7 - 8149 - 8149 + 43 + 3574 7 10 44 @@ -1006,27 +1006,27 @@ 7 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 3 - 0.464 - 0.664 + 0.1210 + 0.5430 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 14339 5 43 - 43 + 3574 5 5 0 @@ -1069,8 +1069,8 @@ 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 @@ -1085,8 +1085,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1121,8 +1121,8 @@ 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 @@ -1137,8 +1137,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1232,23 +1232,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -1284,23 +1284,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -1457,8 +1457,8 @@ 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 @@ -1473,8 +1473,8 @@ 14296 4 - 0 - 0 + 3574 + 3574 4 4 0 @@ -1517,8 +1517,8 @@ 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 @@ -1533,8 +1533,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1795,8 +1795,8 @@ 4 - 0.718 - 0.718 + 0.3590 + 0.3590 0 @@ -1855,8 +1855,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -1907,8 +1907,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -1965,8 +1965,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2017,8 +2017,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2069,8 +2069,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2121,8 +2121,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2201,8 +2201,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2261,8 +2261,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2313,8 +2313,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2365,8 +2365,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2479,8 +2479,8 @@ 3617 2 - 3617 - 3617 + 43 + 3574 1 1 0 @@ -2632,23 +2632,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -2692,23 +2692,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -3189,8 +3189,8 @@ 1 - 0.009 - 0.009 + 0.0090 + 0.0090 0 @@ -3249,8 +3249,8 @@ 1 - 0.009 - 0.009 + 0.0090 + 0.0090 0 @@ -3776,8 +3776,8 @@ 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 @@ -3836,8 +3836,8 @@ 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 @@ -4562,8 +4562,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 @@ -4622,8 +4622,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 @@ -4674,8 +4674,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index 68601d5b0b4..01f822fed8b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -49,8 +49,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml index 70bec810845..90d4257beba 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 44 @@ -135,8 +135,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -195,23 +195,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -639,23 +639,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -828,23 +828,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 2f806524b13..5c889b2c821 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -50,8 +50,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -87,8 +87,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -124,8 +124,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -409,8 +409,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -449,8 +449,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -486,8 +486,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -652,8 +652,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -692,8 +692,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -891,12 +891,12 @@ 3 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 8063 3 - 8063 - 8063 + 915 + 3574 3 3 0 @@ -935,8 +935,8 @@ 4 0 4 - 0.718 - 0.718 + 0.3590 + 0.3590 0 0 @@ -975,8 +975,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1012,8 +1012,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1055,8 +1055,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1092,8 +1092,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1129,8 +1129,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1166,8 +1166,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1219,8 +1219,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1259,8 +1259,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1296,8 +1296,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1333,8 +1333,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1634,8 +1634,8 @@ 1 0 1 - 0.009 - 0.009 + 0.0090 + 0.0090 267 1 267 @@ -1674,8 +1674,8 @@ 1 0 1 - 0.009 - 0.009 + 0.0090 + 0.0090 267 1 267 @@ -2088,8 +2088,8 @@ 2 0 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 0 @@ -2128,8 +2128,8 @@ 2 0 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 0 @@ -2649,8 +2649,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -2689,8 +2689,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -2726,8 +2726,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index b14e123efa8..582cde4ce43 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -6,27 +6,27 @@ 18 60 1 - 0.01 - 0.01 + 0.0100 + 0.0100 6 - 0.743 - 1.543 + 0.0230 + 1.3240 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 39400 13 - 86 - 86 + 43 + 3574 14 23 54 @@ -69,8 +69,8 @@ 5 - 0.647 - 1.447 + 0.0230 + 1.3240 0 @@ -85,8 +85,8 @@ 35740 10 - 0 - 0 + 3574 + 3574 11 20 54 @@ -121,8 +121,8 @@ 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 @@ -137,8 +137,8 @@ 32166 9 - 0 - 0 + 3574 + 3574 10 19 54 @@ -173,8 +173,8 @@ 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 @@ -189,8 +189,8 @@ 32166 9 - 0 - 0 + 3574 + 3574 10 19 54 @@ -231,8 +231,8 @@ 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 @@ -247,8 +247,8 @@ 3574 1 - 0 - 0 + 3574 + 3574 1 1 0 @@ -283,8 +283,8 @@ 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 @@ -299,8 +299,8 @@ 3574 1 - 0 - 0 + 3574 + 3574 1 1 0 @@ -359,8 +359,8 @@ 3617 2 - 3617 - 3617 + 43 + 3574 2 2 0 @@ -722,23 +722,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -774,23 +774,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -826,23 +826,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -878,23 +878,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -942,27 +942,27 @@ 7 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 3 - 0.117 - 0.117 + 0.0010 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 8235 7 - 8149 - 8149 + 43 + 3574 7 10 44 @@ -1006,27 +1006,27 @@ 7 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 3 - 0.464 - 0.664 + 0.1210 + 0.5430 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 14339 5 43 - 43 + 3574 5 5 0 @@ -1069,8 +1069,8 @@ 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 @@ -1085,8 +1085,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1121,8 +1121,8 @@ 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 @@ -1137,8 +1137,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1232,23 +1232,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -1284,23 +1284,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -1457,8 +1457,8 @@ 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 @@ -1473,8 +1473,8 @@ 14296 4 - 0 - 0 + 3574 + 3574 4 4 0 @@ -1517,8 +1517,8 @@ 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 @@ -1533,8 +1533,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1795,8 +1795,8 @@ 4 - 0.718 - 0.718 + 0.3590 + 0.3590 0 @@ -1855,8 +1855,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -1907,8 +1907,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -1965,8 +1965,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2017,8 +2017,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2069,8 +2069,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2121,8 +2121,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2201,8 +2201,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2261,8 +2261,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2313,8 +2313,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2365,8 +2365,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2461,8 +2461,8 @@ 3617 2 - 3617 - 3617 + 43 + 3574 1 1 0 @@ -2650,23 +2650,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -2710,23 +2710,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -3189,8 +3189,8 @@ 1 - 0.009 - 0.009 + 0.0090 + 0.0090 0 @@ -3249,8 +3249,8 @@ 1 - 0.009 - 0.009 + 0.0090 + 0.0090 0 @@ -3740,8 +3740,8 @@ 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 @@ -3800,8 +3800,8 @@ 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 @@ -4526,8 +4526,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 @@ -4586,8 +4586,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 @@ -4638,8 +4638,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 34c8ecc8ec9..5d104d12a6f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -6,12 +6,12 @@ 34 0 7 - 0.001 - 0.001 + 0.0010 + 0.3590 99897 30 - 20087 - 20087 + 182 + 5609 32 3329 0.135 @@ -70,8 +70,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 3106a50b90e..fcedb56f80b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -9,8 +9,8 @@ 17 - 0.024 - 1.325 + 0.0010 + 1.3240 0 @@ -25,8 +25,8 @@ 99897 30 - 0 - 0 + 182 + 5609 33 3329 0 @@ -47,27 +47,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 44 @@ -176,8 +176,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -236,23 +236,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -802,23 +802,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -991,23 +991,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml index cc3d002caff..75edc12c50b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml @@ -6,8 +6,8 @@ 5 60 5 - 0.647 - 1.447 + 0.0230 + 1.3240 0 0 @@ -45,8 +45,8 @@ 5 60 5 - 0.647 - 1.447 + 0.0230 + 1.3240 0 0 @@ -81,8 +81,8 @@ 2 8 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 0 @@ -119,8 +119,8 @@ 3 52 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 0 @@ -200,8 +200,8 @@ 2 0 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 0 @@ -220,8 +220,8 @@ 2 0 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 0 @@ -260,8 +260,8 @@ 3 26 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index c6dfbe76eeb..065925297a3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -10,8 +10,8 @@ 39314 11 - 21444 - 21444 + 3574 + 3574 11 11 0 @@ -50,8 +50,8 @@ 35740 10 - 17870 - 17870 + 3574 + 3574 10 10 0 @@ -87,8 +87,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -124,8 +124,8 @@ 32166 9 - 14296 - 14296 + 3574 + 3574 9 9 0 @@ -409,8 +409,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -449,8 +449,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -486,8 +486,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -652,8 +652,8 @@ 14296 4 - 14296 - 14296 + 3574 + 3574 4 4 0 @@ -692,8 +692,8 @@ 7148 2 - 7148 - 7148 + 3574 + 3574 2 2 0 @@ -891,12 +891,12 @@ 3 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 8063 3 - 8063 - 8063 + 915 + 3574 3 3 0 @@ -935,8 +935,8 @@ 4 0 4 - 0.718 - 0.718 + 0.3590 + 0.3590 0 0 @@ -975,8 +975,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1012,8 +1012,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1055,8 +1055,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1092,8 +1092,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1129,8 +1129,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1166,8 +1166,8 @@ 2 0 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 0 @@ -1219,8 +1219,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1259,8 +1259,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1296,8 +1296,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1333,8 +1333,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -1715,8 +1715,8 @@ 1 0 1 - 0.009 - 0.009 + 0.0090 + 0.0090 267 1 267 @@ -1755,8 +1755,8 @@ 1 0 1 - 0.009 - 0.009 + 0.0090 + 0.0090 267 1 267 @@ -2169,8 +2169,8 @@ 2 0 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 0 @@ -2209,8 +2209,8 @@ 2 0 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 0 @@ -2730,8 +2730,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -2770,8 +2770,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 @@ -2807,8 +2807,8 @@ 1 0 1 - 0.001 - 0.001 + 0.0010 + 0.0010 182 1 182 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 294126d0a8a..b0e62437651 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -6,27 +6,27 @@ 18 60 1 - 0.01 - 0.01 + 0.0100 + 0.0100 6 - 0.743 - 1.543 + 0.0230 + 1.3240 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 39400 13 - 86 - 86 + 43 + 3574 14 23 54 @@ -69,8 +69,8 @@ 5 - 0.647 - 1.447 + 0.0230 + 1.3240 0 @@ -85,8 +85,8 @@ 35740 10 - 0 - 0 + 3574 + 3574 11 20 54 @@ -121,8 +121,8 @@ 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 @@ -137,8 +137,8 @@ 32166 9 - 0 - 0 + 3574 + 3574 10 19 54 @@ -173,8 +173,8 @@ 3 - 0.023 - 0.123 + 0.0230 + 0.1230 0 @@ -189,8 +189,8 @@ 32166 9 - 0 - 0 + 3574 + 3574 10 19 54 @@ -231,8 +231,8 @@ 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 @@ -247,8 +247,8 @@ 3574 1 - 0 - 0 + 3574 + 3574 1 1 0 @@ -283,8 +283,8 @@ 2 - 0.624 - 1.324 + 0.6240 + 1.3240 0 @@ -299,8 +299,8 @@ 3574 1 - 0 - 0 + 3574 + 3574 1 1 0 @@ -359,8 +359,8 @@ 3617 2 - 3617 - 3617 + 43 + 3574 2 2 0 @@ -722,23 +722,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -774,23 +774,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -826,23 +826,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -878,23 +878,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -942,27 +942,27 @@ 7 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 3 - 0.117 - 0.117 + 0.0010 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 8235 7 - 8149 - 8149 + 43 + 3574 7 10 44 @@ -1006,27 +1006,27 @@ 7 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 3 - 0.464 - 0.664 + 0.1210 + 0.5430 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 14339 5 43 - 43 + 3574 5 5 0 @@ -1069,8 +1069,8 @@ 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 @@ -1085,8 +1085,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1121,8 +1121,8 @@ 2 - 0.343 - 0.543 + 0.3430 + 0.5430 0 @@ -1137,8 +1137,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1232,23 +1232,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -1284,23 +1284,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -1457,8 +1457,8 @@ 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 @@ -1473,8 +1473,8 @@ 14296 4 - 0 - 0 + 3574 + 3574 4 4 0 @@ -1517,8 +1517,8 @@ 3 - 0.234 - 0.294 + 0.2340 + 0.2940 0 @@ -1533,8 +1533,8 @@ 7148 2 - 0 - 0 + 3574 + 3574 2 2 0 @@ -1795,8 +1795,8 @@ 4 - 0.718 - 0.718 + 0.3590 + 0.3590 0 @@ -1855,8 +1855,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -1907,8 +1907,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -1965,8 +1965,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2017,8 +2017,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2069,8 +2069,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2121,8 +2121,8 @@ 2 - 0.359 - 0.359 + 0.3590 + 0.3590 0 @@ -2201,8 +2201,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2261,8 +2261,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2313,8 +2313,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2365,8 +2365,8 @@ 5964 2 - 5964 - 5964 + 355 + 5609 1 2 242 @@ -2515,8 +2515,8 @@ 3617 2 - 3617 - 3617 + 43 + 3574 1 1 0 @@ -2704,23 +2704,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -2764,23 +2764,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -3305,8 +3305,8 @@ 1 - 0.009 - 0.009 + 0.0090 + 0.0090 0 @@ -3365,8 +3365,8 @@ 1 - 0.009 - 0.009 + 0.0090 + 0.0090 0 @@ -3971,8 +3971,8 @@ 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 @@ -4031,8 +4031,8 @@ 2 - 0.109 - 0.109 + 0.1090 + 0.1090 0 @@ -4757,8 +4757,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 @@ -4817,8 +4817,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 @@ -4869,8 +4869,8 @@ 1 - 0.001 - 0.001 + 0.0010 + 0.0010 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageTitles_range.xml index 44e757acafa..ff11c065cb1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageTitles_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 43 @@ -54,23 +54,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -196,23 +196,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -388,23 +388,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageUrls_range.xml index d52cbb9e0b6..4754ea7c245 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getEntryPageUrls_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 43 @@ -104,27 +104,27 @@ 2 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 86 2 - 86 - 86 + 43 + 43 2 2 0 @@ -307,23 +307,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -344,23 +344,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -381,23 +381,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -418,23 +418,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -467,23 +467,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -512,23 +512,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -738,23 +738,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -783,23 +783,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -820,23 +820,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageTitles_range.xml index c3436dd389e..de2676c911b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageTitles_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 43 @@ -54,23 +54,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -236,23 +236,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -428,23 +428,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml index 354b23ae3a2..66f417f7f81 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 43 @@ -104,27 +104,27 @@ 2 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 86 2 - 86 - 86 + 43 + 43 2 2 0 @@ -307,23 +307,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -344,23 +344,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -381,23 +381,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -418,23 +418,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -467,23 +467,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -512,23 +512,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -732,23 +732,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -777,23 +777,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -814,23 +814,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageTitles_range.xml index 78a31012643..6ea90fae930 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageTitles_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 43 @@ -54,23 +54,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -323,23 +323,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -515,23 +515,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml index 80c4d264c6d..751585c373b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml @@ -6,27 +6,27 @@ 4 34 2 - 0.067 - 0.067 + 0.0260 + 0.0410 2 - 0.116 - 0.116 + 0.0580 + 0.0580 2 - 0.521 - 0.521 + 0.1550 + 0.3660 2 - 0.654 - 0.654 + 0.2550 + 0.3990 2 - 0.7 - 0.7 + 0.1550 + 0.5450 2 - 0.135 - 0.135 + 0.0450 + 0.0900 172 4 - 86 - 86 + 43 + 43 4 7 43 @@ -104,27 +104,27 @@ 2 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 86 2 - 86 - 86 + 43 + 43 2 2 0 @@ -307,23 +307,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -344,23 +344,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -381,23 +381,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -418,23 +418,23 @@ 1 0 1 - 0.01 - 0.01 + 0.0100 + 0.0100 1 - 0.096 - 0.096 + 0.0960 + 0.0960 1 - 0.232 - 0.232 + 0.2320 + 0.2320 1 - 0.312 - 0.312 + 0.3120 + 0.3120 1 - 0.255 - 0.255 + 0.2550 + 0.2550 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -467,23 +467,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -512,23 +512,23 @@ 2 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.355 - 0.355 + 0.3550 + 0.3550 1 - 0.099 - 0.099 + 0.0990 + 0.0990 1 - 0.341 - 0.341 + 0.3410 + 0.3410 1 - 0.2 - 0.2 + 0.2000 + 0.2000 1 - 0.11 - 0.11 + 0.1100 + 0.1100 86 2 43 @@ -817,23 +817,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -862,23 +862,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 @@ -899,23 +899,23 @@ 1 0 1 - 0.013 - 0.013 + 0.0130 + 0.0130 1 - 0.121 - 0.121 + 0.1210 + 0.1210 1 - 0.244 - 0.244 + 0.2440 + 0.2440 1 - 0.345 - 0.345 + 0.3450 + 0.3450 1 - 0.09 - 0.09 + 0.0900 + 0.0900 1 - 0 - 0 + 0.0000 + 0.0000 43 1 43 diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml index 768bd852090..2a58d2c31ad 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml @@ -6,23 +6,23 @@ 4 720 4 - 0.362 - 0.362 + 0.0000 + 0.2500 4 - 1.256 - 1.256 + 0.0630 + 0.7850 4 - 1.308 - 1.308 + 0.0560 + 0.6990 4 - 1.262 - 1.262 + 0.2450 + 0.3850 4 - 0.715 - 0.715 + 0.1650 + 0.1960 4 - 0.355 - 0.355 + 0.0550 + 0.1200 0 0 diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml index 7ecdbd83e32..057d6a36122 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml @@ -7,23 +7,23 @@ 4 720 4 - 0.362 - 0.362 + 0.0000 + 0.2500 4 - 1.256 - 1.256 + 0.0630 + 0.7850 4 - 1.308 - 1.308 + 0.0560 + 0.6990 4 - 1.262 - 1.262 + 0.2450 + 0.3850 4 - 0.715 - 0.715 + 0.1650 + 0.1960 4 - 0.355 - 0.355 + 0.0550 + 0.1200 0 0 diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml index bb62b1f69e4..f93a55af3b0 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml @@ -6,23 +6,23 @@ 1 36 1 - 0.25 - 0.25 + 0.2500 + 0.2500 1 - 0.212 - 0.212 + 0.2120 + 0.2120 1 - 0.699 - 0.699 + 0.6990 + 0.6990 1 - 0.245 - 0.245 + 0.2450 + 0.2450 1 - 0.196 - 0.196 + 0.1960 + 0.1960 1 - 0.12 - 0.12 + 0.1200 + 0.1200 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml index d4f641848cd..3e2fd418f65 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml @@ -7,28 +7,28 @@ 0 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml index cf78099eb9c..f0ab9548ac4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml @@ -71,28 +71,28 @@ 0 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml index 37c181200bb..887dfd00438 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml @@ -7,28 +7,28 @@ 0 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml index 0df8ac1efc2..aaa219fc249 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml @@ -53,28 +53,28 @@ 0 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml index 7bd032a6485..5c656604db4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml @@ -7,28 +7,28 @@ 0 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml index c358b23fc90..ae76f8d5044 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml @@ -172,28 +172,28 @@ 0 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index 33d905998db..ae50a132f1a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -98,23 +98,23 @@ 4 1080 4 - 0.117 - 0.117 + 0.0000 + 0.0620 4 - 0.682 - 0.682 + 0.1050 + 0.2220 4 - 1.057 - 1.057 + 0.2050 + 0.3330 4 - 5.995 - 5.995 + 1.1110 + 2.0000 4 - 2.28 - 2.28 + 0.2220 + 1.0020 4 - 1.373 - 1.373 + 0.1520 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml index b6bb39de8f2..2c47f00ba1e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml @@ -95,28 +95,28 @@ 1080 0.117 4 - 0.117 - 0.117 + 0.0000 + 0.0620 0.682 4 - 0.682 - 0.682 + 0.1050 + 0.2220 1.057 4 - 1.057 - 1.057 + 0.2050 + 0.3330 5.995 4 - 5.995 - 5.995 + 1.1110 + 2.0000 2.28 4 - 2.28 - 2.28 + 0.2220 + 1.0020 1.373 4 - 1.373 - 1.373 + 0.1520 + 0.6660 0 0 8 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml index a1d11d795b4..8c591b6a4a3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml @@ -4,28 +4,28 @@ 0.022 1 - 0.022 - 0.022 + 0.0220 + 0.0220 0.157 1 - 0.157 - 0.157 + 0.1570 + 0.1570 0.266 1 - 0.266 - 0.266 + 0.2660 + 0.2660 2 1 - 2 - 2 + 2.0000 + 2.0000 1.002 1 - 1.002 - 1.002 + 1.0020 + 1.0020 0.666 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml index 8e86658f3f2..25f074f47ef 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml @@ -6,23 +6,23 @@ 1 0 1 - 0.022 - 0.022 + 0.0220 + 0.0220 1 - 0.157 - 0.157 + 0.1570 + 0.1570 1 - 0.266 - 0.266 + 0.2660 + 0.2660 1 - 2 - 2 + 2.0000 + 2.0000 1 - 1.002 - 1.002 + 1.0020 + 1.0020 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml index ea60bc89ae0..55753bb3ed4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml @@ -68,23 +68,23 @@ 1 0 1 - 0.022 - 0.022 + 0.0220 + 0.0220 1 - 0.157 - 0.157 + 0.1570 + 0.1570 1 - 0.266 - 0.266 + 0.2660 + 0.2660 1 - 2 - 2 + 2.0000 + 2.0000 1 - 1.002 - 1.002 + 1.0020 + 1.0020 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml index af329b67109..27021772a9b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml @@ -6,23 +6,23 @@ 1 0 1 - 0.022 - 0.022 + 0.0220 + 0.0220 1 - 0.157 - 0.157 + 0.1570 + 0.1570 1 - 0.266 - 0.266 + 0.2660 + 0.2660 1 - 2 - 2 + 2.0000 + 2.0000 1 - 1.002 - 1.002 + 1.0020 + 1.0020 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml index 93e15c29e3a..f0870db8ec8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml @@ -51,23 +51,23 @@ 1 0 1 - 0.022 - 0.022 + 0.0220 + 0.0220 1 - 0.157 - 0.157 + 0.1570 + 0.1570 1 - 0.266 - 0.266 + 0.2660 + 0.2660 1 - 2 - 2 + 2.0000 + 2.0000 1 - 1.002 - 1.002 + 1.0020 + 1.0020 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml index b3fe52346cf..e817b46adac 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml @@ -6,23 +6,23 @@ 1 0 1 - 0.022 - 0.022 + 0.0220 + 0.0220 1 - 0.157 - 0.157 + 0.1570 + 0.1570 1 - 0.266 - 0.266 + 0.2660 + 0.2660 1 - 2 - 2 + 2.0000 + 2.0000 1 - 1.002 - 1.002 + 1.0020 + 1.0020 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml index 72a338d86e7..896320bb13d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml @@ -166,23 +166,23 @@ 1 0 1 - 0.022 - 0.022 + 0.0220 + 0.0220 1 - 0.157 - 0.157 + 0.1570 + 0.1570 1 - 0.266 - 0.266 + 0.2660 + 0.2660 1 - 2 - 2 + 2.0000 + 2.0000 1 - 1.002 - 1.002 + 1.0020 + 1.0020 1 - 0.666 - 0.666 + 0.6660 + 0.6660 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index a1105be8566..59cd7a7c632 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -303,28 +303,28 @@ 4500 0.398 17 - 0.0360 + 0.0000 0.0620 4.648 17 - 0.2280 - 0.823 + 0.1990 + 0.3560 6.26 17 - 0.3350 - 1.097 + 0.2890 + 0.4520 19.784 17 - 1.0150 - 3.522 + 0.9980 + 1.4990 4.815 17 - 0.2090 - 0.85 + 0.1980 + 0.3560 5.256 17 - 0.3010 - 0.903 + 0.2690 + 0.4400 0 0 7 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index 45d533581d4..69f01d65a27 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -332,28 +332,28 @@ 4500 0.398 17 - 0.027 - 0.098 + 0.0000 + 0.0620 4.648 17 - 0.467 - 0.624 + 0.1990 + 0.3560 6.26 17 - 0.645 - 0.808 + 0.2890 + 0.4520 19.784 17 - 2.023 - 2.524 + 0.9980 + 1.4990 4.815 17 - 0.494 - 0.652 + 0.1980 + 0.3560 5.256 17 - 0.604 - 0.741 + 0.2690 + 0.4400 0 0 7 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml index d3751671ee1..0022b7aa730 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml @@ -8,23 +8,23 @@ 8 0 8 - 0.264 - 0.264 + 0.0330 + 0.0330 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 3.616 - 3.616 + 0.4520 + 0.4520 8 - 11.992 - 11.992 + 1.4990 + 1.4990 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 2.152 - 2.152 + 0.2690 + 0.2690 0 0 @@ -51,23 +51,23 @@ 8 2880 8 - 0.216 - 0.216 + 0.0270 + 0.0270 8 - 2.144 - 2.144 + 0.2680 + 0.2680 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 8.2 - 8.2 + 1.0250 + 1.0250 8 - 2.368 - 2.368 + 0.2960 + 0.2960 8 - 2.68 - 2.68 + 0.3350 + 0.3350 0 0 @@ -97,23 +97,23 @@ 8 4320 8 - 0 - 0 + 0.0000 + 0.0000 8 - 1.592 - 1.592 + 0.1990 + 0.1990 8 - 2.312 - 2.312 + 0.2890 + 0.2890 8 - 7.984 - 7.984 + 0.9980 + 0.9980 8 - 1.584 - 1.584 + 0.1980 + 0.1980 8 - 2.392 - 2.392 + 0.2990 + 0.2990 0 0 @@ -138,23 +138,23 @@ 2 0 2 - 0.036 - 0.062 + 0.0360 + 0.0620 2 - 0.228 - 0.305 + 0.2280 + 0.3050 2 - 0.335 - 0.44 + 0.3350 + 0.4400 2 - 1.015 - 1.159 + 1.0150 + 1.1590 2 - 0.209 - 0.356 + 0.2090 + 0.3560 2 - 0.301 - 0.44 + 0.3010 + 0.4400 0 0 @@ -237,23 +237,23 @@ 2 0 2 - 0 - 0.021 + 0.0000 + 0.0210 2 - 0.258 - 0.344 + 0.2580 + 0.3440 2 - 0.299 - 0.444 + 0.2990 + 0.4440 2 - 0.245 - 0.325 + 0.2450 + 0.3250 2 - 0.189 - 0.999 + 0.1890 + 0.9990 2 - 0.12 - 0.35 + 0.1200 + 0.3500 0 0 @@ -278,23 +278,23 @@ 1 0 1 - 0.033 - 0.033 + 0.0330 + 0.0330 1 - 0.144 - 0.144 + 0.1440 + 0.1440 1 - 0.318 - 0.318 + 0.3180 + 0.3180 1 - 0.289 - 0.289 + 0.2890 + 0.2890 1 - 0.035 - 0.035 + 0.0350 + 0.0350 1 - 0.05 - 0.05 + 0.0500 + 0.0500 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml index b58540a1365..1d3de2ecfa0 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml @@ -8,23 +8,23 @@ 2 0 2 - 0.036 - 0.062 + 0.0360 + 0.0620 2 - 0.228 - 0.305 + 0.2280 + 0.3050 2 - 0.335 - 0.44 + 0.3350 + 0.4400 2 - 1.015 - 1.159 + 1.0150 + 1.1590 2 - 0.209 - 0.356 + 0.2090 + 0.3560 2 - 0.301 - 0.44 + 0.3010 + 0.4400 0 0 @@ -58,23 +58,23 @@ 6 0 6 - 0.198 - 0.198 + 0.0330 + 0.0330 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 2.712 - 2.712 + 0.4520 + 0.4520 6 - 8.994 - 8.994 + 1.4990 + 1.4990 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 1.614 - 1.614 + 0.2690 + 0.2690 0 0 @@ -101,23 +101,23 @@ 6 2160 6 - 0.162 - 0.162 + 0.0270 + 0.0270 6 - 1.608 - 1.608 + 0.2680 + 0.2680 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 6.15 - 6.15 + 1.0250 + 1.0250 6 - 1.776 - 1.776 + 0.2960 + 0.2960 6 - 2.01 - 2.01 + 0.3350 + 0.3350 0 0 @@ -147,23 +147,23 @@ 6 3240 6 - 0 - 0 + 0.0000 + 0.0000 6 - 1.194 - 1.194 + 0.1990 + 0.1990 6 - 1.734 - 1.734 + 0.2890 + 0.2890 6 - 5.988 - 5.988 + 0.9980 + 0.9980 6 - 1.188 - 1.188 + 0.1980 + 0.1980 6 - 1.794 - 1.794 + 0.2990 + 0.2990 0 0 @@ -231,23 +231,23 @@ 2 0 2 - 0.066 - 0.066 + 0.0330 + 0.0330 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 0.904 - 0.904 + 0.4520 + 0.4520 2 - 2.998 - 2.998 + 1.4990 + 1.4990 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 0.538 - 0.538 + 0.2690 + 0.2690 0 0 @@ -274,23 +274,23 @@ 2 720 2 - 0.054 - 0.054 + 0.0270 + 0.0270 2 - 0.536 - 0.536 + 0.2680 + 0.2680 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 2.05 - 2.05 + 1.0250 + 1.0250 2 - 0.592 - 0.592 + 0.2960 + 0.2960 2 - 0.67 - 0.67 + 0.3350 + 0.3350 0 0 @@ -320,23 +320,23 @@ 2 1080 2 - 0 - 0 + 0.0000 + 0.0000 2 - 0.398 - 0.398 + 0.1990 + 0.1990 2 - 0.578 - 0.578 + 0.2890 + 0.2890 2 - 1.996 - 1.996 + 0.9980 + 0.9980 2 - 0.396 - 0.396 + 0.1980 + 0.1980 2 - 0.598 - 0.598 + 0.2990 + 0.2990 0 0 @@ -370,23 +370,23 @@ 2 0 2 - 0 - 0.021 + 0.0000 + 0.0210 2 - 0.258 - 0.344 + 0.2580 + 0.3440 2 - 0.299 - 0.444 + 0.2990 + 0.4440 2 - 0.245 - 0.325 + 0.2450 + 0.3250 2 - 0.189 - 0.999 + 0.1890 + 0.9990 2 - 0.12 - 0.35 + 0.1200 + 0.3500 0 0 @@ -411,23 +411,23 @@ 1 0 1 - 0.033 - 0.033 + 0.0330 + 0.0330 1 - 0.144 - 0.144 + 0.1440 + 0.1440 1 - 0.318 - 0.318 + 0.3180 + 0.3180 1 - 0.289 - 0.289 + 0.2890 + 0.2890 1 - 0.035 - 0.035 + 0.0350 + 0.0350 1 - 0.05 - 0.05 + 0.0500 + 0.0500 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml index 0ef066b9940..9b04797363d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml @@ -8,23 +8,23 @@ 8 0 8 - 0.264 - 0.264 + 0.0330 + 0.0330 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 3.616 - 3.616 + 0.4520 + 0.4520 8 - 11.992 - 11.992 + 1.4990 + 1.4990 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 2.152 - 2.152 + 0.2690 + 0.2690 0 0 @@ -51,23 +51,23 @@ 8 2880 8 - 0.216 - 0.216 + 0.0270 + 0.0270 8 - 2.144 - 2.144 + 0.2680 + 0.2680 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 8.2 - 8.2 + 1.0250 + 1.0250 8 - 2.368 - 2.368 + 0.2960 + 0.2960 8 - 2.68 - 2.68 + 0.3350 + 0.3350 0 0 @@ -97,23 +97,23 @@ 8 4320 8 - 0 - 0 + 0.0000 + 0.0000 8 - 1.592 - 1.592 + 0.1990 + 0.1990 8 - 2.312 - 2.312 + 0.2890 + 0.2890 8 - 7.984 - 7.984 + 0.9980 + 0.9980 8 - 1.584 - 1.584 + 0.1980 + 0.1980 8 - 2.392 - 2.392 + 0.2990 + 0.2990 0 0 @@ -138,23 +138,23 @@ 2 0 2 - 0.036 - 0.062 + 0.0360 + 0.0620 2 - 0.228 - 0.305 + 0.2280 + 0.3050 2 - 0.335 - 0.44 + 0.3350 + 0.4400 2 - 1.015 - 1.159 + 1.0150 + 1.1590 2 - 0.209 - 0.356 + 0.2090 + 0.3560 2 - 0.301 - 0.44 + 0.3010 + 0.4400 0 0 @@ -237,23 +237,23 @@ 2 0 2 - 0 - 0.021 + 0.0000 + 0.0210 2 - 0.258 - 0.344 + 0.2580 + 0.3440 2 - 0.299 - 0.444 + 0.2990 + 0.4440 2 - 0.245 - 0.325 + 0.2450 + 0.3250 2 - 0.189 - 0.999 + 0.1890 + 0.9990 2 - 0.12 - 0.35 + 0.1200 + 0.3500 0 0 @@ -278,23 +278,23 @@ 1 0 1 - 0.033 - 0.033 + 0.0330 + 0.0330 1 - 0.144 - 0.144 + 0.1440 + 0.1440 1 - 0.318 - 0.318 + 0.3180 + 0.3180 1 - 0.289 - 0.289 + 0.2890 + 0.2890 1 - 0.035 - 0.035 + 0.0350 + 0.0350 1 - 0.05 - 0.05 + 0.0500 + 0.0500 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml index da8f8eb7716..2059c17194c 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml @@ -8,23 +8,23 @@ 9 2880 9 - 0.252 - 0.252 + 0.0270 + 0.0360 9 - 2.372 - 2.372 + 0.2280 + 0.2680 9 - 3.183 - 3.183 + 0.3350 + 0.3560 9 - 9.215 - 9.215 + 1.0150 + 1.0250 9 - 2.577 - 2.577 + 0.2090 + 0.2960 9 - 2.981 - 2.981 + 0.3010 + 0.3350 0 0 @@ -99,23 +99,23 @@ 16 4320 16 - 0 - 0.264 + 0.0000 + 0.0330 16 - 1.592 - 2.848 + 0.1990 + 0.3560 16 - 2.312 - 3.616 + 0.2890 + 0.4520 16 - 7.984 - 11.992 + 0.9980 + 1.4990 16 - 1.584 - 2.848 + 0.1980 + 0.3560 16 - 2.152 - 2.392 + 0.2690 + 0.2990 0 0 @@ -143,23 +143,23 @@ 1 0 1 - 0.062 - 0.062 + 0.0620 + 0.0620 1 - 0.305 - 0.305 + 0.3050 + 0.3050 1 - 0.44 - 0.44 + 0.4400 + 0.4400 1 - 1.159 - 1.159 + 1.1590 + 1.1590 1 - 0.356 - 0.356 + 0.3560 + 0.3560 1 - 0.44 - 0.44 + 0.4400 + 0.4400 0 0 @@ -202,23 +202,23 @@ 2 0 2 - 0.021 - 0.033 + 0.0210 + 0.0330 2 - 0.144 - 0.344 + 0.1440 + 0.3440 2 - 0.299 - 0.318 + 0.2990 + 0.3180 2 - 0.245 - 0.289 + 0.2450 + 0.2890 2 - 0.035 - 0.189 + 0.0350 + 0.1890 2 - 0.05 - 0.35 + 0.0500 + 0.3500 0 0 @@ -251,23 +251,23 @@ 1 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.258 - 0.258 + 0.2580 + 0.2580 1 - 0.444 - 0.444 + 0.4440 + 0.4440 1 - 0.325 - 0.325 + 0.3250 + 0.3250 1 - 0.999 - 0.999 + 0.9990 + 0.9990 1 - 0.12 - 0.12 + 0.1200 + 0.1200 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml index 798f026b38b..5537e1e7b80 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml @@ -8,23 +8,23 @@ 1 0 1 - 0.036 - 0.036 + 0.0360 + 0.0360 1 - 0.228 - 0.228 + 0.2280 + 0.2280 1 - 0.335 - 0.335 + 0.3350 + 0.3350 1 - 1.015 - 1.015 + 1.0150 + 1.0150 1 - 0.209 - 0.209 + 0.2090 + 0.2090 1 - 0.301 - 0.301 + 0.3010 + 0.3010 0 0 @@ -57,23 +57,23 @@ 1 0 1 - 0.062 - 0.062 + 0.0620 + 0.0620 1 - 0.305 - 0.305 + 0.3050 + 0.3050 1 - 0.44 - 0.44 + 0.4400 + 0.4400 1 - 1.159 - 1.159 + 1.1590 + 1.1590 1 - 0.356 - 0.356 + 0.3560 + 0.3560 1 - 0.44 - 0.44 + 0.4400 + 0.4400 0 0 @@ -150,23 +150,23 @@ 6 2160 6 - 0.162 - 0.162 + 0.0270 + 0.0270 6 - 1.608 - 1.608 + 0.2680 + 0.2680 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 6.15 - 6.15 + 1.0250 + 1.0250 6 - 1.776 - 1.776 + 0.2960 + 0.2960 6 - 2.01 - 2.01 + 0.3350 + 0.3350 0 0 @@ -197,23 +197,23 @@ 12 3240 12 - 0 - 0.198 + 0.0000 + 0.0330 12 - 1.194 - 2.136 + 0.1990 + 0.3560 12 - 1.734 - 2.712 + 0.2890 + 0.4520 12 - 5.988 - 8.994 + 0.9980 + 1.4990 12 - 1.188 - 2.136 + 0.1980 + 0.3560 12 - 1.614 - 1.794 + 0.2690 + 0.2990 0 0 @@ -243,23 +243,23 @@ 2 720 2 - 0.054 - 0.054 + 0.0270 + 0.0270 2 - 0.536 - 0.536 + 0.2680 + 0.2680 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 2.05 - 2.05 + 1.0250 + 1.0250 2 - 0.592 - 0.592 + 0.2960 + 0.2960 2 - 0.67 - 0.67 + 0.3350 + 0.3350 0 0 @@ -290,23 +290,23 @@ 4 1080 4 - 0 - 0.066 + 0.0000 + 0.0330 4 - 0.398 - 0.712 + 0.1990 + 0.3560 4 - 0.578 - 0.904 + 0.2890 + 0.4520 4 - 1.996 - 2.998 + 0.9980 + 1.4990 4 - 0.396 - 0.712 + 0.1980 + 0.3560 4 - 0.538 - 0.598 + 0.2690 + 0.2990 0 0 @@ -385,23 +385,23 @@ 2 0 2 - 0.021 - 0.033 + 0.0210 + 0.0330 2 - 0.144 - 0.344 + 0.1440 + 0.3440 2 - 0.299 - 0.318 + 0.2990 + 0.3180 2 - 0.245 - 0.289 + 0.2450 + 0.2890 2 - 0.035 - 0.189 + 0.0350 + 0.1890 2 - 0.05 - 0.35 + 0.0500 + 0.3500 0 0 @@ -434,23 +434,23 @@ 1 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.258 - 0.258 + 0.2580 + 0.2580 1 - 0.444 - 0.444 + 0.4440 + 0.4440 1 - 0.325 - 0.325 + 0.3250 + 0.3250 1 - 0.999 - 0.999 + 0.9990 + 0.9990 1 - 0.12 - 0.12 + 0.1200 + 0.1200 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml index 1a3b9c0d070..27a5d051d5f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml @@ -8,23 +8,23 @@ 9 2880 9 - 0.252 - 0.252 + 0.0270 + 0.0360 9 - 2.372 - 2.372 + 0.2280 + 0.2680 9 - 3.183 - 3.183 + 0.3350 + 0.3560 9 - 9.215 - 9.215 + 1.0150 + 1.0250 9 - 2.577 - 2.577 + 0.2090 + 0.2960 9 - 2.981 - 2.981 + 0.3010 + 0.3350 0 0 @@ -99,23 +99,23 @@ 16 4320 16 - 0 - 0.264 + 0.0000 + 0.0330 16 - 1.592 - 2.848 + 0.1990 + 0.3560 16 - 2.312 - 3.616 + 0.2890 + 0.4520 16 - 7.984 - 11.992 + 0.9980 + 1.4990 16 - 1.584 - 2.848 + 0.1980 + 0.3560 16 - 2.152 - 2.392 + 0.2690 + 0.2990 0 0 @@ -143,23 +143,23 @@ 1 0 1 - 0.062 - 0.062 + 0.0620 + 0.0620 1 - 0.305 - 0.305 + 0.3050 + 0.3050 1 - 0.44 - 0.44 + 0.4400 + 0.4400 1 - 1.159 - 1.159 + 1.1590 + 1.1590 1 - 0.356 - 0.356 + 0.3560 + 0.3560 1 - 0.44 - 0.44 + 0.4400 + 0.4400 0 0 @@ -202,23 +202,23 @@ 2 0 2 - 0.021 - 0.033 + 0.0210 + 0.0330 2 - 0.144 - 0.344 + 0.1440 + 0.3440 2 - 0.299 - 0.318 + 0.2990 + 0.3180 2 - 0.245 - 0.289 + 0.2450 + 0.2890 2 - 0.035 - 0.189 + 0.0350 + 0.1890 2 - 0.05 - 0.35 + 0.0500 + 0.3500 0 0 @@ -251,23 +251,23 @@ 1 0 1 - 0 - 0 + 0.0000 + 0.0000 1 - 0.258 - 0.258 + 0.2580 + 0.2580 1 - 0.444 - 0.444 + 0.4440 + 0.4440 1 - 0.325 - 0.325 + 0.3250 + 0.3250 1 - 0.999 - 0.999 + 0.9990 + 0.9990 1 - 0.12 - 0.12 + 0.1200 + 0.1200 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml index cfb717030e9..12cb1d551be 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml @@ -7,23 +7,23 @@ 8 0 8 - 0.264 - 0.264 + 0.0330 + 0.0330 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 3.616 - 3.616 + 0.4520 + 0.4520 8 - 11.992 - 11.992 + 1.4990 + 1.4990 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 2.152 - 2.152 + 0.2690 + 0.2690 0 0 @@ -50,23 +50,23 @@ 8 2880 8 - 0.216 - 0.216 + 0.0270 + 0.0270 8 - 2.144 - 2.144 + 0.2680 + 0.2680 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 8.2 - 8.2 + 1.0250 + 1.0250 8 - 2.368 - 2.368 + 0.2960 + 0.2960 8 - 2.68 - 2.68 + 0.3350 + 0.3350 0 0 @@ -96,23 +96,23 @@ 8 4320 8 - 0 - 0 + 0.0000 + 0.0000 8 - 1.592 - 1.592 + 0.1990 + 0.1990 8 - 2.312 - 2.312 + 0.2890 + 0.2890 8 - 7.984 - 7.984 + 0.9980 + 0.9980 8 - 1.584 - 1.584 + 0.1980 + 0.1980 8 - 2.392 - 2.392 + 0.2990 + 0.2990 0 0 @@ -137,23 +137,23 @@ 2 0 2 - 0.036 - 0.062 + 0.0360 + 0.0620 2 - 0.228 - 0.305 + 0.2280 + 0.3050 2 - 0.335 - 0.44 + 0.3350 + 0.4400 2 - 1.015 - 1.159 + 1.0150 + 1.1590 2 - 0.209 - 0.356 + 0.2090 + 0.3560 2 - 0.301 - 0.44 + 0.3010 + 0.4400 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml index c88724317ce..df3b476e715 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml @@ -7,23 +7,23 @@ 2 0 2 - 0.036 - 0.062 + 0.0360 + 0.0620 2 - 0.228 - 0.305 + 0.2280 + 0.3050 2 - 0.335 - 0.44 + 0.3350 + 0.4400 2 - 1.015 - 1.159 + 1.0150 + 1.1590 2 - 0.209 - 0.356 + 0.2090 + 0.3560 2 - 0.301 - 0.44 + 0.3010 + 0.4400 0 0 @@ -57,23 +57,23 @@ 6 0 6 - 0.198 - 0.198 + 0.0330 + 0.0330 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 2.712 - 2.712 + 0.4520 + 0.4520 6 - 8.994 - 8.994 + 1.4990 + 1.4990 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 1.614 - 1.614 + 0.2690 + 0.2690 0 0 @@ -100,23 +100,23 @@ 6 2160 6 - 0.162 - 0.162 + 0.0270 + 0.0270 6 - 1.608 - 1.608 + 0.2680 + 0.2680 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 6.15 - 6.15 + 1.0250 + 1.0250 6 - 1.776 - 1.776 + 0.2960 + 0.2960 6 - 2.01 - 2.01 + 0.3350 + 0.3350 0 0 @@ -146,23 +146,23 @@ 6 3240 6 - 0 - 0 + 0.0000 + 0.0000 6 - 1.194 - 1.194 + 0.1990 + 0.1990 6 - 1.734 - 1.734 + 0.2890 + 0.2890 6 - 5.988 - 5.988 + 0.9980 + 0.9980 6 - 1.188 - 1.188 + 0.1980 + 0.1980 6 - 1.794 - 1.794 + 0.2990 + 0.2990 0 0 @@ -230,23 +230,23 @@ 2 0 2 - 0.066 - 0.066 + 0.0330 + 0.0330 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 0.904 - 0.904 + 0.4520 + 0.4520 2 - 2.998 - 2.998 + 1.4990 + 1.4990 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 0.538 - 0.538 + 0.2690 + 0.2690 0 0 @@ -273,23 +273,23 @@ 2 720 2 - 0.054 - 0.054 + 0.0270 + 0.0270 2 - 0.536 - 0.536 + 0.2680 + 0.2680 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 2.05 - 2.05 + 1.0250 + 1.0250 2 - 0.592 - 0.592 + 0.2960 + 0.2960 2 - 0.67 - 0.67 + 0.3350 + 0.3350 0 0 @@ -319,23 +319,23 @@ 2 1080 2 - 0 - 0 + 0.0000 + 0.0000 2 - 0.398 - 0.398 + 0.1990 + 0.1990 2 - 0.578 - 0.578 + 0.2890 + 0.2890 2 - 1.996 - 1.996 + 0.9980 + 0.9980 2 - 0.396 - 0.396 + 0.1980 + 0.1980 2 - 0.598 - 0.598 + 0.2990 + 0.2990 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml index d6fcc3f394c..4e04539635b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml @@ -7,23 +7,23 @@ 8 0 8 - 0.264 - 0.264 + 0.0330 + 0.0330 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 3.616 - 3.616 + 0.4520 + 0.4520 8 - 11.992 - 11.992 + 1.4990 + 1.4990 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 2.152 - 2.152 + 0.2690 + 0.2690 0 0 @@ -50,23 +50,23 @@ 8 2880 8 - 0.216 - 0.216 + 0.0270 + 0.0270 8 - 2.144 - 2.144 + 0.2680 + 0.2680 8 - 2.848 - 2.848 + 0.3560 + 0.3560 8 - 8.2 - 8.2 + 1.0250 + 1.0250 8 - 2.368 - 2.368 + 0.2960 + 0.2960 8 - 2.68 - 2.68 + 0.3350 + 0.3350 0 0 @@ -96,23 +96,23 @@ 8 4320 8 - 0 - 0 + 0.0000 + 0.0000 8 - 1.592 - 1.592 + 0.1990 + 0.1990 8 - 2.312 - 2.312 + 0.2890 + 0.2890 8 - 7.984 - 7.984 + 0.9980 + 0.9980 8 - 1.584 - 1.584 + 0.1980 + 0.1980 8 - 2.392 - 2.392 + 0.2990 + 0.2990 0 0 @@ -137,23 +137,23 @@ 2 0 2 - 0.036 - 0.062 + 0.0360 + 0.0620 2 - 0.228 - 0.305 + 0.2280 + 0.3050 2 - 0.335 - 0.44 + 0.3350 + 0.4400 2 - 1.015 - 1.159 + 1.0150 + 1.1590 2 - 0.209 - 0.356 + 0.2090 + 0.3560 2 - 0.301 - 0.44 + 0.3010 + 0.4400 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml index edc6a6738ad..17e989dca49 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml @@ -7,23 +7,23 @@ 9 2880 9 - 0.252 - 0.252 + 0.0270 + 0.0360 9 - 2.372 - 2.372 + 0.2280 + 0.2680 9 - 3.183 - 3.183 + 0.3350 + 0.3560 9 - 9.215 - 9.215 + 1.0150 + 1.0250 9 - 2.577 - 2.577 + 0.2090 + 0.2960 9 - 2.981 - 2.981 + 0.3010 + 0.3350 0 0 @@ -98,23 +98,23 @@ 16 4320 16 - 0 - 0.264 + 0.0000 + 0.0330 16 - 1.592 - 2.848 + 0.1990 + 0.3560 16 - 2.312 - 3.616 + 0.2890 + 0.4520 16 - 7.984 - 11.992 + 0.9980 + 1.4990 16 - 1.584 - 2.848 + 0.1980 + 0.3560 16 - 2.152 - 2.392 + 0.2690 + 0.2990 0 0 @@ -142,23 +142,23 @@ 1 0 1 - 0.062 - 0.062 + 0.0620 + 0.0620 1 - 0.305 - 0.305 + 0.3050 + 0.3050 1 - 0.44 - 0.44 + 0.4400 + 0.4400 1 - 1.159 - 1.159 + 1.1590 + 1.1590 1 - 0.356 - 0.356 + 0.3560 + 0.3560 1 - 0.44 - 0.44 + 0.4400 + 0.4400 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml index abbcda0a637..7b84df16c2c 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml @@ -7,23 +7,23 @@ 1 0 1 - 0.036 - 0.036 + 0.0360 + 0.0360 1 - 0.228 - 0.228 + 0.2280 + 0.2280 1 - 0.335 - 0.335 + 0.3350 + 0.3350 1 - 1.015 - 1.015 + 1.0150 + 1.0150 1 - 0.209 - 0.209 + 0.2090 + 0.2090 1 - 0.301 - 0.301 + 0.3010 + 0.3010 0 0 @@ -56,23 +56,23 @@ 1 0 1 - 0.062 - 0.062 + 0.0620 + 0.0620 1 - 0.305 - 0.305 + 0.3050 + 0.3050 1 - 0.44 - 0.44 + 0.4400 + 0.4400 1 - 1.159 - 1.159 + 1.1590 + 1.1590 1 - 0.356 - 0.356 + 0.3560 + 0.3560 1 - 0.44 - 0.44 + 0.4400 + 0.4400 0 0 @@ -149,23 +149,23 @@ 6 2160 6 - 0.162 - 0.162 + 0.0270 + 0.0270 6 - 1.608 - 1.608 + 0.2680 + 0.2680 6 - 2.136 - 2.136 + 0.3560 + 0.3560 6 - 6.15 - 6.15 + 1.0250 + 1.0250 6 - 1.776 - 1.776 + 0.2960 + 0.2960 6 - 2.01 - 2.01 + 0.3350 + 0.3350 0 0 @@ -196,23 +196,23 @@ 12 3240 12 - 0 - 0.198 + 0.0000 + 0.0330 12 - 1.194 - 2.136 + 0.1990 + 0.3560 12 - 1.734 - 2.712 + 0.2890 + 0.4520 12 - 5.988 - 8.994 + 0.9980 + 1.4990 12 - 1.188 - 2.136 + 0.1980 + 0.3560 12 - 1.614 - 1.794 + 0.2690 + 0.2990 0 0 @@ -242,23 +242,23 @@ 2 720 2 - 0.054 - 0.054 + 0.0270 + 0.0270 2 - 0.536 - 0.536 + 0.2680 + 0.2680 2 - 0.712 - 0.712 + 0.3560 + 0.3560 2 - 2.05 - 2.05 + 1.0250 + 1.0250 2 - 0.592 - 0.592 + 0.2960 + 0.2960 2 - 0.67 - 0.67 + 0.3350 + 0.3350 0 0 @@ -289,23 +289,23 @@ 4 1080 4 - 0 - 0.066 + 0.0000 + 0.0330 4 - 0.398 - 0.712 + 0.1990 + 0.3560 4 - 0.578 - 0.904 + 0.2890 + 0.4520 4 - 1.996 - 2.998 + 0.9980 + 1.4990 4 - 0.396 - 0.712 + 0.1980 + 0.3560 4 - 0.538 - 0.598 + 0.2690 + 0.2990 0 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml index 807d9daad56..1921f120a62 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml @@ -7,23 +7,23 @@ 9 2880 9 - 0.252 - 0.252 + 0.0270 + 0.0360 9 - 2.372 - 2.372 + 0.2280 + 0.2680 9 - 3.183 - 3.183 + 0.3350 + 0.3560 9 - 9.215 - 9.215 + 1.0150 + 1.0250 9 - 2.577 - 2.577 + 0.2090 + 0.2960 9 - 2.981 - 2.981 + 0.3010 + 0.3350 0 0 @@ -98,23 +98,23 @@ 16 4320 16 - 0 - 0.264 + 0.0000 + 0.0330 16 - 1.592 - 2.848 + 0.1990 + 0.3560 16 - 2.312 - 3.616 + 0.2890 + 0.4520 16 - 7.984 - 11.992 + 0.9980 + 1.4990 16 - 1.584 - 2.848 + 0.1980 + 0.3560 16 - 2.152 - 2.392 + 0.2690 + 0.2990 0 0 @@ -142,23 +142,23 @@ 1 0 1 - 0.062 - 0.062 + 0.0620 + 0.0620 1 - 0.305 - 0.305 + 0.3050 + 0.3050 1 - 0.44 - 0.44 + 0.4400 + 0.4400 1 - 1.159 - 1.159 + 1.1590 + 1.1590 1 - 0.356 - 0.356 + 0.3560 + 0.3560 1 - 0.44 - 0.44 + 0.4400 + 0.4400 0 0 From c5cde81bd3594af17933b618d8928335fcf4229b Mon Sep 17 00:00:00 2001 From: sgiehl Date: Thu, 27 Jun 2024 23:39:04 +0200 Subject: [PATCH 04/10] update submodule --- plugins/Bandwidth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Bandwidth b/plugins/Bandwidth index d5aed4d92b9..7da6f6bd529 160000 --- a/plugins/Bandwidth +++ b/plugins/Bandwidth @@ -1 +1 @@ -Subproject commit d5aed4d92b9613a48681329a3ae32839ffcbbdb1 +Subproject commit 7da6f6bd5292c2789c0a2eda23be2db43edc2dd5 From fe2599b0cea5eae5cdf0534d5009d1750241991e Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 1 Jul 2024 09:29:22 +0200 Subject: [PATCH 05/10] Fix min/max checks --- core/DataTable/Row.php | 8 ++++---- ...ts.getCategory_flat__API.getProcessedReport_day.xml | 2 +- ...s.getCategory_lastN__API.getProcessedReport_day.xml | 10 +++++----- ...Events.getName_flat__API.getProcessedReport_day.xml | 2 +- ...vents.getName_lastN__API.getProcessedReport_day.xml | 10 +++++----- .../test_CustomEvents__Events.getCategory_day.xml | 4 ++-- .../test_CustomEvents__Events.getCategory_month.xml | 4 ++-- .../expected/test_CustomEvents__Events.getName_day.xml | 4 ++-- .../test_CustomEvents__Events.getName_month.xml | 4 ++-- ...ventCategoryOrNameMatch__Events.getCategory_day.xml | 4 ++-- ...ts_eventCategoryOrNameMatch__Events.getName_day.xml | 4 ++-- ...mEvents_eventValueMatch__Events.getCategory_day.xml | 4 ++-- ...ustomEvents_eventValueMatch__Events.getName_day.xml | 4 ++-- ...yDimensionIsEventAction__Events.getCategory_day.xml | 4 ++-- ...imensionIsEventAction__Events.getCategory_month.xml | 4 ++-- ...ndaryDimensionIsEventAction__Events.getName_day.xml | 4 ++-- ...aryDimensionIsEventAction__Events.getName_month.xml | 4 ++-- ...aryDimensionIsEventCategory__Events.getName_day.xml | 8 ++++---- ...yDimensionIsEventCategory__Events.getName_month.xml | 8 ++++---- ...aryDimensionIsEventName__Events.getCategory_day.xml | 8 ++++---- ...yDimensionIsEventName__Events.getCategory_month.xml | 8 ++++---- ...tMatchesEventActionPlay__Events.getCategory_day.xml | 4 ++-- ...gmentMatchesEventActionPlay__Events.getName_day.xml | 4 ++-- 23 files changed, 60 insertions(+), 60 deletions(-) diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index 8c09497836d..2fae16509e4 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -521,18 +521,18 @@ private function getColumnValuesMerged($operation, $thisColumnValue, $columnToSu $newValue = null; break; case 'max': - if (!$thisColumnValue) { + if (!is_numeric($thisColumnValue)) { $newValue = $columnToSumValue; - } elseif (!$columnToSumValue) { + } elseif (!is_numeric($columnToSumValue)) { $newValue = $thisColumnValue; } else { $newValue = max($thisColumnValue, $columnToSumValue); } break; case 'min': - if (!$thisColumnValue) { + if (!is_numeric($thisColumnValue)) { $newValue = $columnToSumValue; - } elseif (!$columnToSumValue) { + } elseif (!is_numeric($columnToSumValue)) { $newValue = $thisColumnValue; } else { $newValue = min($thisColumnValue, $columnToSumValue); diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml index 4d5a0796c11..8aad84c32cb 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml @@ -538,7 +538,7 @@ 69 14 137.96 - 28.32 + 9.66 52.32 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index b027438a3dc..3207dc56caf 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -62,7 +62,7 @@ 28 2 19.32 - 9.66 + 0 9.66 9.66 @@ -71,7 +71,7 @@ 14 4 38 - 9 + 0 10 9.5 @@ -100,7 +100,7 @@ 14 1 9.66 - 9.66 + 0 9.66 9.66 @@ -109,7 +109,7 @@ 7 2 19 - 9 + 0 10 9.5 @@ -181,7 +181,7 @@ 69 14 137.96 - 28.32 + 9.66 52.32 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml index 89f4d94e6dd..b09152ec912 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml @@ -616,7 +616,7 @@ 69 14 137.96 - 28.32 + 9.66 52.32 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index 1e52aad94fe..b434b1c9e0c 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -62,7 +62,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 @@ -71,7 +71,7 @@ 14 4 38 - 9 + 0 10 9.5 @@ -127,7 +127,7 @@ 8 1 9.66 - 9.66 + 0 9.66 9.66 @@ -136,7 +136,7 @@ 7 2 19 - 9 + 0 10 9.5 @@ -277,7 +277,7 @@ 69 14 137.96 - 28.32 + 9.66 52.32 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml index 199260817dd..d041b8b8f88 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 9.66 + 0 9.66 9.66 eventCategory==Movie @@ -131,7 +131,7 @@ 14 4 38 - 9 + 0 10 9.5 eventCategory==Music diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml index 91dc65835b8..676180c09b4 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml @@ -6,7 +6,7 @@ 42 3 28.98 - 9.66 + 0 9.66 39 9.66 @@ -130,7 +130,7 @@ 21 6 57 - 9 + 0 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml index cb218553cc2..4771d85dfe0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -109,7 +109,7 @@ 14 4 38 - 9 + 0 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml index 183f2eefba2..d4668aa656f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml @@ -6,7 +6,7 @@ 24 3 28.98 - 9.66 + 0 9.66 24 9.66 @@ -108,7 +108,7 @@ 21 6 57 - 9 + 0 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml index 199260817dd..d041b8b8f88 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 9.66 + 0 9.66 9.66 eventCategory==Movie @@ -131,7 +131,7 @@ 14 4 38 - 9 + 0 10 9.5 eventCategory==Music diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml index cb218553cc2..4771d85dfe0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -109,7 +109,7 @@ 14 4 38 - 9 + 0 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml index 6121cdbdac3..ed183f1c09d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 22 2 19.32 - 9.66 + 0 9.66 9.66 eventCategory==Movie @@ -120,7 +120,7 @@ 14 4 38 - 9 + 0 10 9.5 eventCategory==Music diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml index 80db1caf35c..d2b7fbedf84 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -109,7 +109,7 @@ 14 4 38 - 9 + 0 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml index 199260817dd..d041b8b8f88 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 9.66 + 0 9.66 9.66 eventCategory==Movie @@ -131,7 +131,7 @@ 14 4 38 - 9 + 0 10 9.5 eventCategory==Music diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml index 91dc65835b8..676180c09b4 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml @@ -6,7 +6,7 @@ 42 3 28.98 - 9.66 + 0 9.66 39 9.66 @@ -130,7 +130,7 @@ 21 6 57 - 9 + 0 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml index cb218553cc2..4771d85dfe0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -109,7 +109,7 @@ 14 4 38 - 9 + 0 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml index 183f2eefba2..d4668aa656f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml @@ -6,7 +6,7 @@ 24 3 28.98 - 9.66 + 0 9.66 24 9.66 @@ -108,7 +108,7 @@ 21 6 57 - 9 + 0 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml index a87b0f793b6..e96aadbdbf3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,7 +19,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 @@ -32,7 +32,7 @@ 14 4 38 - 9 + 0 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -44,7 +44,7 @@ 14 4 38 - 9 + 0 10 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml index 0ef3ec85a98..3edcf190b8d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml @@ -6,7 +6,7 @@ 24 3 28.98 - 9.66 + 0 9.66 24 9.66 @@ -18,7 +18,7 @@ 24 3 28.98 - 9.66 + 0 9.66 24 9.66 @@ -31,7 +31,7 @@ 21 6 57 - 9 + 0 10 18 9.5 @@ -43,7 +43,7 @@ 21 6 57 - 9 + 0 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml index 994a8e104a9..aac93550e82 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 9.66 + 0 9.66 9.66 eventCategory==Movie @@ -19,7 +19,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 @@ -65,7 +65,7 @@ 14 4 38 - 9 + 0 10 9.5 eventCategory==Music @@ -77,7 +77,7 @@ 14 4 38 - 9 + 0 10 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml index d1953619319..b5a25b61417 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml @@ -6,7 +6,7 @@ 42 3 28.98 - 9.66 + 0 9.66 39 9.66 @@ -18,7 +18,7 @@ 24 3 28.98 - 9.66 + 0 9.66 24 9.66 @@ -64,7 +64,7 @@ 21 6 57 - 9 + 0 10 18 9.5 @@ -76,7 +76,7 @@ 21 6 57 - 9 + 0 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml index 6121cdbdac3..ed183f1c09d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 22 2 19.32 - 9.66 + 0 9.66 9.66 eventCategory==Movie @@ -120,7 +120,7 @@ 14 4 38 - 9 + 0 10 9.5 eventCategory==Music diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml index 80db1caf35c..d2b7fbedf84 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 9.66 + 0 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -109,7 +109,7 @@ 14 4 38 - 9 + 0 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau From c3d4a934e17136d2497525580f054cbe6649ffd8 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 2 Jul 2024 13:25:50 +0200 Subject: [PATCH 06/10] Ensure to store null for min/max event value metric if no values are available --- plugins/Events/RecordBuilders/EventReports.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Events/RecordBuilders/EventReports.php b/plugins/Events/RecordBuilders/EventReports.php index 1fe7a56fb6a..72a0b9cd2f6 100644 --- a/plugins/Events/RecordBuilders/EventReports.php +++ b/plugins/Events/RecordBuilders/EventReports.php @@ -198,8 +198,8 @@ protected function aggregateEventRow(array &$reports, array $row): void Metrics::INDEX_EVENT_NB_HITS => $row[Metrics::INDEX_EVENT_NB_HITS] ?? 0, Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE => $row[Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE] ?? 0, Metrics::INDEX_EVENT_SUM_EVENT_VALUE => round($row[Metrics::INDEX_EVENT_SUM_EVENT_VALUE] ?? 0, 2), - Metrics::INDEX_EVENT_MIN_EVENT_VALUE => round($row[Metrics::INDEX_EVENT_MIN_EVENT_VALUE] ?? false, 2), - Metrics::INDEX_EVENT_MAX_EVENT_VALUE => round($row[Metrics::INDEX_EVENT_MAX_EVENT_VALUE] ?? 0, 2), + Metrics::INDEX_EVENT_MIN_EVENT_VALUE => is_numeric($row[Metrics::INDEX_EVENT_MIN_EVENT_VALUE]) ? round($row[Metrics::INDEX_EVENT_MIN_EVENT_VALUE], 2) : null, + Metrics::INDEX_EVENT_MAX_EVENT_VALUE => is_numeric($row[Metrics::INDEX_EVENT_MAX_EVENT_VALUE]) ? round($row[Metrics::INDEX_EVENT_MAX_EVENT_VALUE], 2) : null, ]; $topLevelRow = $table->sumRowWithLabel($mainLabel, $columns, $this->columnAggregationOps); From b922e1b794810445b843af0a49bf07bb85b0cb42 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 2 Jul 2024 13:37:24 +0200 Subject: [PATCH 07/10] don't use numeric check to not break percentage values --- core/DataTable/Row.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index 2fae16509e4..fe87954a755 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -521,18 +521,18 @@ private function getColumnValuesMerged($operation, $thisColumnValue, $columnToSu $newValue = null; break; case 'max': - if (!is_numeric($thisColumnValue)) { + if (null === $thisColumnValue || false === $thisColumnValue || '' === $thisColumnValue) { $newValue = $columnToSumValue; - } elseif (!is_numeric($columnToSumValue)) { + } elseif (null === $columnToSumValue || false === $columnToSumValue || '' === $columnToSumValue) { $newValue = $thisColumnValue; } else { $newValue = max($thisColumnValue, $columnToSumValue); } break; case 'min': - if (!is_numeric($thisColumnValue)) { + if (null === $thisColumnValue || false === $thisColumnValue || '' === $thisColumnValue) { $newValue = $columnToSumValue; - } elseif (!is_numeric($columnToSumValue)) { + } elseif (null === $columnToSumValue || false === $columnToSumValue || '' === $columnToSumValue) { $newValue = $thisColumnValue; } else { $newValue = min($thisColumnValue, $columnToSumValue); From 6e22bed52f7bb33ad406944712eb8be399c4a46b Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 2 Jul 2024 14:40:06 +0200 Subject: [PATCH 08/10] Updates expected test files --- ...ction_flat__API.getProcessedReport_day.xml | 4 +- ...tion_lastN__API.getProcessedReport_day.xml | 4 +- ...egory_flat__API.getProcessedReport_day.xml | 2 +- ...gory_lastN__API.getProcessedReport_day.xml | 10 +- ...tName_flat__API.getProcessedReport_day.xml | 2 +- ...Name_lastN__API.getProcessedReport_day.xml | 10 +- ...est_CustomEvents__Events.getAction_day.xml | 100 +++++++++--------- ...t_CustomEvents__Events.getAction_month.xml | 100 +++++++++--------- ...t_CustomEvents__Events.getCategory_day.xml | 60 +++++------ ...CustomEvents__Events.getCategory_month.xml | 60 +++++------ .../test_CustomEvents__Events.getName_day.xml | 84 +++++++-------- ...est_CustomEvents__Events.getName_month.xml | 84 +++++++-------- ...egoryOrNameMatch__Events.getAction_day.xml | 100 +++++++++--------- ...oryOrNameMatch__Events.getCategory_day.xml | 60 +++++------ ...ategoryOrNameMatch__Events.getName_day.xml | 84 +++++++-------- ..._eventValueMatch__Events.getAction_day.xml | 96 ++++++++--------- ...ventValueMatch__Events.getCategory_day.xml | 56 +++++----- ...ts_eventValueMatch__Events.getName_day.xml | 76 ++++++------- ...nIsEventAction__Events.getCategory_day.xml | 60 +++++------ ...sEventAction__Events.getCategory_month.xml | 60 +++++------ ...nsionIsEventAction__Events.getName_day.xml | 84 +++++++-------- ...ionIsEventAction__Events.getName_month.xml | 84 +++++++-------- ...nIsEventCategory__Events.getAction_day.xml | 96 ++++++++--------- ...sEventCategory__Events.getAction_month.xml | 96 ++++++++--------- ...ionIsEventCategory__Events.getName_day.xml | 36 +++---- ...nIsEventCategory__Events.getName_month.xml | 36 +++---- ...nsionIsEventName__Events.getAction_day.xml | 100 +++++++++--------- ...ionIsEventName__Events.getAction_month.xml | 100 +++++++++--------- ...ionIsEventName__Events.getCategory_day.xml | 20 ++-- ...nIsEventName__Events.getCategory_month.xml | 20 ++-- ...sEventActionPlay__Events.getAction_day.xml | 96 ++++++++--------- ...ventActionPlay__Events.getCategory_day.xml | 56 +++++----- ...hesEventActionPlay__Events.getName_day.xml | 76 ++++++------- ...est_ImportLogs__Events.getAction_month.xml | 12 +-- ...t_ImportLogs__Events.getCategory_month.xml | 12 +-- .../test_ImportLogs__Events.getName_month.xml | 16 +-- ...t_reportLimiting__Events.getAction_day.xml | 20 ++-- ...reportLimiting__Events.getAction_month.xml | 28 ++--- ...reportLimiting__Events.getCategory_day.xml | 20 ++-- ...portLimiting__Events.getCategory_month.xml | 28 ++--- ...est_reportLimiting__Events.getName_day.xml | 20 ++-- ...t_reportLimiting__Events.getName_month.xml | 28 ++--- ...miting_flattened__Events.getAction_day.xml | 12 +-- ...ting_flattened__Events.getCategory_day.xml | 12 +-- ...Limiting_flattened__Events.getName_day.xml | 12 +-- ...ing_rankingQuery__Events.getAction_day.xml | 20 ++-- ...g_rankingQuery__Events.getCategory_day.xml | 20 ++-- ...iting_rankingQuery__Events.getName_day.xml | 20 ++-- ...withNegOneLabel___Events.getAction_day.xml | 20 ++-- ...thNegOneLabel___Events.getCategory_day.xml | 20 ++-- ...ngwithNegOneLabel___Events.getName_day.xml | 20 ++-- ...Label__flattened__Events.getAction_day.xml | 12 +-- ...bel__flattened__Events.getCategory_day.xml | 12 +-- ...neLabel__flattened__Events.getName_day.xml | 12 +-- 54 files changed, 1194 insertions(+), 1194 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml index ee90cbfc340..4bdf1cce873 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml @@ -587,7 +587,7 @@ 69 14 137.96 - 18.66 - 42.66 + 0 + 23 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index 5b1cc603b99..31ffc3ae4e2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -427,7 +427,7 @@ 69 14 137.96 - 18.66 - 42.66 + 0 + 23 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml index 8aad84c32cb..4d5a0796c11 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml @@ -538,7 +538,7 @@ 69 14 137.96 - 9.66 + 28.32 52.32 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index 3207dc56caf..b027438a3dc 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -62,7 +62,7 @@ 28 2 19.32 - 0 + 9.66 9.66 9.66 @@ -71,7 +71,7 @@ 14 4 38 - 0 + 9 10 9.5 @@ -100,7 +100,7 @@ 14 1 9.66 - 0 + 9.66 9.66 9.66 @@ -109,7 +109,7 @@ 7 2 19 - 0 + 9 10 9.5 @@ -181,7 +181,7 @@ 69 14 137.96 - 9.66 + 28.32 52.32 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml index b09152ec912..a029da6f0f0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml @@ -617,6 +617,6 @@ 14 137.96 9.66 - 52.32 + 9.66 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index b434b1c9e0c..e864b79f430 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -62,7 +62,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 @@ -71,7 +71,7 @@ 14 4 38 - 0 + 9 10 9.5 @@ -127,7 +127,7 @@ 8 1 9.66 - 0 + 9.66 9.66 9.66 @@ -136,7 +136,7 @@ 7 2 19 - 0 + 9 10 9.5 @@ -278,6 +278,6 @@ 14 137.96 9.66 - 52.32 + 9.66 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml index e6a4ea541e4..d74e416f5a5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml @@ -7,8 +7,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==playTrailer @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -54,8 +54,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==Search @@ -66,8 +66,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -79,8 +79,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play25%25 @@ -91,8 +91,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -102,8 +102,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -115,8 +115,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play50%25 @@ -127,8 +127,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -138,8 +138,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -151,8 +151,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play75%25 @@ -163,8 +163,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -174,8 +174,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -187,8 +187,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==playEnd @@ -199,8 +199,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -210,8 +210,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -259,8 +259,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==clickBuyNow @@ -271,8 +271,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -309,8 +309,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==play @@ -321,8 +321,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -334,8 +334,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==playStart @@ -346,8 +346,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -359,8 +359,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==Purchase diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml index 4330b5be206..301dadb7406 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml @@ -6,8 +6,8 @@ 9 0 0 - 0 - 0 + + 9 0 eventAction==playTrailer @@ -18,8 +18,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -29,8 +29,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -53,8 +53,8 @@ 9 0 0 - 0 - 0 + + 6 0 eventAction==Search @@ -65,8 +65,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -78,8 +78,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play25%25 @@ -90,8 +90,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -101,8 +101,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -114,8 +114,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play50%25 @@ -126,8 +126,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -137,8 +137,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -150,8 +150,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play75%25 @@ -162,8 +162,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -173,8 +173,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -186,8 +186,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==playEnd @@ -198,8 +198,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -209,8 +209,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -258,8 +258,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==clickBuyNow @@ -270,8 +270,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -308,8 +308,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==play @@ -320,8 +320,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -333,8 +333,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==playStart @@ -345,8 +345,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -358,8 +358,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==Purchase diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml index d041b8b8f88..e18382ba520 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 0 + 9.66 9.66 9.66 eventCategory==Movie @@ -19,8 +19,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -96,8 +96,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -107,8 +107,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -131,7 +131,7 @@ 14 4 38 - 0 + 9 10 9.5 eventCategory==Music @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -176,8 +176,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -187,8 +187,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml index 676180c09b4..2d231192c03 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml @@ -6,7 +6,7 @@ 42 3 28.98 - 0 + 9.66 9.66 39 9.66 @@ -18,8 +18,8 @@ 9 0 0 - 0 - 0 + + 9 0 @@ -29,8 +29,8 @@ 9 0 0 - 0 - 0 + + 6 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -51,8 +51,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -62,8 +62,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -73,8 +73,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -84,8 +84,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -95,8 +95,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -106,8 +106,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -130,7 +130,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -142,8 +142,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -153,8 +153,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -164,8 +164,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -175,8 +175,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -186,8 +186,8 @@ 3 0 0 - 0 - 0 + + 3 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml index 4771d85dfe0..12104772780 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -109,7 +109,7 @@ 14 4 38 - 0 + 9 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -121,8 +121,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -200,8 +200,8 @@ 4 0 0 - 0 - 0 + + 0 @@ -211,8 +211,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -260,8 +260,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -272,8 +272,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -285,8 +285,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -297,8 +297,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -310,8 +310,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Search+query+here @@ -322,8 +322,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml index d4668aa656f..bdf1e98ff06 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml @@ -6,7 +6,7 @@ 24 3 28.98 - 0 + 9.66 9.66 24 9.66 @@ -18,8 +18,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -29,8 +29,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -51,8 +51,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -62,8 +62,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -73,8 +73,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -84,8 +84,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -108,7 +108,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -120,8 +120,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -131,8 +131,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -142,8 +142,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -153,8 +153,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -164,8 +164,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -199,8 +199,8 @@ 6 0 0 - 0 - 0 + + 3 0 @@ -210,8 +210,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -259,8 +259,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -271,8 +271,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -284,8 +284,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -296,8 +296,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -309,8 +309,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Search+query+here @@ -321,8 +321,8 @@ 3 0 0 - 0 - 0 + + 3 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml index e6a4ea541e4..d74e416f5a5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml @@ -7,8 +7,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==playTrailer @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -54,8 +54,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==Search @@ -66,8 +66,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -79,8 +79,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play25%25 @@ -91,8 +91,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -102,8 +102,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -115,8 +115,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play50%25 @@ -127,8 +127,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -138,8 +138,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -151,8 +151,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play75%25 @@ -163,8 +163,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -174,8 +174,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -187,8 +187,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==playEnd @@ -199,8 +199,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -210,8 +210,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -259,8 +259,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==clickBuyNow @@ -271,8 +271,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -309,8 +309,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==play @@ -321,8 +321,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -334,8 +334,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==playStart @@ -346,8 +346,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -359,8 +359,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==Purchase diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml index d041b8b8f88..e18382ba520 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 0 + 9.66 9.66 9.66 eventCategory==Movie @@ -19,8 +19,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -96,8 +96,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -107,8 +107,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -131,7 +131,7 @@ 14 4 38 - 0 + 9 10 9.5 eventCategory==Music @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -176,8 +176,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -187,8 +187,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml index 4771d85dfe0..12104772780 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -109,7 +109,7 @@ 14 4 38 - 0 + 9 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -121,8 +121,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -200,8 +200,8 @@ 4 0 0 - 0 - 0 + + 0 @@ -211,8 +211,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -260,8 +260,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -272,8 +272,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -285,8 +285,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -297,8 +297,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -310,8 +310,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Search+query+here @@ -322,8 +322,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getAction_day.xml index f30d0221994..04f7e66565e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getAction_day.xml @@ -7,8 +7,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==playTrailer @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -54,8 +54,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play25%25 @@ -66,8 +66,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -77,8 +77,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -90,8 +90,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play50%25 @@ -102,8 +102,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -113,8 +113,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -126,8 +126,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play75%25 @@ -138,8 +138,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -149,8 +149,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -162,8 +162,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==playEnd @@ -174,8 +174,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -185,8 +185,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -234,8 +234,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==clickBuyNow @@ -246,8 +246,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -284,8 +284,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==play @@ -296,8 +296,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -309,8 +309,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==playStart @@ -321,8 +321,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -334,8 +334,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==Search @@ -346,8 +346,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml index ed183f1c09d..eed47e95c80 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 22 2 19.32 - 0 + 9.66 9.66 9.66 eventCategory==Movie @@ -19,8 +19,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -107,8 +107,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -120,7 +120,7 @@ 14 4 38 - 0 + 9 10 9.5 eventCategory==Music @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -176,8 +176,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml index d2b7fbedf84..edf47ecc455 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -109,7 +109,7 @@ 14 4 38 - 0 + 9 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -121,8 +121,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -214,8 +214,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -226,8 +226,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -239,8 +239,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -251,8 +251,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -264,8 +264,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Search+query+here @@ -276,8 +276,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml index d041b8b8f88..e18382ba520 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 0 + 9.66 9.66 9.66 eventCategory==Movie @@ -19,8 +19,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -96,8 +96,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -107,8 +107,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -131,7 +131,7 @@ 14 4 38 - 0 + 9 10 9.5 eventCategory==Music @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -176,8 +176,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -187,8 +187,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml index 676180c09b4..2d231192c03 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml @@ -6,7 +6,7 @@ 42 3 28.98 - 0 + 9.66 9.66 39 9.66 @@ -18,8 +18,8 @@ 9 0 0 - 0 - 0 + + 9 0 @@ -29,8 +29,8 @@ 9 0 0 - 0 - 0 + + 6 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -51,8 +51,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -62,8 +62,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -73,8 +73,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -84,8 +84,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -95,8 +95,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -106,8 +106,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -130,7 +130,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -142,8 +142,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -153,8 +153,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -164,8 +164,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -175,8 +175,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -186,8 +186,8 @@ 3 0 0 - 0 - 0 + + 3 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml index 4771d85dfe0..12104772780 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -109,7 +109,7 @@ 14 4 38 - 0 + 9 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -121,8 +121,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -200,8 +200,8 @@ 4 0 0 - 0 - 0 + + 0 @@ -211,8 +211,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -260,8 +260,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -272,8 +272,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -285,8 +285,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -297,8 +297,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -310,8 +310,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Search+query+here @@ -322,8 +322,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml index d4668aa656f..bdf1e98ff06 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml @@ -6,7 +6,7 @@ 24 3 28.98 - 0 + 9.66 9.66 24 9.66 @@ -18,8 +18,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -29,8 +29,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -51,8 +51,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -62,8 +62,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -73,8 +73,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -84,8 +84,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -108,7 +108,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -120,8 +120,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -131,8 +131,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -142,8 +142,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -153,8 +153,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -164,8 +164,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -199,8 +199,8 @@ 6 0 0 - 0 - 0 + + 3 0 @@ -210,8 +210,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -259,8 +259,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -271,8 +271,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -284,8 +284,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -296,8 +296,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -309,8 +309,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Search+query+here @@ -321,8 +321,8 @@ 3 0 0 - 0 - 0 + + 3 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml index e43a3d0b990..ed827916f93 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml @@ -7,8 +7,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==playTrailer @@ -19,8 +19,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==Search @@ -44,8 +44,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play25%25 @@ -69,8 +69,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -80,8 +80,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -93,8 +93,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play50%25 @@ -105,8 +105,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -116,8 +116,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -129,8 +129,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play75%25 @@ -141,8 +141,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -152,8 +152,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==playEnd @@ -177,8 +177,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -188,8 +188,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -237,8 +237,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==clickBuyNow @@ -249,8 +249,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -287,8 +287,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==play @@ -299,8 +299,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -312,8 +312,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==playStart @@ -324,8 +324,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -337,8 +337,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==Purchase @@ -349,8 +349,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml index 5c38d6b82c0..7d9aececf39 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml @@ -6,8 +6,8 @@ 9 0 0 - 0 - 0 + + 9 0 eventAction==playTrailer @@ -18,8 +18,8 @@ 9 0 0 - 0 - 0 + + 9 0 @@ -31,8 +31,8 @@ 9 0 0 - 0 - 0 + + 6 0 eventAction==Search @@ -43,8 +43,8 @@ 9 0 0 - 0 - 0 + + 6 0 @@ -56,8 +56,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play25%25 @@ -68,8 +68,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -79,8 +79,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -92,8 +92,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play50%25 @@ -104,8 +104,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -115,8 +115,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -128,8 +128,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play75%25 @@ -140,8 +140,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -151,8 +151,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -164,8 +164,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==playEnd @@ -176,8 +176,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -187,8 +187,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -236,8 +236,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==clickBuyNow @@ -248,8 +248,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -286,8 +286,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==play @@ -298,8 +298,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -311,8 +311,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==playStart @@ -323,8 +323,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -336,8 +336,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==Purchase @@ -348,8 +348,8 @@ 3 0 0 - 0 - 0 + + 3 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml index e96aadbdbf3..e0d97a9980a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,7 +19,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 @@ -32,7 +32,7 @@ 14 4 38 - 0 + 9 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -44,7 +44,7 @@ 14 4 38 - 0 + 9 10 9.5 @@ -68,8 +68,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -117,8 +117,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -129,8 +129,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -142,8 +142,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -167,8 +167,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Search+query+here @@ -179,8 +179,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml index 3edcf190b8d..e35c861915d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml @@ -6,7 +6,7 @@ 24 3 28.98 - 0 + 9.66 9.66 24 9.66 @@ -18,7 +18,7 @@ 24 3 28.98 - 0 + 9.66 9.66 24 9.66 @@ -31,7 +31,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -43,7 +43,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -67,8 +67,8 @@ 9 0 0 - 0 - 0 + + 6 0 @@ -116,8 +116,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -128,8 +128,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -141,8 +141,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -153,8 +153,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -166,8 +166,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventName==Search+query+here @@ -178,8 +178,8 @@ 3 0 0 - 0 - 0 + + 3 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml index e6a4ea541e4..d74e416f5a5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml @@ -7,8 +7,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==playTrailer @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -54,8 +54,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==Search @@ -66,8 +66,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -79,8 +79,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play25%25 @@ -91,8 +91,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -102,8 +102,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -115,8 +115,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play50%25 @@ -127,8 +127,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -138,8 +138,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -151,8 +151,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play75%25 @@ -163,8 +163,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -174,8 +174,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -187,8 +187,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==playEnd @@ -199,8 +199,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -210,8 +210,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -259,8 +259,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==clickBuyNow @@ -271,8 +271,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -309,8 +309,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==play @@ -321,8 +321,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -334,8 +334,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==playStart @@ -346,8 +346,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -359,8 +359,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==Purchase diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml index 4330b5be206..301dadb7406 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml @@ -6,8 +6,8 @@ 9 0 0 - 0 - 0 + + 9 0 eventAction==playTrailer @@ -18,8 +18,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -29,8 +29,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -53,8 +53,8 @@ 9 0 0 - 0 - 0 + + 6 0 eventAction==Search @@ -65,8 +65,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -78,8 +78,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play25%25 @@ -90,8 +90,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -101,8 +101,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -114,8 +114,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play50%25 @@ -126,8 +126,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -137,8 +137,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -150,8 +150,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==play75%25 @@ -162,8 +162,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -173,8 +173,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -186,8 +186,8 @@ 6 0 0 - 0 - 0 + + 6 0 eventAction==playEnd @@ -198,8 +198,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -209,8 +209,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -258,8 +258,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==clickBuyNow @@ -270,8 +270,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -308,8 +308,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==play @@ -320,8 +320,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -333,8 +333,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==playStart @@ -345,8 +345,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -358,8 +358,8 @@ 3 0 0 - 0 - 0 + + 3 0 eventAction==Purchase diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml index aac93550e82..9a17e65f99f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 28 2 19.32 - 0 + 9.66 9.66 9.66 eventCategory==Movie @@ -19,7 +19,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -65,7 +65,7 @@ 14 4 38 - 0 + 9 10 9.5 eventCategory==Music @@ -77,7 +77,7 @@ 14 4 38 - 0 + 9 10 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml index b5a25b61417..f8400f8530b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml @@ -6,7 +6,7 @@ 42 3 28.98 - 0 + 9.66 9.66 39 9.66 @@ -18,7 +18,7 @@ 24 3 28.98 - 0 + 9.66 9.66 24 9.66 @@ -29,8 +29,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -40,8 +40,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -51,8 +51,8 @@ 3 0 0 - 0 - 0 + + 3 0 @@ -64,7 +64,7 @@ 21 6 57 - 0 + 9 10 18 9.5 @@ -76,7 +76,7 @@ 21 6 57 - 0 + 9 10 18 9.5 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml index f30d0221994..04f7e66565e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml @@ -7,8 +7,8 @@ 6 0 0 - 0 - 0 + + 0 eventAction==playTrailer @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -54,8 +54,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play25%25 @@ -66,8 +66,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -77,8 +77,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -90,8 +90,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play50%25 @@ -102,8 +102,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -113,8 +113,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -126,8 +126,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==play75%25 @@ -138,8 +138,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -149,8 +149,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -162,8 +162,8 @@ 4 0 0 - 0 - 0 + + 0 eventAction==playEnd @@ -174,8 +174,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -185,8 +185,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -234,8 +234,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==clickBuyNow @@ -246,8 +246,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -284,8 +284,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==play @@ -296,8 +296,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -309,8 +309,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==playStart @@ -321,8 +321,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -334,8 +334,8 @@ 2 0 0 - 0 - 0 + + 0 eventAction==Search @@ -346,8 +346,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml index ed183f1c09d..eed47e95c80 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml @@ -7,7 +7,7 @@ 22 2 19.32 - 0 + 9.66 9.66 9.66 eventCategory==Movie @@ -19,8 +19,8 @@ 6 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -107,8 +107,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -120,7 +120,7 @@ 14 4 38 - 0 + 9 10 9.5 eventCategory==Music @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -176,8 +176,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml index d2b7fbedf84..edf47ecc455 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml @@ -7,7 +7,7 @@ 16 2 19.32 - 0 + 9.66 9.66 9.66 eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -19,8 +19,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -30,8 +30,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -41,8 +41,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -52,8 +52,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -63,8 +63,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -74,8 +74,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -85,8 +85,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -109,7 +109,7 @@ 14 4 38 - 0 + 9 10 9.5 eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau @@ -121,8 +121,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -132,8 +132,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -143,8 +143,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -154,8 +154,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -165,8 +165,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -214,8 +214,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29 @@ -226,8 +226,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -239,8 +239,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29 @@ -251,8 +251,8 @@ 2 0 0 - 0 - 0 + + 0 @@ -264,8 +264,8 @@ 2 0 0 - 0 - 0 + + 0 eventName==Search+query+here @@ -276,8 +276,8 @@ 2 0 0 - 0 - 0 + + 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml index bac3a36cd13..153861cf605 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml @@ -6,8 +6,8 @@ 1 0 0 - 0 - 0 + + 1 0 eventAction==connect @@ -18,8 +18,8 @@ 1 0 0 - 0 - 0 + + 1 0 eventAction==play @@ -30,8 +30,8 @@ 1 0 0 - 0 - 0 + + 1 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml index 43f62b91e76..6f55439cb14 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml @@ -6,8 +6,8 @@ 2 0 0 - 0 - 0 + + 2 0 eventCategory==cloudfront_rtmp @@ -18,8 +18,8 @@ 1 0 0 - 0 - 0 + + 1 0 @@ -29,8 +29,8 @@ 1 0 0 - 0 - 0 + + 1 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml index 699a749faa8..18cce94b2b5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml @@ -6,8 +6,8 @@ 1 0 0 - 0 - 0 + + 1 0 @@ -17,8 +17,8 @@ 1 0 0 - 0 - 0 + + 1 0 @@ -30,8 +30,8 @@ 1 0 0 - 0 - 0 + + 1 0 eventName==myvideo @@ -42,8 +42,8 @@ 1 0 0 - 0 - 0 + + 1 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml index 1a438e6fb4d..2e7988119b7 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml @@ -7,8 +7,8 @@ 5 0 0 - 0 - 0 + + 0 eventAction==event+action+1 @@ -19,8 +19,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 5 0 0 - 0 - 0 + + 0 eventAction==event+action+2 @@ -44,8 +44,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 15 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_month.xml index 8288e5d583e..9f8ec4c5e9c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_month.xml @@ -6,8 +6,8 @@ 15 0 0 - 0 - 0 + + 3 0 eventAction==event+action+1 @@ -18,8 +18,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -29,8 +29,8 @@ 10 0 0 - 0 - 0 + + 2 0 @@ -42,8 +42,8 @@ 10 0 0 - 0 - 0 + + 2 0 eventAction==event+action+0 @@ -54,8 +54,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -65,8 +65,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -78,8 +78,8 @@ 50 0 0 - 0 - 0 + + 10 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml index ae898310603..cd4822f6156 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml @@ -7,8 +7,8 @@ 5 0 0 - 0 - 0 + + 0 eventCategory==event+category+0 @@ -19,8 +19,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 5 0 0 - 0 - 0 + + 0 eventCategory==event+category+1 @@ -44,8 +44,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 15 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_month.xml index 2e53af689c6..0527d05ca62 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_month.xml @@ -6,8 +6,8 @@ 15 0 0 - 0 - 0 + + 3 0 eventCategory==event+category+1 @@ -18,8 +18,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -29,8 +29,8 @@ 10 0 0 - 0 - 0 + + 2 0 @@ -42,8 +42,8 @@ 10 0 0 - 0 - 0 + + 2 0 eventCategory==event+category+0 @@ -54,8 +54,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -65,8 +65,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -78,8 +78,8 @@ 50 0 0 - 0 - 0 + + 10 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml index 49697c0c16a..2e9f6b6bcf0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml @@ -7,8 +7,8 @@ 5 0 0 - 0 - 0 + + 0 eventName==event+name0 @@ -19,8 +19,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 5 0 0 - 0 - 0 + + 0 eventName==event+name1 @@ -44,8 +44,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 15 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_month.xml index 7e70afe2a6c..c0f7d979937 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_month.xml @@ -6,8 +6,8 @@ 15 0 0 - 0 - 0 + + 3 0 eventName==event+name0 @@ -18,8 +18,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -29,8 +29,8 @@ 10 0 0 - 0 - 0 + + 2 0 @@ -42,8 +42,8 @@ 15 0 0 - 0 - 0 + + 3 0 eventName==event+name1 @@ -54,8 +54,8 @@ 5 0 0 - 0 - 0 + + 1 0 @@ -65,8 +65,8 @@ 10 0 0 - 0 - 0 + + 2 0 @@ -78,8 +78,8 @@ 45 0 0 - 0 - 0 + + 9 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml index aeceaa829e8..14bc9366099 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml @@ -7,8 +7,8 @@ 15 0 0 - 0 - 0 + + 0 1 Others @@ -20,8 +20,8 @@ 5 0 0 - 0 - 0 + + 0 event action 1 event name0 @@ -33,8 +33,8 @@ 5 0 0 - 0 - 0 + + 0 event action 2 event name1 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml index 392afa1a4e3..e3279b2e651 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml @@ -7,8 +7,8 @@ 15 0 0 - 0 - 0 + + 0 1 Others @@ -20,8 +20,8 @@ 5 0 0 - 0 - 0 + + 0 event category 0 event action 4 @@ -33,8 +33,8 @@ 5 0 0 - 0 - 0 + + 0 event category 1 event action 5 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml index fe92fd5fdc4..c581277d6b9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml @@ -7,8 +7,8 @@ 15 0 0 - 0 - 0 + + 0 1 Others @@ -20,8 +20,8 @@ 5 0 0 - 0 - 0 + + 0 event name0 event action 1 @@ -33,8 +33,8 @@ 5 0 0 - 0 - 0 + + 0 event name1 event action 2 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml index 1a438e6fb4d..2e7988119b7 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml @@ -7,8 +7,8 @@ 5 0 0 - 0 - 0 + + 0 eventAction==event+action+1 @@ -19,8 +19,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 5 0 0 - 0 - 0 + + 0 eventAction==event+action+2 @@ -44,8 +44,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 15 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml index 8b55e04661d..4353aa725b0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml @@ -7,8 +7,8 @@ 5 0 0 - 0 - 0 + + 0 eventCategory==event+category+0 @@ -19,8 +19,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 5 0 0 - 0 - 0 + + 0 eventCategory==event+category+3 @@ -44,8 +44,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 15 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml index 49697c0c16a..2e9f6b6bcf0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml @@ -7,8 +7,8 @@ 5 0 0 - 0 - 0 + + 0 eventName==event+name0 @@ -19,8 +19,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 5 0 0 - 0 - 0 + + 0 eventName==event+name1 @@ -44,8 +44,8 @@ 5 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 15 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getAction_day.xml index cd2e176bea4..48ced301290 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getAction_day.xml @@ -7,8 +7,8 @@ 1 0 0 - 0 - 0 + + 0 eventAction==-1 @@ -19,8 +19,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 1 0 0 - 0 - 0 + + 0 eventAction==event+action+0 @@ -44,8 +44,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 19 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getCategory_day.xml index 135998e73f0..46a1146fc0e 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getCategory_day.xml @@ -7,8 +7,8 @@ 1 0 0 - 0 - 0 + + 0 eventCategory==-1 @@ -19,8 +19,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 1 0 0 - 0 - 0 + + 0 eventCategory==event+category+0 @@ -44,8 +44,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 19 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getName_day.xml index 9f4a5318dc6..31d2d849ad4 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel___Events.getName_day.xml @@ -7,8 +7,8 @@ 1 0 0 - 0 - 0 + + 0 eventName==-1 @@ -19,8 +19,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 1 0 0 - 0 - 0 + + 0 eventName==event+name+0 @@ -44,8 +44,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 19 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getAction_day.xml index 07a0d6c5155..ddf55214652 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getAction_day.xml @@ -7,8 +7,8 @@ 19 0 0 - 0 - 0 + + 0 1 Others @@ -20,8 +20,8 @@ 1 0 0 - 0 - 0 + + 0 -1 -1 @@ -33,8 +33,8 @@ 1 0 0 - 0 - 0 + + 0 event action 0 event name 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getCategory_day.xml index 3a6b3be7f1c..8f2b51fd5ee 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getCategory_day.xml @@ -7,8 +7,8 @@ 19 0 0 - 0 - 0 + + 0 1 Others @@ -20,8 +20,8 @@ 1 0 0 - 0 - 0 + + 0 -1 -1 @@ -33,8 +33,8 @@ 1 0 0 - 0 - 0 + + 0 event category 0 event action 0 diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getName_day.xml index c61d47a9d67..9f85d8411bc 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__flattened__Events.getName_day.xml @@ -7,8 +7,8 @@ 19 0 0 - 0 - 0 + + 0 1 Others @@ -20,8 +20,8 @@ 1 0 0 - 0 - 0 + + 0 -1 -1 @@ -33,8 +33,8 @@ 1 0 0 - 0 - 0 + + 0 event name 0 event action 0 From 05580b497a03e5381ee79fd88766c0ecf0dc7b07 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 2 Jul 2024 18:50:42 +0200 Subject: [PATCH 09/10] Ensure correct aggregation of min/max event value metrics --- plugins/Events/API.php | 9 +++++++++ .../Events/RecordBuilders/EventReports.php | 3 ++- ...egory_flat__API.getProcessedReport_day.xml | 4 ++-- ...gory_lastN__API.getProcessedReport_day.xml | 4 ++-- ...tName_flat__API.getProcessedReport_day.xml | 4 ++-- ...Name_lastN__API.getProcessedReport_day.xml | 4 ++-- ...el__rankingQuery__Events.getAction_day.xml | 20 +++++++++---------- ...__rankingQuery__Events.getCategory_day.xml | 20 +++++++++---------- ...abel__rankingQuery__Events.getName_day.xml | 20 +++++++++---------- 9 files changed, 49 insertions(+), 39 deletions(-) diff --git a/plugins/Events/API.php b/plugins/Events/API.php index 0b3213fd106..92df1cfb0f4 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -10,6 +10,8 @@ namespace Piwik\Plugins\Events; use Piwik\Archive; +use Piwik\DataTable; +use Piwik\Metrics; use Piwik\Piwik; /** @@ -154,6 +156,13 @@ protected function getDataTable($name, $idSite, $period, $date, $segment, $expan $dataTable = Archive::createDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable); + $dataTable->filter(function ($dataTable) { + $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, [ + Metrics::INDEX_EVENT_MIN_EVENT_VALUE => 'min', + Metrics::INDEX_EVENT_MAX_EVENT_VALUE => 'max', + ]); + }); + if ($flat) { $dataTable->filterSubtables('Piwik\Plugins\Events\DataTable\Filter\ReplaceEventNameNotSet'); } else { diff --git a/plugins/Events/RecordBuilders/EventReports.php b/plugins/Events/RecordBuilders/EventReports.php index 72a0b9cd2f6..2a07364cf41 100644 --- a/plugins/Events/RecordBuilders/EventReports.php +++ b/plugins/Events/RecordBuilders/EventReports.php @@ -51,7 +51,8 @@ public function getRecordMetadata(ArchiveProcessor $archiveProcessor): array foreach ($records as $record) { $record->setMaxRowsInTable($maximumRowsInDataTable) - ->setMaxRowsInSubtable($maximumRowsInSubDataTable); + ->setMaxRowsInSubtable($maximumRowsInSubDataTable) + ->setBlobColumnAggregationOps($this->columnAggregationOps); } return $records; diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml index 4d5a0796c11..515337a43d4 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml @@ -538,7 +538,7 @@ 69 14 137.96 - 28.32 - 52.32 + 0 + 23 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index b027438a3dc..6433ad093bc 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -181,7 +181,7 @@ 69 14 137.96 - 28.32 - 52.32 + 0 + 23 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml index a029da6f0f0..23f70b8e3cc 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml @@ -616,7 +616,7 @@ 69 14 137.96 - 9.66 - 9.66 + 0 + 23 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index e864b79f430..660304f6a50 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -277,7 +277,7 @@ 69 14 137.96 - 9.66 - 9.66 + 0 + 23 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getAction_day.xml index 77f8fc302fa..7d74074f369 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getAction_day.xml @@ -7,8 +7,8 @@ 1 0 0 - 0 - 0 + + 0 eventAction==-1 @@ -19,8 +19,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 1 0 0 - 0 - 0 + + 0 eventAction==event+action+0 @@ -44,8 +44,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 19 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getCategory_day.xml index 980dbf02679..3da6ff1077f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getCategory_day.xml @@ -7,8 +7,8 @@ 1 0 0 - 0 - 0 + + 0 eventCategory==-1 @@ -19,8 +19,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 1 0 0 - 0 - 0 + + 0 eventCategory==event+category+0 @@ -44,8 +44,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 19 0 0 - 0 - 0 + + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getName_day.xml index 8e12635faae..1ae683001b3 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingwithNegOneLabel__rankingQuery__Events.getName_day.xml @@ -7,8 +7,8 @@ 1 0 0 - 0 - 0 + + 0 eventName==-1 @@ -19,8 +19,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -32,8 +32,8 @@ 1 0 0 - 0 - 0 + + 0 eventName==event+name+0 @@ -44,8 +44,8 @@ 1 0 0 - 0 - 0 + + 0 @@ -57,8 +57,8 @@ 19 0 0 - 0 - 0 + + 0 \ No newline at end of file From 3eb91566ff2c73ad6a7884bb38656d330b09d2c7 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 2 Jul 2024 23:19:36 +0200 Subject: [PATCH 10/10] apply review feedback --- core/DataTable/Row.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index fe87954a755..136b593327a 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -521,18 +521,18 @@ private function getColumnValuesMerged($operation, $thisColumnValue, $columnToSu $newValue = null; break; case 'max': - if (null === $thisColumnValue || false === $thisColumnValue || '' === $thisColumnValue) { + if ($this->isValueConsideredEmpty($thisColumnValue)) { $newValue = $columnToSumValue; - } elseif (null === $columnToSumValue || false === $columnToSumValue || '' === $columnToSumValue) { + } elseif ($this->isValueConsideredEmpty($columnToSumValue)) { $newValue = $thisColumnValue; } else { $newValue = max($thisColumnValue, $columnToSumValue); } break; case 'min': - if (null === $thisColumnValue || false === $thisColumnValue || '' === $thisColumnValue) { + if ($this->isValueConsideredEmpty($thisColumnValue)) { $newValue = $columnToSumValue; - } elseif (null === $columnToSumValue || false === $columnToSumValue || '' === $columnToSumValue) { + } elseif ($this->isValueConsideredEmpty($columnToSumValue)) { $newValue = $thisColumnValue; } else { $newValue = min($thisColumnValue, $columnToSumValue); @@ -564,6 +564,11 @@ private function getColumnValuesMerged($operation, $thisColumnValue, $columnToSu return $newValue; } + private function isValueConsideredEmpty($value): bool + { + return in_array($value, [null, false, ''], true); + } + /** * Sums the metadata in `$rowToSum` with the metadata in `$this` row. *