Revert test to previous state from 10 days ago, now that we've reverted the API refs #4878

tests/PHPUnit/Integration/PrivacyManagerTest.php

@@ -33,10 +33,6 @@ class PrivacyManagerTest extends IntegrationTestCase
     // total archive count for each month.
     const TOTAL_JAN_ARCHIVE_COUNT = 37; // 31 + 4 + 1 + 1;
     const TOTAL_FEB_ARCHIVE_COUNT = 34; // 29 + 4 + 1;
-    const JAN_DAYS_WITH_VISITS = 5;
-    const JAN_METRIC_RETURNING_VISIT_DAYS = 4;
-    const FEB_DAYS_WITH_VISITS = 6;
-    const FEB_METRIC_RETURNING_VISIT_DAYS = 6;
 
     // the number of archive entries for a single metric if no purging is done. this #
     // is dependent on the number of periods for which there were visits.
@@ -223,7 +219,7 @@ class PrivacyManagerTest extends IntegrationTestCase
         // January numeric table should be dropped
         $this->assertFalse($this->_tableExists($archiveTables['numeric'][0])); // January
 
-        // Check february metric count 
+        // Check february metric count
         $febRowCount = $this->_getExpectedNumericArchiveCountFeb();
         $this->assertEquals($febRowCount, $this->_getTableCount($archiveTables['numeric'][1])); // February
 
@@ -893,9 +889,7 @@ class PrivacyManagerTest extends IntegrationTestCase
         // + 1 garbage metric
         // log_link_visit_action+ 2 entries per range period (4 total) + 2 'done...' entries per range period (4 total)
         // + 2 entries per segment (2 total) + 2 'done...' entries per segment (2 total)
-        // + 2 entries per day w/ returning visits + 1 entry per day w/ visits (visit frequency's visit summary metrics & segment done entries)
-        return self::JAN_METRIC_ARCHIVE_COUNT * 5 + self::TOTAL_JAN_ARCHIVE_COUNT + 1 + 8 + 4
-             + 2 * self::JAN_METRIC_RETURNING_VISIT_DAYS + self::JAN_DAYS_WITH_VISITS;
+        return self::JAN_METRIC_ARCHIVE_COUNT * 5 + self::TOTAL_JAN_ARCHIVE_COUNT + 1 + 8 + 4;
     }
 
     protected function _getExpectedNumericArchiveCountFeb()
@@ -903,10 +897,7 @@ class PrivacyManagerTest extends IntegrationTestCase
         // (5 metrics per period w/ visits
         // + 1 'done' archive for every period)
         // + 1 garbage metric
-        // + 1 entry per period w/ returning visits
-        // + 2 entries per day w/ returning visits + 1 entry per day w/ visits (visit frequency's visit summary metrics & segment done entries)
-        return self::FEB_METRIC_ARCHIVE_COUNT * 5 + self::TOTAL_FEB_ARCHIVE_COUNT + 1
-             + 2 * self::FEB_METRIC_RETURNING_VISIT_DAYS + self::FEB_DAYS_WITH_VISITS;
+        return self::FEB_METRIC_ARCHIVE_COUNT * 5 + self::TOTAL_FEB_ARCHIVE_COUNT + 1;
     }
 
     /**