1 files changed, 9 insertions, 31 deletions

diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/Integration/PrivacyManagerTest.php
index c8a6d975b0..591be30265 100644
--- a/tests/PHPUnit/Integration/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/PrivacyManagerTest.php
@@ -5,6 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Integration;
+
 use Piwik\Archive;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
@@ -23,9 +25,15 @@ use Piwik\Plugins\VisitorInterest\API as APIVisitorInterest;
 use Piwik\Site;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\GoalManager;
+use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixture;
 
 require_once 'PrivacyManager/PrivacyManager.php';
 
+/**
+ * @group PrivacyManagerTest
+ * @group Integration
+ */
 class PrivacyManagerTest extends IntegrationTestCase
 {
     // constants used in checking whether numeric tables are populated correctly.
@@ -134,8 +142,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Make sure the first time deleteLogData is run, nothing happens.
-     *
-     * @group Integration
      */
     public function testDeleteLogDataInitialRun()
     {
@@ -153,8 +159,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Make sure the first time deleteReportData is run, nothing happens.
-     *
-     * @group Integration
      */
     public function testDeleteReportDataInitialRun()
     {
@@ -169,8 +173,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Make sure the task is not run when its scheduled for later.
-     *
-     * @group Integration
      */
     public function testPurgeDataNotTimeToRun()
     {
@@ -188,8 +190,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Make sure purging data runs when scheduled.
-     *
-     * @group Integration
      */
     public function testPurgeDataNotInitialAndTimeToRun()
     {
@@ -234,8 +234,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Make sure nothing happens when deleting logs & reports are both disabled.
-     *
-     * @group Integration
      */
     public function testPurgeDataBothDisabled()
     {
@@ -263,8 +261,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test that purgeData works when there's no data.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteLogsNoData()
     {
@@ -301,8 +297,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test that purgeData works correctly when the 'keep basic metrics' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepBasicMetrics()
     {
@@ -357,8 +351,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test that purgeData works correctly when the 'keep daily reports' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepDailyReports()
     {
@@ -393,8 +385,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test that purgeData works correctly when the 'keep weekly reports' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepWeeklyReports()
     {
@@ -429,8 +419,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test that purgeData works correctly when the 'keep monthly reports' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepMonthlyReports()
     {
@@ -465,8 +453,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test that purgeData works correctly when the 'keep yearly reports' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepYearlyReports()
     {
@@ -501,8 +487,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Test no concurrency issues when deleting log data from log_action table.
-     *
-     * @group Integration
      */
     public function testPurgeLogDataConcurrency()
     {
@@ -532,8 +516,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Tests that purgeData works correctly when the 'keep range reports' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepRangeReports()
     {
@@ -568,8 +550,6 @@ class PrivacyManagerTest extends IntegrationTestCase
 
     /**
      * Tests that purgeData works correctly when the 'keep segment reports' setting is set to true.
-     *
-     * @group Integration
      */
     public function testPurgeDataDeleteReportsKeepSegmentsReports()
     {
@@ -675,7 +655,6 @@ class PrivacyManagerTest extends IntegrationTestCase
         $archive = Archive::build(self::$idSite, 'year', $date);
 
         APIVisitorInterest::getInstance()->getNumberOfVisitsPerVisitDuration(self::$idSite, 'year', $date);
-//        APIVisitorInterest::getInstance()->get(self::$idSite, 'month', $date, $segment = false, self::$idSite);
 
         // months are added via the 'year' period, but weeks must be done manually
         for ($daysAgo = self::$daysAgoStart; $daysAgo > 0; $daysAgo -= 7) // every week
@@ -915,5 +894,4 @@ class PrivacyManagerTest extends IntegrationTestCase
         ;
         return $eventsId;
     }
-}
-
+}
\ No newline at end of file