diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-01-29 06:48:23 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-02-13 08:23:10 +0300 |
| commit | 8ef47c8e4a3fb0094b4b0c19df8ed18c58cf7a6f (patch) | |
| tree | 162315afc7f5a5bc0c8840eff30251a76b665b6f | |
| parent | ec8dc0f150d71b752188dac3d01d29950ae6f869 (diff) | |
refs #4633 open segmented visitor log with one click on a row
272 files changed, 2244 insertions, 299 deletions
diff --git a/core/API/DataTablePostProcessor.php b/core/API/DataTablePostProcessor.php index 352771464e..96bae3b409 100644 --- a/core/API/DataTablePostProcessor.php +++ b/core/API/DataTablePostProcessor.php @@ -100,6 +100,15 @@ class DataTablePostProcessor $dataTable = $this->applyLabelFilter($dataTable); $dataTable = $this->applyMetricsFormatting($dataTable); + $dataTable = $this->convertSegmentValueToSegmentFilter($dataTable); + + return $dataTable; + } + + public function convertSegmentValueToSegmentFilter(DataTableInterface $dataTable) + { + $dataTable->filter('AddSegmentFilterBySegmentValue', array($this->report)); + $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue')); return $dataTable; } @@ -118,6 +127,8 @@ class DataTablePostProcessor $pivotByColumn = Common::getRequestVar('pivotByColumn', false, 'string', $this->request); $pivotByColumnLimit = Common::getRequestVar('pivotByColumnLimit', false, 'int', $this->request); + $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue')); + $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentFilter')); $dataTable->filter('PivotByDimension', array($reportId, $pivotBy, $pivotByColumn, $pivotByColumnLimit, PivotByDimension::isSegmentFetchingEnabledInConfig())); } diff --git a/core/DataTable/Filter/AddSegmentFilter.php b/core/DataTable/Filter/AddSegmentFilter.php new file mode 100644 index 0000000000..05b5d8e884 --- /dev/null +++ b/core/DataTable/Filter/AddSegmentFilter.php @@ -0,0 +1,114 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable; +use Piwik\DataTable\BaseFilter; +use Piwik\Development; + +/** + * Executes a filter for each row of a {@link DataTable} and generates a segment filter for each row. + * + * **Basic usage example** + * + * $dataTable->filter('AddSegmentFilter', array('segmentName')); + * $dataTable->filter('AddSegmentFilter', array(array('segmentName1', 'segment2'), ';'); + * + * @api + */ +class AddSegmentFilter extends BaseFilter +{ + private $segments; + private $delimiter; + + /** + * Generates a segment filter based on the label column and the given segment names + * + * @param DataTable $table + * @param string|array $segmentOrSegments Either one segment or an array of segments. + * If more than one segment is given a delimter has to be defined. + * @param string $delimiter The delimiter by which the label should be splitted. + */ + public function __construct($table, $segmentOrSegments, $delimiter = '') + { + parent::__construct($table); + + if (!is_array($segmentOrSegments)) { + $segmentOrSegments = array($segmentOrSegments); + } + + $this->segments = $segmentOrSegments; + $this->delimiter = $delimiter; + } + + /** + * See {@link AddSegmentFilter}. + * + * @param DataTable $table + */ + public function filter($table) + { + $delimiter = $this->delimiter; + $segments = $this->segments; + + if (empty($segments)) { + $msg = 'AddSegmentFilter is called without having any segments defined'; + Development::error($msg); + return; + } + + if (count($segments) === 1) { + $table->filter(function (DataTable $dataTable) use ($segments) { + $segment = array_shift($segments); + + foreach ($dataTable->getRows() as $key => $row) { + if ($key == DataTable::ID_SUMMARY_ROW) { + continue; + } + + $label = $row->getColumn('label'); + + if (!empty($label)) { + $row->setMetadata('segmentFilter', $segment . '==' . urlencode($label)); + } + } + }); + } else if (!empty($delimiter)) { + $table->filter(function (DataTable $dataTable) use ($segments, $delimiter) { + $numSegments = count($segments); + $conditionAnd = ';'; + + foreach ($dataTable->getRows() as $key => $row) { + if ($key == DataTable::ID_SUMMARY_ROW) { + continue; + } + + $label = $row->getColumn('label'); + if (!empty($label)) { + $parts = explode($delimiter, $label); + + if (count($parts) === $numSegments) { + $filter = array(); + foreach ($segments as $index => $segment) { + if (!empty($segment)) { + $filter[] = $segment . '==' . urlencode($parts[$index]); + } + } + $row->setMetadata('segmentFilter', implode($conditionAnd, $filter)); + } + } + } + }); + } else { + $names = implode(', ', $segments); + $msg = 'Multiple segments are given but no delimiter defined. Segments: ' . $names; + Development::error($msg); + } + } +} diff --git a/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php b/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php new file mode 100644 index 0000000000..41f3e18cf1 --- /dev/null +++ b/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php @@ -0,0 +1,68 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable; +use Piwik\DataTable\BaseFilter; + +/** + * Executes a filter for each row of a {@link DataTable} and generates a segment filter for each row. + * It will map the label column to a segmentValue by searching for the label in the index of the given + * mapping array. + * + * **Basic usage example** + * + * $dataTable->filter('AddSegmentFilterByLabelMapping', array('segmentName', array('1' => 'smartphone, '2' => 'desktop'))); + * + * @api + */ +class AddSegmentFilterByLabelMapping extends BaseFilter +{ + private $segment; + private $mapping; + + /** + * @param DataTable $table + * @param string $segment + * @param array $mapping + */ + public function __construct($table, $segment, $mapping) + { + parent::__construct($table); + + $this->segment = $segment; + $this->mapping = $mapping; + } + + /** + * See {@link AddSegmentFilterByLabelMapping}. + * + * @param DataTable $table + */ + public function filter($table) + { + $mapping = $this->mapping; + $segment = $this->segment; + + if (empty($segment) || empty($mapping)) { + return; + } + + $table->filter(function (DataTable $dataTable) use ($segment, $mapping) { + foreach ($dataTable->getRows() as $row) { + $label = $row->getColumn('label'); + + if (!empty($mapping[$label])) { + $label = $mapping[$label]; + $row->setMetadata('segmentFilter', $segment . '==' . urlencode($label)); + } + } + }); + } +} diff --git a/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php b/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php new file mode 100644 index 0000000000..cc27404792 --- /dev/null +++ b/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php @@ -0,0 +1,78 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable\BaseFilter; +use Piwik\DataTable; + +/** + * Converts for each row of a {@link DataTable} a segmentValue to a segmentFilter. The name of the segment + * is automatically detected based on the given report. + * + * **Basic usage example** + * + * $dataTable->filter('AddSegmentFilterBySegmentValue', array($reportInstance)); + * + * @api + */ +class AddSegmentFilterBySegmentValue extends BaseFilter +{ + /** + * @var \Piwik\Plugin\Report + */ + private $report; + + /** + * @param DataTable $table + * @param $report + */ + public function __construct($table, $report) + { + parent::__construct($table); + $this->report = $report; + } + + /** + * See {@link AddSegmentFilterBySegmentValue}. + * + * @param DataTable $table + * @return int The number of deleted rows. + */ + public function filter($table) + { + if (empty($this->report) || empty($table) || !$table->getRowsCount()) { + return; + } + + $dimension = $this->report->getDimension(); + + if (empty($dimension)) { + return; + } + + $segments = $dimension->getSegments(); + + if (empty($segments)) { + return; + } + + /** @var \Piwik\Plugin\Segment $segment */ + $segment = array_shift($segments); + $segmentName = $segment->getSegment(); + + foreach ($table->getRows() as $row) { + $value = $row->getMetadata('segmentValue'); + $filter = $row->getMetadata('segmentFilter'); + + if ($value !== false && $filter === false) { + $row->setMetadata('segmentFilter', sprintf('%s==%s', $segmentName, urlencode($value))); + } + } + } +} diff --git a/core/DataTable/Filter/AddSegmentValue.php b/core/DataTable/Filter/AddSegmentValue.php new file mode 100644 index 0000000000..857bf02ce3 --- /dev/null +++ b/core/DataTable/Filter/AddSegmentValue.php @@ -0,0 +1,33 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable; + +/** + * Executes a filter for each row of a {@link DataTable} and generates a segment filter for each row. + * + * **Basic usage example** + * + * $dataTable->filter('AddSegmentValue', array()); + * $dataTable->filter('AddSegmentValue', array(function ($label) { + * $transformedValue = urldecode($transformedValue); + * return $transformedValue; + * }); + * + * @api + */ +class AddSegmentValue extends ColumnCallbackAddMetadata +{ + public function __construct($table, $callback = null) + { + parent::__construct($table, 'label', 'segmentValue', $callback, null, false); + } + +} diff --git a/core/DataTable/Filter/ColumnCallbackDeleteMetadata.php b/core/DataTable/Filter/ColumnCallbackDeleteMetadata.php new file mode 100644 index 0000000000..dc37f96016 --- /dev/null +++ b/core/DataTable/Filter/ColumnCallbackDeleteMetadata.php @@ -0,0 +1,51 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable; +use Piwik\DataTable\BaseFilter; + +/** + * Executes a callback for each row of a {@link DataTable} and removes the defined metadata column from each row. + * + * **Basic usage example** + * + * $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue')); + * + * @api + */ +class ColumnCallbackDeleteMetadata extends BaseFilter +{ + private $metadataToRemove; + + /** + * Constructor. + * + * @param DataTable $table The DataTable instance that will be filtered. + * @param string $metadataToRemove The name of the metadata field that will be removed from each row. + */ + public function __construct($table, $metadataToRemove) + { + parent::__construct($table); + + $this->metadataToRemove = $metadataToRemove; + } + + /** + * See {@link ColumnCallbackDeleteMetadata}. + * + * @param DataTable $table + */ + public function filter($table) + { + foreach ($table->getRows() as $row) { + $row->deleteMetadata($this->metadataToRemove); + } + } +} diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php index 3e167b5593..4d78831e88 100644 --- a/core/DataTable/Filter/ColumnCallbackReplace.php +++ b/core/DataTable/Filter/ColumnCallbackReplace.php @@ -81,6 +81,7 @@ class ColumnCallbackReplace extends BaseFilter } foreach ($this->columnsToFilter as $column) { + // when a value is not defined, we set it to zero by default (rather than displaying '-') $value = $this->getElementToReplace($row, $column); if ($value === false) { diff --git a/core/DataTable/Filter/PrependSegmentFilter.php b/core/DataTable/Filter/PrependSegmentFilter.php new file mode 100644 index 0000000000..36f1772ff4 --- /dev/null +++ b/core/DataTable/Filter/PrependSegmentFilter.php @@ -0,0 +1,34 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable; + +/** + * Executes a callback for each row of a {@link DataTable} and prepends each existing segmentFilter with the + * given segment. + * + * **Basic usage example** + * + * $dataTable->filter('PrependSegmentFilter', array('segmentName==segmentValue;')); + * + * @api + */ +class PrependSegmentFilter extends PrependValueToMetadata +{ + /** + * @param DataTable $table + * @param string $prependSegmentFilter The segment to prepend if a segmentFilter is defined. Make sure to include + * A condition, eg the segment should end with ';' or ',' + */ + public function __construct($table, $prependSegmentFilter = '') + { + parent::__construct($table, 'segmentFilter', $prependSegmentFilter); + } +} diff --git a/core/DataTable/Filter/PrependValueToMetadata.php b/core/DataTable/Filter/PrependValueToMetadata.php new file mode 100644 index 0000000000..564372daba --- /dev/null +++ b/core/DataTable/Filter/PrependValueToMetadata.php @@ -0,0 +1,65 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\DataTable\Filter; + +use Piwik\DataTable; +use Piwik\DataTable\BaseFilter; + +/** + * Executes a callback for each row of a {@link DataTable} and prepends the given value to each metadata entry + * but only if the given metadata entry exists. + * + * **Basic usage example** + * + * $dataTable->filter('PrependValueToMetadata', array('segmentFilter', 'segmentName==segmentValue')); + * + * @api + */ +class PrependValueToMetadata extends BaseFilter +{ + private $metadataColumn; + private $valueToPrepend; + + /** + * @param DataTable $table + * @param string $metadataName The name of the metadata that should be prepended + * @param string $valueToPrepend The value to prepend if the metadata entry exists + */ + public function __construct($table, $metadataName, $valueToPrepend) + { + parent::__construct($table); + + $this->metadataColumn = $metadataName; + $this->valueToPrepend = $valueToPrepend; + } + + /** + * See {@link PrependValueToMetadata}. + * + * @param DataTable $table + */ + public function filter($table) + { + if (empty($this->metadataColumn) || empty($this->valueToPrepend)) { + return; + } + + $metadataColumn = $this->metadataColumn; + $valueToPrepend = $this->valueToPrepend; + + $table->filter(function (DataTable $dataTable) use ($metadataColumn, $valueToPrepend) { + foreach ($dataTable->getRows() as $row) { + $filter = $row->getMetadata($metadataColumn); + if ($filter !== false) { + $row->setMetadata($metadataColumn, $valueToPrepend . $filter); + } + } + }); + } +} diff --git a/core/Date.php b/core/Date.php index 909f7adb0e..63c6384729 100644 --- a/core/Date.php +++ b/core/Date.php @@ -627,6 +627,14 @@ class Date return $out; } + public function getHourInUTC() + { + $dateTime = $this->getDatetime(); + $hourInTz = Date::factory($dateTime, 'UTC')->toString('G'); + + return $hourInTz; + } + /** * Adds `$n` days to `$this` date and returns the result in a new Date. * instance. diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php index 8b92ef58a8..62ed594f8c 100644 --- a/core/Plugin/Report.php +++ b/core/Plugin/Report.php @@ -535,14 +535,6 @@ class Report if (!empty($this->dimension)) { $report['dimension'] = $this->dimension->getName(); - - $segments = $this->dimension->getSegments(); - if (!empty($segments)) { - $report['segments'] = array(); - foreach ($segments as $segment) { - $report['segments'][] = $segment->getSegment(); - } - } } if (!empty($this->documentation)) { diff --git a/core/Plugin/Segment.php b/core/Plugin/Segment.php index f29f208059..2f0c84db63 100644 --- a/core/Plugin/Segment.php +++ b/core/Plugin/Segment.php @@ -253,4 +253,4 @@ class Segment return $segment; } -} +}
\ No newline at end of file diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index 8c843806de..15b468e362 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -19,6 +19,7 @@ use Piwik\NoAccessException; use Piwik\Option; use Piwik\Period; use Piwik\Piwik; +use Piwik\Plugins\API\API as ApiApi; use Piwik\Plugins\PrivacyManager\PrivacyManager; use Piwik\View; use Piwik\ViewDataTable\Manager as ViewDataTableManager; @@ -207,6 +208,7 @@ class Visualization extends ViewDataTable $view->visualization = $this; $view->visualizationTemplate = static::TEMPLATE_FILE; $view->visualizationCssClass = $this->getDefaultDataTableCssClass(); + $view->reportMetdadata = $this->getReportMetadata(); if (null === $this->dataTable) { $view->dataTable = null; @@ -231,6 +233,22 @@ class Visualization extends ViewDataTable return $view; } + private function getReportMetadata() + { + $request = $this->request->getRequestArray() + $_GET + $_POST; + + $idSite = Common::getRequestVar('idSite', null, 'string', $request); + $module = $this->requestConfig->getApiModuleToRequest(); + $action = $this->requestConfig->getApiMethodToRequest(); + $metadata = ApiApi::getInstance()->getMetadata($idSite, $module, $action); + + if (!empty($metadata)) { + return array_shift($metadata); + } + + return false; + } + private function overrideSomeConfigPropertiesIfNeeded() { if (empty($this->config->footer_icons)) { diff --git a/core/Twig.php b/core/Twig.php index 221236002a..8eeb34ffe4 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -21,6 +21,7 @@ use Twig_Loader_Chain; use Twig_Loader_Filesystem; use Twig_SimpleFilter; use Twig_SimpleFunction; +use Twig_SimpleTest; /** * Twig class @@ -97,6 +98,19 @@ class Twig $this->addFunction_getJavascriptTranslations(); $this->twig->addTokenParser(new RenderTokenParser()); + + $this->addTest_false(); + } + + private function addTest_false() + { + $test = new Twig_SimpleTest( + 'false', + function ($value) { + return false === $value; + } + ); + $this->twig->addTest($test); } protected function addFunction_getJavascriptTranslations() diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 2f0b8f5f9d..64c11ec37c 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -453,6 +453,14 @@ class API extends \Piwik\Plugin\API // (in the transition period between pre 1.2 and post 1.2 datatable structure) $dataTable->filter('ReplaceColumnNames'); $dataTable->filter('Sort', array('nb_visits', 'desc', $naturalSort = false, $expanded)); + $dataTable->queueFilter(function (DataTable $dataTable) { + foreach ($dataTable->getRows() as $row) { + $url = $row->getMetadata('url'); + if ($url) { + $row->setMetadata('segmentValue', urldecode($url)); + } + } + }); $dataTable->queueFilter('ReplaceSummaryRowLabel'); } diff --git a/plugins/Contents/API.php b/plugins/Contents/API.php index 43d07b7cdc..968231a702 100644 --- a/plugins/Contents/API.php +++ b/plugins/Contents/API.php @@ -37,6 +37,17 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $recordName = Dimensions::getRecordNameForAction($name); $dataTable = Archive::getDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $idSubtable); + + if (empty($idSubtable)) { + $dataTable->filter('AddSegmentValue', array(function ($label) { + if ($label === Archiver::CONTENT_PIECE_NOT_SET) { + return false; + } + + return $label; + })); + } + $this->filterDataTable($dataTable); return $dataTable; } diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml index d3e1af1e2e..ad30423f17 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml @@ -58,14 +58,17 @@ <result prettyDate="Sunday 3 January 2010"> <row> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentName==ImageAd</segmentFilter> </row> <row> <contentTarget>http://piwik.org/</contentTarget> + <segmentFilter>contentName==Text+Ad</segmentFilter> </row> <row> <contentTarget /> + <segmentFilter>contentName==Video+Ad</segmentFilter> </row> </result> diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml index 402909f7d5..c1665283d0 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml @@ -82,22 +82,27 @@ <result prettyDate="Sunday 3 January 2010"> <row> <contentTarget>http://piwik.org/download</contentTarget> + <segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter> </row> <row> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter> </row> <row> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter> </row> <row> <contentTarget>http://piwik.org/</contentTarget> + <segmentFilter>contentPiece==Click+NOW</segmentFilter> </row> <row> <contentTarget /> + <segmentFilter>contentPiece==movie.mov</segmentFilter> </row> <row> @@ -106,6 +111,7 @@ </row> <row> <contentTarget /> + <segmentFilter>contentPiece==Unknown</segmentFilter> </row> </result> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml index fde347f2b5..190e3be524 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml @@ -21,5 +21,6 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://www.example.org/page</url> + <segmentFilter>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segmentFilter> </row> </result>
\ No newline at end of file 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 3dc775d40a..6213a85ca6 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 @@ -21,5 +21,6 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://www.example.org/page</url> + <segmentFilter>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml index 957c6fa85a..630f06f47c 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml @@ -8,6 +8,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>25%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentName==ImageAd</segmentFilter> </row> <row> <label>Text Ad</label> @@ -17,6 +18,7 @@ <nb_interactions>4</nb_interactions> <interaction_rate>66.67%</interaction_rate> <contentTarget>http://piwik.org/</contentTarget> + <segmentFilter>contentName==Text+Ad</segmentFilter> </row> <row> <label>Video Ad</label> @@ -26,5 +28,6 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentName==Video+Ad</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml index 44bfdfd54e..0560531eff 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml @@ -8,6 +8,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <interaction_rate>25%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentName==ImageAd</segmentFilter> </row> <row> <label>Text Ad</label> @@ -17,6 +18,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <interaction_rate>66.67%</interaction_rate> <contentTarget>http://piwik.org/</contentTarget> + <segmentFilter>contentName==Text+Ad</segmentFilter> </row> <row> <label>Video Ad</label> @@ -26,5 +28,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentName==Video+Ad</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml index 8927f8a8ec..8598065093 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml @@ -8,6 +8,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>50%</interaction_rate> <contentTarget>http://piwik.org/download</contentTarget> + <segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter> </row> <row> <label>/path/ad.jpg</label> @@ -17,6 +18,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>100%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter> </row> <row> <label>/path/ad2.jpg</label> @@ -26,6 +28,7 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter> </row> <row> <label>Click NOW</label> @@ -35,6 +38,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>100%</interaction_rate> <contentTarget>http://piwik.org/</contentTarget> + <segmentFilter>contentPiece==Click+NOW</segmentFilter> </row> <row> <label>movie.mov</label> @@ -44,6 +48,7 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentPiece==movie.mov</segmentFilter> </row> <row> <label>Content Piece not defined</label> @@ -62,5 +67,6 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentPiece==Unknown</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml index b604544417..0b8e36e62a 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml @@ -8,6 +8,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <interaction_rate>50%</interaction_rate> <contentTarget>http://piwik.org/download</contentTarget> + <segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter> </row> <row> <label>/path/ad.jpg</label> @@ -17,6 +18,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>100%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter> </row> <row> <label>/path/ad2.jpg</label> @@ -26,6 +28,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>0%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter> </row> <row> <label>Click NOW</label> @@ -35,6 +38,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>100%</interaction_rate> <contentTarget>http://piwik.org/</contentTarget> + <segmentFilter>contentPiece==Click+NOW</segmentFilter> </row> <row> <label>movie.mov</label> @@ -44,6 +48,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentPiece==movie.mov</segmentFilter> </row> <row> <label>Content Piece not defined</label> @@ -62,5 +67,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentPiece==Unknown</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 21e3a4f8a3..aac8a12ee8 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -17,6 +17,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> @@ -117,6 +118,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 21e3a4f8a3..aac8a12ee8 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -17,6 +17,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> @@ -117,6 +118,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 21e3a4f8a3..aac8a12ee8 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -17,6 +17,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> @@ -117,6 +118,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml index 5212486a1c..470a9b027f 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml @@ -8,5 +8,6 @@ <nb_interactions>2</nb_interactions> <interaction_rate>50%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentName==ImageAd</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml index ac1d39a577..bb14d08c71 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml @@ -8,6 +8,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>100%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter> </row> <row> <label>/path/ad2.jpg</label> @@ -17,5 +18,6 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 21e3a4f8a3..aac8a12ee8 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -17,6 +17,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> @@ -117,6 +118,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml index 17b781db1c..1729025fed 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml @@ -8,6 +8,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>25%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentName==ImageAd</segmentFilter> </row> <row> <label>Text Ad</label> @@ -17,5 +18,6 @@ <nb_interactions>2</nb_interactions> <interaction_rate>50%</interaction_rate> <contentTarget>http://piwik.org/download</contentTarget> + <segmentFilter>contentName==Text+Ad</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml index 7df6e4f0e1..9c897b080d 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml @@ -8,6 +8,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>50%</interaction_rate> <contentTarget>http://piwik.org/download</contentTarget> + <segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter> </row> <row> <label>/path/ad.jpg</label> @@ -17,6 +18,7 @@ <nb_interactions>2</nb_interactions> <interaction_rate>100%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter> </row> <row> <label>/path/ad2.jpg</label> @@ -26,6 +28,7 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget>http://www.example.com</contentTarget> + <segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter> </row> <row> <label>Content Piece not defined</label> @@ -44,5 +47,6 @@ <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segmentFilter>contentPiece==Unknown</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 21e3a4f8a3..aac8a12ee8 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -17,6 +17,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> @@ -117,6 +118,7 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> + </row> </actionDetails> <goalConversions>0</goalConversions> diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 6746663b7e..48dffda0c5 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -140,6 +140,10 @@ $.extend(DataTable.prototype, UIControl.prototype, { return !!$('#dashboardWidgetsArea').length; }, + getReportMetadata: function () { + return JSON.parse(this.$element.attr('data-report-metadata') || '{}'); + }, + //Reset DataTable filters (used before a reload or view change) resetAllFilters: function () { var self = this; diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig index 234d90ea94..6bc35bca9e 100644 --- a/plugins/CoreHome/templates/_dataTable.twig +++ b/plugins/CoreHome/templates/_dataTable.twig @@ -7,6 +7,7 @@ <div class="dataTable {{ visualizationCssClass }} {{ properties.datatable_css_class|default('') }} {% if isSubtable %}subDataTable{% endif %}" data-table-type="{{ properties.datatable_js_type }}" data-report="{{ properties.report_id }}" + data-report-metadata="{{ reportMetdadata|json_encode|e('html_attr') }}" data-props="{% if clientSideProperties is empty %}{}{% else %}{{ clientSideProperties|json_encode }}{% endif %}" data-params="{% if clientSideParameters is empty %}{}{% else %}{{ clientSideParameters|json_encode }}{% endif %}"> <div class="reportDocumentation"> diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index c6de5abdea..873cd38c17 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -31,6 +31,8 @@ {% if showRow %} <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %} + {% if row.getMetadata('segmentFilter') is not false %} data-segment-filter="{{ row.getMetadata('segmentFilter')|e('html_attr') }}"{% endif %} + {% if row.getMetadata('url') is not false %} data-url-label="{{ row.getMetadata('url')|rawSafeDecoded }}"{% endif %} class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}" {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}> {% for column in properties.columns_to_display %} diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index 07a9f85a38..f1904c3946 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -53,6 +53,9 @@ class API extends \Piwik\Plugin\API $dataTable = $this->getDataTable('DevicesDetection_types', $idSite, $period, $date, $segment); // ensure all device types are in the list $this->ensureDefaultRowsInTable($dataTable); + + $mapping = DeviceParserAbstract::getAvailableDeviceTypeNames(); + $dataTable->filter('AddSegmentFilterByLabelMapping', array('deviceType', $mapping)); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getDeviceTypeLogo')); $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceTypeLabel')); return $dataTable; @@ -123,7 +126,7 @@ class API extends \Piwik\Plugin\API public function getOsFamilies($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_os', $idSite, $period, $date, $segment); - + // handle legacy archives if ($dataTable instanceof DataTable\Map || !$dataTable->getRowsCount()) { $versionDataTable = $this->getDataTable('DevicesDetection_osVersions', $idSite, $period, $date, $segment); @@ -193,6 +196,9 @@ class API extends \Piwik\Plugin\API public function getOsVersions($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_osVersions', $idSite, $period, $date, $segment); + + $segments = array('operatingSystemCode', 'operatingSystemVersion'); + $dataTable->filter('AddSegmentFilter', array($segments, Archiver::BROWSER_SEPARATOR)); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsLogo')); // use GroupBy filter to avoid duplicate rows if old (UserSettings) and new (DevicesDetection) reports were combined $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOsFullName')); @@ -225,6 +231,7 @@ class API extends \Piwik\Plugin\API public function getBrowsers($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_browsers', $idSite, $period, $date, $segment); + $dataTable->filter('AddSegmentValue'); // handle legacy archives if ($dataTable instanceof DataTable\Map || !$dataTable->getRowsCount()) { @@ -248,6 +255,9 @@ class API extends \Piwik\Plugin\API public function getBrowserVersions($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_browserVersions', $idSite, $period, $date, $segment); + + $segments = array('browserCode', 'browserVersion'); + $dataTable->filter('AddSegmentFilter', array($segments, Archiver::BROWSER_SEPARATOR)); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserLogo')); $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserNameWithVersion')); return $dataTable; @@ -264,6 +274,7 @@ class API extends \Piwik\Plugin\API public function getBrowserEngines($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_browserEngines', $idSite, $period, $date, $segment); + $dataTable->filter('AddSegmentValue'); // use GroupBy filter to avoid duplicate rows if old (UserSettings) and new (DevicesDetection) reports were combined $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserEngineName')); return $dataTable; diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php index 0d6f40c062..3ecb310028 100644 --- a/plugins/DevicesDetection/Archiver.php +++ b/plugins/DevicesDetection/Archiver.php @@ -13,6 +13,7 @@ use Piwik\Metrics; class Archiver extends \Piwik\Plugin\Archiver { + const BROWSER_SEPARATOR = ';'; const DEVICE_TYPE_RECORD_NAME = 'DevicesDetection_types'; const DEVICE_BRAND_RECORD_NAME = 'DevicesDetection_brands'; const DEVICE_MODEL_RECORD_NAME = 'DevicesDetection_models'; diff --git a/plugins/DevicesDetection/Columns/DeviceType.php b/plugins/DevicesDetection/Columns/DeviceType.php index 37b7cc0679..3c7320326b 100644 --- a/plugins/DevicesDetection/Columns/DeviceType.php +++ b/plugins/DevicesDetection/Columns/DeviceType.php @@ -61,4 +61,4 @@ class DeviceType extends Base return $parser->getDevice(); } -} +}
\ No newline at end of file diff --git a/plugins/DevicesDetection/Columns/OsVersion.php b/plugins/DevicesDetection/Columns/OsVersion.php index e9913f740e..d1c3cb422a 100644 --- a/plugins/DevicesDetection/Columns/OsVersion.php +++ b/plugins/DevicesDetection/Columns/OsVersion.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\DevicesDetection\Columns; use Piwik\Piwik; +use Piwik\Plugins\DevicesDetection\Segment; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; use Piwik\Tracker\Action; @@ -18,6 +19,15 @@ class OsVersion extends Base protected $columnName = 'config_os_version'; protected $columnType = 'VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL'; + protected function configureSegments() + { + $segment = new Segment(); + $segment->setSegment('operatingSystemVersion'); + $segment->setName('DevicesDetection_ColumnOperatingSystemVersion'); + $segment->setAcceptedValues('XP, 7, 2.3, 5.1, ...'); + $this->addSegment($segment); + } + public function getName() { return Piwik::translate('DevicesDetection_OperatingSystemVersions'); diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json index 59472a9dcb..67aba39280 100644 --- a/plugins/DevicesDetection/lang/en.json +++ b/plugins/DevicesDetection/lang/en.json @@ -11,6 +11,7 @@ "CarBrowser": "Car browser", "ColumnBrowser": "Browser", "ColumnOperatingSystem": "Operating system", + "ColumnOperatingSystemVersion": "Operating system version", "Console": "Console", "dataTableLabelBrands": "Brand", "dataTableLabelModels": "Model", diff --git a/plugins/Events/API.php b/plugins/Events/API.php index d81144f855..345deb4f96 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -154,6 +154,13 @@ class API extends \Piwik\Plugin\API $this->checkSecondaryDimension($name, $secondaryDimension); $recordName = $this->getRecordNameForAction($name, $secondaryDimension); $dataTable = Archive::getDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $idSubtable); + $dataTable->filter('AddSegmentValue', array(function ($label) { + if ($label === Archiver::EVENT_NAME_NOT_SET) { + return false; + } + + return $label; + })); $this->filterDataTable($dataTable); return $dataTable; } diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index aaddca1f22..3dbe242b78 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -42,6 +42,7 @@ class Live extends \Piwik\Plugin $jsFiles[] = "plugins/Live/javascripts/live.js"; $jsFiles[] = "plugins/Live/javascripts/visitorProfile.js"; $jsFiles[] = "plugins/Live/javascripts/visitorLog.js"; + $jsFiles[] = "plugins/Live/javascripts/rowaction.js"; } public function getClientSideTranslationKeys(&$translationKeys) @@ -51,5 +52,9 @@ class Live extends \Piwik\Plugin $translationKeys[] = "Live_ShowMap"; $translationKeys[] = "Live_HideMap"; $translationKeys[] = "Live_PageRefreshed"; + $translationKeys[] = "Live_RowActionTooltipTitle"; + $translationKeys[] = "Live_RowActionTooltipDefault"; + $translationKeys[] = "Live_RowActionTooltipWithDimension"; + $translationKeys[] = "Live_SegmentedVisitorLogTitle"; } }
\ No newline at end of file diff --git a/plugins/Live/VisitorLog.php b/plugins/Live/VisitorLog.php index d3d93c2dd4..821873926d 100644 --- a/plugins/Live/VisitorLog.php +++ b/plugins/Live/VisitorLog.php @@ -74,6 +74,7 @@ class VisitorLog extends Visualization // set a very high row count so that the next link in the footer of the data table is always shown $this->config->custom_parameters['totalRows'] = 10000000; $this->config->custom_parameters['smallWidth'] = (1 == Common::getRequestVar('small', 0, 'int')); + $this->config->custom_parameters['hideProfileLink'] = (1 == Common::getRequestVar('hideProfileLink', 0, 'int')); $this->config->custom_parameters['pageUrlNotDefined'] = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL')); $this->config->footer_icons = array( diff --git a/plugins/Live/images/visitorlog-hover.png b/plugins/Live/images/visitorlog-hover.png Binary files differnew file mode 100644 index 0000000000..523a8ac6b4 --- /dev/null +++ b/plugins/Live/images/visitorlog-hover.png diff --git a/plugins/Live/images/visitorlog.png b/plugins/Live/images/visitorlog.png Binary files differnew file mode 100644 index 0000000000..423392db75 --- /dev/null +++ b/plugins/Live/images/visitorlog.png diff --git a/plugins/Live/javascripts/rowaction.js b/plugins/Live/javascripts/rowaction.js new file mode 100644 index 0000000000..8e0a4bf8f5 --- /dev/null +++ b/plugins/Live/javascripts/rowaction.js @@ -0,0 +1,266 @@ +/*! + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +/** + * This file registers the Overlay row action on the pages report. + */ + +(function () { + + var actionName = 'SegmentVisitorLog'; + + function getLabelFromTr ($tr, apiMethod) { + var label; + + if (apiMethod && 0 === apiMethod.indexOf('Actions.')) { + // for now only use this for Actions... I know a hack :( Otherwise in Search Engines + // it would show "http://www.searchenginename.org" instead of "SearchEngineName" + label = $tr.attr('data-url-label'); + } + + if (!label) { + label = $tr.find('.label .value').text(); + } + + if (label) { + label = $.trim(label); + } + + return label; + } + + function getRawSegmentValueFromRow(tr) + { + return $(tr).attr('data-segment-filter'); + } + + function findTitleOfRowHavingRawSegmentValue(apiMethod, rawSegmentValue) + { + var $tr = $('[data-report="' + apiMethod + '"] tr[data-segment-filter="' + rawSegmentValue + '"]').first(); + + return getLabelFromTr($tr, apiMethod); + } + + function getDataTableFromApiMethod(apiMethod) + { + var div = $(require('piwik/UI').DataTable.getDataTableByReport(apiMethod)); + if (div.size() > 0 && div.data('uiControlObject')) { + return div.data('uiControlObject'); + } + } + + function getMetadataFromDataTable(dataTable) + { + if (dataTable) { + + return dataTable.getReportMetadata(); + } + } + + function getDimensionFromApiMethod(apiMethod) + { + if (!apiMethod) { + return; + } + + var dataTable = getDataTableFromApiMethod(apiMethod); + var metadata = getMetadataFromDataTable(dataTable); + + if (metadata && metadata.dimension) { + return metadata.dimension; + } + } + + function DataTable_RowActions_SegmentVisitorLog(dataTable) { + this.dataTable = dataTable; + this.actionName = actionName; + + // has to be overridden in subclasses + this.trEventName = 'piwikTriggerSegmentVisitorLogAction'; + + this.segmentComparison = '=='; + } + + DataTable_RowActions_SegmentVisitorLog.prototype = new DataTable_RowAction(); + + DataTable_RowActions_SegmentVisitorLog.prototype.openPopover = function (apiMethod, segment, extraParams) { + var urlParam = apiMethod + ':' + encodeURIComponent(segment) + ':' + encodeURIComponent(JSON.stringify(extraParams)); + + broadcast.propagateNewPopoverParameter('RowAction', actionName + ':' + urlParam); + }; + + DataTable_RowActions_SegmentVisitorLog.prototype.trigger = function (tr, e, subTableLabel) { + var segment = getRawSegmentValueFromRow(tr); + + this.performAction(segment, tr, e); + }; + + DataTable_RowActions_SegmentVisitorLog.prototype.performAction = function (segment, tr, e) { + + var apiMethod = this.dataTable.param.module + '.' + this.dataTable.param.action; + + this.openPopover(apiMethod, segment, {}); + }; + + DataTable_RowActions_SegmentVisitorLog.prototype.doOpenPopover = function (urlParam) { + var urlParamParts = urlParam.split(':'); + + var apiMethod = urlParamParts.shift(); + var segment = decodeURIComponent(urlParamParts.shift()); + + var extraParamsString = urlParamParts.shift(), + extraParams = {}; // 0/1 or "0"/"1" + + try { + extraParams = JSON.parse(decodeURIComponent(extraParamsString)); + } catch (e) { + // assume the parameter is an int/string describing whether to use multi row evolution + } + + this.showVisitorLog(apiMethod, segment, extraParams); + }; + + DataTable_RowActions_SegmentVisitorLog.prototype.showVisitorLog = function (apiMethod, segment, extraParams) { + + var self = this; + + // open the popover + var box = Piwik_Popover.showLoading('Segmented Visitor Log'); + box.addClass('segmentedVisitorLogPopover'); + + function setPopoverTitle(apiMethod, index) + { + var dataTable = getDataTableFromApiMethod(apiMethod); + + if (!dataTable) { + if (index < 15) { + // this is needed when the popover is opened before the dataTable is there which can often + // happen when opening the popover directly via URL (broadcast.popoverHandler) + setTimeout(function () { + setPopoverTitle(apiMethod, index + 1); + }, 150); + } + return; + } + + var segmentName = getDimensionFromApiMethod(apiMethod); + var segmentValue = findTitleOfRowHavingRawSegmentValue(apiMethod, segment); + + segmentName = piwikHelper.escape(segmentName); + segmentName = piwikHelper.htmlEntities(segmentName); + segmentValue = piwikHelper.escape(segmentValue); + segmentValue = piwikHelper.htmlEntities(segmentValue); + + var title = _pk_translate('Live_SegmentedVisitorLogTitle', [segmentName, segmentValue]); + + Piwik_Popover.setTitle(title); + } + + var callback = function (html) { + Piwik_Popover.setContent(html); + + // remove title returned from the server + var title = box.find('h2[piwik-enriched-headline]'); + var defaultTitle = title.text(); + + if (title.size() > 0) { + title.remove(); + } + + Piwik_Popover.setTitle(defaultTitle); + + setPopoverTitle(apiMethod, 0); + }; + + // prepare loading the popover contents + var requestParams = { + module: 'Live', + action: 'indexVisitorLog', + segment: segment, + disableLink: 1, + small: 1, + hideProfileLink: 1 + }; + + $.extend(requestParams, extraParams); + + var ajaxRequest = new ajaxHelper(); + ajaxRequest.addParams(requestParams, 'get'); + ajaxRequest.setCallback(callback); + ajaxRequest.setFormat('html'); + ajaxRequest.send(false); + }; + + DataTable_RowActions_Registry.register({ + + name: actionName, + + dataTableIcon: 'plugins/Live/images/visitorlog.png', + dataTableIconHover: 'plugins/Live/images/visitorlog-hover.png', + + order: 30, + + dataTableIconTooltip: [ + _pk_translate('Live_RowActionTooltipTitle'), + _pk_translate('Live_RowActionTooltipDefault') + ], + + isAvailableOnReport: function (dataTableParams, undefined) { + return true; + }, + + isAvailableOnRow: function (dataTableParams, tr) { + var value = getRawSegmentValueFromRow(tr) + if ('undefined' === (typeof value)) { + return false; + } + + var reportTitle = null; + + var apiMethod = $(tr).parents('div.dataTable').last().attr('data-report'); + var dimension = getDimensionFromApiMethod(apiMethod); + + if (dimension) { + reportTitle = _pk_translate('Live_RowActionTooltipWithDimension', [dimension]) + } else { + reportTitle = _pk_translate('Live_RowActionTooltipDefault'); + } + + this.dataTableIconTooltip[1] = reportTitle; + + return true; + }, + + createInstance: function (dataTable, param) { + if (dataTable !== null && typeof dataTable.segmentVisitorLogInstance != 'undefined') { + return dataTable.segmentVisitorLogInstance; + } + + if (dataTable === null && param) { + // when segmented visitor log is triggered from the url (not a click on the data table) + // we look for the data table instance in the dom + var report = param.split(':')[0]; + var tempTable = getDataTableFromApiMethod(report); + if (tempTable) { + dataTable = tempTable; + if (typeof dataTable.segmentVisitorLogInstance != 'undefined') { + return dataTable.segmentVisitorLogInstance; + } + } + } + + var instance = new DataTable_RowActions_SegmentVisitorLog(dataTable); + if (dataTable !== null) { + dataTable.segmentVisitorLogInstance = instance; + } + + return instance; + } + + }); + +})();
\ No newline at end of file diff --git a/plugins/Live/lang/en.json b/plugins/Live/lang/en.json index 6fe3fe810b..9ae4fd7a14 100644 --- a/plugins/Live/lang/en.json +++ b/plugins/Live/lang/en.json @@ -35,6 +35,10 @@ "VisitorsInRealTime": "Visitors in Real-time", "VisitorsLastVisit": "This visitor's last visit was %s days ago.", "VisitsFrom": "%1$s%2$s visits%3$s from", - "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s" + "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s", + "RowActionTooltipDefault": "Show Visitor Log segmented by this row", + "RowActionTooltipWithDimension": "Show Visitor Log segmented by this %s", + "RowActionTooltipTitle": "Open segmented Visitor Log", + "SegmentedVisitorLogTitle": "Visitor Log showing visits where %s is \"%s\"" } }
\ No newline at end of file diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index 1d2b2fb9b9..d84db8aea5 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -58,6 +58,17 @@ margin: 0 3px 0 0; } +.ui-dialog.ui-widget { + .dataTableVizVisitorLog { + .dataTableFeatures { + border-bottom: 0px; + } + .expandDataTableFooterDrawer { + display: none; + } + } +} + .visitsLiveFooter a.rightLink { float: right; padding-right: 20px; diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index 74a2c4ab04..92d6e9e05e 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -181,7 +181,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit <td class="column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}"> <div class="visitor-log-page-list"> - {% if visitor.getColumn('visitorId') is not empty %} + {% if visitor.getColumn('visitorId') is not empty and not clientSideParameters.hideProfileLink %} <a class="visitor-log-visitor-profile-link" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.getColumn("visitorId") }}"> <img src="plugins/Live/images/visitorProfileLaunch.png"/> <span>{{ 'Live_ViewVisitorProfile'|translate }} {%- if visitor.getColumn('userId') is not empty %}: {{ visitor.getColumn('userId')|raw }}{% endif %}</span> diff --git a/plugins/Morpheus/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js index 8e89039dd0..4f851092b9 100644 --- a/plugins/Morpheus/javascripts/piwikHelper.js +++ b/plugins/Morpheus/javascripts/piwikHelper.js @@ -82,6 +82,13 @@ var piwikHelper = { return value; }, + escape: function (value) + { + var escape = angular.element(document).injector().get('$sanitize'); + + return escape(value); + }, + /** * Add break points to a string so that it can be displayed more compactly */ diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index 5172729e86..992842a294 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -125,7 +125,6 @@ class API extends \Piwik\Plugin\API } $dataTable = $dataTable->mergeSubtables($labelColumn = 'referer_type', $useMetadataColumn = true); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc')); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); @@ -136,6 +135,7 @@ class API extends \Piwik\Plugin\API public function getKeywords($idSite, $period, $date, $segment = false, $expanded = false) { $dataTable = $this->getDataTable(Archiver::KEYWORDS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded); + $dataTable->filter('AddSegmentValue'); $dataTable = $this->handleKeywordNotDefined($dataTable); return $dataTable; } @@ -234,6 +234,9 @@ class API extends \Piwik\Plugin\API public function getSearchEngines($idSite, $period, $date, $segment = false, $expanded = false) { $dataTable = $this->getDataTable(Archiver::SEARCH_ENGINES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded); + + $dataTable->filter('AddSegmentFilter', array('referrerName')); + $dataTable->queueFilter('PrependSegmentFilter', array('referrerType==search;')); $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromName')); $dataTable->queueFilter('MetadataCallbackAddMetadata', array('url', 'logo', __NAMESPACE__ . '\getSearchEngineLogoFromUrl')); return $dataTable; @@ -273,6 +276,10 @@ class API extends \Piwik\Plugin\API public function getCampaigns($idSite, $period, $date, $segment = false, $expanded = false) { $dataTable = $this->getDataTable(Archiver::CAMPAIGNS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded); + + $dataTable->filter('AddSegmentFilter', array('referrerName')); + $dataTable->queueFilter('PrependSegmentFilter', array('referrerType==campaign;')); + return $dataTable; } @@ -285,6 +292,7 @@ class API extends \Piwik\Plugin\API public function getWebsites($idSite, $period, $date, $segment = false, $expanded = false) { $dataTable = $this->getDataTable(Archiver::WEBSITES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded); + $dataTable->filter('AddSegmentFilter', array('referrerName')); return $dataTable; } @@ -314,9 +322,7 @@ class API extends \Piwik\Plugin\API public function getSocials($idSite, $period, $date, $segment = false, $expanded = false) { $dataTable = $this->getDataTable(Archiver::WEBSITES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded); - $dataTable->filter('ColumnCallbackDeleteRow', array('label', function ($url) { return !isSocialUrl($url); })); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSocialMainUrl')); $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getSocialNetworkFromDomain')); diff --git a/plugins/Resolution/API.php b/plugins/Resolution/API.php index a3c0215518..8a39d78e0b 100644 --- a/plugins/Resolution/API.php +++ b/plugins/Resolution/API.php @@ -37,6 +37,7 @@ class API extends \Piwik\Plugin\API public function getResolution($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment); + $dataTable->filter('AddSegmentValue'); return $dataTable; } diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 4e17fb6767..c9fcfeec78 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -32,6 +32,7 @@ class API extends \Piwik\Plugin\API $dataTable = $this->getDataTable(Archiver::COUNTRY_RECORD_NAME, $idSite, $period, $date, $segment); // apply filter on the whole datatable in order the inline search to work (searches are done on "beautiful" label) + $dataTable->filter('AddSegmentValue'); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'code')); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getFlagFromCode')); $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\countryTranslate')); @@ -68,6 +69,9 @@ class API extends \Piwik\Plugin\API { $dataTable = $this->getDataTable(Archiver::REGION_RECORD_NAME, $idSite, $period, $date, $segment); + $segments = array('regionCode', 'countryCode'); + $dataTable->filter('AddSegmentFilter', array($segments, Archiver::LOCATION_SEPARATOR)); + $separator = Archiver::LOCATION_SEPARATOR; $unk = Visit::UNKNOWN_CODE; @@ -110,6 +114,9 @@ class API extends \Piwik\Plugin\API { $dataTable = $this->getDataTable(Archiver::CITY_RECORD_NAME, $idSite, $period, $date, $segment); + $segments = array('city', 'regionCode', 'countryCode'); + $dataTable->filter('AddSegmentFilter', array($segments, Archiver::LOCATION_SEPARATOR)); + $separator = Archiver::LOCATION_SEPARATOR; $unk = Visit::UNKNOWN_CODE; diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php index f27e5f812a..d0a52b2a45 100644 --- a/plugins/VisitTime/API.php +++ b/plugins/VisitTime/API.php @@ -14,6 +14,7 @@ use Piwik\DataTable; use Piwik\Date; use Piwik\Metrics; use Piwik\Period; +use Piwik\Period\Range; use Piwik\Piwik; use Piwik\Site; @@ -31,6 +32,7 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); + $dataTable->filter('Sort', array('label', 'asc', true)); $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getTimeLabel')); $dataTable->queueFilter('ReplaceColumnNames'); @@ -39,12 +41,35 @@ class API extends \Piwik\Plugin\API public function getVisitInformationPerLocalTime($idSite, $period, $date, $segment = false) { - return $this->getDataTable(Archiver::LOCAL_TIME_RECORD_NAME, $idSite, $period, $date, $segment); + $table = $this->getDataTable(Archiver::LOCAL_TIME_RECORD_NAME, $idSite, $period, $date, $segment); + $table->filter('AddSegmentValue'); + + return $table; } public function getVisitInformationPerServerTime($idSite, $period, $date, $segment = false, $hideFutureHoursWhenToday = false) { $table = $this->getDataTable(Archiver::SERVER_TIME_RECORD_NAME, $idSite, $period, $date, $segment); + + $timezone = Site::getTimezoneFor($idSite); + + $range = Range::parseDateRange($date); + if (!empty($range[2])) { + $endDate = Date::factory($range[2]); + } else { + $endDate = Date::factory($date); + } + + $table->filter('AddSegmentValue', array(function ($label) use ($timezone, $endDate) { + $hour = str_pad($label, 2, 0, STR_PAD_LEFT); + $time = $hour . ':00:00'; + + $dateInTimezone = $endDate->setTime($time)->setTimezone($timezone); + $hourInTz = $dateInTimezone->getHourInUTC(); + + return $hourInTz; + })); + if ($hideFutureHoursWhenToday) { $table = $this->removeHoursInFuture($table, $idSite, $period, $date); } diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index de34f10739..9c47da6fd5 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -89,6 +89,26 @@ class BackwardsCompatibility1XTest extends SystemTestCase $idSite = 1; $dateTime = '2012-03-06 11:22:33'; + $defaultOptions = array( + 'idSite' => $idSite, + 'date' => $dateTime, + 'disableArchiving' => true, + 'otherRequestParameters' => array( + 'hideColumns' => 'nb_users', + ) + ); + + $reportsToCompareSeparately = array( + + // the label column is not the first column here + 'MultiSites.getAll', + + // those reports generate a different segmentFilter as a different raw value was stored that time + 'DevicesDetection.getOsVersions', + 'UserSettings.getOS', + 'UserSettings.getBrowserType' + ); + $apiNotToCall = array( // in the SQL dump, a referrer is named referer.com, but now in OneVisitorTwoVisits it is referrer.com 'Referrers', @@ -105,19 +125,16 @@ class BackwardsCompatibility1XTest extends SystemTestCase // the Action.getPageTitles test fails for unknown reason, so skipping it // eg. https://travis-ci.org/piwik/piwik/jobs/24449365 'Action.getPageTitles', - - // the label column is not the first column here - 'MultiSites.getAll' ); + $apiNotToCall = array_merge($apiNotToCall, $reportsToCompareSeparately); + + $allReportsOptions = $defaultOptions; + $allReportsOptions['compareAgainst'] = 'OneVisitorTwoVisits'; + $allReportsOptions['apiNotToCall'] = $apiNotToCall; + return array( - array('all', array('idSite' => $idSite, 'date' => $dateTime, - 'compareAgainst' => 'OneVisitorTwoVisits', - 'disableArchiving' => true, - 'apiNotToCall' => $apiNotToCall, - 'otherRequestParameters' => array( - 'hideColumns' => 'nb_users', - ))), + array('all', $allReportsOptions), array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-03', 'setDateLastN' => true, 'disableArchiving' => true, 'testSuffix' => '_multipleDates')), @@ -131,11 +148,7 @@ class BackwardsCompatibility1XTest extends SystemTestCase array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-03,2012-12-12', 'periods' => array('month'), 'testSuffix' => '_multipleOldNew', 'disableArchiving' => true)), - array('MultiSites.getAll', array('idSite' => $idSite, 'date' => $dateTime, - 'disableArchiving' => true, - 'otherRequestParameters' => array( - 'hideColumns' => 'nb_users', - ))), + array($reportsToCompareSeparately, $defaultOptions), ); } } diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index e01e2b9983..c283980c47 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -48,6 +48,7 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa 'VisitTime.getVisitInformationPerServerTime'); // 2 segments: ALL and another way of expressing ALL but triggering the Segment code path + // 2 segments: ALL and another way of expressing ALL but triggering the Segment code path $segments = array( false, 'countryCode!=aa', diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml index 823b29f7a5..a16af7bd2f 100644 --- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml @@ -75,6 +75,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> </row> <row> <label>/Home</label> @@ -86,6 +87,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml index d4056f1f70..75c111e7dd 100644 --- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml @@ -64,6 +64,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> </row> <row> <label>/Home</label> @@ -75,6 +76,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..0abf9e4246 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>XP</row> + <row>UNK</row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..5d07770e4e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>28</nb_visits> + <nb_actions>48</nb_actions> + <nb_visits_converted>28</nb_visits_converted> + <bounce_count>15</bounce_count> + <sum_visit_length>16393</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>54%</bounce_rate> + <nb_actions_per_visit>1.7</nb_actions_per_visit> + <avg_time_on_site>585</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml new file mode 100644 index 0000000000..1f40f3a55f --- /dev/null +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Windows XP</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>7</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>operatingSystemCode==WXP;operatingSystemVersion==XP</segmentFilter> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml new file mode 100644 index 0000000000..d6b1f54334 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Gecko (Firefox)</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>7</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserEngine==gecko</segmentFilter> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml new file mode 100644 index 0000000000..1f40f3a55f --- /dev/null +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Windows XP</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>7</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>operatingSystemCode==WXP;operatingSystemVersion==XP</segmentFilter> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + </row> +</result>
\ 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 18509953c4..81b53dcd71 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 @@ -161,38 +161,52 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> + <segmentFilter>eventAction==playTrailer</segmentFilter> </row> <row> + <segmentFilter>eventAction==Search</segmentFilter> </row> <row> + <segmentFilter>eventAction==play25%25</segmentFilter> </row> <row> + <segmentFilter>eventAction==play50%25</segmentFilter> </row> <row> + <segmentFilter>eventAction==play75%25</segmentFilter> </row> <row> + <segmentFilter>eventAction==playEnd</segmentFilter> </row> <row> + <segmentFilter>eventAction==rating</segmentFilter> </row> <row> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> </row> <row> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> </row> <row> + <segmentFilter>eventAction==play</segmentFilter> </row> <row> + <segmentFilter>eventAction==playStart</segmentFilter> </row> + <row> + <segmentFilter>eventAction==Purchase</segmentFilter> + </row> </result> <result prettyDate="Monday 4 January 2010" /> <result prettyDate="Tuesday 5 January 2010" /> 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 dbf61d55a0..4f9e6b111d 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 @@ -80,12 +80,15 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> + <segmentFilter>eventCategory==Movie</segmentFilter> </row> <row> + <segmentFilter>eventCategory==Music</segmentFilter> </row> <row> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> </row> </result> 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 15678442b5..13dea9baf7 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 @@ -116,24 +116,30 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> + <segmentFilter>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</segmentFilter> </row> <row> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> </row> <row> </row> <row> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> </row> <row> + <segmentFilter>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</segmentFilter> </row> <row> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> </row> <row> + <segmentFilter>eventName==Search+query+here</segmentFilter> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml index b09bbc9e7f..31287387f3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml @@ -16,6 +16,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.666</avg_time_generation> <url>http://example.org/movies</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segmentFilter> </row> <row> <label>/webradio</label> @@ -36,5 +37,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://example.org/webradio</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segmentFilter> </row> </result>
\ No newline at end of file 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 5e6a7b260b..ad053a1955 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml @@ -16,6 +16,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.666</avg_time_generation> <url>http://example.org/movies</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segmentFilter> </row> <row> <label>/webradio</label> @@ -36,5 +37,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://example.org/webradio</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segmentFilter> </row> </result>
\ 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 26752bbd7b..c633b5a363 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -56,6 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Search query here</label> @@ -80,6 +82,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -115,6 +118,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -150,6 +154,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -185,6 +190,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -220,6 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -255,6 +262,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -279,6 +287,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -303,6 +312,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -327,6 +337,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -351,5 +362,6 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> </row> </result>
\ No newline at end of file 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 9868947268..9ac5f80dfd 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml @@ -10,6 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -56,6 +57,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Search query here</label> @@ -80,6 +82,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -115,6 +118,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -150,6 +154,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -185,6 +190,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -220,6 +226,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -255,6 +262,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -279,6 +287,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -303,6 +312,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -327,6 +337,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -351,5 +362,6 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> </row> </result>
\ 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 5f3469aa23..f740647245 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -133,6 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>play</label> @@ -212,6 +214,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> 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 1f8fdb7c02..7032517c9d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml @@ -10,6 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -133,6 +134,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>play</label> @@ -212,6 +214,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> 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 9461eeb42e..f6b37adfe7 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>clickBuyNow</label> @@ -111,6 +112,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>play</label> @@ -225,6 +227,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -249,6 +252,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -273,6 +277,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -297,6 +302,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Search</label> 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 5f8de9463f..8d9740913e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml @@ -10,6 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>clickBuyNow</label> @@ -111,6 +112,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>play</label> @@ -225,6 +227,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -249,6 +252,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -273,6 +277,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -297,6 +302,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Search</label> 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 d70e8c2950..bf53c1e631 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -56,6 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Search query here</label> @@ -80,6 +82,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -115,6 +118,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -150,6 +154,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -185,6 +190,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -220,6 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -255,6 +262,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -279,6 +287,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -303,6 +312,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -327,5 +337,6 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> </row> </result>
\ No newline at end of file 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 d65a2784c3..c2979a9c00 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -133,6 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>play</label> 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 71ccc3d69b..b3e5a2e90f 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>clickBuyNow</label> @@ -111,6 +112,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>play</label> @@ -225,6 +227,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -249,6 +252,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -273,6 +277,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Search</label> 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 5f3469aa23..f740647245 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -133,6 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>play</label> @@ -212,6 +214,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> 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 1f8fdb7c02..7032517c9d 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 @@ -10,6 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -133,6 +134,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>play</label> @@ -212,6 +214,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> 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 9461eeb42e..f6b37adfe7 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>clickBuyNow</label> @@ -111,6 +112,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>play</label> @@ -225,6 +227,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -249,6 +252,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -273,6 +277,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -297,6 +302,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Search</label> 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 5f8de9463f..8d9740913e 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 @@ -10,6 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>clickBuyNow</label> @@ -111,6 +112,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>play</label> @@ -225,6 +227,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -249,6 +252,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -273,6 +277,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -297,6 +302,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Search</label> 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 8d225ad12f..cb28224c94 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Movie</label> @@ -34,6 +35,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Movie</label> @@ -58,6 +60,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>Movie</label> @@ -93,6 +96,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>Movie</label> @@ -128,6 +132,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>Movie</label> @@ -163,6 +168,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>Movie</label> @@ -198,6 +204,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>Movie</label> @@ -233,6 +240,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Movie</label> @@ -257,6 +265,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -281,6 +290,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>Music</label> @@ -305,6 +315,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Movie</label> @@ -329,6 +340,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> <subtable> <row> <label>Movie</label> 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 f558d64451..7cfde0a1aa 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 @@ -10,6 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Movie</label> @@ -34,6 +35,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Movie</label> @@ -58,6 +60,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>Movie</label> @@ -93,6 +96,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>Movie</label> @@ -128,6 +132,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>Movie</label> @@ -163,6 +168,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>Movie</label> @@ -198,6 +204,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>Movie</label> @@ -233,6 +240,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Movie</label> @@ -257,6 +265,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -281,6 +290,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>Music</label> @@ -305,6 +315,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Movie</label> @@ -329,6 +340,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> <subtable> <row> <label>Movie</label> 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 03b5718c7b..6717c32ba1 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>Movie</label> @@ -34,6 +35,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>Music</label> @@ -82,6 +84,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -106,6 +109,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>Movie</label> @@ -130,6 +134,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>Movie</label> @@ -154,6 +159,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Movie</label> 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 54676e7511..94db9a9ded 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 @@ -10,6 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>Movie</label> @@ -34,6 +35,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>Music</label> @@ -82,6 +84,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -106,6 +109,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>Movie</label> @@ -130,6 +134,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>Movie</label> @@ -154,6 +159,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Search+query+here</segmentFilter> <subtable> <row> <label>Movie</label> 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 26752bbd7b..c633b5a363 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -56,6 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Search query here</label> @@ -80,6 +82,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -115,6 +118,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -150,6 +154,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -185,6 +190,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -220,6 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -255,6 +262,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -279,6 +287,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -303,6 +312,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -327,6 +337,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -351,5 +362,6 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> </row> </result>
\ No newline at end of file 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 9868947268..9ac5f80dfd 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 @@ -10,6 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -56,6 +57,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Search</segmentFilter> <subtable> <row> <label>Search query here</label> @@ -80,6 +82,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -115,6 +118,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -150,6 +154,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -185,6 +190,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -220,6 +226,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>9.55</avg_event_value> + <segmentFilter>eventAction==rating</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -255,6 +262,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==clickBuyNow</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -279,6 +287,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> @@ -303,6 +312,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -327,6 +337,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -351,5 +362,6 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==Purchase</segmentFilter> </row> </result>
\ No newline at end of file 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 d6f7a63bbe..a67b042898 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -67,6 +68,7 @@ <min_event_value>0</min_event_value> <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -91,6 +93,7 @@ <min_event_value>0</min_event_value> <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> 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 835e7cc629..8000e3dbd4 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 @@ -10,6 +10,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> @@ -67,6 +68,7 @@ <max_event_value>10</max_event_value> <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <avg_event_value>9.5</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -91,6 +93,7 @@ <max_event_value>9.66</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>9.66</avg_event_value> + <segmentFilter>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segmentFilter> <subtable> <row> <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</label> 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 609b2b8d6c..35d00353e3 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playTrailer</segmentFilter> <subtable> <row> <label>Ponyo (崖の上のポニョ)</label> @@ -56,6 +57,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play25%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -91,6 +93,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play50%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -126,6 +129,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play75%25</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -161,6 +165,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playEnd</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -196,6 +201,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>La fiancée de l&#039;eau</label> @@ -220,6 +226,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==playStart</segmentFilter> <subtable> <row> <label>Spirited Away (千と千尋の神隠し)</label> 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 7582baa657..88c0b4d327 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventCategory==Movie</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -89,6 +90,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventCategory==Music</segmentFilter> <subtable> <row> <label>play</label> 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 e1aa570c57..4aa85ffe10 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 @@ -10,6 +10,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>play25%</label> @@ -89,6 +90,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segmentFilter> <subtable> <row> <label>play</label> @@ -157,6 +159,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>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</segmentFilter> <subtable> <row> <label>playTrailer</label> @@ -181,6 +184,7 @@ <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segmentFilter> <subtable> <row> <label>playTrailer</label> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml index 1db9719c00..73c1489673 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml @@ -19,6 +19,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.15</avg_time_generation> <url>http://example.org/dir1/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segmentFilter> </row> <row> <label>dir1/sub/dir/page1.html</label> @@ -34,6 +35,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir1/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segmentFilter> </row> <row> <label>dir1/sub/dir/page2.html</label> @@ -51,6 +53,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir1/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segmentFilter> </row> <row> <label>dir2/sub/dir/page0.html</label> @@ -71,6 +74,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir2/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segmentFilter> </row> <row> <label>dir2/sub/dir/page1.html</label> @@ -86,6 +90,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.6</avg_time_generation> <url>http://example.org/dir2/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segmentFilter> </row> <row> <label>dir2/sub/dir/page2.html</label> @@ -103,6 +108,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir2/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segmentFilter> </row> <row> <label>dir3/sub/dir/page0.html</label> @@ -123,6 +129,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir3/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segmentFilter> </row> <row> <label>dir3/sub/dir/page1.html</label> @@ -138,6 +145,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir3/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segmentFilter> </row> <row> <label>dir3/sub/dir/page2.html</label> @@ -155,6 +163,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>1.35</avg_time_generation> <url>http://example.org/dir3/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segmentFilter> </row> <row> <label>page1.html</label> @@ -171,6 +180,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segmentFilter> </row> <row> <label>sub/dir/dir1/page1.html</label> @@ -187,5 +197,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/sub/dir/dir1/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml index 60400f15ef..8b77a42ecd 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml @@ -130,6 +130,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segmentFilter> </row> <row> <label>sub</label> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml index 6acf67f60c..628975b9cc 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml @@ -19,6 +19,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir2/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segmentFilter> </row> <row> <label>dir2/sub/dir/page1.html</label> @@ -34,6 +35,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.6</avg_time_generation> <url>http://example.org/dir2/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segmentFilter> </row> <row> <label>dir2/sub/dir/page2.html</label> @@ -51,5 +53,6 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir2/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml index eda55355bc..b7f5bb049d 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml @@ -76,6 +76,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.15</avg_time_generation> <url>http://example.org/dir1/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -92,6 +93,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir1/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -110,6 +112,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir1/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -188,6 +191,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.3</avg_time_generation> <url>http://example.org/dir2/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -204,6 +208,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.6</avg_time_generation> <url>http://example.org/dir2/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -222,6 +227,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir2/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -300,6 +306,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.45</avg_time_generation> <url>http://example.org/dir3/sub/dir/page0.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -316,6 +323,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.9</avg_time_generation> <url>http://example.org/dir3/sub/dir/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -334,6 +342,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>1.35</avg_time_generation> <url>http://example.org/dir3/sub/dir/page2.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> <row> @@ -353,6 +362,7 @@ <avg_time_generation>0</avg_time_generation> <url>http://example.org/page1.html</url> <is_aggregate>0</is_aggregate> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segmentFilter> </row> <row> <label>sub</label> @@ -418,6 +428,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/sub/dir/dir1/page1.html</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segmentFilter> <is_aggregate>0</is_aggregate> </row> </result>
\ No newline at end of file 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 ec18e38c66..db38d73559 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -547,6 +547,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> </row> <row> <label>Citrix</label> @@ -691,6 +692,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/moved-permanently</label> @@ -711,6 +713,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -733,6 +736,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> </row> <row> <label>/to-an-error</label> @@ -755,6 +759,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> </row> <row> <label>download</label> 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 c649d1bb3b..a0c3f66015 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -363,6 +363,7 @@ <exit_rate>71%</exit_rate> <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> </row> <row> <label>docs</label> @@ -1029,6 +1030,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</label> @@ -1051,6 +1053,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.413</avg_time_generation> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segmentFilter> </row> <row> <label>/moved-permanently</label> @@ -1071,6 +1074,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -1093,6 +1097,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> </row> <row> <label>/to-an-error</label> @@ -1115,6 +1120,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> </row> <row> <label>changelog</label> 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 bf371f7283..48248f425c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -547,6 +547,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> </row> <row> <label>Citrix</label> @@ -688,6 +689,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -710,6 +712,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> </row> <row> <label>/temp-redirect</label> @@ -727,6 +730,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> </row> <row> <label>/to-an-error</label> @@ -749,6 +753,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> </row> <row> <label>download</label> 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 15c0306207..5448020af2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -363,6 +363,7 @@ <exit_rate>71%</exit_rate> <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> </row> <row> <label>docs</label> @@ -1026,6 +1027,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</label> @@ -1048,6 +1050,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.413</avg_time_generation> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segmentFilter> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -1070,6 +1073,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> </row> <row> <label>/temp-redirect</label> @@ -1087,6 +1091,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> </row> <row> <label>/to-an-error</label> @@ -1109,6 +1114,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> </row> <row> <label>contact</label> 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 6ce4ef4d62..a52faeb86c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -547,6 +547,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.001</avg_time_generation> <url>http://piwik.net/</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> </row> <row> <label>Citrix</label> @@ -704,6 +705,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/moved-permanently</label> @@ -724,6 +726,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -746,6 +749,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <segmentFilter>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> </row> <row> <label>/temp-redirect</label> @@ -763,6 +767,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> </row> <row> <label>/to-an-error</label> @@ -785,6 +790,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> </row> <row> <label>download</label> 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 083021160d..5411b711ef 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -363,6 +363,7 @@ <exit_rate>71%</exit_rate> <avg_time_generation>0.133</avg_time_generation> <url>http://piwik.net/</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2F</segmentFilter> </row> <row> <label>docs</label> @@ -1061,6 +1062,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</label> @@ -1083,6 +1085,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.413</avg_time_generation> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> + <segmentFilter>pageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segmentFilter> </row> <row> <label>/moved-permanently</label> @@ -1103,6 +1106,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segmentFilter> </row> <row> <label>/register.php?0,approve=9a94a02145599</label> @@ -1125,6 +1129,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <segmentFilter>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segmentFilter> </row> <row> <label>/temp-redirect</label> @@ -1142,6 +1147,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segmentFilter> </row> <row> <label>/to-an-error</label> @@ -1164,6 +1170,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> + <segmentFilter>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segmentFilter> </row> <row> <label>changelog</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index f404a50a9c..06dd10a5cb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>16</nb_visits_converted> <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==WebKit</segmentFilter> </row> <row> <label>Trident (IE)</label> @@ -21,6 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==Trident</segmentFilter> </row> <row> <label>Blink (Chrome, Opera)</label> @@ -32,6 +34,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segmentFilter>browserEngine==Blink</segmentFilter> </row> <row> <label>Unknown</label> @@ -43,6 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==</segmentFilter> </row> <row> <label>Gecko (Firefox)</label> @@ -54,5 +58,6 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==Gecko</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 27811a9911..c955bf9002 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==EP;browserVersion==2.30</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -34,6 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==RM;browserVersion==0.9</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -46,6 +49,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==UNK;browserVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> @@ -58,6 +62,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==37.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -70,6 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==AN;browserVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> @@ -82,6 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==19.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -94,6 +101,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==20.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -106,6 +114,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -118,6 +127,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==11.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -130,6 +140,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==39.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -142,6 +153,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==41.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -154,6 +166,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>browserCode==CM;browserVersion==39.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> </row> <row> @@ -166,6 +179,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==IE;browserVersion==6.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -178,6 +192,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==IE;browserVersion==8.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 930e0f0aa7..22b2ce81fc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <segmentFilter>browserCode==CH</segmentFilter> </row> <row> <label>Internet Explorer</label> @@ -23,6 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <segmentFilter>browserCode==IE</segmentFilter> </row> <row> <label>Epiphany</label> @@ -35,6 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <segmentFilter>browserCode==EP</segmentFilter> </row> <row> <label>RockMelt</label> @@ -47,6 +50,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <segmentFilter>browserCode==RM</segmentFilter> </row> <row> <label>Unknown</label> @@ -59,6 +63,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <segmentFilter>browserCode==UNK</segmentFilter> </row> <row> <label>Android Browser</label> @@ -71,6 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <segmentFilter>browserCode==AN</segmentFilter> </row> <row> <label>Firefox</label> @@ -83,6 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <segmentFilter>browserCode==FF</segmentFilter> </row> <row> <label>Chrome Mobile</label> @@ -95,5 +102,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <segmentFilter>browserCode==CM</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 0bd4f21719..ce2197886f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==7</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -34,6 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.6</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -46,6 +49,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.10</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -58,6 +62,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==UNK;operatingSystemVersion==UNK</segmentFilter> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -70,6 +75,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -82,6 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==2.3</segmentFilter> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -94,6 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.4</segmentFilter> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -106,6 +114,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==BOT;operatingSystemVersion==UNK</segmentFilter> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -118,6 +127,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -130,6 +140,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.8</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -142,6 +153,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 7029c34a16..8593134c46 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>29</nb_visits_converted> <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>deviceType==desktop</segmentFilter> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> @@ -34,46 +35,55 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>deviceType==smartphone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tablet</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==feature+phone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==console</segmentFilter> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tv</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==car+browser</segmentFilter> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smart+display</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==camera</segmentFilter> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==portable+media+player</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file 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 3a93f6652b..3823686d3c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml @@ -10,6 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==connect</segmentFilter> </row> <row> <label>play</label> @@ -21,6 +22,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventAction==play</segmentFilter> <subtable> <row> <label>myvideo</label> 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 23e67434b4..8c7199a85a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml @@ -10,6 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventCategory==cloudfront_rtmp</segmentFilter> <subtable> <row> <label>connect</label> 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 8c2883c098..f3df70d01b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml @@ -10,6 +10,7 @@ <max_event_value>0</max_event_value> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> + <segmentFilter>eventName==myvideo</segmentFilter> <subtable> <row> <label>play</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml index c9f1986b2e..a08c747f2d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -18,6 +18,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==www.test.nl</segmentFilter> <referer_type>3</referer_type> </row> <row> @@ -38,6 +39,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==sn110w.snt110.mail.live.com</segmentFilter> <referer_type>3</referer_type> </row> <row> @@ -58,6 +60,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==piwik.org</segmentFilter> <referer_type>3</referer_type> </row> <row> @@ -78,6 +81,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>referrerName==example.com</segmentFilter> <referer_type>3</referer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index b0ecf5b676..efcb7c21dd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -57,6 +57,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>referrerName==example.com</segmentFilter> </row> <row> <label>piwik.org</label> @@ -76,6 +77,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==piwik.org</segmentFilter> </row> <row> <label>sn110w.snt110.mail.live.com</label> @@ -95,6 +97,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==sn110w.snt110.mail.live.com</segmentFilter> </row> <row> <label>www.test.nl</label> @@ -114,6 +117,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==www.test.nl</segmentFilter> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 99d6b9258c..13bacfb184 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -18,6 +18,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>referrerName==example.com</segmentFilter> <subtable> <row> <label>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</label> @@ -50,6 +51,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==piwik.org</segmentFilter> <subtable> <row> <label>http://piwik.org/contribute%</label> @@ -82,6 +84,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==sn110w.snt110.mail.live.com</segmentFilter> <subtable> <row> <label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label> @@ -114,6 +117,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==www.test.nl</segmentFilter> <subtable> <row> <label>https://www.test.nl/</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml index e676cce9fa..6a0e66ad8f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>31</nb_visits_converted> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segmentFilter>resolution==unknown</segmentFilter> </row> <row> <label>1024x768</label> @@ -21,6 +22,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>resolution==1024x768</segmentFilter> </row> <row> <label>1280x800</label> @@ -32,5 +34,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>resolution==1280x800</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index 2af14a1f40..0193f18852 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -47,6 +47,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>39.044</lat> <long>-77.488</long> + <segmentFilter>city==Ashburn;regionCode==VA;countryCode==us</segmentFilter> <city_name>Ashburn</city_name> <region>VA</region> <country>us</country> @@ -74,6 +75,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>69.4</lat> <long>-81.8</long> + <segmentFilter>city==Igloolik;regionCode==NU;countryCode==ca</segmentFilter> <city_name>Igloolik</city_name> <region>NU</region> <country>ca</country> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 149fedf47c..deb7e6019b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -22,6 +22,7 @@ <logo>plugins/UserCountry/images/flags/jp.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==jp</segmentFilter> </row> <row> <label>Unknown</label> @@ -46,6 +47,7 @@ <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==xx</segmentFilter> </row> <row> <label>United States</label> @@ -69,6 +71,7 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==us</segmentFilter> </row> <row> <label>Brazil</label> @@ -92,6 +95,7 @@ <logo>plugins/UserCountry/images/flags/br.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==br</segmentFilter> </row> <row> <label>Australia</label> @@ -107,6 +111,7 @@ <logo>plugins/UserCountry/images/flags/au.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==au</segmentFilter> </row> <row> <label>Canada</label> @@ -130,5 +135,6 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==ca</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 21c708618f..9e45d25c47 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -43,6 +43,7 @@ <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==VA;countryCode==us</segmentFilter> <region>VA</region> <country>us</country> <country_name>United States</country_name> @@ -67,6 +68,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==NU;countryCode==ca</segmentFilter> <region>NU</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index f404a50a9c..06dd10a5cb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>16</nb_visits_converted> <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==WebKit</segmentFilter> </row> <row> <label>Trident (IE)</label> @@ -21,6 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==Trident</segmentFilter> </row> <row> <label>Blink (Chrome, Opera)</label> @@ -32,6 +34,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segmentFilter>browserEngine==Blink</segmentFilter> </row> <row> <label>Unknown</label> @@ -43,6 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==</segmentFilter> </row> <row> <label>Gecko (Firefox)</label> @@ -54,5 +58,6 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserEngine==Gecko</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 27811a9911..c955bf9002 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==EP;browserVersion==2.30</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -34,6 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==RM;browserVersion==0.9</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -46,6 +49,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==UNK;browserVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> @@ -58,6 +62,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==37.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -70,6 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==AN;browserVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> @@ -82,6 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==19.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -94,6 +101,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==20.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -106,6 +114,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -118,6 +127,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==11.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -130,6 +140,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==39.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -142,6 +153,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==CH;browserVersion==41.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -154,6 +166,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>browserCode==CM;browserVersion==39.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> </row> <row> @@ -166,6 +179,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==IE;browserVersion==6.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> @@ -178,6 +192,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>browserCode==IE;browserVersion==8.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 930e0f0aa7..22b2ce81fc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <segmentFilter>browserCode==CH</segmentFilter> </row> <row> <label>Internet Explorer</label> @@ -23,6 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <segmentFilter>browserCode==IE</segmentFilter> </row> <row> <label>Epiphany</label> @@ -35,6 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <segmentFilter>browserCode==EP</segmentFilter> </row> <row> <label>RockMelt</label> @@ -47,6 +50,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <segmentFilter>browserCode==RM</segmentFilter> </row> <row> <label>Unknown</label> @@ -59,6 +63,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <segmentFilter>browserCode==UNK</segmentFilter> </row> <row> <label>Android Browser</label> @@ -71,6 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <segmentFilter>browserCode==AN</segmentFilter> </row> <row> <label>Firefox</label> @@ -83,6 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <segmentFilter>browserCode==FF</segmentFilter> </row> <row> <label>Chrome Mobile</label> @@ -95,5 +102,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <segmentFilter>browserCode==CM</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 7029c34a16..8593134c46 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>29</nb_visits_converted> <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>deviceType==desktop</segmentFilter> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> @@ -34,46 +35,55 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>deviceType==smartphone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tablet</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==feature+phone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==console</segmentFilter> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tv</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==car+browser</segmentFilter> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smart+display</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==camera</segmentFilter> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==portable+media+player</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 0bd4f21719..ce2197886f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==7</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -34,6 +36,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.6</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -46,6 +49,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.10</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -58,6 +62,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==UNK;operatingSystemVersion==UNK</segmentFilter> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -70,6 +75,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -82,6 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==2.3</segmentFilter> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -94,6 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.4</segmentFilter> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> @@ -106,6 +114,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==BOT;operatingSystemVersion==UNK</segmentFilter> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> @@ -118,6 +127,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -130,6 +140,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==MAC;operatingSystemVersion==10.8</segmentFilter> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> @@ -142,6 +153,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml index e676cce9fa..6a0e66ad8f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>31</nb_visits_converted> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segmentFilter>resolution==unknown</segmentFilter> </row> <row> <label>1024x768</label> @@ -21,6 +22,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>resolution==1024x768</segmentFilter> </row> <row> <label>1280x800</label> @@ -32,5 +34,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>resolution==1280x800</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index fbdbbe9484..7394b03aff 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -21,6 +22,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -32,6 +34,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -43,6 +46,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -54,6 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -65,6 +70,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -76,6 +82,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -87,6 +94,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -98,6 +106,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -109,6 +118,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -120,6 +130,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -131,6 +142,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -142,6 +154,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -153,6 +166,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -164,6 +178,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -175,6 +190,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -186,6 +202,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -197,6 +214,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segmentFilter>visitLocalHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -208,6 +226,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -219,6 +238,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -230,6 +250,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -241,6 +262,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -252,6 +274,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -263,5 +286,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitLocalHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 71a5de3ef5..80dd4201fa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -10,6 +10,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -30,6 +31,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -41,6 +43,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -52,6 +55,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -72,6 +76,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -83,6 +88,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -94,6 +100,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -114,6 +121,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -134,6 +142,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -145,6 +154,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -156,6 +166,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -176,6 +187,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -196,6 +208,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -216,6 +229,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -227,6 +241,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -247,6 +262,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -267,6 +283,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>10</revenue> + <segmentFilter>visitServerHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -287,6 +304,7 @@ </goals> <nb_conversions>7</nb_conversions> <revenue>35</revenue> + <segmentFilter>visitServerHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -307,6 +325,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> + <segmentFilter>visitServerHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -327,6 +346,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>10</revenue> + <segmentFilter>visitServerHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -347,6 +367,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -367,6 +388,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -378,6 +400,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -389,5 +412,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>visitServerHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml index 88bdbcf6cd..129439273c 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml @@ -16,5 +16,6 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.635</avg_time_generation> <url>http://example.org/0</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F0</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml index 8cedb2f9a9..9221fa4ce7 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml @@ -10,5 +10,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/dir2/sub/0/file.php</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2F0%2Ffile.php</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml index b557287b32..da905d8434 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml @@ -14,5 +14,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/dir/file.php?foo=bar&foo2=bar</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Ffile.php%3Ffoo%3Dbar%26foo2%3Dbar</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml index 2a3958ceba..d33b719f35 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml @@ -14,5 +14,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.333</avg_time_generation> <url>http://example.org/dir/subdir</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Fsubdir</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml index 4cec8aa9aa..9fbff20062 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml @@ -19,5 +19,6 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.523</avg_time_generation> <url>http://example.org/%C3%A9%C3%A9%C3%A9%22%27...%20%3Cthis%20is%20cool%3E!</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F%C3%A9%C3%A9%C3%A9%22%27...+%3Cthis+is+cool%3E%21</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 15d7f11b70..5065550f08 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -56,6 +56,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> + <segmentFilter>city==Vancouver;regionCode==BC;countryCode==ca</segmentFilter> <city_name>Vancouver</city_name> <region>BC</region> <country>ca</country> @@ -88,6 +89,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> + <segmentFilter>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segmentFilter> <city_name>Stratford-upon-Avon</city_name> <region>P3</region> <country>gb</country> @@ -120,6 +122,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>47.249</lat> <long>6.018</long> + <segmentFilter>city==Besan%C3%A7on;regionCode==A6;countryCode==fr</segmentFilter> <city_name>Besançon</city_name> <region>A6</region> <country>fr</country> @@ -150,6 +153,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==Hlubok%C3%A1+nad+Vltavou;regionCode==66;countryCode==ru</segmentFilter> <city_name>Hluboká nad Vltavou</city_name> <region>66</region> <country>ru</country> @@ -182,6 +186,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>29.65</lat> <long>91.1</long> + <segmentFilter>city==Lhasa;regionCode==1;countryCode==ti</segmentFilter> <city_name>Lhasa</city_name> <region>1</region> <country>ti</country> @@ -212,6 +217,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==London;regionCode==H9;countryCode==gb</segmentFilter> <city_name>London</city_name> <region>H9</region> <country>gb</country> @@ -242,6 +248,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segmentFilter> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> @@ -272,6 +279,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==Stratford-upon-Avon;regionCode==66;countryCode==mk</segmentFilter> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>mk</country> @@ -302,6 +310,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==Stratford-upon-Avon;regionCode==66;countryCode==ru</segmentFilter> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>ru</country> @@ -332,6 +341,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==Stratford-upon-Avon;regionCode==G5;countryCode==gb</segmentFilter> <city_name>Stratford-upon-Avon</city_name> <region>G5</region> <country>gb</country> @@ -359,6 +369,7 @@ <sum_daily_nb_users>1</sum_daily_nb_users> <lat>1</lat> <long>2</long> + <segmentFilter>city==not+a+city;regionCode==CA;countryCode==us</segmentFilter> <city_name>not a city</city_name> <region>CA</region> <country>us</country> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index c56807d771..59c4dd3a58 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -27,6 +27,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==gb</segmentFilter> </row> <row> <label>Canada</label> @@ -55,6 +56,7 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==ca</segmentFilter> </row> <row> <label>Russian Federation</label> @@ -83,6 +85,7 @@ <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==ru</segmentFilter> </row> <row> <label>United States</label> @@ -111,6 +114,7 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==us</segmentFilter> </row> <row> <label>France</label> @@ -139,6 +143,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> <row> <label>Indonesia</label> @@ -167,6 +172,7 @@ <logo>plugins/UserCountry/images/flags/id.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==id</segmentFilter> </row> <row> <label>Italy</label> @@ -195,6 +201,7 @@ <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==it</segmentFilter> </row> <row> <label>Macedonia, the Former Yugoslav Republic of</label> @@ -223,6 +230,7 @@ <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==mk</segmentFilter> </row> <row> <label>Tibet</label> @@ -251,6 +259,7 @@ <logo>plugins/UserCountry/images/flags/ti.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==ti</segmentFilter> </row> <row> <label>Unknown</label> @@ -279,5 +288,6 @@ <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==xx</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index dc3dfb8724..bf899780a3 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -52,6 +52,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==BC;countryCode==ca</segmentFilter> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> @@ -81,6 +82,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==P3;countryCode==gb</segmentFilter> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -110,6 +112,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==66;countryCode==ru</segmentFilter> <region>66</region> <country>ru</country> <country_name>Russian Federation</country_name> @@ -139,6 +142,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==1;countryCode==ti</segmentFilter> <region>1</region> <country>ti</country> <country_name>Tibet</country_name> @@ -168,6 +172,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==66;countryCode==mk</segmentFilter> <region>66</region> <country>mk</country> <country_name>Macedonia, the Former Yugoslav Republic of</country_name> @@ -197,6 +202,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==A6;countryCode==fr</segmentFilter> <region>A6</region> <country>fr</country> <country_name>France</country_name> @@ -226,6 +232,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==G5;countryCode==gb</segmentFilter> <region>G5</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -255,6 +262,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==H9;countryCode==gb</segmentFilter> <region>H9</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -279,6 +287,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segmentFilter>regionCode==CA;countryCode==us</segmentFilter> <region>CA</region> <country>us</country> <country_name>United States</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index 9f9d42d029..cc0d8afbd8 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -25,6 +25,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> + <segmentFilter>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segmentFilter> <city_name>Stratford-upon-Avon</city_name> <region>P3</region> <country>gb</country> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index 369a9aa0e0..6ad1658745 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -27,5 +27,6 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==gb</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index 1324cdf0bc..cdc1a1a229 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -23,6 +23,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==P3;countryCode==gb</segmentFilter> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 18fe81f3a0..f5f453d212 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -27,6 +27,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==gb</segmentFilter> </row> <row> <label>Russian Federation</label> @@ -55,6 +56,7 @@ <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==ru</segmentFilter> </row> <row> <label>France</label> @@ -83,6 +85,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> <row> <label>Italy</label> @@ -111,6 +114,7 @@ <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==it</segmentFilter> </row> <row> <label>Macedonia, the Former Yugoslav Republic of</label> @@ -139,5 +143,6 @@ <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==mk</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index 77c07df86f..d82cc166fb 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -25,6 +25,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> + <segmentFilter>city==Vancouver;regionCode==BC;countryCode==ca</segmentFilter> <city_name>Vancouver</city_name> <region>BC</region> <country>ca</country> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index f881b40d77..89ad0c364d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -27,5 +27,6 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==ca</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 16373b92ee..64783618ac 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -23,6 +23,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==BC;countryCode==ca</segmentFilter> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index 0f87ed59f3..d0fa142f4e 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -25,6 +25,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> + <segmentFilter>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segmentFilter> <city_name>Stratford-upon-Avon</city_name> <region>P3</region> <country>gb</country> @@ -55,6 +56,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segmentFilter> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 48c3eea1ad..2a6bbbb5d2 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -27,5 +27,6 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==gb</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 5b3a0754a3..fe29ea3744 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -23,6 +23,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>regionCode==P3;countryCode==gb</segmentFilter> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 3861e6c668..7d628fa12a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -314,7 +314,80 @@ <revenue>$ 0</revenue> </row> </reportData> - <reportMetadata /> + <reportMetadata> + <row> + <segmentFilter>visitServerHour==12</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==11</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==0</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==1</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==2</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==3</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==4</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==5</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==6</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==7</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==8</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==9</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==10</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==13</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==14</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==15</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==16</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==17</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==18</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==19</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==20</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==21</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==22</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==23</segmentFilter> + </row> + </reportMetadata> <reportTotal> <nb_visits>8</nb_visits> <nb_uniq_visitors>8</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml index 3b556b046b..23a508e8e9 100644 --- a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml @@ -13,6 +13,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/exit-page</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fexit-page</segmentFilter> </row> <row> <label>page</label> diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml index bf07781a28..aabd619ffe 100644 --- a/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>721</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==anothersite.com</segmentFilter> <subtable> <row> <label>http://anothersite.com/whatever.html</label> 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 782624f6dc..4b00d2bad7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml @@ -20,6 +20,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> </row> <row> <label>store</label> 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 39e9d36014..3ce521ab13 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml @@ -17,6 +17,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.023</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>store</label> 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 099d3c8c45..4b7e1149c7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml @@ -15,6 +15,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.224</avg_time_generation> <url>http://example.org/</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F</segmentFilter> </row> <row> <label>/index.htm</label> @@ -33,6 +34,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.023</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.htm?parameter=Should display</label> @@ -54,6 +56,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml index 935548a360..61a7d56829 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml @@ -9,5 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserEngine==Gecko</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index 019893396e..a083c46720 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -9,6 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index d2b191ec2f..bbdb2c3d6d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -10,5 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <segmentFilter>browserCode==FF</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 2080d81278..08b331b507 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -9,6 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index df75b8253a..522f8a716c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -9,51 +9,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>deviceType==desktop</segmentFilter> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smartphone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tablet</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==feature+phone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==console</segmentFilter> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tv</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==car+browser</segmentFilter> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smart+display</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==camera</segmentFilter> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==portable+media+player</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml index 0e80bf7ceb..147b0ac55c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml @@ -17,6 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerName==referrer.com</segmentFilter> <referer_type>3</referer_type> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml index e5e6ad0926..85cfe0f589 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml @@ -17,6 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentFilter>referrerKeyword==purchase</segmentFilter> <subtable> <row> <label>Yahoo!</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml index deb88da799..1fb87a1f7b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -35,6 +35,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentValue>purchase</segmentValue> </row> </subtable> </row> @@ -73,6 +74,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerName==referrer.com</segmentFilter> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml index 8a34da6deb..50c2be558d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml @@ -17,6 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml index 5d8d25b332..c336162bf5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml @@ -17,6 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml index ede209680d..ce93429ef0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml @@ -9,5 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>resolution==1024x768</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index 86f61ceeba..adf7a9395f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -26,5 +26,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml index 935548a360..61a7d56829 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml @@ -9,5 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserEngine==Gecko</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml index 019893396e..a083c46720 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml @@ -9,6 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml index d2b191ec2f..bbdb2c3d6d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml @@ -10,5 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <segmentFilter>browserCode==FF</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml index df75b8253a..522f8a716c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml @@ -9,51 +9,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>deviceType==desktop</segmentFilter> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smartphone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tablet</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==feature+phone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==console</segmentFilter> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tv</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==car+browser</segmentFilter> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smart+display</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==camera</segmentFilter> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==portable+media+player</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml index 2080d81278..08b331b507 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml @@ -9,6 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml index ede209680d..ce93429ef0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml @@ -9,5 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>resolution==1024x768</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml index b95f277bfc..eea8474455 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -9,6 +9,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -19,6 +20,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -29,6 +31,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -39,6 +42,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -49,6 +53,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -59,6 +64,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -69,6 +75,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -79,6 +86,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -89,6 +97,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -99,6 +108,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -109,6 +119,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -119,6 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -129,6 +141,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>visitLocalHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -139,6 +152,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -149,6 +163,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -159,6 +174,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -169,6 +185,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -179,6 +196,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -189,6 +207,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -199,6 +218,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -209,6 +229,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -219,6 +240,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -229,6 +251,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -239,5 +262,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml index 5f96c55a5b..9c2adfb1fa 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml @@ -9,6 +9,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -19,6 +20,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -29,6 +31,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -39,6 +42,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -49,6 +53,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -59,6 +64,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -69,6 +75,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -79,6 +86,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -89,6 +97,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -99,6 +108,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -109,6 +119,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -127,6 +138,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>visitServerHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -145,6 +157,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentFilter>visitServerHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -155,6 +168,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -165,6 +179,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -175,6 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -185,6 +201,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -195,6 +212,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -205,6 +223,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -215,6 +234,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -225,6 +245,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -235,6 +256,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -245,6 +267,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -255,5 +278,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==23</segmentFilter> </row> </result>
\ No newline at end of file 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 1c2d3f6a74..86ae59110f 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 @@ -55,6 +55,7 @@ <reportMetadata> <row> <url>http://example.org/store/purchase.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fstore%2Fpurchase.htm</segmentFilter> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml index 1a1180bbff..7aa36902eb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml @@ -153,7 +153,80 @@ <revenue>$ 0</revenue> </row> </reportData> - <reportMetadata /> + <reportMetadata> + <row> + <segmentFilter>visitServerHour==0</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==1</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==2</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==3</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==4</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==5</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==6</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==7</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==8</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==9</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==10</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==11</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==12</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==13</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==14</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==15</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==16</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==17</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==18</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==19</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==20</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==21</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==22</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==23</segmentFilter> + </row> + </reportMetadata> <reportTotal> <nb_visits>2</nb_visits> </reportTotal> 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 5e51da8014..ea033832f9 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 @@ -19,6 +19,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> + <segmentFilter>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> </row> <row> <label>store</label> 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 ef8f599623..ebe03b68fb 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 @@ -17,6 +17,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.024</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>store</label> 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 ad64d61bfe..bf909a3f87 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 @@ -14,6 +14,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.224</avg_time_generation> <url>http://example.org/</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2F</segmentFilter> </row> <row> <label>/index.htm</label> @@ -32,6 +33,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.024</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.htm?parameter=Should display</label> @@ -52,6 +54,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.234</avg_time_generation> <url>http://example.org/index.htm?parameter=Should display</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segmentFilter> </row> <row> <label>store</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml index 5bcb7b02d6..5ce8125a9d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml @@ -10,5 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserEngine==Gecko</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 955f9837f9..7393a6c35f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index da553644d5..8c7b31d6bf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -11,5 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <segmentFilter>browserCode==FF</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index 452580c138..76e2ea51b7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 0eb81a014d..6c2e471542 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -10,51 +10,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>deviceType==desktop</segmentFilter> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smartphone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tablet</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==feature+phone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==console</segmentFilter> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tv</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==car+browser</segmentFilter> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smart+display</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==camera</segmentFilter> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==portable+media+player</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml index fd61a97675..5455d26b5a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerName==referrer.com</segmentFilter> <referer_type>3</referer_type> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml index 52501d1f57..4dac5a544d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentFilter>referrerKeyword==purchase</segmentFilter> <subtable> <row> <label>Yahoo!</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index 2225e62fa0..29cb726085 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -37,6 +37,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentValue>purchase</segmentValue> </row> </subtable> </row> @@ -77,6 +78,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerName==referrer.com</segmentFilter> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml index 325ad6ac4f..91bc9aecfa 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml index b3100810b3..0dfe6357dd 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index c7cdb13402..6dad93f7d8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -27,5 +27,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml index 5bcb7b02d6..5ce8125a9d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml @@ -10,5 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserEngine==Gecko</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml index 955f9837f9..7393a6c35f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>browserCode==FF;browserVersion==3.6</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml index da553644d5..8c7b31d6bf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml @@ -11,5 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <segmentFilter>browserCode==FF</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml index 0eb81a014d..6c2e471542 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml @@ -10,51 +10,61 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>deviceType==desktop</segmentFilter> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smartphone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> <label>Tablet</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tablet</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==feature+phone</segmentFilter> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==console</segmentFilter> <logo>plugins/DevicesDetection/images/screens/console.gif</logo> </row> <row> <label>Tv</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==tv</segmentFilter> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==car+browser</segmentFilter> <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==smart+display</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==camera</segmentFilter> <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> + <segmentFilter>deviceType==portable+media+player</segmentFilter> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index 452580c138..76e2ea51b7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>operatingSystemCode==WIN;operatingSystemVersion==XP</segmentFilter> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml index 05f05aaf02..047ed92f79 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml @@ -10,5 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>resolution==1024x768</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml index 09556822a9..f166f11a6f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -32,6 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -43,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -54,6 +58,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -65,6 +70,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -76,6 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -87,6 +94,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -98,6 +106,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -109,6 +118,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -120,6 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -131,6 +142,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -142,6 +154,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>visitLocalHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -153,6 +166,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -164,6 +178,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -175,6 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -186,6 +202,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -197,6 +214,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -208,6 +226,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -219,6 +238,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -230,6 +250,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -241,6 +262,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -252,6 +274,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -263,5 +286,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index 9ded5c32c2..8f1b279503 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -32,6 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -43,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -54,6 +58,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -65,6 +70,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -76,6 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -87,6 +94,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -98,6 +106,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -109,6 +118,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -120,6 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -139,6 +150,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>visitServerHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -158,6 +170,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segmentFilter>visitServerHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -169,6 +182,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -180,6 +194,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -191,6 +206,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -202,6 +218,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -213,6 +230,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -224,6 +242,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -235,6 +254,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -246,6 +266,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -257,6 +278,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -268,6 +290,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -279,5 +302,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml index d1914d0e11..be1a67bb8d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml @@ -17,6 +17,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/contact.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fcontact.htm</segmentFilter> </row> <row> <label>category</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml index aa89682153..9da78c7f25 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==kia+ora</segmentFilter> <subtable> <row> <label>Google</label> @@ -56,6 +57,7 @@ <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==hello+world</segmentFilter> <subtable> <row> <label>Bing</label> @@ -80,6 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==salut</segmentFilter> <subtable> <row> <label>Google</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml index 8555f09801..22276b704e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerKeyword==</segmentFilter> <subtable> <row> <label>Google</label> @@ -42,6 +43,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segmentFilter> <subtable> <row> <label>Google</label> diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml index 8adb115a5f..ac51ac9a3d 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42.26</revenue> + <segmentFilter>referrerType==campaign;referrerName==ga+campaign</segmentFilter> <subtable> <row> <label>piwik kwd</label> @@ -72,6 +73,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==campaign;referrerName==adwords+campaign</segmentFilter> <subtable> <row> <label>(adwords) www.adwords-publisher-website.org</label> @@ -107,6 +109,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==campaign;referrerName==adwords+%28text%29</segmentFilter> <subtable> <row> <label>(adwords) www.example.com</label> @@ -131,6 +134,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==campaign;referrerName==adwords+%28text_image%29</segmentFilter> <subtable> <row> <label>(adwords) example.com</label> @@ -163,6 +167,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>24</revenue> + <segmentFilter>referrerType==campaign;referrerName==credited+to+another+goal</segmentFilter> <subtable> <row> <label>example.org</label> @@ -203,6 +208,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segmentFilter>referrerType==campaign;referrerName==credited+to+goal+please</segmentFilter> <subtable> <row> <label>example.org</label> diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml index 51ea81cd04..1d80af64cd 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==mutantregistration.com</segmentFilter> <subtable> <row> <label>http://mutantregistration.com</label> @@ -34,6 +35,7 @@ <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==myotherreferrerwebsite.com</segmentFilter> <subtable> <row> <label>http://myotherreferrerwebsite.com</label> @@ -58,6 +60,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==myreferrerwebsite.com</segmentFilter> <subtable> <row> <label>http://myreferrerwebsite.com</label> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index 0e98c5b577..459302f912 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -77,12 +77,15 @@ <result prettyDate="Sunday 3 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> </row> <row> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> </row> </result> <result prettyDate="Monday 4 January 2010" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml index ac1a2430de..5f859a86b2 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml @@ -77,12 +77,15 @@ <result prettyDate="2010, January"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> </row> <row> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> </row> </result> <result prettyDate="2010, February" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml index ff058d70eb..9d84e15cdb 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml @@ -13,6 +13,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -26,6 +27,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -38,6 +40,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> </row> </result> <result date="2010-01-04" /> @@ -64,6 +67,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</label> @@ -75,6 +79,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> </row> </result> <result date="2010-01-04" /> @@ -98,6 +103,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segmentFilter> </row> <row> <label>/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</label> @@ -109,6 +115,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> </row> <row> <label>/index.htm?q=Search 1&IsPageView=1</label> @@ -125,6 +132,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> </row> </result> <result date="2010-01-04" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml index 87e23ee986..57e60b2a58 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml @@ -13,6 +13,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -26,6 +27,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -38,6 +40,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> </row> </result> <result date="2010-02" /> @@ -64,6 +67,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</label> @@ -75,6 +79,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> </row> </result> <result date="2010-02" /> @@ -98,6 +103,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segmentFilter> </row> <row> <label>/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</label> @@ -109,6 +115,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segmentFilter> </row> <row> <label>/index.htm?q=Search 1&IsPageView=1</label> @@ -125,6 +132,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?q=Search 1&IsPageView=1</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segmentFilter> </row> </result> <result date="2010-02" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml index f709bef598..f14f11079b 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml @@ -11,6 +11,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -24,6 +25,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -36,5 +38,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml index a7eeb309c9..013bdd80b6 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml @@ -11,6 +11,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label> @@ -24,6 +25,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segmentFilter> </row> <row> <label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label> @@ -36,5 +38,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segmentFilter> </row> </result>
\ No newline at end of file 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 e8a1b4f34b..e3a5d44f88 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 @@ -223,9 +223,11 @@ <result prettyDate="Sunday 3 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result prettyDate="Monday 4 January 2010"> @@ -236,9 +238,11 @@ <result prettyDate="Tuesday 5 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <url /> @@ -247,9 +251,11 @@ <result prettyDate="Wednesday 6 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <url /> @@ -258,9 +264,11 @@ <result prettyDate="Thursday 7 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <url /> @@ -269,9 +277,11 @@ <result prettyDate="Friday 8 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <url /> @@ -280,9 +290,11 @@ <result prettyDate="Saturday 9 January 2010"> <row> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <url /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index fbcf1fbc09..2b86ba1f4f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -109,11 +109,13 @@ <reportMetadata> <result prettyDate="Sunday 3 January 2010"> <row> + <segmentFilter>referrerName==referrer.com</segmentFilter> </row> </result> <result prettyDate="Monday 4 January 2010"> <row> + <segmentFilter>referrerName==referrer.com</segmentFilter> </row> </result> @@ -122,11 +124,13 @@ <result prettyDate="Thursday 7 January 2010" /> <result prettyDate="Friday 8 January 2010"> <row> + <segmentFilter>referrerName==referrer.com</segmentFilter> </row> </result> <result prettyDate="Saturday 9 January 2010"> <row> + <segmentFilter>referrerName==referrer.com</segmentFilter> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml index 8f12a3232b..1e2080ab0f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml @@ -23,6 +23,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/products</label> @@ -45,6 +46,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="2010-01-04"> @@ -84,6 +86,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -101,6 +104,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -138,6 +142,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -155,6 +160,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -192,6 +198,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -209,6 +216,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -246,6 +254,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -263,6 +272,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -300,6 +310,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -317,6 +328,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -359,6 +371,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> </row> <row> <label>Page URL not defined</label> 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 b34880ccf4..e32b5d9e9d 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 @@ -23,6 +23,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -55,6 +56,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>/products</label> @@ -77,6 +79,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="2010-02" /> @@ -109,6 +112,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> </row> <row> <label>Page URL not defined</label> 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 612ed2c38d..f416a1ce36 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 @@ -23,6 +23,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/products</label> @@ -45,6 +46,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="From 2010-01-04 to 2010-01-10"> @@ -82,6 +84,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -99,6 +102,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> </result> <result date="From 2010-01-11 to 2010-01-17"> @@ -121,6 +125,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -138,6 +143,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -184,6 +190,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> </row> <row> <label>Page URL not defined</label> 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 60aab5d751..44a0e1ce36 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 @@ -23,6 +23,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -55,6 +56,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>/products</label> @@ -77,6 +79,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="2011" /> @@ -109,6 +112,7 @@ <exit_rate>50%</exit_rate> <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segmentFilter> </row> <row> <label>Page URL not defined</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml index 926587d371..f0cea9f926 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml @@ -12,6 +12,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -38,6 +39,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -67,6 +69,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -93,6 +96,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -122,6 +126,7 @@ <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index 2ddfc23c4b..baf6483b39 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -12,6 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -57,6 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index 4bb03ec3cb..c43d480368 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -12,6 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -38,6 +39,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -75,6 +77,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -108,6 +111,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index 185e5ad77d..086c01292c 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -12,6 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -57,6 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==only-homepage-referrer.com</segmentFilter> <subtable> <row> <label>http://only-homepage-referrer.com/</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml index bb90dc73e3..e9c3aa5f1f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml @@ -22,6 +22,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/products</label> @@ -44,6 +45,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="2010-01-04"> @@ -83,6 +85,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -100,6 +103,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -137,6 +141,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -154,6 +159,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -191,6 +197,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -208,6 +215,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -245,6 +253,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -262,6 +271,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -299,6 +309,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -316,6 +327,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> 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 6442655663..44c5f1ba43 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 @@ -22,6 +22,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -54,6 +55,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>/products</label> @@ -76,6 +78,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="2010-02" /> 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 0eb61980dc..8f4c8ef43a 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 @@ -22,6 +22,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.123</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/products</label> @@ -44,6 +45,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="From 2010-01-04 to 2010-01-10"> @@ -81,6 +83,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -98,6 +101,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> </result> <result date="From 2010-01-11 to 2010-01-17"> @@ -120,6 +124,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.323</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>/thankyou</label> @@ -137,6 +142,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>Page URL not defined</label> 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 d08ec4f3b7..47d044b724 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 @@ -22,6 +22,7 @@ <exit_rate>11%</exit_rate> <avg_time_generation>0.301</avg_time_generation> <url>http://example.org/index.htm</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segmentFilter> </row> <row> <label>Page URL not defined</label> @@ -54,6 +55,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> <url>http://example.org/thankyou</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segmentFilter> </row> <row> <label>/products</label> @@ -76,6 +78,7 @@ <exit_rate>100%</exit_rate> <avg_time_generation>0.153</avg_time_generation> <url>http://example.org/products</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segmentFilter> </row> </result> <result date="2011" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml index 4f98f9bdd0..2d0795cf91 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml @@ -11,6 +11,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -37,6 +38,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -66,6 +68,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -92,6 +95,7 @@ <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index 14ec451e90..d151503d5f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -11,6 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index 7da13caaa0..7020455958 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -11,6 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -37,6 +38,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -74,6 +76,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index 9c836d9cd0..c7e850c90a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -11,6 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerName==referrer.com</segmentFilter> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml index 2f10eb3f97..0562371d1a 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml @@ -123,6 +123,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> </row> <row> <label>/Home</label> @@ -134,6 +135,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml index 2f10eb3f97..0562371d1a 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml @@ -123,6 +123,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> </row> <row> <label>/Home</label> @@ -134,6 +135,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml index 401e8d2dc7..36dcc573f8 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml @@ -124,6 +124,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> </row> <row> <label>/Home</label> @@ -135,6 +136,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml index 401e8d2dc7..36dcc573f8 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml @@ -124,6 +124,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Contact</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FContact</segmentFilter> </row> <row> <label>/Home</label> @@ -135,6 +136,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/Home</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2FHome</segmentFilter> </row> <row> <label>Contact</label> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index f08e134ae6..e9443d4066 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -63,6 +63,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 152da458e3..add85693bb 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -153,6 +153,13 @@ <row> <type>dimension</type> <category>Visit</category> + <name>Operating system version</name> + <segment>operatingSystemVersion</segment> + <acceptedValues>XP, 7, 2.3, 5.1, ...</acceptedValues> + </row> + <row> + <type>dimension</type> + <category>Visit</category> <name>Resolution</name> <segment>resolution</segment> <acceptedValues>1280x1024, 800x600, etc.</acceptedValues> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index a701470308..eb1a89b00f 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -76,6 +76,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index dda3bec0a8..252dcb55ab 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -314,7 +314,80 @@ <revenue>$ 0</revenue> </row> </reportData> - <reportMetadata /> + <reportMetadata> + <row> + <segmentFilter>visitServerHour==0</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==1</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==2</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==3</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==4</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==5</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==6</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==7</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==8</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==9</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==10</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==11</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==12</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==13</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==14</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==15</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==16</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==17</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==18</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==19</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==20</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==21</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==22</segmentFilter> + </row> + <row> + <segmentFilter>visitServerHour==23</segmentFilter> + </row> + </reportMetadata> <reportTotal> <nb_visits>3</nb_visits> <nb_uniq_visitors>3</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 2b07701c01..34c01175fa 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -73,12 +73,14 @@ <logo>plugins/UserCountry/images/flags/pl.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==pl</segmentFilter> </row> <row> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml index 1f4ae42832..0c53b50140 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -33,6 +33,7 @@ <logo>plugins/UserCountry/images/flags/pl.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==pl</segmentFilter> </row> <row> <label>France</label> @@ -56,5 +57,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml index 18762c91ed..bb4506a284 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -32,6 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -43,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -54,6 +58,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -65,6 +70,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -76,6 +82,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -87,6 +94,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -98,6 +106,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -109,6 +118,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -120,6 +130,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -131,6 +142,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -142,6 +154,7 @@ <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>2</nb_visits_converted> + <segmentFilter>visitLocalHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -153,6 +166,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -164,6 +178,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -175,6 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -186,6 +202,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -197,6 +214,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -208,6 +226,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -219,6 +238,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -230,6 +250,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -241,6 +262,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -252,6 +274,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -263,5 +286,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitLocalHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml index 09cede1477..340ddeaaa1 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>10</revenue> + <segmentFilter>visitServerHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -29,6 +30,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -59,6 +61,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>3111.11</revenue> + <segmentFilter>visitServerHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -70,6 +73,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -81,6 +85,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -92,6 +97,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -103,6 +109,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -123,6 +130,7 @@ </goals> <nb_conversions>0</nb_conversions> <revenue>0</revenue> + <segmentFilter>visitServerHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -134,6 +142,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -145,6 +154,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -156,6 +166,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -167,6 +178,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -178,6 +190,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -189,6 +202,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -200,6 +214,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -211,6 +226,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -222,6 +238,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -233,6 +250,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -244,6 +262,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -255,6 +274,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -266,6 +286,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -277,6 +298,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -288,6 +310,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -299,5 +322,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml index fdcb7efcf3..46b632de3c 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml @@ -15,6 +15,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/homepage</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> </row> <row> <label>/news</label> @@ -33,6 +34,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/news</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segmentFilter> </row> <row> <label>sub1</label> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml index bef1e186ef..87462b68c3 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml @@ -10,5 +10,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>resolution==1024x768</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml index 7cbd671101..cdb1990717 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml @@ -14,5 +14,6 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml index b054303185..98588b09fc 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml @@ -1,267 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row> - <label>0h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>1h</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>1083</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>2h</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>3h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>4h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>5h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>6h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>7h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>8h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>9h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>10h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>11h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>12h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>13h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>14h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>15h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>16h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>17h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>18h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>19h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>20h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>21h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>22h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>23h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> + <error message="Date format must be: YYYY-MM-DD, or 'today' or 'yesterday' or any keyword supported by the strtotime function (see http://php.net/strtotime for more information): 2010-12-15,2011-01-15 + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml index f5ed922233..018d31f7ab 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml @@ -15,6 +15,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/homepage</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> </row> <row> <label>/news</label> @@ -33,6 +34,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/news</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segmentFilter> </row> <row> <label>sub1</label> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml index 1f11de6d95..b8256bd516 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml @@ -15,6 +15,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/homepage</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> </row> <row> <label>news</label> @@ -33,6 +34,7 @@ <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/news</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segmentFilter> </row> <row> <label>sub1/sub2/sub3/news</label> @@ -46,5 +48,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/sub1/sub2/sub3/news</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fsub1%2Fsub2%2Fsub3%2Fnews</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index 077a490219..45599068e7 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -60,6 +60,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> + <segmentFilter>countryCode==fr</segmentFilter> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml index 7bc6d955d2..46f666ea16 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml @@ -17,6 +17,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>50%</exit_rate> <url>http://example.org/homepage</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> </row> <row> <label>user</label> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml index 4faa5d55df..2aeca9fae4 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml @@ -12,6 +12,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <nb_visits>0</nb_visits> + <segmentFilter>referrerType==campaign;referrerName==campaign+name+-+yeah%21</segmentFilter> <subtable> <row> <label>campaign keyword - right...</label> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml index bd1f763bd0..2ba81831d8 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml @@ -10,6 +10,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerKeyword==this+keyword+should+be+ranked</segmentFilter> <subtable> <row> <label>Google</label> @@ -41,5 +42,6 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <nb_visits>0</nb_visits> + <segmentFilter>referrerKeyword==piwik</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 4606699122..9cc5d5f011 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index 2925479cc4..0c8d501613 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.0</segmentFilter> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml index 8202c35460..a9436bf83f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever1.com</segmentFilter> <referer_type>3</referer_type> </row> <row> @@ -22,6 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever0.com</segmentFilter> <referer_type>3</referer_type> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml index dd1f7037e6..62b0fbce59 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==this+search+term</segmentFilter> <subtable> <row> <label>Ask</label> @@ -45,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==search+term+2</segmentFilter> <subtable> <row> <label>Alexa</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml index 6b8c754c71..127c0a4942 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -32,6 +32,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentValue>this search term</segmentValue> </row> <row> <label>search term 2</label> @@ -43,6 +44,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentValue>search term 2</segmentValue> </row> <row> <label>Others</label> @@ -78,6 +80,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever0.com</segmentFilter> </row> <row> <label>whatever1.com</label> @@ -89,6 +92,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever1.com</segmentFilter> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml index cfcc0601a9..9ec10bb990 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==search;referrerName==Google</segmentFilter> <url>http://google.com</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> <subtable> @@ -47,6 +48,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml index 6b473345a8..bd85718705 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever0.com</segmentFilter> <subtable> <row> <label>http://whatever0.com/0</label> @@ -45,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever1.com</segmentFilter> <subtable> <row> <label>http://whatever1.com/0</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml index 7b29bb6e65..8604b27aec 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>resolution==1920x1080</segmentFilter> </row> <row> <label>1280x1024</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>resolution==1280x1024</segmentFilter> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml index c9eb98ffda..b25a896506 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>city==Melbourne;regionCode==07;countryCode==au</segmentFilter> <city_name>Melbourne</city_name> <region>07</region> <country>au</country> @@ -27,6 +28,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>city==Nice;regionCode==B8;countryCode==fr</segmentFilter> <city_name>Nice</city_name> <region>B8</region> <country>fr</country> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml index 50888ce069..af4ce205a1 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>regionCode==07;countryCode==au</segmentFilter> <region>07</region> <country>au</country> <country_name>Australia</country_name> @@ -26,6 +27,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>regionCode==B8;countryCode==fr</segmentFilter> <region>B8</region> <country>fr</country> <country_name>France</country_name> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index 4606699122..9cc5d5f011 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>browserCode==FF;browserVersion==6.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>browserCode==IE;browserVersion==9.0</segmentFilter> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index 2925479cc4..0c8d501613 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>operatingSystemCode==LIN;operatingSystemVersion==</segmentFilter> <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> @@ -22,6 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>operatingSystemCode==AND;operatingSystemVersion==4.0</segmentFilter> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml index 8202c35460..a9436bf83f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever1.com</segmentFilter> <referer_type>3</referer_type> </row> <row> @@ -22,6 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever0.com</segmentFilter> <referer_type>3</referer_type> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml index dd1f7037e6..62b0fbce59 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==this+search+term</segmentFilter> <subtable> <row> <label>Ask</label> @@ -45,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerKeyword==search+term+2</segmentFilter> <subtable> <row> <label>Alexa</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml index 6b8c754c71..127c0a4942 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml @@ -32,6 +32,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentValue>this search term</segmentValue> </row> <row> <label>search term 2</label> @@ -43,6 +44,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentValue>search term 2</segmentValue> </row> <row> <label>Others</label> @@ -78,6 +80,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever0.com</segmentFilter> </row> <row> <label>whatever1.com</label> @@ -89,6 +92,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever1.com</segmentFilter> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml index cfcc0601a9..9ec10bb990 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==search;referrerName==Google</segmentFilter> <url>http://google.com</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> <subtable> @@ -47,6 +48,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerType==search;referrerName==Yahoo%21</segmentFilter> <url>http://search.yahoo.com</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> <subtable> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml index 6b473345a8..bd85718705 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever0.com</segmentFilter> <subtable> <row> <label>http://whatever0.com/0</label> @@ -45,6 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>referrerName==whatever1.com</segmentFilter> <subtable> <row> <label>http://whatever1.com/0</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml index 7b29bb6e65..8604b27aec 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>resolution==1920x1080</segmentFilter> </row> <row> <label>1280x1024</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>resolution==1280x1024</segmentFilter> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index c9eb98ffda..b25a896506 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>city==Melbourne;regionCode==07;countryCode==au</segmentFilter> <city_name>Melbourne</city_name> <region>07</region> <country>au</country> @@ -27,6 +28,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>city==Nice;regionCode==B8;countryCode==fr</segmentFilter> <city_name>Nice</city_name> <region>B8</region> <country>fr</country> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index 50888ce069..af4ce205a1 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>regionCode==07;countryCode==au</segmentFilter> <region>07</region> <country>au</country> <country_name>Australia</country_name> @@ -26,6 +27,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>regionCode==B8;countryCode==fr</segmentFilter> <region>B8</region> <country>fr</country> <country_name>France</country_name> diff --git a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml index 55a4fa3bd0..d1211383eb 100644 --- a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml @@ -38,6 +38,7 @@ </goals> <nb_conversions>8</nb_conversions> <revenue>1332</revenue> + <segmentFilter>visitServerHour==0</segmentFilter> </row> <row> <label>1h</label> @@ -49,6 +50,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==1</segmentFilter> </row> <row> <label>2h</label> @@ -60,6 +62,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==2</segmentFilter> </row> <row> <label>3h</label> @@ -71,6 +74,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==3</segmentFilter> </row> <row> <label>4h</label> @@ -82,6 +86,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==4</segmentFilter> </row> <row> <label>5h</label> @@ -93,6 +98,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==5</segmentFilter> </row> <row> <label>6h</label> @@ -104,6 +110,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==6</segmentFilter> </row> <row> <label>7h</label> @@ -115,6 +122,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==7</segmentFilter> </row> <row> <label>8h</label> @@ -126,6 +134,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==8</segmentFilter> </row> <row> <label>9h</label> @@ -137,6 +146,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==9</segmentFilter> </row> <row> <label>10h</label> @@ -148,6 +158,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==10</segmentFilter> </row> <row> <label>11h</label> @@ -159,6 +170,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==11</segmentFilter> </row> <row> <label>12h</label> @@ -170,6 +182,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==12</segmentFilter> </row> <row> <label>13h</label> @@ -181,6 +194,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==13</segmentFilter> </row> <row> <label>14h</label> @@ -192,6 +206,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==14</segmentFilter> </row> <row> <label>15h</label> @@ -203,6 +218,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==15</segmentFilter> </row> <row> <label>16h</label> @@ -214,6 +230,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==16</segmentFilter> </row> <row> <label>17h</label> @@ -225,6 +242,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==17</segmentFilter> </row> <row> <label>18h</label> @@ -236,6 +254,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==18</segmentFilter> </row> <row> <label>19h</label> @@ -247,6 +266,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==19</segmentFilter> </row> <row> <label>20h</label> @@ -258,6 +278,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==20</segmentFilter> </row> <row> <label>21h</label> @@ -269,6 +290,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==21</segmentFilter> </row> <row> <label>22h</label> @@ -280,6 +302,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==22</segmentFilter> </row> <row> <label>23h</label> @@ -291,5 +314,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segmentFilter>visitServerHour==23</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml index 2c178c678b..7ce507892a 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml @@ -17,5 +17,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>50%</exit_rate> <url>http://example.org/homepage</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml index 2c178c678b..7ce507892a 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml @@ -17,5 +17,6 @@ <bounce_rate>0%</bounce_rate> <exit_rate>50%</exit_rate> <url>http://example.org/homepage</url> + <segmentFilter>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segmentFilter> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml index 5f34b6f1bb..515359ad29 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml @@ -12,6 +12,7 @@ <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> + <segmentFilter>referrerKeyword==this+keyword+should+be+ranked</segmentFilter> <subtable> <row> <label>Google</label> @@ -43,6 +44,7 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <nb_visits>0</nb_visits> + <segmentFilter>referrerKeyword==piwik</segmentFilter> </row> </result> <result date="2010-01-04" /> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml index 94f2fa7c83..269fb7f690 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml @@ -12,6 +12,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segmentFilter>referrerKeyword==this+keyword+should+be+ranked</segmentFilter> <subtable> <row> <label>Google</label> @@ -43,6 +44,7 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <nb_visits>0</nb_visits> + <segmentFilter>referrerKeyword==piwik</segmentFilter> </row> </result> <result date="From 2010-01-04 to 2010-01-10" /> diff --git a/tests/PHPUnit/Unit/DateTest.php b/tests/PHPUnit/Unit/DateTest.php index 129fd99a7c..8d29aa5f12 100644 --- a/tests/PHPUnit/Unit/DateTest.php +++ b/tests/PHPUnit/Unit/DateTest.php @@ -89,6 +89,27 @@ class DateTest extends \PHPUnit_Framework_TestCase } } + public function test_getHourInUTC() + { + $date = Date::factory('today', 'UTC'); + $hour = $date->getHourInUTC(); + $this->assertSame('0', $hour); // hour is already in UTC + + $date = Date::factory('today', 'UTC+10'); + $hour = $date->getHourInUTC(); + $this->assertSame('10', $hour); + + $date = Date::factory('today'); + $date = $date->setTime('14:00:00')->setTimezone('UTC+10'); // 14-10 = 4 + $hour = $date->getHourInUTC(); + $this->assertSame('4', $hour); + + $date = Date::factory('today'); + $date = $date->setTime('14:00:00')->setTimezone('UTC-5'); // 14+5 = 19 + $hour = $date->getHourInUTC(); + $this->assertSame('19', $hour); + } + /** * @group Core */ diff --git a/tests/UI/specs/ActionsDataTable_spec.js b/tests/UI/specs/ActionsDataTable_spec.js index 71969c49c3..7f4874b37e 100644 --- a/tests/UI/specs/ActionsDataTable_spec.js +++ b/tests/UI/specs/ActionsDataTable_spec.js @@ -63,8 +63,24 @@ describe("ActionsDataTable", function () { }, done); }); + it("should generate a proper title for the visitor log segmented by the current row", function (done) { + expect.screenshot('segmented_visitor_log_hover').to.be.capture(function (page) { + var row = 'tr:eq(2) '; + page.mouseMove(row + 'td.column:first'); + page.mouseMove(row + 'td.label .actionSegmentVisitorLog'); + }, done); + }); + + it("should open the visitor log segmented by the current row", function (done) { + expect.screenshot('segmented_visitor_log').to.be.capture(function (page) { + page.click('tr:eq(2) td.label .actionSegmentVisitorLog'); + }, done); + }); + it("should display unique pageview percentages when hovering over unique pageviews column", function (done) { expect.screenshot('unique_pageview_percentages').to.be.capture(function (page) { + page.click('.ui-widget .ui-dialog-titlebar-close'); + page.mouseMove('tr:eq(2) td.column:eq(1)'); }, done); }); |
