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:
authorsgiehl <stefan@piwik.org>2014-10-11 15:06:39 +0400
committersgiehl <stefan@piwik.org>2014-10-11 15:06:39 +0400
commit3b53f3865d7ca947bc71eb44fc72becd7dd0ac90 (patch)
treef80bc9a41e720b57020b3a77c1493b1dab7e5c0b /plugins/Contents/tests/System
parent7c2325fed09d51cad6f15c65562b76bf64602eac (diff)
parent794c67f511ebc6745fe592548f6df01f3e1f1179 (diff)
Merge branch 'master' into deprecate_usersettings
Conflicts: core/Version.php plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserEngines_day.xml tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserType_day.xml
Diffstat (limited to 'plugins/Contents/tests/System')
-rw-r--r--plugins/Contents/tests/System/ContentsTest.php135
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml83
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml123
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml25
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml25
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml12
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml12
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml30
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml30
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml66
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml66
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml199
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml199
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml2
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml2
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml2
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml199
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml2
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml12
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml21
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml199
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml2
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml21
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml48
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml199
-rw-r--r--plugins/Contents/tests/System/processed/.gitkeep0
26 files changed, 1714 insertions, 0 deletions
diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php
new file mode 100644
index 0000000000..c5304fb19e
--- /dev/null
+++ b/plugins/Contents/tests/System/ContentsTest.php
@@ -0,0 +1,135 @@
+<?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\Plugins\Contents\tests\System;
+
+use Piwik\Tests\Impl\SystemTestCase;
+use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents;
+use Piwik\Translate;
+
+/**
+ * Testing Contents
+ *
+ * @group ContentsTest
+ * @group System
+ * @group Plugins
+ */
+class ContentsTest extends SystemTestCase
+{
+ public static $fixture = null; // initialized below class definition
+
+ /**
+ * @dataProvider getApiForTesting
+ */
+ public function testApi($api, $params)
+ {
+ $this->runApiTests($api, $params);
+ }
+
+ protected function getApiToCall()
+ {
+ return array(
+ 'Contents.getContentNames',
+ 'Contents.getContentPieces',
+ 'Actions.get',
+ 'Actions.getPageUrls',
+ 'Live.getLastVisitsDetails'
+ );
+ }
+
+ protected function setup()
+ {
+ parent::setup();
+ Translate::reloadLanguage('en');
+ }
+
+ protected function tearDown()
+ {
+ parent::tearDown();
+ }
+
+ public function getApiForTesting()
+ {
+ $dateTime = self::$fixture->dateTime;
+ $idSite1 = self::$fixture->idSite;
+
+ $apiToCallProcessedReportMetadata = $this->getApiToCall();
+
+ $dayPeriod = 'day';
+ $periods = array($dayPeriod, 'month');
+
+ $apisToTest = array('Contents', 'Actions.getPageUrls', 'Live.getLastVisitsDetails');
+ $result = array(
+ array($apiToCallProcessedReportMetadata, array(
+ 'idSite' => $idSite1,
+ 'date' => $dateTime,
+ 'periods' => $periods,
+ 'setDateLastN' => false,
+ 'testSuffix' => '')),
+
+ array($apisToTest, array(
+ 'idSite' => $idSite1,
+ 'date' => $dateTime,
+ 'periods' => $dayPeriod,
+ 'segment' => "contentName==ImageAd,contentPiece==".urlencode('Click to download Piwik now'),
+ 'setDateLastN' => false,
+ 'testSuffix' => 'contentNameOrPieceMatch')
+ ),
+
+ array($apisToTest, array(
+ 'idSite' => $idSite1,
+ 'date' => $dateTime,
+ 'periods' => $dayPeriod,
+ 'segment' => "contentTarget==".urlencode('http://www.example.com'),
+ 'setDateLastN' => false,
+ 'testSuffix' => '_contentTargetMatch')
+ ),
+
+ array($apisToTest, array(
+ 'idSite' => $idSite1,
+ 'date' => $dateTime,
+ 'periods' => $dayPeriod,
+ 'segment' => "contentInteraction==click",
+ 'setDateLastN' => false,
+ 'testSuffix' => '_contentInteractionMatch')
+ )
+ );
+
+ $apiToCallProcessedReportMetadata = array(
+ 'Contents.getContentNames',
+ 'Contents.getContentPieces'
+ );
+ // testing metadata API for Contents reports
+ foreach ($apiToCallProcessedReportMetadata as $api) {
+ list($apiModule, $apiAction) = explode(".", $api);
+
+ $result[] = array(
+ 'API.getProcessedReport', array('idSite' => $idSite1,
+ 'date' => $dateTime,
+ 'periods' => $dayPeriod,
+ 'setDateLastN' => true,
+ 'apiModule' => $apiModule,
+ 'apiAction' => $apiAction,
+ 'testSuffix' => '_' . $api . '_lastN')
+ );
+ }
+
+ return $result;
+ }
+
+ public static function getOutputPrefix()
+ {
+ return 'Contents';
+ }
+
+ public static function getPathToTestDirectory()
+ {
+ return dirname(__FILE__);
+ }
+}
+
+ContentsTest::$fixture = new TwoVisitsWithContents(); \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
new file mode 100644
index 0000000000..d3e1af1e2e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <website>Piwik test</website>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+ <metadata>
+ <category>Actions</category>
+ <name>Content Name</name>
+ <module>Contents</module>
+ <action>getContentNames</action>
+ <dimension>Content Name</dimension>
+ <metrics>
+ <nb_impressions>Impressions</nb_impressions>
+ <nb_interactions>Interactions</nb_interactions>
+ </metrics>
+ <processedMetrics>
+ <interaction_rate>Interaction Rate</interaction_rate>
+ </processedMetrics>
+ <actionToLoadSubTables>getContentNames</actionToLoadSubTables>
+ <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Contents&amp;apiAction=getContentNames&amp;period=range&amp;date=2010-01-03,2010-01-09</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Contents&amp;apiAction=getContentNames&amp;period=day&amp;date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
+ <uniqueId>Contents_getContentNames</uniqueId>
+ </metadata>
+ <columns>
+ <label>Content Name</label>
+ <nb_impressions>Impressions</nb_impressions>
+ <nb_interactions>Interactions</nb_interactions>
+ <interaction_rate>Interaction Rate</interaction_rate>
+ </columns>
+ <reportData>
+ <result prettyDate="Sunday 3 January 2010">
+ <row>
+ <label>ImageAd</label>
+ <nb_impressions>8</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>25%</interaction_rate>
+ </row>
+ <row>
+ <label>Text Ad</label>
+ <nb_impressions>6</nb_impressions>
+ <nb_interactions>4</nb_interactions>
+ <interaction_rate>66.67%</interaction_rate>
+ </row>
+ <row>
+ <label>Video Ad</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ </row>
+ </result>
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
+ </reportData>
+ <reportMetadata>
+ <result prettyDate="Sunday 3 January 2010">
+ <row>
+ <contentTarget>http://www.example.com</contentTarget>
+
+ </row>
+ <row>
+ <contentTarget>http://piwik.org/</contentTarget>
+
+ </row>
+ <row>
+ <contentTarget />
+
+ </row>
+ </result>
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
+ </reportMetadata>
+ <reportTotal>
+ <nb_visits>16</nb_visits>
+ <nb_uniq_visitors>16</nb_uniq_visitors>
+ </reportTotal>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
new file mode 100644
index 0000000000..402909f7d5
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <website>Piwik test</website>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+ <metadata>
+ <category>Actions</category>
+ <name>Content Piece</name>
+ <module>Contents</module>
+ <action>getContentPieces</action>
+ <dimension>Content Piece</dimension>
+ <metrics>
+ <nb_impressions>Impressions</nb_impressions>
+ <nb_interactions>Interactions</nb_interactions>
+ </metrics>
+ <processedMetrics>
+ <interaction_rate>Interaction Rate</interaction_rate>
+ </processedMetrics>
+ <actionToLoadSubTables>getContentPieces</actionToLoadSubTables>
+ <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Contents&amp;apiAction=getContentPieces&amp;period=range&amp;date=2010-01-03,2010-01-09</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Contents&amp;apiAction=getContentPieces&amp;period=day&amp;date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
+ <uniqueId>Contents_getContentPieces</uniqueId>
+ </metadata>
+ <columns>
+ <label>Content Piece</label>
+ <nb_impressions>Impressions</nb_impressions>
+ <nb_interactions>Interactions</nb_interactions>
+ <interaction_rate>Interaction Rate</interaction_rate>
+ </columns>
+ <reportData>
+ <result prettyDate="Sunday 3 January 2010">
+ <row>
+ <label>Click to download Piwik now</label>
+ <nb_impressions>4</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>50%</interaction_rate>
+ </row>
+ <row>
+ <label>/path/ad.jpg</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>100%</interaction_rate>
+ </row>
+ <row>
+ <label>/path/ad2.jpg</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ </row>
+ <row>
+ <label>Click NOW</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>100%</interaction_rate>
+ </row>
+ <row>
+ <label>movie.mov</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ </row>
+ <row>
+ <label>Content Piece not defined</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ </row>
+ <row>
+ <label>Unknown</label>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ </row>
+ </result>
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
+ </reportData>
+ <reportMetadata>
+ <result prettyDate="Sunday 3 January 2010">
+ <row>
+ <contentTarget>http://piwik.org/download</contentTarget>
+
+ </row>
+ <row>
+ <contentTarget>http://www.example.com</contentTarget>
+
+ </row>
+ <row>
+ <contentTarget>http://www.example.com</contentTarget>
+
+ </row>
+ <row>
+ <contentTarget>http://piwik.org/</contentTarget>
+
+ </row>
+ <row>
+ <contentTarget />
+
+ </row>
+ <row>
+ <contentTarget />
+
+ </row>
+ <row>
+ <contentTarget />
+
+ </row>
+ </result>
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
+ </reportMetadata>
+ <reportTotal>
+ <nb_visits>16</nb_visits>
+ <nb_uniq_visitors>16</nb_uniq_visitors>
+ </reportTotal>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
new file mode 100644
index 0000000000..fde347f2b5
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>/page</label>
+ <nb_visits>2</nb_visits>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>540</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.333</min_time_generation>
+ <max_time_generation>0.333</max_time_generation>
+ <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>542</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>270</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.333</avg_time_generation>
+ <url>http://www.example.org/page</url>
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
new file mode 100644
index 0000000000..3dc775d40a
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>/page</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>540</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.333</min_time_generation>
+ <max_time_generation>0.333</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>542</entry_sum_visit_length>
+ <entry_bounce_count>2</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>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>270</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.333</avg_time_generation>
+ <url>http://www.example.org/page</url>
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml
new file mode 100644
index 0000000000..f51cfaf913
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_pageviews>2</nb_pageviews>
+ <nb_uniq_pageviews>2</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.335</avg_time_generation>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml
new file mode 100644
index 0000000000..f51cfaf913
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_pageviews>2</nb_pageviews>
+ <nb_uniq_pageviews>2</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.335</avg_time_generation>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
new file mode 100644
index 0000000000..957c6fa85a
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>ImageAd</label>
+ <nb_uniq_visitors>8</nb_uniq_visitors>
+ <nb_visits>8</nb_visits>
+ <nb_impressions>8</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>25%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>Text Ad</label>
+ <nb_uniq_visitors>6</nb_uniq_visitors>
+ <nb_visits>6</nb_visits>
+ <nb_impressions>6</nb_impressions>
+ <nb_interactions>4</nb_interactions>
+ <interaction_rate>66.67%</interaction_rate>
+ <contentTarget>http://piwik.org/</contentTarget>
+ </row>
+ <row>
+ <label>Video Ad</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
new file mode 100644
index 0000000000..44bfdfd54e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>ImageAd</label>
+ <nb_visits>8</nb_visits>
+ <nb_impressions>8</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+ <interaction_rate>25%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>Text Ad</label>
+ <nb_visits>6</nb_visits>
+ <nb_impressions>6</nb_impressions>
+ <nb_interactions>4</nb_interactions>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <interaction_rate>66.67%</interaction_rate>
+ <contentTarget>http://piwik.org/</contentTarget>
+ </row>
+ <row>
+ <label>Video Ad</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
new file mode 100644
index 0000000000..8927f8a8ec
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Click to download Piwik now</label>
+ <nb_uniq_visitors>4</nb_uniq_visitors>
+ <nb_visits>4</nb_visits>
+ <nb_impressions>4</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>50%</interaction_rate>
+ <contentTarget>http://piwik.org/download</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad.jpg</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>100%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad2.jpg</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>Click NOW</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>100%</interaction_rate>
+ <contentTarget>http://piwik.org/</contentTarget>
+ </row>
+ <row>
+ <label>movie.mov</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+ <row>
+ <label>Content Piece not defined</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+ <row>
+ <label>Unknown</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
new file mode 100644
index 0000000000..b604544417
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Click to download Piwik now</label>
+ <nb_visits>4</nb_visits>
+ <nb_impressions>4</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <interaction_rate>50%</interaction_rate>
+ <contentTarget>http://piwik.org/download</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad.jpg</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>100%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad2.jpg</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>Click NOW</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>100%</interaction_rate>
+ <contentTarget>http://piwik.org/</contentTarget>
+ </row>
+ <row>
+ <label>movie.mov</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+ <row>
+ <label>Content Piece not defined</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..857c554b17
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>13</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
new file mode 100644
index 0000000000..857c554b17
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>13</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result /> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result /> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result /> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..857c554b17
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>13</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result /> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
new file mode 100644
index 0000000000..5212486a1c
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>ImageAd</label>
+ <nb_uniq_visitors>4</nb_uniq_visitors>
+ <nb_visits>4</nb_visits>
+ <nb_impressions>4</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>50%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
new file mode 100644
index 0000000000..ac1d39a577
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>/path/ad.jpg</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>100%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad2.jpg</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..857c554b17
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>13</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result /> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
new file mode 100644
index 0000000000..17b781db1c
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>ImageAd</label>
+ <nb_uniq_visitors>8</nb_uniq_visitors>
+ <nb_visits>8</nb_visits>
+ <nb_impressions>8</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>25%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>Text Ad</label>
+ <nb_uniq_visitors>4</nb_uniq_visitors>
+ <nb_visits>4</nb_visits>
+ <nb_impressions>4</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>50%</interaction_rate>
+ <contentTarget>http://piwik.org/download</contentTarget>
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
new file mode 100644
index 0000000000..7df6e4f0e1
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Click to download Piwik now</label>
+ <nb_uniq_visitors>4</nb_uniq_visitors>
+ <nb_visits>4</nb_visits>
+ <nb_impressions>4</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>50%</interaction_rate>
+ <contentTarget>http://piwik.org/download</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad.jpg</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>2</nb_interactions>
+ <interaction_rate>100%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>/path/ad2.jpg</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget>http://www.example.com</contentTarget>
+ </row>
+ <row>
+ <label>Content Piece not defined</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+ <row>
+ <label>Unknown</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_impressions>2</nb_impressions>
+ <nb_interactions>0</nb_interactions>
+ <interaction_rate>0%</interaction_rate>
+ <contentTarget />
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..857c554b17
--- /dev/null
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://www.example.org/page</url>
+ <pageTitle>Ads</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>13</pageId>
+ <generationTime>0.33s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>271</visitDuration>
+ <visitDurationPretty>4 min 31s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemCode>WXP</operatingSystemCode>
+ <operatingSystemShortName>Win XP</operatingSystemShortName>
+ <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <browserName>Firefox 3.6</browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <screenType>normal</screenType>
+ <resolution>1024x768</resolution>
+ <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
+ </row>
+ </pluginsIcons>
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/processed/.gitkeep b/plugins/Contents/tests/System/processed/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/plugins/Contents/tests/System/processed/.gitkeep