refs #4996 moved test files to plugin

16 files changed, 0 insertions, 743 deletions

diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithContents.php b/tests/PHPUnit/Fixtures/TwoVisitsWithContents.php
deleted file mode 100644
index d3167daf71..0000000000
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithContents.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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\Fixtures;
-
-use Piwik\Date;
-use Piwik\Plugins\Goals\API as APIGoals;
-use Piwik\Tests\Fixture;
-use PiwikTracker;
-
-/**
- * Tracks contents
- */
-class TwoVisitsWithContents extends Fixture
-{
-    public $dateTime = '2010-01-03 11:22:33';
-    public $idSite = 1;
-    public $idGoal1 = 1;
-
-    public function setUp()
-    {
-        $this->setUpWebsitesAndGoals();
-        $this->trackVisits();
-    }
-
-    private function setUpWebsitesAndGoals()
-    {
-        // tests run in UTC, the Tracker in UTC
-        if (!self::siteCreated($idSite = 1)) {
-            self::createWebsite($this->dateTime);
-        }
-
-        if (!self::goalExists($idSite = 1, $idGoal = 1)) {
-            // These two goals are to check contents don't trigger for URL or Title matching
-            APIGoals::getInstance()->addGoal($this->idSite, 'triggered js', 'url', 'webradio', 'contains');
-            APIGoals::getInstance()->addGoal($this->idSite, 'triggered js', 'title', 'Music', 'contains');
-        }
-    }
-
-    public function trackVisits()
-    {
-        $uselocal = false;
-        $vis = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal);
-
-        $this->trackContentImpressionsAndInteractions($vis);
-
-        $this->dateTime = Date::factory($this->dateTime)->addHour(0.5);
-        $vis2 = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal);
-        $vis2->setIp('111.1.1.1');
-        $vis2->setPlugins($flash = false, $java = false, $director = true);
-
-        $this->trackContentImpressionsAndInteractions($vis2);
-    }
-
-    private function moveTimeForward(PiwikTracker $vis, $minutes)
-    {
-        $hour = $minutes / 60;
-        $vis->setForceVisitDateTime(Date::factory($this->dateTime)->addHour($hour)->getDatetime());
-    }
-
-    protected function trackContentImpressionsAndInteractions(PiwikTracker $vis)
-    {
-        $vis->setUrl('http://www.example.org/page');
-        $vis->setGenerationTime(333);
-        self::checkResponse($vis->doTrackPageView('Ads'));
-
-        self::checkResponse($vis->doTrackContentImpression('ImageAd'));
-        self::checkResponse($vis->doTrackContentImpression('ImageAd', ''));
-
-        $this->moveTimeForward($vis, 2);
-        self::checkResponse($vis->doTrackContentImpression('ImageAd', '/path/ad.jpg', 'http://www.example.com'));
-        self::checkResponse($vis->doTrackContentImpression('ImageAd', '/path/ad2.jpg', 'http://www.example.com'));
-        self::checkResponse($vis->doTrackContentInteraction('submit', 'ImageAd', '/path/ad.jpg', 'http://www.example.com'));
-        $this->moveTimeForward($vis, 3);
-        self::checkResponse($vis->doTrackContentImpression('Text Ad', 'Click to download Piwik now', 'http://piwik.org/download'));
-        self::checkResponse($vis->doTrackContentImpression('Text Ad', 'Click NOW', 'http://piwik.org/'));
-        self::checkResponse($vis->doTrackContentInteraction('click', 'Text Ad', 'Click to download Piwik now', 'http://piwik.org/download'));
-        self::checkResponse($vis->doTrackContentInteraction('click', 'Text Ad', 'Click NOW', 'http://piwik.org/download'));
-        $this->moveTimeForward($vis, 4);
-        self::checkResponse($vis->doTrackContentImpression('Text Ad', 'Click to download Piwik now', ''));
-
-        $this->moveTimeForward($vis, 4.5);
-        self::checkResponse($vis->doTrackContentImpression('Video Ad', 'movie.mov'));
-    }
-
-    public function tearDown()
-    {
-    }
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ContentsTest.php b/tests/PHPUnit/Integration/ContentsTest.php
deleted file mode 100644
index 76bf4b2970..0000000000
--- a/tests/PHPUnit/Integration/ContentsTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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\Integration;
-
-use Piwik\Tests\IntegrationTestCase;
-use Piwik\Tests\Fixtures\TwoVisitsWithContents;
-
-/**
- * Testing Contents
- *
- * @group ContentsTest
- * @group Integration
- */
-class ContentsTest extends IntegrationTestCase
-{
-    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',
-      //      'Live.getLastVisitsDetails',
-      //      'Actions.getPageUrls',
-        );
-    }
-
-    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');
-        $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';
-    }
-}
-
-ContentsTest::$fixture = new TwoVisitsWithContents();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
deleted file mode 100644
index d3e1af1e2e..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
deleted file mode 100644
index 402909f7d5..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents__Actions.get_day.xml b/tests/PHPUnit/Integration/expected/test_Contents__Actions.get_day.xml
deleted file mode 100644
index f51cfaf913..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents__Actions.get_day.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents__Actions.get_month.xml b/tests/PHPUnit/Integration/expected/test_Contents__Actions.get_month.xml
deleted file mode 100644
index f51cfaf913..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents__Actions.get_month.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentNames_day.xml b/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentNames_day.xml
deleted file mode 100644
index 957c6fa85a..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentNames_day.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentNames_month.xml b/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentNames_month.xml
deleted file mode 100644
index 44bfdfd54e..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentNames_month.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentPieces_day.xml b/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentPieces_day.xml
deleted file mode 100644
index 8927f8a8ec..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentPieces_day.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentPieces_month.xml b/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentPieces_month.xml
deleted file mode 100644
index b604544417..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents__Contents.getContentPieces_month.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml b/tests/PHPUnit/Integration/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
deleted file mode 100644
index c234bed59e..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml b/tests/PHPUnit/Integration/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
deleted file mode 100644
index c234bed59e..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/tests/PHPUnit/Integration/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
deleted file mode 100644
index 5212486a1c..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/tests/PHPUnit/Integration/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
deleted file mode 100644
index ac1d39a577..0000000000
--- a/tests/PHPUnit/Integration/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/tests/PHPUnit/Integration/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
deleted file mode 100644
index 17b781db1c..0000000000
--- a/tests/PHPUnit/Integration/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/tests/PHPUnit/Integration/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/tests/PHPUnit/Integration/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
deleted file mode 100644
index 7df6e4f0e1..0000000000
--- a/tests/PHPUnit/Integration/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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