diff options
54 files changed, 1247 insertions, 473 deletions
diff --git a/core/DataTable.php b/core/DataTable.php index 356ce86f69..f7f6cd824f 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -1607,7 +1607,12 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess if (isset($subtablePerLabel[$label])) { $cleanRow[Row::DATATABLE_ASSOCIATED] = $subtablePerLabel[$label]; } - $table->addRow(new Row($cleanRow)); + + if ($label === RankingQuery::LABEL_SUMMARY_ROW) { + $table->addSummaryRow(new Row($cleanRow)); + } else { + $table->addRow(new Row($cleanRow)); + } } return $table; } diff --git a/core/RankingQuery.php b/core/RankingQuery.php index fd4f69b16f..0f84a59995 100644 --- a/core/RankingQuery.php +++ b/core/RankingQuery.php @@ -41,6 +41,9 @@ use Exception; */ class RankingQuery { + // a special label used to mark the 'Others' row in a ranking query result set. this is mapped to the + // datatable summary row during archiving. + const LABEL_SUMMARY_ROW = '__mtm_ranking_query_others__'; /** * Contains the labels of the inner query. @@ -84,7 +87,7 @@ class RankingQuery * The value to use in the label of the 'Others' row. * @var string */ - private $othersLabelValue = 'Others'; + private $othersLabelValue = self::LABEL_SUMMARY_ROW; /** * Constructor. diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 30e2003c77..88cb9a1057 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -2581,7 +2581,7 @@ <region>Xizang Zizhiqu</region> <regionCode>XZ</regionCode> <city>Lhasa</city> - <location>Lhasa, Xizang, China</location> + <location>Lhasa, Xizang Zizhiqu, China</location> <latitude>29.650000</latitude> <longitude>91.100000</longitude> <visitLocalTime>12:34:06</visitLocalTime> @@ -2883,7 +2883,7 @@ <region>Xizang Zizhiqu</region> <regionCode>XZ</regionCode> <city>Lhasa</city> - <location>Lhasa, Xizang, China</location> + <location>Lhasa, Xizang Zizhiqu, China</location> <latitude>29.650000</latitude> <longitude>91.100000</longitude> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index ddb05cc5ae..35ecf41230 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -200,7 +200,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = false; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn(array('idaction', 'name')); $rankingQuery->addColumn('url_prefix'); @@ -281,7 +280,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = false; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS); $rankingQuery->addColumn(array(PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS, @@ -330,7 +328,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = false; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS); $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_EXIT_NB_VISITS, 'sum'); @@ -374,7 +371,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = false; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum'); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType)); diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 2e878a45bb..e5c315d0b1 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -15,6 +15,7 @@ use Piwik\DataTable; use Piwik\DataTable\Row; use Piwik\Metrics as PiwikMetrics; use Piwik\Piwik; +use Piwik\RankingQuery; use Piwik\Tracker\Action; use Piwik\Tracker\PageUrl; use Zend_Db_Statement; @@ -57,7 +58,7 @@ class ArchivingHelper continue; } - $hasRowName = !empty($row['name']) && $row['name'] != DataTable::LABEL_SUMMARY_ROW; + $hasRowName = !empty($row['name']) && $row['name'] != RankingQuery::LABEL_SUMMARY_ROW; // This will appear as <url /> in the API, which is actually very important to keep // eg. When there's at least one row in a report that does not have a URL, not having this <url/> would break HTML/PDF reports. @@ -381,7 +382,7 @@ class ArchivingHelper } // check for ranking query cut-off - if ($actionName == DataTable::LABEL_SUMMARY_ROW) { + if ($actionName == RankingQuery::LABEL_SUMMARY_ROW) { $summaryRow = $currentTable->getRowFromId(DataTable::ID_SUMMARY_ROW); if ($summaryRow === false) { $summaryRow = $currentTable->addSummaryRow(self::createSummaryRow()); @@ -499,7 +500,7 @@ class ArchivingHelper */ private static function getCachedActionRowKey($idAction, $actionType) { - return $idAction == DataTable::LABEL_SUMMARY_ROW + return $idAction == RankingQuery::LABEL_SUMMARY_ROW ? $actionType . '_others' : $idAction; } diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php index 27ead44c37..a627ac38d8 100644 --- a/plugins/Contents/Archiver.php +++ b/plugins/Contents/Archiver.php @@ -117,7 +117,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = null; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn(array('contentPiece', 'contentTarget', 'contentName')); $rankingQuery->addColumn(array(Metrics::INDEX_NB_UNIQ_VISITORS)); $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_IMPRESSIONS, Metrics::INDEX_NB_VISITS), 'sum'); @@ -173,7 +172,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = null; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn(array('contentPiece', 'contentInteraction', 'contentName')); $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_INTERACTIONS), 'sum'); } diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php index bfa4813e36..b87ff8543a 100644 --- a/plugins/Events/Archiver.php +++ b/plugins/Events/Archiver.php @@ -180,7 +180,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = null; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn(array('eventCategory', 'eventAction', 'eventName')); $rankingQuery->addColumn(array(Metrics::INDEX_NB_UNIQ_VISITORS)); $rankingQuery->addColumn(array(Metrics::INDEX_EVENT_NB_HITS, Metrics::INDEX_NB_VISITS, Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE), 'sum'); diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 4c57d2722d..33c330f999 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -271,6 +271,7 @@ class API extends \Piwik\Plugin\API $types[Action::TYPE_DOWNLOAD] = 'downloads'; $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); + $rankingQuery->setOthersLabel('Others'); $rankingQuery->addLabelColumn(array('name', 'url_prefix')); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($types)); @@ -301,6 +302,7 @@ class API extends \Piwik\Plugin\API protected function queryExternalReferrers($idaction, $actionType, $logAggregator, $limitBeforeGrouping = false) { $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); + $rankingQuery->setOthersLabel('Others'); // we generate a single column that contains the interesting data for each referrer. // the reason we cannot group by referer_* becomes clear when we look at search engine keywords. @@ -379,6 +381,7 @@ class API extends \Piwik\Plugin\API $keyIsSiteSearchAction = 2; $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); + $rankingQuery->setOthersLabel('Others'); $rankingQuery->addLabelColumn(array('name', 'url_prefix')); $rankingQuery->setColumnToMarkExcludedRows('is_self'); $rankingQuery->partitionResultIntoMultipleGroups('action_partition', array($keyIsOther, $keyIsPageUrlAction, $keyIsSiteSearchAction)); diff --git a/plugins/UserId/Archiver.php b/plugins/UserId/Archiver.php index ae7fdcee8a..07e6be51d5 100644 --- a/plugins/UserId/Archiver.php +++ b/plugins/UserId/Archiver.php @@ -83,7 +83,6 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery = false; if ($rankingQueryLimit > 0) { $rankingQuery = new RankingQuery($rankingQueryLimit); - $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn($userIdFieldName); $rankingQuery->addLabelColumn($visitorIdFieldName); } @@ -119,21 +118,6 @@ class Archiver extends \Piwik\Plugin\Archiver { /** @var DataTable $dataTable */ $dataTable = $this->arrays->asDataTable(); - - // deal w/ ranking query summary row - $rankingQuerySummaryRow = $dataTable->getRowFromLabel(DataTable::LABEL_SUMMARY_ROW); - if ($rankingQuerySummaryRow) { - $rankingQuerySummaryRowId = $dataTable->getRowIdFromLabel(DataTable::LABEL_SUMMARY_ROW); - $dataTable->deleteRow($rankingQuerySummaryRowId); - - $actualSummaryRow = $dataTable->getRowFromId(DataTable::ID_SUMMARY_ROW); - if ($actualSummaryRow) { - $actualSummaryRow->sumRow($rankingQuerySummaryRow); - } else { - $dataTable->addSummaryRow($rankingQuerySummaryRow); - } - } - $this->setVisitorIds($dataTable); $report = $dataTable->getSerialized($this->maximumRowsInDataTableLevelZero, null, PiwikMetrics::INDEX_NB_VISITS); $this->getProcessor()->insertBlobRecord(self::USERID_ARCHIVE_RECORD, $report); diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php index e0840f8536..887f542d7c 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php @@ -128,6 +128,12 @@ class ManyVisitsWithMockLocationProvider extends Fixture // track outlinks $this->trackActions($t, $visitorCounter, 'outlink', $userAgents, $resolutions); + // track events + $this->trackActions($t, $visitorCounter, 'event', $userAgents, $resolutions); + + // track events + $this->trackActions($t, $visitorCounter, 'content', $userAgents, $resolutions); + // track ecommerce product orders $this->trackOrders($t); } @@ -142,8 +148,8 @@ class ManyVisitsWithMockLocationProvider extends Fixture $t->setUserId('user' . $visitorCounter); $t->setIp("156.5.3.$visitorCounter"); - $t->setUserAgent($userAgents[$visitorCounter]); - list($w, $h) = explode('x', $resolutions[$visitorCounter]); + $t->setUserAgent($userAgents[$visitorCounter % count($userAgents)]); + list($w, $h) = explode('x', $resolutions[$visitorCounter % count($resolutions)]); $t->setResolution((int)$w, (int)$h); // one visit to root url @@ -201,7 +207,7 @@ class ManyVisitsWithMockLocationProvider extends Fixture } } - private function trackAction($t, $actionType, $visitorCounter, $actionNum) + private function trackAction(\PiwikTracker $t, $actionType, $visitorCounter, $actionNum) { if ($actionType == 'pageview') { self::checkResponse($t->doTrackPageView( @@ -214,6 +220,14 @@ class ManyVisitsWithMockLocationProvider extends Fixture } else if ($actionType == 'outlink') { self::checkResponse($t->doTrackAction(is_null($actionNum) ? "http://othersite$visitorCounter.com/" : "http://othersite$visitorCounter.com/$actionNum/", 'link')); + } else if ($actionType == 'event') { + self::checkResponse($t->doTrackEvent('event category ' . ($visitorCounter % 6), 'event action ' . ($visitorCounter % 7), 'event name' . ($visitorCounter % 5))); + } else if ($actionType == 'content') { + self::checkResponse($t->doTrackContentImpression('content name ' . $visitorCounter, 'content piece ' . $visitorCounter)); + + if ($visitorCounter % 2 == 0) { + self::checkResponse($t->doTrackContentInteraction('click', 'content name ' . $visitorCounter, 'content piece ' . $visitorCounter)); + } } // Add a site search to some visits diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index 78e9fcdea8..34b63f2426 100644 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -46,7 +46,7 @@ class BlobReportLimitingTest extends SystemTestCase 'Resolution.getResolution', 'Resolution.getConfiguration', 'DevicesDetection.getOsVersions', 'DevicesDetection.getBrowserVersions', 'UserCountry.getRegion', 'UserCountry.getCity', - 'UserId.getUsers', + 'UserId.getUsers', 'Events', 'Contents', ); $ecommerceApi = array('Goals.getItemsSku', 'Goals.getItemsName', 'Goals.getItemsCategory'); @@ -187,6 +187,8 @@ class BlobReportLimitingTest extends SystemTestCase $generalConfig['datatable_archiving_maximum_rows_subtable_actions'] = 2; $generalConfig['datatable_archiving_maximum_rows_standard'] = 3; $generalConfig['datatable_archiving_maximum_rows_userid_users'] = 3; + $generalConfig['datatable_archiving_maximum_rows_events'] = 3; + $generalConfig['datatable_archiving_maximum_rows_subtable_events'] = 2; $generalConfig['archiving_ranking_query_row_limit'] = 50000; // Should be more than the datatable_archiving_maximum_rows_actions as code will take the max of these two $generalConfig['datatable_archiving_maximum_rows_site_search'] = 5; diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimensionReport__CustomDimensions.getCustomDimension_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimensionReport__CustomDimensions.getCustomDimension_week.xml index a33ba5bf5c..7be83e6aaa 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimensionReport__CustomDimensions.getCustomDimension_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimensionReport__CustomDimensions.getCustomDimension_week.xml @@ -2,37 +2,37 @@ <result> <row> <col name="label">0</col> - <col name="1. Melbourne, Victoria, Australia">1</col> - <col name="2. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> - <col name="3. Toronto, Ontario, Canada">1</col> - <col name="4. Yokohama, Kanagawa, Japan">0</col> + <col name="1. Toronto, Ontario, Canada">2</col> + <col name="2. Melbourne, Victoria, Australia">1</col> + <col name="3. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> + <col name="4. Yokohama, Kanagawa, Japan">1</col> </row> <row> <col name="label">5</col> - <col name="1. Melbourne, Victoria, Australia">1</col> - <col name="2. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> - <col name="3. Toronto, Ontario, Canada">0</col> + <col name="1. Toronto, Ontario, Canada">1</col> + <col name="2. Melbourne, Victoria, Australia">1</col> + <col name="3. Nice, Provence-Alpes-Côte-d’Azur, France">2</col> <col name="4. Yokohama, Kanagawa, Japan">1</col> </row> <row> <col name="label">10</col> - <col name="1. Melbourne, Victoria, Australia">1</col> - <col name="2. Nice, Provence-Alpes-Côte-d’Azur, France">0</col> - <col name="3. Toronto, Ontario, Canada">1</col> + <col name="1. Toronto, Ontario, Canada">1</col> + <col name="2. Melbourne, Victoria, Australia">2</col> + <col name="3. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> <col name="4. Yokohama, Kanagawa, Japan">1</col> </row> <row> <col name="label">15</col> - <col name="1. Melbourne, Victoria, Australia">0</col> - <col name="2. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> - <col name="3. Toronto, Ontario, Canada">1</col> - <col name="4. Yokohama, Kanagawa, Japan">1</col> + <col name="1. Toronto, Ontario, Canada">1</col> + <col name="2. Melbourne, Victoria, Australia">1</col> + <col name="3. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> + <col name="4. Yokohama, Kanagawa, Japan">2</col> </row> <row> <col name="label">20</col> - <col name="1. Melbourne, Victoria, Australia">1</col> - <col name="2. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> - <col name="3. Toronto, Ontario, Canada">1</col> - <col name="4. Yokohama, Kanagawa, Japan">0</col> + <col name="1. Toronto, Ontario, Canada">2</col> + <col name="2. Melbourne, Victoria, Australia">1</col> + <col name="3. Nice, Provence-Alpes-Côte-d’Azur, France">1</col> + <col name="4. Yokohama, Kanagawa, Japan">1</col> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimension__UserCountry.getCountry_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimension__UserCountry.getCountry_week.xml index d3e9d87e1b..5adc2f694d 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimension__UserCountry.getCountry_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCustomDimension__UserCountry.getCountry_week.xml @@ -3,8 +3,8 @@ <row> <col name="label">Australia</col> <col name="1. 0">1</col> - <col name="2. 10">1</col> - <col name="3. 15">0</col> + <col name="2. 10">2</col> + <col name="3. 15">1</col> <col name="4. 20">1</col> <col name="5. 5">1</col> <col name="code">au</col> @@ -12,30 +12,30 @@ </row> <row> <col name="label">Canada</col> - <col name="1. 0">1</col> + <col name="1. 0">2</col> <col name="2. 10">1</col> <col name="3. 15">1</col> - <col name="4. 20">1</col> - <col name="5. 5">0</col> + <col name="4. 20">2</col> + <col name="5. 5">1</col> <col name="code">ca</col> <col name="logo">plugins/Morpheus/icons/dist/flags/ca.png</col> </row> <row> <col name="label">France</col> <col name="1. 0">1</col> - <col name="2. 10">0</col> + <col name="2. 10">1</col> <col name="3. 15">1</col> <col name="4. 20">1</col> - <col name="5. 5">1</col> + <col name="5. 5">2</col> <col name="code">fr</col> <col name="logo">plugins/Morpheus/icons/dist/flags/fr.png</col> </row> <row> <col name="label">Japan</col> - <col name="1. 0">0</col> + <col name="1. 0">1</col> <col name="2. 10">1</col> - <col name="3. 15">1</col> - <col name="4. 20">0</col> + <col name="3. 15">2</col> + <col name="4. 20">1</col> <col name="5. 5">1</col> <col name="code">jp</col> <col name="logo">plugins/Morpheus/icons/dist/flags/jp.png</col> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index e9c05eb1c8..6885e205b2 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -106,7 +106,7 @@ <category>Visitors</category> <name>Device brand</name> <segment>deviceBrand</segment> - <acceptedValues>3Q, 4Good, Acer, Advan, Advance, AGM, Ainol, Airness, Airties, Aiwa, Akai, Alcatel, AllCall, Allview, Altech UEC, altron, Amazon, AMGOO, Amoi, ANS, Apple, Archos, Arian Space, Ark, Arnova, ARRIS, Ask, Assistant, Asus, Audiovox, AVH, Avvio, Axxion, Azumi Mobile, BangOlufsen, Barnes & Noble, BBK, Becker, Beeline, Beetel, BenQ, BenQ-Siemens, BGH, Bird, Bitel, Blackview, Blaupunkt, Blu, Bluboo, Bluegood, Bmobile, bogo, Boway, bq, Bravis, Brondi, Bush, CAGI, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Comio, Compal, Compaq, ComTrade Tesla, Concord, ConCorde, Condor, Coolpad, Cowon, CreNova, Crescent, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Datsun, Dbtel, Dell, Denver, Desay, DEXP, Dialog, Dicam, Digi, Digicel, Digiland, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Doro, Dune HD, E-Boda, E-tel, Easypix, EBEST, Echo Mobiles, ECS, EE, EKO, Eks Mobility, Elephone, Energizer, Energy Sistem, Ergo, Ericsson, Ericy, Essential, Essentielb, Eton, eTouch, Evercoss, Evertek, Evolio, Evolveo, Explay, Extrem, Ezio, Ezze, Fairphone, FiGO, Fly, FNB, Fondi, Forstar, Foxconn, Freetel, Fujitsu, G-TiDE, Garmin-Asus, Gateway, Gemini, Geotel, Ghia, Gigabyte, Gigaset, Ginzzu, Gionee, GOCLEVER, Goly, GoMobile, Google, Gradiente, Grape, Grundig, Hafury, Haier, HannSpree, Hasee, Hi-Level, Hisense, Homtom, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, iHunt, Ikea, iKoMo, IMO Mobile, Impression, iNew, Infinix, InFocus, Inkti, InnJoo, Innostream, Inoi, INQ, Intek, Intex, Inverto, iOcean, iPro, iRola, iTel, iView, JAY-Tech, Jiayu, Jolla, Just5, K-Touch, Kalley, Karbonn, Kazam, KDDI, Kempler & Strauss, Kiano, Kingsun, Kocaso, Kodak, Kogan, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KRONO, Krüger&Matz, KT-Tech, Kumai, Kyocera, LAIQ, Land Rover, Landvo, Lanix, Lava, LCT, Leagoo, Ledstar, LeEco, Lemhoov, Lenco, Lenovo, Leotec, Le Pan, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, LYF, M.T.T., M4tel, Majestic, Manta Multimedia, Maxwest, Maze, Mecer, Mediacom, MediaTek, Medion, MEEG, MegaFon, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Miray, Mitsubishi, MIXC, MLLED, Mobiistar, Mobiola, Mobistel, Modecom, Mofut, Motorola, Movic, Mpman, MSI, MTC, MTN, MyPhone, Myria, MyWigo, Navon, NEC, Neffos, Netgear, NeuImage, Newgen, NEXBOX, Nexian, Nextbit, NextBook, NGM, Nikon, Nintendo, Noain, Noblex, Nokia, Nomi, Nous, NUU Mobile, Nvidia, NYX Mobile, O+, O2, Obi, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panacom, Panasonic, Pantech, PCBOX, PCD, PCD Argentina, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Ployer, Plum, Point of View, Polaroid, PolyPad, Polytron, Pomp, Positivo, PPTV, Prestigio, Primepad, ProScan, PULID, Q-Touch, Qilive, QMobile, Qtek, Quantum, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Riviera, Rokit, Roku, Rover, RT Project, Safaricom, Sagem, Samsung, Sanei, Santin BiTBiZ, Sanyo, Savio, Sega, Selevision, Selfix, Sencor, Sendo, Senseit, Senwa, SFR, Sharp, Siemens, Silent Circle, Simbans, Sky, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sonim, Sony, Sony Ericsson, Spice, Star, STF Mobile, STK, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, SWISSMOBILITY, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, TechPad, Teclast, Tecno Mobile, Telefunken, Telego, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, Timovi, TiPhone, Tolino, Top House, Toplux, Toshiba, Touchmate, TrekStor, Trevi, True, Tunisie Telecom, Turbo-X, TVC, U.S. Cellular, Uhappy, Ulefone, UMIDIGI, Unimax, Uniscope, Unknown, Unnecto, Unonu, Unowhy, UTStarcom, Vastking, Verizon, Vernee, Vertex, Vertu, Verykool, Vestel, Videocon, Videoweb, ViewSonic, Vinsoc, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Vonino, Vorago, Voto, Voxtel, Vulcan, Walton, Web TV, Weimei, WellcoM, Wexler, Wiko, Wileyfox, Wink, Wolder, Wolfgang, Wonu, Woo, Woxter, X-TIGI, X-View, Xiaomi, Xion, Xolo, Yarvik, Yes, Yezz, Ytone, Yu, Yuandao, Yusun, Zeemi, Zen, Zenek, Zonda, Zopo, ZTE, Zuum, Zync, ZYQ, öwn</acceptedValues> + <acceptedValues>3Q, 4Good, Acer, Advan, Advance, AGM, Ainol, Airness, Airties, Aiwa, Akai, Alcatel, AllCall, Allview, Altech UEC, altron, Amazon, AMGOO, Amoi, ANS, Apple, Archos, Arian Space, Ark, Arnova, ARRIS, Ask, Assistant, Asus, Audiovox, AVH, Avvio, Axxion, Azumi Mobile, BangOlufsen, Barnes & Noble, BBK, Becker, Beeline, Beetel, BenQ, BenQ-Siemens, BGH, Bird, Bitel, Blackview, Blaupunkt, Blu, Bluboo, Bluegood, Bmobile, bogo, Boway, bq, Bravis, Brondi, Bush, CAGI, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Comio, Compal, Compaq, ComTrade Tesla, Concord, ConCorde, Condor, Coolpad, Cowon, CreNova, Crescent, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Datsun, Dbtel, Dell, Denver, Desay, DEXP, Dialog, Dicam, Digi, Digicel, Digiland, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Doro, Dune HD, E-Boda, E-tel, Easypix, EBEST, Echo Mobiles, ECS, EE, EKO, Eks Mobility, Elephone, Energizer, Energy Sistem, Ergo, Ericsson, Ericy, Essential, Essentielb, Eton, eTouch, Evercoss, Evertek, Evolio, Evolveo, Explay, Extrem, Ezio, Ezze, Fairphone, FiGO, Fly, FNB, Fondi, Forstar, Foxconn, Freetel, Fujitsu, G-TiDE, Garmin-Asus, Gateway, Gemini, Geotel, Ghia, Gigabyte, Gigaset, Ginzzu, Gionee, GOCLEVER, Goly, GoMobile, Google, Gradiente, Grape, Grundig, Hafury, Haier, HannSpree, Hasee, Hi-Level, Hisense, Homtom, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, iHunt, Ikea, iKoMo, IMO Mobile, Impression, iNew, Infinix, InFocus, Inkti, InnJoo, Innostream, Inoi, INQ, Intek, Intex, Inverto, iOcean, iPro, iRola, iTel, iView, JAY-Tech, Jiayu, Jolla, Just5, K-Touch, Kalley, Karbonn, Kazam, KDDI, Kempler & Strauss, Kiano, Kingsun, Kocaso, Kodak, Kogan, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KRONO, Krüger&Matz, KT-Tech, Kumai, Kyocera, LAIQ, Land Rover, Landvo, Lanix, Lava, LCT, Leagoo, Ledstar, LeEco, Lemhoov, Lenco, Lenovo, Leotec, Le Pan, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, LYF, M.T.T., M4tel, Majestic, Manta Multimedia, Maxwest, Maze, Mecer, Mediacom, MediaTek, Medion, MEEG, MegaFon, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Miray, Mitsubishi, MIXC, MLLED, Mobiistar, Mobiola, Mobistel, Modecom, Mofut, Motorola, Movic, Mpman, MSI, MTC, MTN, MyPhone, Myria, MyWigo, Navon, NEC, Neffos, Netgear, NeuImage, Newgen, NEXBOX, Nexian, Nextbit, NextBook, NGM, Nikon, Nintendo, Noain, Noblex, Nokia, Nomi, Nous, NUU Mobile, Nvidia, NYX Mobile, O+, O2, Obi, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panacom, Panasonic, Pantech, PCBOX, PCD, PCD Argentina, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Ployer, Plum, Point of View, Polaroid, PolyPad, Polytron, Pomp, Positivo, PPTV, Prestigio, Primepad, ProScan, PULID, Q-Touch, Qilive, QMobile, Qtek, Quantum, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Riviera, Rokit, Roku, Rover, RT Project, Safaricom, Sagem, Samsung, Sanei, Santin BiTBiZ, Sanyo, Savio, Sega, Selevision, Selfix, Sencor, Sendo, Senseit, Senwa, SFR, Sharp, Siemens, Silent Circle, Simbans, Sky, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sonim, Sony, Sony Ericsson, Spice, Star, STF Mobile, STK, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, SWISSMOBILITY, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, TechPad, Teclast, Tecno Mobile, Telefunken, Telego, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, Timovi, TiPhone, Tolino, Top House, Toplux, Toshiba, Touchmate, TrekStor, Trevi, True, Tunisie Telecom, Turbo-X, TVC, U.S. Cellular, Uhappy, Ulefone, UMIDIGI, Unimax, Uniscope, Unknown, Unnecto, Unonu, Unowhy, UTStarcom, Vastking, Verizon, Vernee, Vertex, Vertu, Verykool, Vestel, Videocon, Videoweb, ViewSonic, Vinsoc, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Vonino, Vorago, Voto, Voxtel, Vulcan, Walton, Web TV, Weimei, WellcoM, Wexler, Wiko, Wileyfox, Wink, Wolder, Wolfgang, Wonu, Woo, Woxter, X-TIGI, X-View, Xiaomi, Xion, Xolo, Yarvik, Yes, Yezz, Ytone, Yu, Yuandao, Yusun, Zeemi, Zen, Zenek, Zonda, Zopo, ZTE, Zuum, Zync, ZYQ, öwn</acceptedValues> </row> <row> <type>dimension</type> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..d77a26b3de --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>content name 20</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentName==content+name+20</segment> + </row> + <row> + <label>content name 21</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + <segment>contentName==content+name+21</segment> + </row> + <row> + <label>content name 22</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentName==content+name+22</segment> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> + <nb_impressions>10</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>50%</interaction_rate> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..05b2d79e26 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>content piece 20</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentPiece==content+piece+20</segment> + </row> + <row> + <label>content piece 21</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + <segment>contentPiece==content+piece+21</segment> + </row> + <row> + <label>content piece 22</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentPiece==content+piece+22</segment> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> + <nb_impressions>10</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>50%</interaction_rate> + </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 68bc8eb2bf..1c9e32c64d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -2,39 +2,39 @@ <result> <row> <label>Firefox 6.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> - <nb_actions>15</nb_actions> - <nb_users>3</nb_users> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>30</nb_actions> + <nb_users>6</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>15</bounce_count> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> - <label>Internet Explorer 9.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> - <nb_actions>30</nb_actions> - <nb_users>3</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <label>Chrome 3.0</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>20</nb_visits> + <nb_actions>20</nb_actions> + <nb_users>4</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> + <segment>browserCode==CH;browserVersion==3.0</segment> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Others</label> - <nb_uniq_visitors>9</nb_uniq_visitors> - <nb_visits>45</nb_visits> - <nb_actions>80</nb_actions> - <nb_users>9</nb_users> + <nb_uniq_visitors>15</nb_uniq_visitors> + <nb_visits>75</nb_visits> + <nb_actions>100</nb_actions> + <nb_users>15</nb_users> <max_actions>2</max_actions> - <sum_visit_length>35</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </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 d2c4507d0a..b2b8c22026 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -2,39 +2,39 @@ <result> <row> <label>GNU/Linux</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>25</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>8</nb_users> <max_actions>2</max_actions> - <sum_visit_length>5</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_visits>25</nb_visits> <nb_actions>30</nb_actions> - <nb_users>3</nb_users> + <nb_users>5</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>10</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Others</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>40</nb_visits> - <nb_actions>70</nb_actions> - <nb_users>8</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>30</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>35</sum_visit_length> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml new file mode 100644 index 0000000000..1a438e6fb4 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getAction_day.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>event action 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==event+action+1</segment> + <subtable> + <row> + <label>event name0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>event action 2</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==event+action+2</segment> + <subtable> + <row> + <label>event name1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml new file mode 100644 index 0000000000..ae89831060 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getCategory_day.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>event category 0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==event+category+0</segment> + <subtable> + <row> + <label>event action 4</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>event category 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==event+category+1</segment> + <subtable> + <row> + <label>event action 5</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml new file mode 100644 index 0000000000..49697c0c16 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Events.getName_day.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>event name0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventName==event+name0</segment> + <subtable> + <row> + <label>event action 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>event name1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventName==event+name1</segment> + <subtable> + <row> + <label>event action 2</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> +</result>
\ No newline at end of file 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 ec284472ff..b05ee719f9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -2,13 +2,13 @@ <result> <row> <label>Direct Entry</label> - <nb_uniq_visitors>15</nb_uniq_visitors> - <nb_visits>55</nb_visits> - <nb_actions>105</nb_actions> - <nb_users>15</nb_users> + <nb_uniq_visitors>25</nb_uniq_visitors> + <nb_visits>105</nb_visits> + <nb_actions>130</nb_actions> + <nb_users>25</nb_users> <max_actions>2</max_actions> - <sum_visit_length>50</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==direct</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml index a0d208c1a1..890ce7e68c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml @@ -2,35 +2,35 @@ <result> <row> <label>GNU/Linux / Firefox / 1920x1080</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> - <nb_users>2</nb_users> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>20</nb_visits> + <nb_actions>20</nb_actions> + <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>Android / Chrome / 1280x1024</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>5</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> - <nb_users>1</nb_users> + <nb_users>2</nb_users> <max_actions>2</max_actions> - <sum_visit_length>5</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>Others</label> - <nb_uniq_visitors>12</nb_uniq_visitors> - <nb_visits>60</nb_visits> - <nb_actions>105</nb_actions> - <nb_users>12</nb_users> + <nb_uniq_visitors>19</nb_uniq_visitors> + <nb_visits>95</nb_visits> + <nb_actions>120</nb_actions> + <nb_users>19</nb_users> <max_actions>2</max_actions> - <sum_visit_length>45</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>55</sum_visit_length> + <bounce_count>50</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file 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 1e7ffb2bf9..f8844b82ac 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml @@ -2,37 +2,37 @@ <result> <row> <label>1920x1080</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>20</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>8</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>20</bounce_count> + <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>resolution==1920x1080</segment> </row> <row> <label>1280x1024</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> <nb_actions>30</nb_actions> - <nb_users>3</nb_users> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>25</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>resolution==1280x1024</segment> </row> <row> <label>Others</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>40</nb_visits> - <nb_actions>75</nb_actions> - <nb_users>8</nb_users> + <nb_uniq_visitors>11</nb_uniq_visitors> + <nb_visits>55</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>11</nb_users> <max_actions>2</max_actions> - <sum_visit_length>35</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>40</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file 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 378a6b593b..cc70e401ff 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -1,14 +1,32 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Melbourne, Victoria, Australia</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> + <label>Toronto, Ontario, Canada</label> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>35</nb_visits> <nb_actions>35</nb_actions> - <nb_users>4</nb_users> + <nb_users>7</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>25</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <segment>city==Toronto;regionCode==ON;countryCode==ca</segment> + <city_name>Toronto</city_name> + <region>ON</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>Ontario</region_name> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> + </row> + <row> + <label>Melbourne, Victoria, Australia</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>6</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>20</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>city==Melbourne;regionCode==VIC;countryCode==au</segment> <city_name>Melbourne</city_name> @@ -19,32 +37,14 @@ <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> - <label>Nice, Provence-Alpes-Côte-d’Azur, France</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>35</nb_actions> - <nb_users>4</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <segment>city==Nice;regionCode==PAC;countryCode==fr</segment> - <city_name>Nice</city_name> - <region>PAC</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Provence-Alpes-Côte-d’Azur</region_name> - <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> - </row> - <row> <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>35</nb_visits> - <nb_actions>55</nb_actions> - <nb_users>7</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>75</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>20</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>25</sum_visit_length> + <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> 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 edfaa10ed9..760a981d13 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -2,13 +2,13 @@ <result> <row> <label>Ontario, Canada</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>30</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>35</nb_visits> + <nb_actions>35</nb_actions> + <nb_users>7</nb_users> <max_actions>2</max_actions> - <sum_visit_length>10</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>regionCode==ON;countryCode==ca</segment> <region>ON</region> @@ -18,31 +18,31 @@ <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> - <label>Provence-Alpes-Côte-d’Azur, France</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> + <label>Kanagawa, Japan</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> <nb_actions>35</nb_actions> - <nb_users>4</nb_users> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>regionCode==PAC;countryCode==fr</segment> - <region>PAC</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Provence-Alpes-Côte-d’Azur</region_name> - <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> + <segment>regionCode==14;countryCode==jp</segment> + <region>14</region> + <country>jp</country> + <country_name>Japan</country_name> + <region_name>Kanagawa</region_name> + <logo>plugins/Morpheus/icons/dist/flags/jp.png</logo> </row> <row> <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>35</nb_visits> - <nb_actions>60</nb_actions> - <nb_users>7</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>25</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>35</sum_visit_length> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml index acd3f282fa..582741e8d1 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml @@ -26,13 +26,13 @@ </row> <row> <label>Others</label> - <nb_uniq_visitors>13</nb_uniq_visitors> - <nb_visits>65</nb_visits> - <nb_actions>115</nb_actions> - <nb_users>13</nb_users> + <nb_uniq_visitors>23</nb_uniq_visitors> + <nb_visits>115</nb_visits> + <nb_actions>140</nb_actions> + <nb_users>23</nb_users> <max_actions>2</max_actions> - <sum_visit_length>50</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>65</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..066a4135bb --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> + <nb_impressions>10</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>50%</interaction_rate> + <is_summary>1</is_summary> + <Contents_ContentName>Others</Contents_ContentName> + </row> + <row> + <label>content name 20 - content piece 20</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <Contents_ContentName>content name 20 - content piece 20</Contents_ContentName> + <segment>contentName==content+name+20</segment> + </row> + <row> + <label>content name 21 - content piece 21</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + <Contents_ContentName>content name 21 - content piece 21</Contents_ContentName> + <segment>contentName==content+name+21</segment> + </row> + <row> + <label>content name 22 - content piece 22</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <Contents_ContentName>content name 22 - content piece 22</Contents_ContentName> + <segment>contentName==content+name+22</segment> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..296d0f4275 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> + <nb_impressions>10</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>50%</interaction_rate> + <is_summary>1</is_summary> + <Contents_ContentPiece>Others</Contents_ContentPiece> + </row> + <row> + <label>content piece 20 - content name 20</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <Contents_ContentPiece>content piece 20 - content name 20</Contents_ContentPiece> + <segment>contentPiece==content+piece+20</segment> + </row> + <row> + <label>content piece 21 - content name 21</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + <Contents_ContentPiece>content piece 21 - content name 21</Contents_ContentPiece> + <segment>contentPiece==content+piece+21</segment> + </row> + <row> + <label>content piece 22 - content name 22</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <Contents_ContentPiece>content piece 22 - content name 22</Contents_ContentPiece> + <segment>contentPiece==content+piece+22</segment> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index dc0cc13c20..3cb1a3cfa5 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -2,13 +2,13 @@ <result> <row> <label>Others</label> - <nb_uniq_visitors>9</nb_uniq_visitors> - <nb_visits>45</nb_visits> - <nb_actions>80</nb_actions> - <nb_users>9</nb_users> + <nb_uniq_visitors>15</nb_uniq_visitors> + <nb_visits>75</nb_visits> + <nb_actions>100</nb_actions> + <nb_users>15</nb_users> <max_actions>2</max_actions> - <sum_visit_length>35</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> <is_summary>1</is_summary> @@ -16,30 +16,30 @@ </row> <row> <label>Firefox 6.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> - <nb_actions>15</nb_actions> - <nb_users>3</nb_users> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>30</nb_actions> + <nb_users>6</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>15</bounce_count> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> <DevicesDetection_BrowserVersion>Firefox 6.0</DevicesDetection_BrowserVersion> </row> <row> - <label>Internet Explorer 9.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> - <nb_actions>30</nb_actions> - <nb_users>3</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <label>Chrome 3.0</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>20</nb_visits> + <nb_actions>20</nb_actions> + <nb_users>4</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> - <DevicesDetection_BrowserVersion>Internet Explorer 9.0</DevicesDetection_BrowserVersion> + <segment>browserCode==CH;browserVersion==3.0</segment> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> + <DevicesDetection_BrowserVersion>Chrome 3.0</DevicesDetection_BrowserVersion> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml index 41afe8920e..c3b224d4a8 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml @@ -2,13 +2,13 @@ <result> <row> <label>Others</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>40</nb_visits> - <nb_actions>70</nb_actions> - <nb_users>8</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>30</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>35</sum_visit_length> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> <is_summary>1</is_summary> @@ -16,13 +16,13 @@ </row> <row> <label>GNU/Linux</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>25</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>8</nb_users> <max_actions>2</max_actions> - <sum_visit_length>5</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> @@ -30,13 +30,13 @@ </row> <row> <label>Android 4.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_visits>25</nb_visits> <nb_actions>30</nb_actions> - <nb_users>3</nb_users> + <nb_users>5</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>10</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml new file mode 100644 index 0000000000..aeceaa829e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getAction_day.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <is_summary>1</is_summary> + <Events_EventAction>Others</Events_EventAction> + </row> + <row> + <label>event action 1 - event name0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <Events_EventAction>event action 1</Events_EventAction> + <Events_EventName>event name0</Events_EventName> + </row> + <row> + <label>event action 2 - event name1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <Events_EventAction>event action 2</Events_EventAction> + <Events_EventName>event name1</Events_EventName> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml new file mode 100644 index 0000000000..392afa1a4e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getCategory_day.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <is_summary>1</is_summary> + <Events_EventCategory>Others</Events_EventCategory> + </row> + <row> + <label>event category 0 - event action 4</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <Events_EventCategory>event category 0</Events_EventCategory> + <Events_EventAction>event action 4</Events_EventAction> + </row> + <row> + <label>event category 1 - event action 5</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <Events_EventCategory>event category 1</Events_EventCategory> + <Events_EventAction>event action 5</Events_EventAction> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml new file mode 100644 index 0000000000..fe92fd5fdc --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Events.getName_day.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <is_summary>1</is_summary> + <Events_EventName>Others</Events_EventName> + </row> + <row> + <label>event name0 - event action 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <Events_EventName>event name0</Events_EventName> + <Events_EventAction>event action 1</Events_EventAction> + </row> + <row> + <label>event name1 - event action 2</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <Events_EventName>event name1</Events_EventName> + <Events_EventAction>event action 2</Events_EventAction> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index dc4a076fa9..7db3ae2c01 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -2,13 +2,13 @@ <result> <row> <label>Direct Entry</label> - <nb_uniq_visitors>15</nb_uniq_visitors> - <nb_visits>55</nb_visits> - <nb_actions>105</nb_actions> - <nb_users>15</nb_users> + <nb_uniq_visitors>25</nb_uniq_visitors> + <nb_visits>105</nb_visits> + <nb_actions>130</nb_actions> + <nb_users>25</nb_users> <max_actions>2</max_actions> - <sum_visit_length>50</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==direct</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml index c216d6c8e5..9df1d69a8e 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml @@ -2,38 +2,38 @@ <result> <row> <label>Others</label> - <nb_uniq_visitors>12</nb_uniq_visitors> - <nb_visits>60</nb_visits> - <nb_actions>105</nb_actions> - <nb_users>12</nb_users> + <nb_uniq_visitors>19</nb_uniq_visitors> + <nb_visits>95</nb_visits> + <nb_actions>120</nb_actions> + <nb_users>19</nb_users> <max_actions>2</max_actions> - <sum_visit_length>45</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>55</sum_visit_length> + <bounce_count>50</bounce_count> <nb_visits_converted>0</nb_visits_converted> <is_summary>1</is_summary> <Resolution_Configuration>Others</Resolution_Configuration> </row> <row> <label>GNU/Linux / Firefox / 1920x1080</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> - <nb_users>2</nb_users> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>20</nb_visits> + <nb_actions>20</nb_actions> + <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <Resolution_Configuration>LIN;FF;1920x1080</Resolution_Configuration> </row> <row> <label>Android / Chrome / 1280x1024</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>5</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> - <nb_users>1</nb_users> + <nb_users>2</nb_users> <max_actions>2</max_actions> - <sum_visit_length>5</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> <Resolution_Configuration>AND;CH;1280x1024</Resolution_Configuration> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml index 4753d131a3..cd3239a55b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml @@ -2,39 +2,39 @@ <result> <row> <label>Others</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>40</nb_visits> - <nb_actions>75</nb_actions> - <nb_users>8</nb_users> + <nb_uniq_visitors>11</nb_uniq_visitors> + <nb_visits>55</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>11</nb_users> <max_actions>2</max_actions> - <sum_visit_length>35</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>40</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <is_summary>1</is_summary> <Resolution_Resolution>Others</Resolution_Resolution> </row> <row> <label>1920x1080</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>20</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>8</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>20</bounce_count> + <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <Resolution_Resolution>1920x1080</Resolution_Resolution> <segment>resolution==1920x1080</segment> </row> <row> <label>1280x1024</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> <nb_actions>30</nb_actions> - <nb_users>3</nb_users> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>25</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <Resolution_Resolution>1280x1024</Resolution_Resolution> <segment>resolution==1280x1024</segment> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml index 8ae658d9ab..106f164a25 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml @@ -2,27 +2,46 @@ <result> <row> <label>Others</label> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>75</nb_actions> + <nb_users>12</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>25</sum_visit_length> + <bounce_count>35</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> + <is_summary>1</is_summary> + <UserCountry_City>Others</UserCountry_City> + </row> + <row> + <label>Toronto, Ontario, Canada</label> <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>35</nb_visits> - <nb_actions>55</nb_actions> + <nb_actions>35</nb_actions> <nb_users>7</nb_users> <max_actions>2</max_actions> <sum_visit_length>20</sum_visit_length> - <bounce_count>15</bounce_count> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> - <is_summary>1</is_summary> - <UserCountry_City>Others</UserCountry_City> + <segment>city==Toronto;regionCode==ON;countryCode==ca</segment> + <city_name>Toronto</city_name> + <region>ON</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>Ontario</region_name> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> + <UserCountry_City>Toronto, Ontario, Canada</UserCountry_City> </row> <row> <label>Melbourne, Victoria, Australia</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>35</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>city==Melbourne;regionCode==VIC;countryCode==au</segment> <city_name>Melbourne</city_name> @@ -33,23 +52,4 @@ <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> <UserCountry_City>Melbourne, Victoria, Australia</UserCountry_City> </row> - <row> - <label>Nice, Provence-Alpes-Côte-d’Azur, France</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>35</nb_actions> - <nb_users>4</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <segment>city==Nice;regionCode==PAC;countryCode==fr</segment> - <city_name>Nice</city_name> - <region>PAC</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Provence-Alpes-Côte-d’Azur</region_name> - <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> - <UserCountry_City>Nice, Provence-Alpes-Côte-d’Azur, France</UserCountry_City> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml index f918428310..d154419386 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml @@ -2,13 +2,13 @@ <result> <row> <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>35</nb_visits> - <nb_actions>60</nb_actions> - <nb_users>7</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>25</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>35</sum_visit_length> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> <is_summary>1</is_summary> @@ -16,13 +16,13 @@ </row> <row> <label>Ontario, Canada</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>30</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>35</nb_visits> + <nb_actions>35</nb_actions> + <nb_users>7</nb_users> <max_actions>2</max_actions> - <sum_visit_length>10</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>regionCode==ON;countryCode==ca</segment> <region>ON</region> @@ -33,21 +33,21 @@ <UserCountry_Region>Ontario, Canada</UserCountry_Region> </row> <row> - <label>Provence-Alpes-Côte-d’Azur, France</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> + <label>Kanagawa, Japan</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> <nb_actions>35</nb_actions> - <nb_users>4</nb_users> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>regionCode==PAC;countryCode==fr</segment> - <region>PAC</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Provence-Alpes-Côte-d’Azur</region_name> - <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> - <UserCountry_Region>Provence-Alpes-Côte-d’Azur, France</UserCountry_Region> + <segment>regionCode==14;countryCode==jp</segment> + <region>14</region> + <country>jp</country> + <country_name>Japan</country_name> + <region_name>Kanagawa</region_name> + <logo>plugins/Morpheus/icons/dist/flags/jp.png</logo> + <UserCountry_Region>Kanagawa, Japan</UserCountry_Region> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml index acd3f282fa..582741e8d1 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml @@ -26,13 +26,13 @@ </row> <row> <label>Others</label> - <nb_uniq_visitors>13</nb_uniq_visitors> - <nb_visits>65</nb_visits> - <nb_actions>115</nb_actions> - <nb_users>13</nb_users> + <nb_uniq_visitors>23</nb_uniq_visitors> + <nb_visits>115</nb_visits> + <nb_actions>140</nb_actions> + <nb_users>23</nb_users> <max_actions>2</max_actions> - <sum_visit_length>50</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>65</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..8417171cd2 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>content name 20</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentName==content+name+20</segment> + </row> + <row> + <label>content name 21</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + <segment>contentName==content+name+21</segment> + </row> + <row> + <label>content name 22</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentName==content+name+22</segment> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> + <nb_impressions>10</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..2af5de8fd7 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>content piece 20</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentPiece==content+piece+20</segment> + </row> + <row> + <label>content piece 21</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + <segment>contentPiece==content+piece+21</segment> + </row> + <row> + <label>content piece 22</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_impressions>5</nb_impressions> + <nb_interactions>5</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget /> + <segment>contentPiece==content+piece+22</segment> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> + <nb_impressions>10</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> +</result>
\ No newline at end of file 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 68bc8eb2bf..1c9e32c64d 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 @@ -2,39 +2,39 @@ <result> <row> <label>Firefox 6.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> - <nb_actions>15</nb_actions> - <nb_users>3</nb_users> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>30</nb_actions> + <nb_users>6</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>15</bounce_count> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> - <label>Internet Explorer 9.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> - <nb_actions>30</nb_actions> - <nb_users>3</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <label>Chrome 3.0</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>20</nb_visits> + <nb_actions>20</nb_actions> + <nb_users>4</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> + <segment>browserCode==CH;browserVersion==3.0</segment> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Others</label> - <nb_uniq_visitors>9</nb_uniq_visitors> - <nb_visits>45</nb_visits> - <nb_actions>80</nb_actions> - <nb_users>9</nb_users> + <nb_uniq_visitors>15</nb_uniq_visitors> + <nb_visits>75</nb_visits> + <nb_actions>100</nb_actions> + <nb_users>15</nb_users> <max_actions>2</max_actions> - <sum_visit_length>35</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </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 d2c4507d0a..b2b8c22026 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 @@ -2,39 +2,39 @@ <result> <row> <label>GNU/Linux</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>25</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>8</nb_users> <max_actions>2</max_actions> - <sum_visit_length>5</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_visits>25</nb_visits> <nb_actions>30</nb_actions> - <nb_users>3</nb_users> + <nb_users>5</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>10</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Others</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>40</nb_visits> - <nb_actions>70</nb_actions> - <nb_users>8</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>30</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>35</sum_visit_length> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml new file mode 100644 index 0000000000..1a438e6fb4 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getAction_day.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>event action 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==event+action+1</segment> + <subtable> + <row> + <label>event name0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>event action 2</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==event+action+2</segment> + <subtable> + <row> + <label>event name1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml new file mode 100644 index 0000000000..8b55e04661 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getCategory_day.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>event category 0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==event+category+0</segment> + <subtable> + <row> + <label>event action 4</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>event category 3</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==event+category+3</segment> + <subtable> + <row> + <label>event action 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml new file mode 100644 index 0000000000..49697c0c16 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Events.getName_day.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>event name0</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventName==event+name0</segment> + <subtable> + <row> + <label>event action 1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>event name1</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventName==event+name1</segment> + <subtable> + <row> + <label>event action 2</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_events>5</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> + <row> + <label>Others</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_events>15</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> +</result>
\ No newline at end of file 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 ec284472ff..b05ee719f9 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 @@ -2,13 +2,13 @@ <result> <row> <label>Direct Entry</label> - <nb_uniq_visitors>15</nb_uniq_visitors> - <nb_visits>55</nb_visits> - <nb_actions>105</nb_actions> - <nb_users>15</nb_users> + <nb_uniq_visitors>25</nb_uniq_visitors> + <nb_visits>105</nb_visits> + <nb_actions>130</nb_actions> + <nb_users>25</nb_users> <max_actions>2</max_actions> - <sum_visit_length>50</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==direct</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml index a0d208c1a1..890ce7e68c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml @@ -2,35 +2,35 @@ <result> <row> <label>GNU/Linux / Firefox / 1920x1080</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> - <nb_users>2</nb_users> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>20</nb_visits> + <nb_actions>20</nb_actions> + <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>Android / Chrome / 1280x1024</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>5</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> - <nb_users>1</nb_users> + <nb_users>2</nb_users> <max_actions>2</max_actions> - <sum_visit_length>5</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>Others</label> - <nb_uniq_visitors>12</nb_uniq_visitors> - <nb_visits>60</nb_visits> - <nb_actions>105</nb_actions> - <nb_users>12</nb_users> + <nb_uniq_visitors>19</nb_uniq_visitors> + <nb_visits>95</nb_visits> + <nb_actions>120</nb_actions> + <nb_users>19</nb_users> <max_actions>2</max_actions> - <sum_visit_length>45</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>55</sum_visit_length> + <bounce_count>50</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file 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 1e7ffb2bf9..f8844b82ac 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 @@ -2,37 +2,37 @@ <result> <row> <label>1920x1080</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>20</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>8</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>20</bounce_count> + <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>resolution==1920x1080</segment> </row> <row> <label>1280x1024</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>15</nb_visits> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> <nb_actions>30</nb_actions> - <nb_users>3</nb_users> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>0</bounce_count> + <sum_visit_length>25</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>resolution==1280x1024</segment> </row> <row> <label>Others</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>40</nb_visits> - <nb_actions>75</nb_actions> - <nb_users>8</nb_users> + <nb_uniq_visitors>11</nb_uniq_visitors> + <nb_visits>55</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>11</nb_users> <max_actions>2</max_actions> - <sum_visit_length>35</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>40</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file 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 378a6b593b..cc70e401ff 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 @@ -1,14 +1,32 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Melbourne, Victoria, Australia</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> + <label>Toronto, Ontario, Canada</label> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>35</nb_visits> <nb_actions>35</nb_actions> - <nb_users>4</nb_users> + <nb_users>7</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>25</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <segment>city==Toronto;regionCode==ON;countryCode==ca</segment> + <city_name>Toronto</city_name> + <region>ON</region> + <country>ca</country> + <country_name>Canada</country_name> + <region_name>Ontario</region_name> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> + </row> + <row> + <label>Melbourne, Victoria, Australia</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> + <nb_actions>40</nb_actions> + <nb_users>6</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>20</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>city==Melbourne;regionCode==VIC;countryCode==au</segment> <city_name>Melbourne</city_name> @@ -19,32 +37,14 @@ <logo>plugins/Morpheus/icons/dist/flags/au.png</logo> </row> <row> - <label>Nice, Provence-Alpes-Côte-d’Azur, France</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>35</nb_actions> - <nb_users>4</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <segment>city==Nice;regionCode==PAC;countryCode==fr</segment> - <city_name>Nice</city_name> - <region>PAC</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Provence-Alpes-Côte-d’Azur</region_name> - <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> - </row> - <row> <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>35</nb_visits> - <nb_actions>55</nb_actions> - <nb_users>7</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>75</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>20</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>25</sum_visit_length> + <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> 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 edfaa10ed9..760a981d13 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 @@ -2,13 +2,13 @@ <result> <row> <label>Ontario, Canada</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> - <nb_actions>30</nb_actions> - <nb_users>4</nb_users> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>35</nb_visits> + <nb_actions>35</nb_actions> + <nb_users>7</nb_users> <max_actions>2</max_actions> - <sum_visit_length>10</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>20</sum_visit_length> + <bounce_count>25</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>regionCode==ON;countryCode==ca</segment> <region>ON</region> @@ -18,31 +18,31 @@ <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> - <label>Provence-Alpes-Côte-d’Azur, France</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>20</nb_visits> + <label>Kanagawa, Japan</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>30</nb_visits> <nb_actions>35</nb_actions> - <nb_users>4</nb_users> + <nb_users>6</nb_users> <max_actions>2</max_actions> - <sum_visit_length>15</sum_visit_length> - <bounce_count>5</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>regionCode==PAC;countryCode==fr</segment> - <region>PAC</region> - <country>fr</country> - <country_name>France</country_name> - <region_name>Provence-Alpes-Côte-d’Azur</region_name> - <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> + <segment>regionCode==14;countryCode==jp</segment> + <region>14</region> + <country>jp</country> + <country_name>Japan</country_name> + <region_name>Kanagawa</region_name> + <logo>plugins/Morpheus/icons/dist/flags/jp.png</logo> </row> <row> <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>35</nb_visits> - <nb_actions>60</nb_actions> - <nb_users>7</nb_users> + <nb_uniq_visitors>12</nb_uniq_visitors> + <nb_visits>60</nb_visits> + <nb_actions>80</nb_actions> + <nb_users>12</nb_users> <max_actions>2</max_actions> - <sum_visit_length>25</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>35</sum_visit_length> + <bounce_count>30</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml index acd3f282fa..582741e8d1 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml @@ -26,13 +26,13 @@ </row> <row> <label>Others</label> - <nb_uniq_visitors>13</nb_uniq_visitors> - <nb_visits>65</nb_visits> - <nb_actions>115</nb_actions> - <nb_users>13</nb_users> + <nb_uniq_visitors>23</nb_uniq_visitors> + <nb_visits>115</nb_visits> + <nb_actions>140</nb_actions> + <nb_users>23</nb_users> <max_actions>2</max_actions> - <sum_visit_length>50</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>65</sum_visit_length> + <bounce_count>65</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Unit/RankingQueryTest.php b/tests/PHPUnit/Unit/RankingQueryTest.php index f9240a1933..5f62ddb19b 100644 --- a/tests/PHPUnit/Unit/RankingQueryTest.php +++ b/tests/PHPUnit/Unit/RankingQueryTest.php @@ -18,6 +18,7 @@ class RankingQueryTest extends \PHPUnit_Framework_TestCase public function testBasic() { $query = new RankingQuery(); + $query->setOthersLabel('Others'); $query->addLabelColumn('label'); $query->addColumn('column'); $query->addColumn('columnSum', 'sum'); @@ -58,6 +59,7 @@ class RankingQueryTest extends \PHPUnit_Framework_TestCase public function testExcludeRows() { $query = new RankingQuery(20); + $query->setOthersLabel('Others'); $query->addLabelColumn('label'); $query->setColumnToMarkExcludedRows('exclude_marker'); @@ -95,6 +97,7 @@ class RankingQueryTest extends \PHPUnit_Framework_TestCase public function testPartitionResult() { $query = new RankingQuery(1000); + $query->setOthersLabel('Others'); $query->addLabelColumn('label'); $query->partitionResultIntoMultipleGroups('partition', array(1, 2, 3)); |