Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2016-11-14 15:32:14 +0300
committermattab <matthieu.aubry@gmail.com>2016-11-14 15:32:14 +0300
commit48b361e50cc3156527576dd8c3a13b86b7a20af7 (patch)
treeeabe1e582960a5d46856fe54e808de1a93341cbe /tests/PHPUnit
parenta50f7fbb6e8251ac7bf648b26ea1e6d168ffedc4 (diff)
parente4d8bb44a56c1b81be9e218dbdf82be02289d7ac (diff)
Merge branch '3.x-dev' into new_submoduels
Diffstat (limited to 'tests/PHPUnit')
-rw-r--r--tests/PHPUnit/Fixtures/InvalidVisits.php2
-rw-r--r--tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php (renamed from tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php)11
-rw-r--r--tests/PHPUnit/Integration/EmailValidatorTest.php2
-rw-r--r--tests/PHPUnit/Integration/HttpTest.php4
-rw-r--r--tests/PHPUnit/Integration/ReleaseCheckListTest.php3
-rw-r--r--tests/PHPUnit/Integration/SegmentTest.php81
-rw-r--r--tests/PHPUnit/Integration/TrackerTest.php2
-rw-r--r--tests/PHPUnit/System/BackwardsCompatibility1XTest.php4
-rw-r--r--tests/PHPUnit/System/CustomEventsTest.php8
-rw-r--r--tests/PHPUnit/System/EnvironmentValidationTest.php3
-rwxr-xr-xtests/PHPUnit/System/TrackerResponseTest.php4
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml178
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml198
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml160
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml60
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml187
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml121
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml20
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml6
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml200
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml144
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml186
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml412
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml144
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml186
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml194
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml108
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml200
-rw-r--r--tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml78
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml188
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml121
-rw-r--r--tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml4
-rw-r--r--tests/PHPUnit/Unit/DbHelperTest.php61
-rw-r--r--tests/PHPUnit/Unit/DeprecatedMethodsTest.php2
-rw-r--r--tests/PHPUnit/Unit/Tracker/ResponseTest.php2
-rw-r--r--tests/PHPUnit/Unit/Widget/WidgetConfigTest.php11
-rw-r--r--tests/PHPUnit/phpunit.xml.dist2
40 files changed, 2299 insertions, 1010 deletions
diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php
index da1038eba2..2f87d18080 100644
--- a/tests/PHPUnit/Fixtures/InvalidVisits.php
+++ b/tests/PHPUnit/Fixtures/InvalidVisits.php
@@ -56,7 +56,7 @@ class InvalidVisits extends Fixture
// Trigger empty request
$trackerUrl = self::getTrackerUrl();
$response = Http::fetchRemoteFile($trackerUrl);
- self::assertTrue(strpos($response, 'is a free/libre web') !== false, 'Piwik empty request response not correct: ' . $response);
+ self::assertTrue(strpos($response, 'Keep full control of your data with the leading free') !== false, 'Piwik empty request response not correct: ' . $response);
$t = self::getTracker($idSite, $dateTime, $defaultInit = true);
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
index fc3f12d979..3471c3b3e7 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
+++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
@@ -15,7 +15,7 @@ use PiwikTracker;
/**
* Tracks custom events
*/
-class TwoVisitsWithCustomEvents extends Fixture
+class ThreeVisitsWithCustomEvents extends Fixture
{
public $dateTime = '2010-01-03 11:22:33';
public $idSite = 1;
@@ -68,6 +68,15 @@ class TwoVisitsWithCustomEvents extends Fixture
$this->trackMusicRatings($vis2);
$this->trackMovieWatchingIncludingInterval($vis2);
+ $this->dateTime = Date::factory($this->dateTime)->addDay(1);
+ $vis3 = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal);
+ $vis3->setIp('111.1.1.2');
+ $vis3->setPlugins($flash = false, $java = false, $director = true);
+
+ $this->trackMusicPlaying($vis3);
+ $this->trackMusicRatings($vis3);
+ $this->trackMovieWatchingIncludingInterval($vis3);
+
}
private function moveTimeForward(PiwikTracker $vis, $minutes)
diff --git a/tests/PHPUnit/Integration/EmailValidatorTest.php b/tests/PHPUnit/Integration/EmailValidatorTest.php
index a9adff114a..8cb0c198c0 100644
--- a/tests/PHPUnit/Integration/EmailValidatorTest.php
+++ b/tests/PHPUnit/Integration/EmailValidatorTest.php
@@ -24,7 +24,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
private function getAllTlds()
{
/** @var array $response */
- $response = \Piwik\Http::sendHttpRequest("http://data.iana.org/TLD/tlds-alpha-by-domain.txt", 30, null, null, null, null, null, true);
+ $response = \Piwik\Http::sendHttpRequest("http://data.iana.org/TLD/tlds-alpha-by-domain.txt", 60, null, null, null, null, null, true);
$this->assertEquals("200", $response['status']);
diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php
index 417a98599d..272c36c0e1 100644
--- a/tests/PHPUnit/Integration/HttpTest.php
+++ b/tests/PHPUnit/Integration/HttpTest.php
@@ -235,7 +235,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase
*/
public function testCurlHttpsFailsWithInvalidCertificate()
{
- Http::sendHttpRequestBy('curl', 'https://divezone.net', 10);
+ Http::sendHttpRequestBy('curl', 'https://www.virtual-drums.com', 10);
}
/**
@@ -244,7 +244,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase
*/
public function testFopenHttpsFailsWithInvalidCertificate()
{
- Http::sendHttpRequestBy('fopen', 'https://divezone.net', 10);
+ Http::sendHttpRequestBy('fopen', 'https://www.virtual-drums.com', 10);
}
/**
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 54ff0c1a7f..8f50b1ee90 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -455,8 +455,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
public function test_piwikJs_minified_isUpToDate()
{
- Http::fetchRemoteFile('https://github.com/downloads/yui/yuicompressor/yuicompressor-2.4.7.zip', PIWIK_DOCUMENT_ROOT .'/tmp/yuicompressor.zip');
- shell_exec('unzip -n '. PIWIK_DOCUMENT_ROOT .'/tmp/yuicompressor.zip');
+ shell_exec('unzip -n '. PIWIK_DOCUMENT_ROOT .'/tests/resources/yuicompressor/yuicompressor-2.4.7.zip.');
shell_exec("sed '/<DEBUG>/,/<\/DEBUG>/d' < ". PIWIK_DOCUMENT_ROOT ."/js/piwik.js | sed 's/eval/replacedEvilString/' | java -jar yuicompressor-2.4.7/build/yuicompressor-2.4.7.jar --type js --line-break 1000 | sed 's/replacedEvilString/eval/' | sed 's/^[/][*]/\/*!/' > " . PIWIK_DOCUMENT_ROOT ."/piwik-minified.js");
$this->assertFileEquals(PIWIK_DOCUMENT_ROOT . '/piwik-minified.js',
diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index aedd95e61f..9558cc0929 100644
--- a/tests/PHPUnit/Integration/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
@@ -9,16 +9,19 @@
namespace Piwik\Tests\Integration;
use Exception;
+use Piwik\ArchiveProcessor\Rules;
use Piwik\Cache;
use Piwik\Common;
use Piwik\Config;
use Piwik\Container\StaticContainer;
use Piwik\Db;
use Piwik\Segment;
+use Piwik\Tests\Framework\Fixture;
use Piwik\Tests\Framework\Mock\FakeAccess;
use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
use Piwik\Tracker\Action;
use Piwik\Tracker\TableLogAction;
+use Piwik\Plugins\SegmentEditor\API as SegmentEditorApi;
/**
* @group Core
@@ -28,12 +31,16 @@ class SegmentTest extends IntegrationTestCase
{
public $tableLogActionCacheHits = 0;
+ private $exampleSegment = 'visitCount>=1';
+
public function setUp()
{
parent::setUp();
// setup the access layer (required in Segment contrustor testing if anonymous is allowed to use segments)
FakeAccess::$superUser = true;
+
+ Fixture::createWebsite('2015-01-01 00:00:00');
}
static public function removeExtraWhiteSpaces($valueToFilter)
@@ -1491,4 +1498,78 @@ class SegmentTest extends IntegrationTestCase
'Piwik\Tracker\TableLogAction\Cache' => \DI\object()->constructorParameter('cache', $cacheProxy),
);
}
+
+ public function test_willBeArchived_ByDefault_AllSegmentsWillBeArchived()
+ {
+ $this->assertWillBeArchived($this->exampleSegment);
+ }
+
+ public function test_willBeArchived_SegmentsWillNotBeArchivedWhenBrowserArchivingIsDisabledAndNoSuchSegmentExists()
+ {
+ $this->disableSegmentBrowserArchiving();
+ $this->assertNotWillBeArchived($this->exampleSegment);
+ }
+
+ public function test_willBeArchived_SegmentsWillBeArchivedWhenBrowserArchivingIsDisabledButBrowserSegmentsArchivingEnabled()
+ {
+ $this->disableBrowserArchiving();
+ $this->assertWillBeArchived($this->exampleSegment);
+ }
+
+ public function test_willSegmentBeArchived_SegmentsWillNotBeArchivedWhenBrowserArchivingDisabledAndSegmentExistsNotAutoArchive()
+ {
+ $this->disableSegmentBrowserArchiving();
+
+ SegmentEditorApi::getInstance()->add('My Name', $this->exampleSegment, $idSite = false, $autoArchive = false);
+
+ $this->assertNotWillBeArchived($this->exampleSegment);
+ }
+
+ public function test_willSegmentBeArchived_SegmentsWillBeArchivedWhenBrowserArchivingDisabledButSegmentExistsWithAuthoArchive()
+ {
+ $this->disableSegmentBrowserArchiving();
+
+ SegmentEditorApi::getInstance()->add('My Name', $this->exampleSegment, $idSite = false, $autoArchive = true);
+
+ $this->assertWillBeArchived($this->exampleSegment);
+ }
+
+ public function test_willBeArchived_AnEmptySegmentShouldBeAlwaysArchived()
+ {
+ $this->assertWillBeArchived(false);
+
+ $this->disableSegmentBrowserArchiving();
+ $this->assertWillBeArchived(false);
+ }
+
+ private function assertWillBeArchived($segmentString)
+ {
+ $this->assertTrue($this->willSegmentByArchived($segmentString));
+ }
+
+ private function assertNotWillBeArchived($segmentString)
+ {
+ $this->assertFalse($this->willSegmentByArchived($segmentString));
+ }
+
+ private function willSegmentByArchived($segmentString)
+ {
+ $segment = new Segment($segmentString, $idSites = array(1));
+
+ return $segment->willBeArchived();
+ }
+
+ private function disableBrowserArchiving()
+ {
+ Rules::setBrowserTriggerArchiving(false);
+ }
+
+ private function disableSegmentBrowserArchiving()
+ {
+ $this->disableBrowserArchiving();
+ $config = Config::getInstance();
+ $general = $config->General;
+ $general['browser_archiving_disabled_enforce'] = '1';
+ $config->General = $general;
+ }
}
diff --git a/tests/PHPUnit/Integration/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php
index 148bf622df..13b3821bc4 100644
--- a/tests/PHPUnit/Integration/TrackerTest.php
+++ b/tests/PHPUnit/Integration/TrackerTest.php
@@ -251,7 +251,7 @@ class TrackerTest extends IntegrationTestCase
$response = $this->tracker->main($this->getDefaultHandler(), $requestSet);
- $expected = "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
+ $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
$this->assertEquals($expected, $response);
}
diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
index 677272593d..68de1b1e3c 100644
--- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
@@ -135,6 +135,10 @@ class BackwardsCompatibility1XTest extends SystemTestCase
'Actions.get',
'Actions.getOutlink',
'Actions.getOutlinks',
+
+ // system settings such as enable_plugin_update_communication are enabled by default in newest version,
+ // but ugpraded Piwik are not
+ 'CorePluginsAdmin.getSystemSettings'
);
$apiNotToCall = array_merge($apiNotToCall, $reportsToCompareSeparately);
diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php
index f0eef83354..bb2ba6bca7 100644
--- a/tests/PHPUnit/System/CustomEventsTest.php
+++ b/tests/PHPUnit/System/CustomEventsTest.php
@@ -8,7 +8,7 @@
namespace Piwik\Tests\System;
use Piwik\Tests\Framework\TestCase\SystemTestCase;
-use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
+use Piwik\Tests\Fixtures\ThreeVisitsWithCustomEvents;
/**
* Testing Custom Events
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
class CustomEventsTest extends SystemTestCase
{
/**
- * @var TwoVisitsWithCustomEvents
+ * @var ThreeVisitsWithCustomEvents
*/
public static $fixture = null; // initialized below class definition
@@ -91,7 +91,7 @@ class CustomEventsTest extends SystemTestCase
'idSite' => $idSite1,
'date' => $dateTime,
'periods' => $dayPeriod,
- 'idGoal' => TwoVisitsWithCustomEvents::$idGoalTriggeredOnEventCategory,
+ 'idGoal' => ThreeVisitsWithCustomEvents::$idGoalTriggeredOnEventCategory,
'setDateLastN' => false)
)
@@ -151,4 +151,4 @@ class CustomEventsTest extends SystemTestCase
}
}
-CustomEventsTest::$fixture = new TwoVisitsWithCustomEvents();
+CustomEventsTest::$fixture = new ThreeVisitsWithCustomEvents();
diff --git a/tests/PHPUnit/System/EnvironmentValidationTest.php b/tests/PHPUnit/System/EnvironmentValidationTest.php
index 8f87d999f3..2755455324 100644
--- a/tests/PHPUnit/System/EnvironmentValidationTest.php
+++ b/tests/PHPUnit/System/EnvironmentValidationTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\System;
use Piwik\Tests\Framework\Fixture;
use Piwik\Tests\Framework\TestCase\SystemTestCase;
+use Piwik\Version;
/**
* @group System
@@ -134,7 +135,7 @@ class EnvironmentValidationTest extends SystemTestCase
private function assertInstallationProcessStarted($output)
{
- $this->assertContains('<title>Piwik &rsaquo; Installation</title>', $output);
+ $this->assertContains('<title>Piwik '. Version::VERSION .' &rsaquo; Installation</title>', $output);
}
private function simulateAbsentConfigFile($fileName)
diff --git a/tests/PHPUnit/System/TrackerResponseTest.php b/tests/PHPUnit/System/TrackerResponseTest.php
index 337aceb30c..05f6b749c3 100755
--- a/tests/PHPUnit/System/TrackerResponseTest.php
+++ b/tests/PHPUnit/System/TrackerResponseTest.php
@@ -101,7 +101,7 @@ class TrackerResponseTest extends SystemTestCase
$url = Fixture::getTrackerUrl();
$this->assertResponseCode(200, $url);
- $expected = "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
+ $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
$this->assertHttpResponseText($expected, $url);
}
@@ -110,7 +110,7 @@ class TrackerResponseTest extends SystemTestCase
$url = Fixture::getTrackerUrl();
$this->assertResponseCode(400, $url . '?rec=1');
- $expected = "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
+ $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
$this->assertHttpResponseText($expected, $url);
}
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
index 193c7e3ebb..3cfabafb6c 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
@@ -224,7 +224,179 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+ <label>clickBuyNow - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>play - La fiancée de l'eau</label>
+ <nb_events>1</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>
+ <row>
+ <label>play25% - La fiancée de l'eau</label>
+ <nb_events>1</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>
+ <row>
+ <label>play25% - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>play50% - La fiancée de l'eau</label>
+ <nb_events>1</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>
+ <row>
+ <label>play50% - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>play75% - La fiancée de l'eau</label>
+ <nb_events>1</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>
+ <row>
+ <label>play75% - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>playEnd - La fiancée de l'eau</label>
+ <nb_events>1</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>
+ <row>
+ <label>playEnd - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>playStart - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>playTrailer - Ponyo (崖の上のポニョ)</label>
+ <nb_events>1</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>
+ <row>
+ <label>playTrailer - Princess Mononoke (もののけ姫)</label>
+ <nb_events>1</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>
+ <row>
+ <label>playTrailer - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</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>
+ <row>
+ <label>Purchase</label>
+ <nb_events>1</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>
+ <row>
+ <label>rating - La fiancée de l'eau</label>
+ <nb_events>2</nb_events>
+ <nb_events_with_value>2</nb_events_with_value>
+ <sum_event_value>19</sum_event_value>
+ <min_event_value>9</min_event_value>
+ <max_event_value>10</max_event_value>
+ <avg_event_value>9.5</avg_event_value>
+ </row>
+ <row>
+ <label>rating - Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>Search - Search query here</label>
+ <nb_events>1</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>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -241,7 +413,7 @@
<result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
- <nb_visits>43</nb_visits>
- <nb_uniq_visitors>41</nb_uniq_visitors>
+ <nb_visits>64</nb_visits>
+ <nb_uniq_visitors>61</nb_uniq_visitors>
</reportTotal>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
index 60b79ec22c..a852445667 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
@@ -161,7 +161,116 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+ <label>playTrailer</label>
+ <nb_events>3</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>
+ <row>
+ <label>Search</label>
+ <nb_events>3</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>
+ <row>
+ <label>play25%</label>
+ <nb_events>2</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>
+ <row>
+ <label>play50%</label>
+ <nb_events>2</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>
+ <row>
+ <label>play75%</label>
+ <nb_events>2</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>
+ <row>
+ <label>playEnd</label>
+ <nb_events>2</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>
+ <row>
+ <label>rating</label>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.66</sum_event_value>
+ <min_event_value>9</min_event_value>
+ <max_event_value>10</max_event_value>
+ <avg_event_value>9.55</avg_event_value>
+ </row>
+ <row>
+ <label>clickBuyNow</label>
+ <nb_events>1</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>
+ <row>
+ <label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>play</label>
+ <nb_events>1</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>
+ <row>
+ <label>playStart</label>
+ <nb_events>1</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>
+ <row>
+ <label>Purchase</label>
+ <nb_events>1</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>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -173,57 +282,57 @@
<row>
<segment>eventAction==playTrailer</segment>
- <idsubdatatable>856</idsubdatatable>
+ <idsubdatatable>1548</idsubdatatable>
</row>
<row>
<segment>eventAction==Search</segment>
- <idsubdatatable>849</idsubdatatable>
+ <idsubdatatable>1541</idsubdatatable>
</row>
<row>
<segment>eventAction==play25%25</segment>
- <idsubdatatable>851</idsubdatatable>
+ <idsubdatatable>1543</idsubdatatable>
</row>
<row>
<segment>eventAction==play50%25</segment>
- <idsubdatatable>852</idsubdatatable>
+ <idsubdatatable>1544</idsubdatatable>
</row>
<row>
<segment>eventAction==play75%25</segment>
- <idsubdatatable>853</idsubdatatable>
+ <idsubdatatable>1545</idsubdatatable>
</row>
<row>
<segment>eventAction==playEnd</segment>
- <idsubdatatable>854</idsubdatatable>
+ <idsubdatatable>1546</idsubdatatable>
</row>
<row>
<segment>eventAction==rating</segment>
- <idsubdatatable>855</idsubdatatable>
+ <idsubdatatable>1547</idsubdatatable>
</row>
<row>
<segment>eventAction==clickBuyNow</segment>
- <idsubdatatable>857</idsubdatatable>
+ <idsubdatatable>1549</idsubdatatable>
</row>
<row>
<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
- <idsubdatatable>859</idsubdatatable>
+ <idsubdatatable>1551</idsubdatatable>
</row>
<row>
<segment>eventAction==play</segment>
- <idsubdatatable>850</idsubdatatable>
+ <idsubdatatable>1542</idsubdatatable>
</row>
<row>
<segment>eventAction==playStart</segment>
- <idsubdatatable>858</idsubdatatable>
+ <idsubdatatable>1550</idsubdatatable>
</row>
<row>
<segment>eventAction==Purchase</segment>
@@ -232,7 +341,66 @@
<segment>eventAction==This+is+an+event+without+a+URL</segment>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+
+ <segment>eventAction==playTrailer</segment>
+ <idsubdatatable>1560</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==Search</segment>
+ <idsubdatatable>1553</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==play25%25</segment>
+ <idsubdatatable>1555</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==play50%25</segment>
+ <idsubdatatable>1556</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==play75%25</segment>
+ <idsubdatatable>1557</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==playEnd</segment>
+ <idsubdatatable>1558</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==rating</segment>
+ <idsubdatatable>1559</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==clickBuyNow</segment>
+ <idsubdatatable>1561</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
+ <idsubdatatable>1563</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==play</segment>
+ <idsubdatatable>1554</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventAction==playStart</segment>
+ <idsubdatatable>1562</idsubdatatable>
+ </row>
+ <row>
+ <segment>eventAction==Purchase</segment>
+ </row>
+ </result>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -240,7 +408,7 @@
<result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
- <nb_visits>43</nb_visits>
- <nb_uniq_visitors>41</nb_uniq_visitors>
+ <nb_visits>64</nb_visits>
+ <nb_uniq_visitors>61</nb_uniq_visitors>
</reportTotal>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
index 40bd94b451..889fbf772e 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
@@ -206,7 +206,161 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+ <label>Movie - playTrailer</label>
+ <nb_events>3</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>
+ <row>
+ <label>Movie - Search</label>
+ <nb_events>3</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>
+ <row>
+ <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>Movie - clickBuyNow</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - play25%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - play50%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - play75%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - playEnd</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - playStart</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - Purchase</label>
+ <nb_events>1</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>
+ <row>
+ <label>Movie - rating</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>Music - play</label>
+ <nb_events>1</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>
+ <row>
+ <label>Music - play25%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Music - play50%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Music - play75%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Music - playEnd</label>
+ <nb_events>1</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>
+ <row>
+ <label>Music - rating</label>
+ <nb_events>2</nb_events>
+ <nb_events_with_value>2</nb_events_with_value>
+ <sum_event_value>19</sum_event_value>
+ <min_event_value>9</min_event_value>
+ <max_event_value>10</max_event_value>
+ <avg_event_value>9.5</avg_event_value>
+ </row>
+ </result>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -223,7 +377,7 @@
<result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
- <nb_visits>43</nb_visits>
- <nb_uniq_visitors>41</nb_uniq_visitors>
+ <nb_visits>64</nb_visits>
+ <nb_uniq_visitors>61</nb_uniq_visitors>
</reportTotal>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
index 5b430036c5..69faeb032f 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
@@ -80,7 +80,35 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+ <label>Movie</label>
+ <nb_events>14</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>0</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>Music</label>
+ <nb_events>7</nb_events>
+ <nb_events_with_value>2</nb_events_with_value>
+ <sum_event_value>19</sum_event_value>
+ <min_event_value>0</min_event_value>
+ <max_event_value>10</max_event_value>
+ <avg_event_value>9.5</avg_event_value>
+ </row>
+ <row>
+ <label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ </result>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -92,25 +120,41 @@
<row>
<segment>eventCategory==Movie</segment>
- <idsubdatatable>792</idsubdatatable>
+ <idsubdatatable>1478</idsubdatatable>
</row>
<row>
<segment>eventCategory==Music</segment>
- <idsubdatatable>793</idsubdatatable>
+ <idsubdatatable>1479</idsubdatatable>
</row>
<row>
<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
- <idsubdatatable>794</idsubdatatable>
+ <idsubdatatable>1480</idsubdatatable>
</row>
<row>
<segment>eventCategory==CategoryTriggersGoal+here</segment>
- <idsubdatatable>795</idsubdatatable>
+ <idsubdatatable>1481</idsubdatatable>
+ </row>
+ </result>
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+
+ <segment>eventCategory==Movie</segment>
+ <idsubdatatable>1483</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventCategory==Music</segment>
+ <idsubdatatable>1484</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
+ <idsubdatatable>1485</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -118,7 +162,7 @@
<result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
- <nb_visits>43</nb_visits>
- <nb_uniq_visitors>41</nb_uniq_visitors>
+ <nb_visits>64</nb_visits>
+ <nb_uniq_visitors>61</nb_uniq_visitors>
</reportTotal>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
index dcaf39aabb..d09405ea90 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
@@ -233,7 +233,188 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+ <label>Event Name not defined - Search</label>
+ <nb_events>2</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>
+ <row>
+ <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>Event Name not defined - Purchase</label>
+ <nb_events>1</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>
+ <row>
+ <label>La fiancée de l'eau - play</label>
+ <nb_events>1</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>
+ <row>
+ <label>La fiancée de l'eau - play25%</label>
+ <nb_events>1</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>
+ <row>
+ <label>La fiancée de l'eau - play50%</label>
+ <nb_events>1</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>
+ <row>
+ <label>La fiancée de l'eau - play75%</label>
+ <nb_events>1</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>
+ <row>
+ <label>La fiancée de l'eau - playEnd</label>
+ <nb_events>1</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>
+ <row>
+ <label>La fiancée de l'eau - rating</label>
+ <nb_events>2</nb_events>
+ <nb_events_with_value>2</nb_events_with_value>
+ <sum_event_value>19</sum_event_value>
+ <min_event_value>9</min_event_value>
+ <max_event_value>10</max_event_value>
+ <avg_event_value>9.5</avg_event_value>
+ </row>
+ <row>
+ <label>Ponyo (崖の上のポニョ) - playTrailer</label>
+ <nb_events>1</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>
+ <row>
+ <label>Princess Mononoke (もののけ姫) - playTrailer</label>
+ <nb_events>1</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>
+ <row>
+ <label>Search query here - Search</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - clickBuyNow</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - play25%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - play50%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - play75%</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - playEnd</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - playStart</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - playTrailer</label>
+ <nb_events>1</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>
+ <row>
+ <label>Spirited Away (千と千尋の神隠し) - rating</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ </result>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -250,7 +431,7 @@
<result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
- <nb_visits>43</nb_visits>
- <nb_uniq_visitors>41</nb_uniq_visitors>
+ <nb_visits>64</nb_visits>
+ <nb_uniq_visitors>61</nb_uniq_visitors>
</reportTotal>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index 0dbe31d0ef..5f043780cf 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -107,7 +107,71 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+ <label>Spirited Away (千と千尋の神隠し)</label>
+ <nb_events>8</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>0</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>La fiancée de l'eau</label>
+ <nb_events>7</nb_events>
+ <nb_events_with_value>2</nb_events_with_value>
+ <sum_event_value>19</sum_event_value>
+ <min_event_value>0</min_event_value>
+ <max_event_value>10</max_event_value>
+ <avg_event_value>9.5</avg_event_value>
+ </row>
+ <row>
+ <label>Event Name not defined</label>
+ <nb_events>3</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>
+ <row>
+ <label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>1</nb_events_with_value>
+ <sum_event_value>9.66</sum_event_value>
+ <min_event_value>9.66</min_event_value>
+ <max_event_value>9.66</max_event_value>
+ <avg_event_value>9.66</avg_event_value>
+ </row>
+ <row>
+ <label>Ponyo (崖の上のポニョ)</label>
+ <nb_events>1</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>
+ <row>
+ <label>Princess Mononoke (もののけ姫)</label>
+ <nb_events>1</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>
+ <row>
+ <label>Search query here</label>
+ <nb_events>1</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>
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -119,39 +183,74 @@
<row>
<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
- <idsubdatatable>922</idsubdatatable>
+ <idsubdatatable>1636</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
+ <idsubdatatable>1635</idsubdatatable>
+ </row>
+ <row>
+
+ <idsubdatatable>1634</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
+ <idsubdatatable>1640</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
+ <idsubdatatable>1638</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
+ <idsubdatatable>1637</idsubdatatable>
+ </row>
+ <row>
+
+ <segment>eventName==Search+query+here</segment>
+ <idsubdatatable>1639</idsubdatatable>
+ </row>
+ </result>
+ <result prettyDate="Monday, January 4, 2010">
+ <row>
+
+ <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
+ <idsubdatatable>1644</idsubdatatable>
</row>
<row>
<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
- <idsubdatatable>921</idsubdatatable>
+ <idsubdatatable>1643</idsubdatatable>
</row>
<row>
- <idsubdatatable>920</idsubdatatable>
+ <idsubdatatable>1642</idsubdatatable>
</row>
<row>
<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
- <idsubdatatable>926</idsubdatatable>
+ <idsubdatatable>1648</idsubdatatable>
</row>
<row>
<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
- <idsubdatatable>924</idsubdatatable>
+ <idsubdatatable>1646</idsubdatatable>
</row>
<row>
<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
- <idsubdatatable>923</idsubdatatable>
+ <idsubdatatable>1645</idsubdatatable>
</row>
<row>
<segment>eventName==Search+query+here</segment>
- <idsubdatatable>925</idsubdatatable>
+ <idsubdatatable>1647</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
<result prettyDate="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
<result prettyDate="Thursday, January 7, 2010" />
@@ -159,7 +258,7 @@
<result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
- <nb_visits>43</nb_visits>
- <nb_uniq_visitors>41</nb_uniq_visitors>
+ <nb_visits>64</nb_visits>
+ <nb_uniq_visitors>61</nb_uniq_visitors>
</reportTotal>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
index 79b9cb81e5..842dff57a1 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
@@ -2,20 +2,20 @@
<result>
<row>
<label>/movies</label>
- <nb_visits>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.666</min_time_generation>
<max_time_generation>0.666</max_time_generation>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
- <entry_sum_visit_length>3541</entry_sum_visit_length>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>28</entry_nb_actions>
+ <entry_sum_visit_length>7082</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <exit_nb_visits>3</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
index f7a5fb831c..5e22f5f565 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>3</nb_pageviews>
- <nb_uniq_pageviews>3</nb_uniq_pageviews>
+ <nb_pageviews>4</nb_pageviews>
+ <nb_uniq_pageviews>4</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
<nb_uniq_downloads>0</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <avg_time_generation>0.557</avg_time_generation>
+ <avg_time_generation>0.585</avg_time_generation>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
index f60a44a673..07715b1b6f 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
@@ -2,365 +2,365 @@
<result>
<row>
<label>playTrailer</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playTrailer</segment>
<subtable>
<row>
<label>Ponyo (崖の上のポニョ)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Search</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==Search</segment>
<subtable>
<row>
<label>Search query here</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play25%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play25%25</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play50%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play50%25</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play75%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play75%25</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>playEnd</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playEnd</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>rating</label>
- <nb_visits>4</nb_visits>
- <nb_events>6</nb_events>
- <nb_events_with_value>6</nb_events_with_value>
- <sum_event_value>57.32</sum_event_value>
+ <nb_visits>6</nb_visits>
+ <nb_events>9</nb_events>
+ <nb_events_with_value>9</nb_events_with_value>
+ <sum_event_value>85.98</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>9.55</avg_event_value>
<segment>eventAction==rating</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==clickBuyNow</segment>
<subtable>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playStart</segment>
<subtable>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==Purchase</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
index ced40076d2..26def0abf9 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
@@ -2,229 +2,229 @@
<result>
<row>
<label>Movie</label>
- <nb_visits>28</nb_visits>
- <nb_events>28</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>42</nb_visits>
+ <nb_events>42</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventCategory==Movie</segment>
<subtable>
<row>
<label>playTrailer</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Search</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Music</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
<segment>eventCategory==Music</segment>
<subtable>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
index d0560a0023..a87c852b65 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
@@ -2,217 +2,217 @@
<result>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>16</nb_visits>
- <nb_events>16</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>24</nb_visits>
+ <nb_events>24</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
<subtable>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playTrailer</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
<subtable>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Event Name not defined</label>
- <nb_visits>7</nb_visits>
- <nb_events>7</nb_events>
+ <nb_visits>10</nb_visits>
+ <nb_events>10</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>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<subtable>
<row>
<label>Search</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
@@ -230,100 +230,100 @@
</row>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Ponyo (崖の上のポニョ)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
<subtable>
<row>
<label>playTrailer</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
<subtable>
<row>
<label>playTrailer</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Search query here</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Search+query+here</segment>
<subtable>
<row>
<label>Search</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 3c677f06fd..6c7b19157a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -2,8 +2,8 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>5</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>15</idVisit>
+ <visitIp>111.1.1.2</visitIp>
<actionDetails>
<row>
@@ -11,7 +11,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>22</pageId>
+ <pageId>68</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Purchase</eventAction>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -88,15 +88,11 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>director</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
</row>
</pluginsIcons>
@@ -107,8 +103,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>4</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>14</idVisit>
+ <visitIp>111.1.1.2</visitIp>
<actionDetails>
<row>
@@ -116,7 +112,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>21</pageId>
+ <pageId>67</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Search</eventAction>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -193,15 +189,11 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>director</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
</row>
</pluginsIcons>
@@ -212,8 +204,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>12</idVisit>
+ <visitIp>111.1.1.2</visitIp>
<actionDetails>
<row>
@@ -221,7 +213,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>17</pageId>
+ <pageId>63</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>play50%</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -235,7 +227,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>18</pageId>
+ <pageId>64</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>play75%</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -249,7 +241,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>20</pageId>
+ <pageId>66</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Search</eventAction>
<eventName>Search query here</eventName>
@@ -263,7 +255,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>23</pageId>
+ <pageId>69</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playEnd</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -277,7 +269,7 @@
<url />
<pageIdAction />
- <pageId>24</pageId>
+ <pageId>70</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>rating</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -292,7 +284,7 @@
<url>http://example.org/finishedMovie</url>
<pageIdAction>27</pageIdAction>
- <pageId>25</pageId>
+ <pageId>71</pageId>
<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
@@ -371,15 +363,11 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>director</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
</row>
</pluginsIcons>
@@ -390,8 +378,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>3</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>13</idVisit>
+ <visitIp>111.1.1.2</visitIp>
<actionDetails>
<row>
@@ -399,7 +387,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>19</pageId>
+ <pageId>65</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Search</eventAction>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -476,15 +464,11 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>director</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
</row>
</pluginsIcons>
@@ -495,40 +479,16 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>11</idVisit>
+ <visitIp>111.1.1.2</visitIp>
<actionDetails>
<row>
- <type>goal</type>
- <goalName>triggered js</goalName>
- <goalId>1</goalId>
- <revenue>0</revenue>
- <goalPageId>1</goalPageId>
-
- <url>http://example.org/webradio</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
- <row>
- <type>action</type>
- <url>http://example.org/webradio</url>
- <pageTitle>Welcome!</pageTitle>
- <pageIdAction>2</pageIdAction>
-
- <pageId>1</pageId>
- <generationTime>0.33s</generationTime>
- <timeSpent>60</timeSpent>
- <timeSpentPretty>1 min 0s</timeSpentPretty>
- <icon />
-
- </row>
- <row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>2</pageId>
+ <pageId>49</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play</eventAction>
<customVariables>
@@ -545,10 +505,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>3</pageId>
+ <pageId>50</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play25%</eventAction>
<customVariables>
@@ -565,10 +525,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>4</pageId>
+ <pageId>51</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play50%</eventAction>
<customVariables>
@@ -585,10 +545,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>5</pageId>
+ <pageId>52</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play75%</eventAction>
<customVariables>
@@ -605,10 +565,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>6</pageId>
+ <pageId>53</pageId>
<eventCategory>Music</eventCategory>
<eventAction>playEnd</eventAction>
<customVariables>
@@ -625,10 +585,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>7</pageId>
+ <pageId>54</pageId>
<eventCategory>Music</eventCategory>
<eventAction>rating</eventAction>
<customVariables>
@@ -646,10 +606,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.org/webradio</url>
- <pageIdAction>3</pageIdAction>
+ <url>http://example.com/piwik/</url>
+ <pageIdAction>31</pageIdAction>
- <pageId>8</pageId>
+ <pageId>55</pageId>
<eventCategory>Music</eventCategory>
<eventAction>rating</eventAction>
<customVariables>
@@ -660,30 +620,6 @@
</customVariables>
<eventName>La fiancée de l'eau</eventName>
<eventValue>10</eventValue>
- <timeSpent>0</timeSpent>
- <timeSpentPretty>0s</timeSpentPretty>
- <icon>plugins/Morpheus/images/event.png</icon>
-
- </row>
- <row>
- <type>goal</type>
- <goalName>event matching</goalName>
- <goalId>3</goalId>
- <revenue>0</revenue>
- <goalPageId>9</goalPageId>
-
- <url />
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
- <row>
- <type>event</type>
- <url />
- <pageIdAction />
-
- <pageId>9</pageId>
- <eventCategory>CategoryTriggersGoal here</eventCategory>
- <eventAction>This is an event without a URL</eventAction>
<timeSpent>1499</timeSpent>
<timeSpentPretty>24 min 59s</timeSpentPretty>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -695,7 +631,7 @@
<pageTitle>Movie Theater</pageTitle>
<pageIdAction>15</pageIdAction>
- <pageId>10</pageId>
+ <pageId>56</pageId>
<generationTime>0.67s</generationTime>
<timeSpent>60</timeSpent>
<timeSpentPretty>1 min 0s</timeSpentPretty>
@@ -707,7 +643,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>11</pageId>
+ <pageId>57</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playTrailer</eventAction>
<eventName>Princess Mononoke (もののけ姫)</eventName>
@@ -721,7 +657,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>12</pageId>
+ <pageId>58</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playTrailer</eventAction>
<eventName>Ponyo (崖の上のポニョ)</eventName>
@@ -735,7 +671,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>13</pageId>
+ <pageId>59</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playTrailer</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -749,7 +685,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>14</pageId>
+ <pageId>60</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>clickBuyNow</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -763,7 +699,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>15</pageId>
+ <pageId>61</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playStart</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -777,7 +713,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>16</pageId>
+ <pageId>62</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>play25%</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -785,7 +721,7 @@
</row>
</actionDetails>
- <goalConversions>2</goalConversions>
+ <goalConversions>0</goalConversions>
<siteCurrency>USD</siteCurrency>
<siteCurrencySymbol>$</siteCurrencySymbol>
@@ -795,18 +731,18 @@
<userId />
<visitorType>new</visitorType>
<visitorTypeIcon />
- <visitConverted>1</visitConverted>
- <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
<visitCount>1</visitCount>
<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <visitDuration>3601</visitDuration>
- <visitDurationPretty>1 hours 0 min</visitDurationPretty>
+ <visitDuration>3541</visitDuration>
+ <visitDurationPretty>59 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>16</actions>
+ <actions>14</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -833,7 +769,7 @@
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
- <events>14</events>
+ <events>13</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -855,15 +791,11 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>director</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
</row>
</pluginsIcons>
@@ -874,8 +806,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>10</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>5</idVisit>
+ <visitIp>156.5.3.2</visitIp>
<actionDetails>
<row>
@@ -883,7 +815,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>45</pageId>
+ <pageId>22</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Purchase</eventAction>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -960,11 +892,15 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>director</plugins>
+ <plugins>flash, java</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
</row>
</pluginsIcons>
@@ -975,8 +911,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>9</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>4</idVisit>
+ <visitIp>156.5.3.2</visitIp>
<actionDetails>
<row>
@@ -984,7 +920,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>44</pageId>
+ <pageId>21</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Search</eventAction>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -1061,11 +997,15 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>director</plugins>
+ <plugins>flash, java</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
</row>
</pluginsIcons>
@@ -1076,8 +1016,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>7</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>2</idVisit>
+ <visitIp>156.5.3.2</visitIp>
<actionDetails>
<row>
@@ -1085,7 +1025,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>40</pageId>
+ <pageId>17</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>play50%</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1099,7 +1039,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>41</pageId>
+ <pageId>18</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>play75%</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1113,7 +1053,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>43</pageId>
+ <pageId>20</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Search</eventAction>
<eventName>Search query here</eventName>
@@ -1127,7 +1067,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>46</pageId>
+ <pageId>23</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playEnd</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1141,7 +1081,7 @@
<url />
<pageIdAction />
- <pageId>47</pageId>
+ <pageId>24</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>rating</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1156,7 +1096,7 @@
<url>http://example.org/finishedMovie</url>
<pageIdAction>27</pageIdAction>
- <pageId>48</pageId>
+ <pageId>25</pageId>
<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
@@ -1235,11 +1175,15 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>director</plugins>
+ <plugins>flash, java</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
</row>
</pluginsIcons>
@@ -1250,8 +1194,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>8</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>3</idVisit>
+ <visitIp>156.5.3.2</visitIp>
<actionDetails>
<row>
@@ -1259,7 +1203,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>42</pageId>
+ <pageId>19</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>Search</eventAction>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -1336,11 +1280,15 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>director</plugins>
+ <plugins>flash, java</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
</row>
</pluginsIcons>
@@ -1351,16 +1299,40 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>6</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
<actionDetails>
<row>
+ <type>goal</type>
+ <goalName>triggered js</goalName>
+ <goalId>1</goalId>
+ <revenue>0</revenue>
+ <goalPageId>1</goalPageId>
+
+ <url>http://example.org/webradio</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/webradio</url>
+ <pageTitle>Welcome!</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>60</timeSpent>
+ <timeSpentPretty>1 min 0s</timeSpentPretty>
+ <icon />
+
+ </row>
+ <row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>26</pageId>
+ <pageId>2</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play</eventAction>
<customVariables>
@@ -1377,10 +1349,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>27</pageId>
+ <pageId>3</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play25%</eventAction>
<customVariables>
@@ -1397,10 +1369,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>28</pageId>
+ <pageId>4</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play50%</eventAction>
<customVariables>
@@ -1417,10 +1389,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>29</pageId>
+ <pageId>5</pageId>
<eventCategory>Music</eventCategory>
<eventAction>play75%</eventAction>
<customVariables>
@@ -1437,10 +1409,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>30</pageId>
+ <pageId>6</pageId>
<eventCategory>Music</eventCategory>
<eventAction>playEnd</eventAction>
<customVariables>
@@ -1457,10 +1429,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>31</pageId>
+ <pageId>7</pageId>
<eventCategory>Music</eventCategory>
<eventAction>rating</eventAction>
<customVariables>
@@ -1478,10 +1450,10 @@
</row>
<row>
<type>event</type>
- <url>http://example.com/piwik/</url>
- <pageIdAction>31</pageIdAction>
+ <url>http://example.org/webradio</url>
+ <pageIdAction>3</pageIdAction>
- <pageId>32</pageId>
+ <pageId>8</pageId>
<eventCategory>Music</eventCategory>
<eventAction>rating</eventAction>
<customVariables>
@@ -1492,6 +1464,30 @@
</customVariables>
<eventName>La fiancée de l'eau</eventName>
<eventValue>10</eventValue>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/event.png</icon>
+
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>event matching</goalName>
+ <goalId>3</goalId>
+ <revenue>0</revenue>
+ <goalPageId>9</goalPageId>
+
+ <url />
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>event</type>
+ <url />
+ <pageIdAction />
+
+ <pageId>9</pageId>
+ <eventCategory>CategoryTriggersGoal here</eventCategory>
+ <eventAction>This is an event without a URL</eventAction>
<timeSpent>1499</timeSpent>
<timeSpentPretty>24 min 59s</timeSpentPretty>
<icon>plugins/Morpheus/images/event.png</icon>
@@ -1503,7 +1499,7 @@
<pageTitle>Movie Theater</pageTitle>
<pageIdAction>15</pageIdAction>
- <pageId>33</pageId>
+ <pageId>10</pageId>
<generationTime>0.67s</generationTime>
<timeSpent>60</timeSpent>
<timeSpentPretty>1 min 0s</timeSpentPretty>
@@ -1515,7 +1511,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>34</pageId>
+ <pageId>11</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playTrailer</eventAction>
<eventName>Princess Mononoke (もののけ姫)</eventName>
@@ -1529,7 +1525,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>35</pageId>
+ <pageId>12</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playTrailer</eventAction>
<eventName>Ponyo (崖の上のポニョ)</eventName>
@@ -1543,7 +1539,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>36</pageId>
+ <pageId>13</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playTrailer</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1557,7 +1553,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>37</pageId>
+ <pageId>14</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>clickBuyNow</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1571,7 +1567,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>38</pageId>
+ <pageId>15</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>playStart</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1585,7 +1581,7 @@
<url>http://example.org/movies</url>
<pageIdAction>16</pageIdAction>
- <pageId>39</pageId>
+ <pageId>16</pageId>
<eventCategory>Movie</eventCategory>
<eventAction>play25%</eventAction>
<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1593,7 +1589,7 @@
</row>
</actionDetails>
- <goalConversions>0</goalConversions>
+ <goalConversions>2</goalConversions>
<siteCurrency>USD</siteCurrency>
<siteCurrencySymbol>$</siteCurrencySymbol>
@@ -1603,18 +1599,18 @@
<userId />
<visitorType>new</visitorType>
<visitorTypeIcon />
- <visitConverted>0</visitConverted>
- <visitConvertedIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
<visitCount>1</visitCount>
<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <visitDuration>3541</visitDuration>
- <visitDurationPretty>59 min 1s</visitDurationPretty>
+ <visitDuration>3601</visitDuration>
+ <visitDurationPretty>1 hours 0 min</visitDurationPretty>
<searches>0</searches>
- <actions>14</actions>
+ <actions>16</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -1641,7 +1637,7 @@
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
- <events>13</events>
+ <events>14</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1663,11 +1659,15 @@
</row>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>director</plugins>
+ <plugins>flash, java</plugins>
<pluginsIcons>
<row>
- <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
</row>
</pluginsIcons>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
index ced40076d2..26def0abf9 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
@@ -2,229 +2,229 @@
<result>
<row>
<label>Movie</label>
- <nb_visits>28</nb_visits>
- <nb_events>28</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>42</nb_visits>
+ <nb_events>42</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventCategory==Movie</segment>
<subtable>
<row>
<label>playTrailer</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Search</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Music</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
<segment>eventCategory==Music</segment>
<subtable>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
index d0560a0023..a87c852b65 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
@@ -2,217 +2,217 @@
<result>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>16</nb_visits>
- <nb_events>16</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>24</nb_visits>
+ <nb_events>24</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
<subtable>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playTrailer</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
<subtable>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Event Name not defined</label>
- <nb_visits>7</nb_visits>
- <nb_events>7</nb_events>
+ <nb_visits>10</nb_visits>
+ <nb_events>10</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>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<subtable>
<row>
<label>Search</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
@@ -230,100 +230,100 @@
</row>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Ponyo (崖の上のポニョ)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
<subtable>
<row>
<label>playTrailer</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
<subtable>
<row>
<label>playTrailer</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Search query here</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Search+query+here</segment>
<subtable>
<row>
<label>Search</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
index 8503a4dc17..65c0b2aa9e 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
@@ -2,355 +2,355 @@
<result>
<row>
<label>playTrailer</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playTrailer</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Search</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==Search</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play25%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play25%25</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Music</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play50%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play50%25</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Music</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play75%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play75%25</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Music</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>playEnd</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playEnd</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Music</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>rating</label>
- <nb_visits>4</nb_visits>
- <nb_events>6</nb_events>
- <nb_events_with_value>6</nb_events_with_value>
- <sum_event_value>57.32</sum_event_value>
+ <nb_visits>6</nb_visits>
+ <nb_events>9</nb_events>
+ <nb_events_with_value>9</nb_events_with_value>
+ <sum_event_value>85.98</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>9.55</avg_event_value>
<segment>eventAction==rating</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
<row>
<label>Music</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==clickBuyNow</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play</segment>
<subtable>
<row>
<label>Music</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playStart</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==Purchase</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
index ceeee487c1..bc59d36fd8 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
@@ -2,74 +2,74 @@
<result>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>16</nb_visits>
- <nb_events>16</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>24</nb_visits>
+ <nb_events>24</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>16</nb_visits>
- <nb_events>16</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>24</nb_visits>
+ <nb_events>24</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
<subtable>
<row>
<label>Music</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Event Name not defined</label>
- <nb_visits>7</nb_visits>
- <nb_events>7</nb_events>
+ <nb_visits>10</nb_visits>
+ <nb_events>10</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>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
@@ -87,100 +87,100 @@
</row>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Ponyo (崖の上のポニョ)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Search query here</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventName==Search+query+here</segment>
<subtable>
<row>
<label>Movie</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
index f60a44a673..07715b1b6f 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
@@ -2,365 +2,365 @@
<result>
<row>
<label>playTrailer</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playTrailer</segment>
<subtable>
<row>
<label>Ponyo (崖の上のポニョ)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Search</label>
- <nb_visits>6</nb_visits>
- <nb_events>6</nb_events>
+ <nb_visits>9</nb_visits>
+ <nb_events>9</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==Search</segment>
<subtable>
<row>
<label>Search query here</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play25%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play25%25</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play50%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play50%25</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play75%</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play75%25</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>playEnd</label>
- <nb_visits>4</nb_visits>
- <nb_events>4</nb_events>
+ <nb_visits>6</nb_visits>
+ <nb_events>6</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>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playEnd</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>rating</label>
- <nb_visits>4</nb_visits>
- <nb_events>6</nb_events>
- <nb_events_with_value>6</nb_events_with_value>
- <sum_event_value>57.32</sum_event_value>
+ <nb_visits>6</nb_visits>
+ <nb_events>9</nb_events>
+ <nb_events_with_value>9</nb_events_with_value>
+ <sum_event_value>85.98</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<avg_event_value>9.55</avg_event_value>
<segment>eventAction==rating</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>4</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>6</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>9</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>clickBuyNow</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==clickBuyNow</segment>
<subtable>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>play</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==play</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>playStart</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==playStart</segment>
<subtable>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Purchase</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
<segment>eventAction==Purchase</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
index 5f3a8a5f0c..e74fe076fd 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
@@ -2,108 +2,108 @@
<result>
<row>
<label>Movie</label>
- <nb_visits>28</nb_visits>
- <nb_events>28</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>42</nb_visits>
+ <nb_events>42</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventCategory==Movie</segment>
<subtable>
<row>
<label>Spirited Away (千と千尋の神隠し)</label>
- <nb_visits>16</nb_visits>
- <nb_events>16</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>24</nb_visits>
+ <nb_events>24</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
<row>
<label>Ponyo (崖の上のポニョ)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Search query here</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</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>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>0</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>Music</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
<segment>eventCategory==Music</segment>
<subtable>
<row>
<label>La fiancée de l'eau</label>
- <nb_visits>12</nb_visits>
- <nb_events>14</nb_events>
- <nb_events_with_value>4</nb_events_with_value>
- <sum_event_value>38</sum_event_value>
+ <nb_visits>18</nb_visits>
+ <nb_events>21</nb_events>
+ <nb_events_with_value>6</nb_events_with_value>
+ <sum_event_value>57</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<avg_event_value>9.5</avg_event_value>
</row>
</subtable>
</row>
<row>
<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
<subtable>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
- <nb_visits>2</nb_visits>
- <nb_events>2</nb_events>
- <nb_events_with_value>2</nb_events_with_value>
- <sum_event_value>19.32</sum_event_value>
+ <nb_visits>3</nb_visits>
+ <nb_events>3</nb_events>
+ <nb_events_with_value>3</nb_events_with_value>
+ <sum_event_value>28.98</sum_event_value>
<min_event_value>9.66</min_event_value>
<max_event_value>9.66</max_event_value>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<avg_event_value>9.66</avg_event_value>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
index b4d4316097..7f6c3671eb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
@@ -27,8 +27,8 @@
<row>
<name>enable_plugin_update_communication</name>
<title />
- <value>0</value>
- <defaultValue>0</defaultValue>
+ <value>1</value>
+ <defaultValue>1</defaultValue>
<type>boolean</type>
<uiControl>radio</uiControl>
<uiControlAttributes>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
index b4d4316097..7f6c3671eb 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
@@ -27,8 +27,8 @@
<row>
<name>enable_plugin_update_communication</name>
<title />
- <value>0</value>
- <defaultValue>0</defaultValue>
+ <value>1</value>
+ <defaultValue>1</defaultValue>
<type>boolean</type>
<uiControl>radio</uiControl>
<uiControlAttributes>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
index 61fc256ebc..2cbc2807d4 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
@@ -24,6 +24,7 @@
<action>getDownloads</action>
</parameters>
<uniqueId>widgetActionsgetDownloads</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -53,6 +54,7 @@
<action>getEntryPageUrls</action>
</parameters>
<uniqueId>widgetActionsgetEntryPageUrls</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -66,6 +68,7 @@
<action>getEntryPageTitles</action>
</parameters>
<uniqueId>widgetActionsgetEntryPageTitles</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -95,6 +98,7 @@
<action>getExitPageUrls</action>
</parameters>
<uniqueId>widgetActionsgetExitPageUrls</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -108,6 +112,7 @@
<action>getExitPageTitles</action>
</parameters>
<uniqueId>widgetActionsgetExitPageTitles</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -137,6 +142,7 @@
<action>getOutlinks</action>
</parameters>
<uniqueId>widgetActionsgetOutlinks</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -166,6 +172,7 @@
<action>getPageUrls</action>
</parameters>
<uniqueId>widgetActionsgetPageUrls</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -195,6 +202,7 @@
<action>getPageTitles</action>
</parameters>
<uniqueId>widgetActionsgetPageTitles</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -224,6 +232,7 @@
<action>getSiteSearchKeywords</action>
</parameters>
<uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -237,6 +246,7 @@
<action>getPageUrlsFollowingSiteSearch</action>
</parameters>
<uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -250,6 +260,7 @@
<action>getSiteSearchNoResultKeywords</action>
</parameters>
<uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -263,6 +274,7 @@
<action>getPageTitlesFollowingSiteSearch</action>
</parameters>
<uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -276,6 +288,7 @@
<action>getSiteSearchCategories</action>
</parameters>
<uniqueId>widgetActionsgetSiteSearchCategories</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -306,6 +319,7 @@
<containerId>Events</containerId>
</parameters>
<uniqueId>widgetEvents</uniqueId>
+ <isWide>0</isWide>
<layout>ByDimension</layout>
<isContainer>1</isContainer>
<widgets>
@@ -331,6 +345,7 @@
<secondaryDimension>eventAction</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -356,6 +371,7 @@
<secondaryDimension>eventName</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -381,6 +397,7 @@
<secondaryDimension>eventAction</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -413,6 +430,7 @@
<containerId>Contents</containerId>
</parameters>
<uniqueId>widgetContents</uniqueId>
+ <isWide>0</isWide>
<layout>ByDimension</layout>
<isContainer>1</isContainer>
<widgets>
@@ -437,6 +455,7 @@
<action>getContentNames</action>
</parameters>
<uniqueId>widgetContentsgetContentNames</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -461,6 +480,7 @@
<action>getContentPieces</action>
</parameters>
<uniqueId>widgetContentsgetContentPieces</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -492,6 +512,7 @@
<action>getType</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetType</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -505,6 +526,7 @@
<action>getModel</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetModel</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -518,6 +540,7 @@
<action>getBrand</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -531,6 +554,7 @@
<action>getResolution</action>
</parameters>
<uniqueId>widgetResolutiongetResolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -560,6 +584,7 @@
<action>getNumberOfVisitsPerVisitDuration</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -573,6 +598,7 @@
<action>getNumberOfVisitsPerPage</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -586,6 +612,7 @@
<action>getNumberOfVisitsByVisitCount</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -599,6 +626,7 @@
<action>getNumberOfVisitsByDaysSinceLast</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -614,6 +642,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -629,6 +658,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetVisitFrequencygetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -658,6 +688,7 @@
<action>getOsVersions</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -671,6 +702,7 @@
<action>getBrowsers</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -684,6 +716,7 @@
<action>getBrowserVersions</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -697,6 +730,7 @@
<action>getConfiguration</action>
</parameters>
<uniqueId>widgetResolutiongetConfiguration</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -710,6 +744,7 @@
<action>getOsFamilies</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -723,6 +758,7 @@
<action>getBrowserEngines</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrowserEngines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
@@ -736,6 +772,7 @@
<action>getPlugin</action>
</parameters>
<uniqueId>widgetDevicePluginsgetPlugin</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -767,6 +804,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -782,6 +820,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -811,6 +850,7 @@
<action>visitorMap</action>
</parameters>
<uniqueId>widgetUserCountryMapvisitorMap</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Country</name>
@@ -822,6 +862,7 @@
<action>getCountry</action>
</parameters>
<uniqueId>widgetUserCountrygetCountry</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -836,6 +877,7 @@
<containerId>Continent</containerId>
</parameters>
<uniqueId>widgetContinent</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -860,6 +902,7 @@
<action>getContinent</action>
</parameters>
<uniqueId>widgetUserCountrygetContinent</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -884,6 +927,7 @@
<action>getDistinctCountries</action>
</parameters>
<uniqueId>widgetUserCountrygetDistinctCountries</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -899,6 +943,7 @@
<action>getRegion</action>
</parameters>
<uniqueId>widgetUserCountrygetRegion</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -912,6 +957,7 @@
<action>getLanguage</action>
</parameters>
<uniqueId>widgetUserLanguagegetLanguage</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -925,6 +971,7 @@
<action>getCity</action>
</parameters>
<uniqueId>widgetUserCountrygetCity</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -938,6 +985,7 @@
<action>getLanguageCode</action>
</parameters>
<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -967,6 +1015,7 @@
<action>getVisitInformationPerLocalTime</action>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -980,6 +1029,7 @@
<action>getVisitInformationPerServerTime</action>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -993,6 +1043,7 @@
<action>getByDayOfWeek</action>
</parameters>
<uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1022,6 +1073,7 @@
<action>realtimeMap</action>
</parameters>
<uniqueId>widgetUserCountryMaprealtimeMap</uniqueId>
+ <isWide>0</isWide>
</row>
</widgets>
</row>
@@ -1052,6 +1104,7 @@
<small>1</small>
</parameters>
<uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTableVisitorLogsmall1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>VisitorLog</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1081,6 +1134,7 @@
<action>getCustomVariables</action>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariables</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1110,6 +1164,7 @@
<action>getUsers</action>
</parameters>
<uniqueId>widgetUserIdgetUsers</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1140,6 +1195,7 @@
<idDashboard>1</idDashboard>
</parameters>
<uniqueId>widgetDashboardembeddedIndexidDashboard1</uniqueId>
+ <isWide>0</isWide>
</row>
</widgets>
</row>
@@ -1167,6 +1223,7 @@
<action>getReferrerType</action>
</parameters>
<uniqueId>widgetReferrersgetReferrerType</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableAllColumns</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1180,6 +1237,7 @@
<action>getAll</action>
</parameters>
<uniqueId>widgetReferrersgetAll</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableAllColumns</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1209,6 +1267,7 @@
<action>getCampaigns</action>
</parameters>
<uniqueId>widgetReferrersgetCampaigns</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1232,7 +1291,7 @@
<name>Evolution over the period</name>
<module>Referrers</module>
<action>getEvolutionGraph</action>
- <order>101</order>
+ <order>9</order>
<parameters>
<forceView>1</forceView>
<viewDataTable>graphEvolution</viewDataTable>
@@ -1243,6 +1302,7 @@
</columns>
</parameters>
<uniqueId>widgetReferrersgetEvolutionGraphforceView1viewDataTablegraphEvolutioncolumnsArray</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1258,6 +1318,7 @@
<action>getSparklines</action>
</parameters>
<uniqueId>widgetReferrersgetSparklinesforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1287,6 +1348,7 @@
<action>getKeywords</action>
</parameters>
<uniqueId>widgetReferrersgetKeywords</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1300,6 +1362,7 @@
<action>getSearchEngines</action>
</parameters>
<uniqueId>widgetReferrersgetSearchEngines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1329,6 +1392,7 @@
<action>getWebsites</action>
</parameters>
<uniqueId>widgetReferrersgetWebsites</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1342,6 +1406,7 @@
<action>getSocials</action>
</parameters>
<uniqueId>widgetReferrersgetSocials</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1372,6 +1437,7 @@
<containerId>Goal_1</containerId>
</parameters>
<uniqueId>widgetGoal_1</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -1399,6 +1465,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1427,6 +1494,7 @@
<allow_multiple>1</allow_multiple>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal1allow_multiple1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1452,6 +1520,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetGoalsgoalConversionsOverviewidGoal1</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -1473,6 +1542,7 @@
<containerId>Goals1</containerId>
</parameters>
<uniqueId>widgetGoals1</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -1506,6 +1576,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1534,6 +1605,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1562,6 +1634,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1590,6 +1663,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1618,6 +1692,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1646,6 +1721,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1674,6 +1750,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1702,6 +1779,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1730,6 +1808,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1758,6 +1837,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1786,6 +1866,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1814,6 +1895,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1842,6 +1924,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1870,6 +1953,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1898,6 +1982,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1926,6 +2011,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1958,6 +2044,7 @@
<containerId>Goal_2</containerId>
</parameters>
<uniqueId>widgetGoal_2</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -1985,6 +2072,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2013,6 +2101,7 @@
<allow_multiple>0</allow_multiple>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal2allow_multiple0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2038,6 +2127,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetGoalsgoalConversionsOverviewidGoal2</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2059,6 +2149,7 @@
<containerId>Goals2</containerId>
</parameters>
<uniqueId>widgetGoals2</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2092,6 +2183,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2120,6 +2212,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2148,6 +2241,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2176,6 +2270,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2204,6 +2299,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2232,6 +2328,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2260,6 +2357,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2288,6 +2386,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2316,6 +2415,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2344,6 +2444,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2372,6 +2473,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2400,6 +2502,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2428,6 +2531,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2456,6 +2560,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2484,6 +2589,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2512,6 +2618,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2544,6 +2651,7 @@
<containerId>Goal_3</containerId>
</parameters>
<uniqueId>widgetGoal_3</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -2571,6 +2679,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2599,6 +2708,7 @@
<allow_multiple>0</allow_multiple>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal3allow_multiple0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2624,6 +2734,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetGoalsgoalConversionsOverviewidGoal3</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2645,6 +2756,7 @@
<containerId>Goals3</containerId>
</parameters>
<uniqueId>widgetGoals3</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2678,6 +2790,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2706,6 +2819,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2734,6 +2848,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2762,6 +2877,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2790,6 +2906,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2818,6 +2935,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2846,6 +2964,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2874,6 +2993,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2902,6 +3022,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2930,6 +3051,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2958,6 +3080,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2986,6 +3109,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3014,6 +3138,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3042,6 +3167,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3070,6 +3196,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3098,6 +3225,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3130,6 +3258,7 @@
<containerId>GoalsOverview</containerId>
</parameters>
<uniqueId>widgetGoalsOverview</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -3156,6 +3285,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3182,6 +3312,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3211,6 +3342,7 @@
<only_summary>1</only_summary>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal1allow_multiple1only_summary1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3240,6 +3372,7 @@
<only_summary>1</only_summary>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal2allow_multiple0only_summary1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3269,6 +3402,7 @@
<only_summary>1</only_summary>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal3allow_multiple0only_summary1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3285,6 +3419,7 @@
<containerId>Goals</containerId>
</parameters>
<uniqueId>widgetGoals</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -3317,6 +3452,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3345,6 +3481,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3373,6 +3510,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3401,6 +3539,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3429,6 +3568,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3457,6 +3597,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3485,6 +3626,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3513,6 +3655,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3541,6 +3684,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3569,6 +3713,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3597,6 +3742,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3625,6 +3771,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3653,6 +3800,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3681,6 +3829,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3709,6 +3858,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3737,6 +3887,7 @@
<idGoal>0</idGoal>
</parameters>
<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3768,6 +3919,7 @@
<action>editGoals</action>
</parameters>
<uniqueId>widgetGoalseditGoals</uniqueId>
+ <isWide>0</isWide>
</row>
</widgets>
</row>
@@ -3795,6 +3947,7 @@
<action>getEcommerceLog</action>
</parameters>
<uniqueId>widgetEcommercegetEcommerceLog</uniqueId>
+ <isWide>0</isWide>
</row>
</widgets>
</row>
@@ -3823,6 +3976,7 @@
<containerId>EcommerceOverview</containerId>
</parameters>
<uniqueId>widgetEcommerceOverview</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -3850,6 +4004,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3877,6 +4032,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetEcommercegetSparklinesforceView1viewDataTablesparklinesidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3902,6 +4058,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetEcommercegetConversionsOverviewidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -3939,6 +4096,7 @@
<containerId>Products</containerId>
</parameters>
<uniqueId>widgetProducts</uniqueId>
+ <isWide>0</isWide>
<layout>ByDimension</layout>
<isContainer>1</isContainer>
<widgets>
@@ -3963,6 +4121,7 @@
<action>getItemsSku</action>
</parameters>
<uniqueId>widgetGoalsgetItemsSku</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -3987,6 +4146,7 @@
<action>getItemsName</action>
</parameters>
<uniqueId>widgetGoalsgetItemsName</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4011,6 +4171,7 @@
<action>getItemsCategory</action>
</parameters>
<uniqueId>widgetGoalsgetItemsCategory</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4044,6 +4205,7 @@
<containerId>GoalsOrder</containerId>
</parameters>
<uniqueId>widgetGoalsOrderidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<layout>ByDimension</layout>
<isContainer>1</isContainer>
<widgets>
@@ -4072,6 +4234,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4100,6 +4263,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4128,6 +4292,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4156,6 +4321,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4184,6 +4350,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4212,6 +4379,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4240,6 +4408,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4268,6 +4437,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4296,6 +4466,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4324,6 +4495,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4352,6 +4524,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4380,6 +4553,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4408,6 +4582,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4436,6 +4611,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableGoals</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4464,6 +4640,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4492,6 +4669,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4523,6 +4701,7 @@
<action>getTemperatures</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperatures</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4554,6 +4733,7 @@
<action>getTemperatures</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4585,6 +4765,7 @@
<action>getTemperatures</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTableinfoviz-treemap</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>infoviz-treemap</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4616,6 +4797,7 @@
<action>getTemperaturesEvolution</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesEvolutionforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4651,6 +4833,7 @@
</columns>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesEvolutionforceView1viewDataTablegraphEvolutioncolumnsArray</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4680,6 +4863,7 @@
<action>getPlanetRatios</action>
</parameters>
<uniqueId>widgetExampleUIgetPlanetRatios</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4711,6 +4895,7 @@
<action>getPlanetRatios</action>
</parameters>
<uniqueId>widgetExampleUIgetPlanetRatiosforceView1viewDataTablecloud</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -4724,6 +4909,7 @@
<action>getPlanetRatiosWithLogos</action>
</parameters>
<uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 69e163bc02..447ef39261 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -17,6 +17,7 @@
<action>widget</action>
</parameters>
<uniqueId>widgetLivewidget</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Real Time Visitor Count</name>
@@ -35,6 +36,7 @@
<action>getSimpleLastVisitCount</action>
</parameters>
<uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -61,6 +63,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -87,6 +90,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -114,6 +118,7 @@
<small>1</small>
</parameters>
<uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTableVisitorLogsmall1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>VisitorLog</viewDataTable>
<isReport>1</isReport>
</row>
@@ -138,6 +143,7 @@
<action>getUsers</action>
</parameters>
<uniqueId>widgetUserIdgetUsers</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -162,6 +168,7 @@
<action>getCustomVariables</action>
</parameters>
<uniqueId>widgetCustomVariablesgetCustomVariables</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -186,6 +193,7 @@
<action>getModel</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetModel</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -210,6 +218,7 @@
<action>getType</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetType</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -234,6 +243,7 @@
<action>getBrand</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -258,6 +268,7 @@
<action>getResolution</action>
</parameters>
<uniqueId>widgetResolutiongetResolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -282,6 +293,7 @@
<action>getConfiguration</action>
</parameters>
<uniqueId>widgetResolutiongetConfiguration</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -306,6 +318,7 @@
<action>getPlugin</action>
</parameters>
<uniqueId>widgetDevicePluginsgetPlugin</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -327,6 +340,7 @@
<containerId>VisitOverviewWithGraph</containerId>
</parameters>
<uniqueId>widgetVisitOverviewWithGraph</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -353,6 +367,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -379,6 +394,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -405,6 +421,7 @@
<action>getBrowserEngines</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrowserEngines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
@@ -429,6 +446,7 @@
<action>getBrowsers</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -453,6 +471,7 @@
<action>getOsVersions</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -477,6 +496,7 @@
<action>getBrowserVersions</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -501,6 +521,7 @@
<action>getOsFamilies</action>
</parameters>
<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -525,6 +546,7 @@
<action>getLanguage</action>
</parameters>
<uniqueId>widgetUserLanguagegetLanguage</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -549,6 +571,7 @@
<action>getCity</action>
</parameters>
<uniqueId>widgetUserCountrygetCity</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -573,6 +596,7 @@
<action>getRegion</action>
</parameters>
<uniqueId>widgetUserCountrygetRegion</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -597,6 +621,7 @@
<action>visitorMap</action>
</parameters>
<uniqueId>widgetUserCountryMapvisitorMap</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Continent</name>
@@ -619,6 +644,7 @@
<action>getContinent</action>
</parameters>
<uniqueId>widgetUserCountrygetContinent</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -643,6 +669,7 @@
<action>getCountry</action>
</parameters>
<uniqueId>widgetUserCountrygetCountry</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -667,6 +694,7 @@
<action>getLanguageCode</action>
</parameters>
<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -693,6 +721,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetVisitFrequencygetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -719,6 +748,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -743,6 +773,7 @@
<action>getNumberOfVisitsByDaysSinceLast</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -767,6 +798,7 @@
<action>getNumberOfVisitsPerVisitDuration</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -787,6 +819,7 @@
<action>getVisitorProfilePopup</action>
</parameters>
<uniqueId>widgetLivegetVisitorProfilePopup</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Visits by Visit Number</name>
@@ -809,6 +842,7 @@
<action>getNumberOfVisitsByVisitCount</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -833,6 +867,7 @@
<action>getNumberOfVisitsPerPage</action>
</parameters>
<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -857,6 +892,7 @@
<action>getVisitInformationPerServerTime</action>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -881,6 +917,7 @@
<action>getVisitInformationPerLocalTime</action>
</parameters>
<uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -905,6 +942,7 @@
<action>getByDayOfWeek</action>
</parameters>
<uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -929,6 +967,7 @@
<action>realtimeMap</action>
</parameters>
<uniqueId>widgetUserCountryMaprealtimeMap</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Pages</name>
@@ -951,6 +990,7 @@
<action>getPageUrls</action>
</parameters>
<uniqueId>widgetActionsgetPageUrls</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -975,6 +1015,7 @@
<action>getEntryPageTitles</action>
</parameters>
<uniqueId>widgetActionsgetEntryPageTitles</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -999,6 +1040,7 @@
<action>getEntryPageUrls</action>
</parameters>
<uniqueId>widgetActionsgetEntryPageUrls</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1023,6 +1065,7 @@
<action>getExitPageUrls</action>
</parameters>
<uniqueId>widgetActionsgetExitPageUrls</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1047,6 +1090,7 @@
<action>getExitPageTitles</action>
</parameters>
<uniqueId>widgetActionsgetExitPageTitles</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1071,6 +1115,7 @@
<action>getPageTitles</action>
</parameters>
<uniqueId>widgetActionsgetPageTitles</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1095,6 +1140,7 @@
<action>getSiteSearchNoResultKeywords</action>
</parameters>
<uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1119,6 +1165,7 @@
<action>getPageUrlsFollowingSiteSearch</action>
</parameters>
<uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1143,6 +1190,7 @@
<action>getSiteSearchKeywords</action>
</parameters>
<uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1167,6 +1215,7 @@
<action>getPageTitlesFollowingSiteSearch</action>
</parameters>
<uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1191,6 +1240,7 @@
<action>getSiteSearchCategories</action>
</parameters>
<uniqueId>widgetActionsgetSiteSearchCategories</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1215,6 +1265,7 @@
<action>getOutlinks</action>
</parameters>
<uniqueId>widgetActionsgetOutlinks</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1239,6 +1290,7 @@
<action>getDownloads</action>
</parameters>
<uniqueId>widgetActionsgetDownloads</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1264,6 +1316,7 @@
<secondaryDimension>eventName</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1289,6 +1342,7 @@
<secondaryDimension>eventAction</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1314,6 +1368,7 @@
<secondaryDimension>eventAction</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1339,6 +1394,7 @@
<secondaryDimension>eventName</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1364,6 +1420,7 @@
<secondaryDimension>eventAction</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1389,6 +1446,7 @@
<secondaryDimension>eventAction</secondaryDimension>
</parameters>
<uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1413,6 +1471,7 @@
<action>getContentPieces</action>
</parameters>
<uniqueId>widgetContentsgetContentPieces</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1437,6 +1496,7 @@
<action>getContentPieces</action>
</parameters>
<uniqueId>widgetContentsgetContentPieces</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1461,6 +1521,7 @@
<action>getContentNames</action>
</parameters>
<uniqueId>widgetContentsgetContentNames</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1485,6 +1546,7 @@
<action>getContentNames</action>
</parameters>
<uniqueId>widgetContentsgetContentNames</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1509,6 +1571,7 @@
<action>getAll</action>
</parameters>
<uniqueId>widgetReferrersgetAll</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableAllColumns</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1533,6 +1596,7 @@
<action>getReferrerType</action>
</parameters>
<uniqueId>widgetReferrersgetReferrerType</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>tableAllColumns</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1557,6 +1621,7 @@
<action>getSearchEngines</action>
</parameters>
<uniqueId>widgetReferrersgetSearchEngines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1581,6 +1646,7 @@
<action>getKeywords</action>
</parameters>
<uniqueId>widgetReferrersgetKeywords</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1605,6 +1671,7 @@
<action>getWebsites</action>
</parameters>
<uniqueId>widgetReferrersgetWebsites</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1629,6 +1696,7 @@
<action>getSocials</action>
</parameters>
<uniqueId>widgetReferrersgetSocials</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1653,6 +1721,7 @@
<action>getCampaigns</action>
</parameters>
<uniqueId>widgetReferrersgetCampaigns</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1678,6 +1747,7 @@
<containerId>EcommerceOverview</containerId>
</parameters>
<uniqueId>widgetEcommerceOverview</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -1705,6 +1775,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1732,6 +1803,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetEcommercegetSparklinesforceView1viewDataTablesparklinesidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1757,6 +1829,7 @@
<idGoal>ecommerceOrder</idGoal>
</parameters>
<uniqueId>widgetEcommercegetConversionsOverviewidGoalecommerceOrder</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -1788,6 +1861,7 @@
<action>getEcommerceLog</action>
</parameters>
<uniqueId>widgetEcommercegetEcommerceLog</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Product SKU</name>
@@ -1810,6 +1884,7 @@
<action>getItemsSku</action>
</parameters>
<uniqueId>widgetGoalsgetItemsSku</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1834,6 +1909,7 @@
<action>getItemsCategory</action>
</parameters>
<uniqueId>widgetGoalsgetItemsCategory</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1858,6 +1934,7 @@
<action>getItemsSku</action>
</parameters>
<uniqueId>widgetGoalsgetItemsSku</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1882,6 +1959,7 @@
<action>getItemsName</action>
</parameters>
<uniqueId>widgetGoalsgetItemsName</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1906,6 +1984,7 @@
<action>getItemsName</action>
</parameters>
<uniqueId>widgetGoalsgetItemsName</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1930,6 +2009,7 @@
<action>getItemsCategory</action>
</parameters>
<uniqueId>widgetGoalsgetItemsCategory</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -1955,6 +2035,7 @@
<containerId>GoalsOverview</containerId>
</parameters>
<uniqueId>widgetGoalsOverview</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -1981,6 +2062,7 @@
<action>getEvolutionGraph</action>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2007,6 +2089,7 @@
<action>get</action>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2036,6 +2119,7 @@
<only_summary>1</only_summary>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal1allow_multiple1only_summary1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2065,6 +2149,7 @@
<only_summary>1</only_summary>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal2allow_multiple0only_summary1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2094,6 +2179,7 @@
<only_summary>1</only_summary>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal3allow_multiple0only_summary1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2121,6 +2207,7 @@
<containerId>Goal_1</containerId>
</parameters>
<uniqueId>widgetGoal_1</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -2148,6 +2235,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoal1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2176,6 +2264,7 @@
<allow_multiple>1</allow_multiple>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal1allow_multiple1</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2201,6 +2290,7 @@
<idGoal>1</idGoal>
</parameters>
<uniqueId>widgetGoalsgoalConversionsOverviewidGoal1</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2233,6 +2323,7 @@
<containerId>Goal_2</containerId>
</parameters>
<uniqueId>widgetGoal_2</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -2260,6 +2351,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoal2</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2288,6 +2380,7 @@
<allow_multiple>0</allow_multiple>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal2allow_multiple0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2313,6 +2406,7 @@
<idGoal>2</idGoal>
</parameters>
<uniqueId>widgetGoalsgoalConversionsOverviewidGoal2</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2345,6 +2439,7 @@
<containerId>Goal_3</containerId>
</parameters>
<uniqueId>widgetGoal_3</uniqueId>
+ <isWide>0</isWide>
<layout />
<isContainer>1</isContainer>
<widgets>
@@ -2372,6 +2467,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetGoalsgetEvolutionGraphforceView1viewDataTablegraphEvolutionidGoal3</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2400,6 +2496,7 @@
<allow_multiple>0</allow_multiple>
</parameters>
<uniqueId>widgetGoalsgetforceView1viewDataTablesparklinesidGoal3allow_multiple0</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2425,6 +2522,7 @@
<idGoal>3</idGoal>
</parameters>
<uniqueId>widgetGoalsgoalConversionsOverviewidGoal3</uniqueId>
+ <isWide>0</isWide>
<middlewareParameters>
<module>Goals</module>
<action>hasConversions</action>
@@ -2456,6 +2554,7 @@
<action>getTemperatures</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperatures</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2480,6 +2579,7 @@
<action>getPlanetRatiosWithLogos</action>
</parameters>
<uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2506,6 +2606,7 @@
<action>getTemperatures</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2536,6 +2637,7 @@
</columns>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesEvolutionforceView1viewDataTablegraphEvolutioncolumnsArray</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2562,6 +2664,7 @@
<action>getTemperaturesEvolution</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesEvolutionforceView1viewDataTablesparklines</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2588,6 +2691,7 @@
<action>getTemperatures</action>
</parameters>
<uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTableinfoviz-treemap</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>infoviz-treemap</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2612,6 +2716,7 @@
<action>getPlanetRatios</action>
</parameters>
<uniqueId>widgetExampleUIgetPlanetRatios</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2638,6 +2743,7 @@
<action>getPlanetRatios</action>
</parameters>
<uniqueId>widgetExampleUIgetPlanetRatiosforceView1viewDataTablecloud</uniqueId>
+ <isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
@@ -2658,6 +2764,7 @@
<action>rssChangelog</action>
</parameters>
<uniqueId>widgetRssWidgetrssChangelog</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>System Summary</name>
@@ -2676,6 +2783,7 @@
<action>getSystemSummary</action>
</parameters>
<uniqueId>widgetCoreHomegetSystemSummary</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Top Keywords for Page URL</name>
@@ -2694,6 +2802,7 @@
<action>getKeywordsForPage</action>
</parameters>
<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Piwik.org Blog</name>
@@ -2712,9 +2821,10 @@
<action>rssPiwik</action>
</parameters>
<uniqueId>widgetRssWidgetrssPiwik</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
- <name>Latest Piwik Plugin Updates</name>
+ <name>Latest Marketplace Updates</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2730,6 +2840,7 @@
<action>getNewPlugins</action>
</parameters>
<uniqueId>widgetCorePluginsAdmingetNewPlugins</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>SEO Rankings</name>
@@ -2748,6 +2859,7 @@
<action>getRank</action>
</parameters>
<uniqueId>widgetSEOgetRank</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Professional Services for Piwik</name>
@@ -2766,6 +2878,7 @@
<action>promoServices</action>
</parameters>
<uniqueId>widgetProfessionalServicespromoServices</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Welcome!</name>
@@ -2784,6 +2897,7 @@
<action>getPromoVideo</action>
</parameters>
<uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Movers and Shakers</name>
@@ -2802,6 +2916,7 @@
<action>getOverallMoversAndShakers</action>
</parameters>
<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>System Check</name>
@@ -2820,6 +2935,7 @@
<action>getSystemCheck</action>
</parameters>
<uniqueId>widgetInstallationgetSystemCheck</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Example Widget Name</name>
@@ -2838,6 +2954,7 @@
<action>myExampleWidget</action>
</parameters>
<uniqueId>widgetExamplePluginmyExampleWidget</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Support Piwik!</name>
@@ -2856,6 +2973,7 @@
<action>getDonateForm</action>
</parameters>
<uniqueId>widgetCoreHomegetDonateForm</uniqueId>
+ <isWide>0</isWide>
</row>
<row>
<name>Insights Overview</name>
@@ -2874,5 +2992,6 @@
<action>getInsightsOverview</action>
</parameters>
<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+ <isWide>0</isWide>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
index b4d4316097..7f6c3671eb 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
@@ -27,8 +27,8 @@
<row>
<name>enable_plugin_update_communication</name>
<title />
- <value>0</value>
- <defaultValue>0</defaultValue>
+ <value>1</value>
+ <defaultValue>1</defaultValue>
<type>boolean</type>
<uiControl>radio</uiControl>
<uiControlAttributes>
diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
index b4d4316097..7f6c3671eb 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
@@ -27,8 +27,8 @@
<row>
<name>enable_plugin_update_communication</name>
<title />
- <value>0</value>
- <defaultValue>0</defaultValue>
+ <value>1</value>
+ <defaultValue>1</defaultValue>
<type>boolean</type>
<uiControl>radio</uiControl>
<uiControlAttributes>
diff --git a/tests/PHPUnit/Unit/DbHelperTest.php b/tests/PHPUnit/Unit/DbHelperTest.php
new file mode 100644
index 0000000000..fa6957d4ba
--- /dev/null
+++ b/tests/PHPUnit/Unit/DbHelperTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit;
+
+use Piwik\DbHelper;
+
+/**
+ * Class DbHelperTest
+ * @package Piwik\Tests\Unit
+ * @group Core
+ * @group Core_Unit
+ */
+class DbHelperTest extends \PHPUnit_Framework_TestCase
+{
+
+ /**
+ * @dataProvider getVariousDbNames
+ * @param string $dbName
+ * @param bool $expectation
+ */
+ public function testCorrectNames($dbName, $expectation)
+ {
+ $this->assertSame(DbHelper::isValidDbname($dbName), $expectation);
+ }
+
+ public function getVariousDbNames()
+ {
+ return array(
+ 'simpleDbName' => array(
+ 'dbName' => 'FirstPiwikDb',
+ 'expectation' => true
+ ),
+ 'containsNumbers' => array(
+ 'dbName' => 'FirstPiw1kDb',
+ 'expectation' => true
+ ),
+ 'startsWithNumber' => array(
+ 'dbName' => '1stPiwikDb',
+ 'expectation' => true
+ ),
+ 'containsAllowedSpecialCharacters' => array(
+ 'dbName' => 'MyPiwikDb-with.More+compleX_N4M3',
+ 'expectation' => true
+ ),
+ 'containsSpace' => array(
+ 'dbName' => '1st PiwikDb',
+ 'expectation' => false
+ ),
+ 'startWithNonAlphaNumericSign' => array(
+ 'dbName' => ';FirstPiwikDb',
+ 'expectation' => false
+ ),
+ );
+ }
+}
diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
index 1cb3f36cc1..bea7551e1e 100644
--- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
@@ -69,7 +69,6 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add');
$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Archive', 'getDataTableFromArchive');
- $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Plugin', 'getListHooksRegistered');
$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Plugins\API\API', 'getLastDate');
$this->assertDeprecatedMethodIsRemovedInPiwik3('Piwik\Plugins\DevicesDetection\DevicesDetection', 'renameUserSettingsModuleAndAction');
@@ -77,6 +76,7 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
$this->assertDeprecatedMethodIsRemovedInPiwik3('Piwik\Plugins\DevicePlugins\DevicePlugins', 'renameUserSettingsModuleAndAction');
$this->assertDeprecatedMethodIsRemovedInPiwik3('Piwik\Plugins\UserLanguage\UserLanguage', 'renameUserSettingsModuleAndAction');
+ $this->assertDeprecatedMethodIsRemovedInPiwik4('\Piwik\Plugin', 'getListHooksRegistered');
$this->assertDeprecatedMethodIsRemovedInPiwik4('Piwik\Updates', 'getSql');
$this->assertDeprecatedMethodIsRemovedInPiwik4('Piwik\Updates', 'update');
$this->assertDeprecatedMethodIsRemovedInPiwik4('Piwik\Updates', 'getMigrationQueries');
diff --git a/tests/PHPUnit/Unit/Tracker/ResponseTest.php b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
index 4d902ada08..597ee513db 100644
--- a/tests/PHPUnit/Unit/Tracker/ResponseTest.php
+++ b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
@@ -127,7 +127,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
$tracker->setCountOfLoggedRequests(0);
$this->response->outputResponse($tracker);
- $this->assertEquals("<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.",
+ $this->assertEquals("This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.",
$this->response->getOutput());
}
diff --git a/tests/PHPUnit/Unit/Widget/WidgetConfigTest.php b/tests/PHPUnit/Unit/Widget/WidgetConfigTest.php
index de6917ef0e..6b0b070804 100644
--- a/tests/PHPUnit/Unit/Widget/WidgetConfigTest.php
+++ b/tests/PHPUnit/Unit/Widget/WidgetConfigTest.php
@@ -52,6 +52,17 @@ class WidgetConfigTest extends \PHPUnit_Framework_TestCase
$this->assertSame('', $this->config->getCategoryId());
}
+ public function test_isWide_shouldBeFalseByDefault()
+ {
+ $this->assertFalse($this->config->isWide());
+ }
+
+ public function test_setisWide()
+ {
+ $this->config->setIsWide();
+ $this->assertTrue($this->config->isWide());
+ }
+
public function test_subcategoryId_set_get()
{
$this->config->setSubcategoryId('testsubcat');
diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist
index 81bfcc00ff..a0b0793a91 100644
--- a/tests/PHPUnit/phpunit.xml.dist
+++ b/tests/PHPUnit/phpunit.xml.dist
@@ -23,7 +23,7 @@
<directory>./System</directory>
<directory>../../plugins/*/tests</directory><!-- There should be actually a tests/System but this way we make sure to execute all tests even if some are not moved to correct subdirectory. We will execute Unit and Integration tests twice :( ... -->
<directory>../../plugins/*/Test</directory>
- <exclude>../../plugins/*/tests/Integration</exclude><!-- * in exclude is currently not supported by PHPUnit, so it won't work yet. See https://github.com/sebastianbergmann/php-file-iterator/pull/23 -->
+ <exclude>../../plugins/*/tests/Integration</exclude>
<exclude>../../plugins/*/Test/Integration</exclude>
<exclude>../../plugins/*/tests/Unit</exclude>
<exclude>../../plugins/*/Test/Unit</exclude>