Added ArchiveInvalidator tests and got them to pass.

1 files changed, 322 insertions, 7 deletions

diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
index b638a7e707..2b403b73c1 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -8,9 +8,16 @@
 
 namespace Piwik\Tests\Integration\DataAccess;
 
+use Piwik\CronArchive\SitesToReprocessDistributedList;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataAccess\Model;
 use Piwik\Date;
+use Piwik\Db;
 use Piwik\Option;
+use Piwik\Piwik;
+use Piwik\Plugins\CoreAdminHome\Tasks\ArchivesToPurgeDistributedList;
+use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Archive\ArchiveInvalidator;
 
@@ -142,7 +149,7 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
             Date::factory('2010-10-10'),
         );
 
-        $this->invalidator->markArchivesAsInvalidated($idSites, $dates, false);
+        $this->invalidator->markArchivesAsInvalidated($idSites, $dates, 'week');
         $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
 
         $expected = array(
@@ -187,26 +194,334 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
 
     public function test_markArchivesAsInvalidated_DoesNotInvalidateDatesBeforePurgeThreshold()
     {
-        // TODO
+        PrivacyManager::savePurgeDataSettings(array(
+            'delete_logs_enable' => 1,
+            'delete_logs_older_than' => 180,
+        ));
+
+        $dateBeforeThreshold = Date::factory('today')->subDay(190);
+        $thresholdDate = Date::factory('today')->subDay(180);
+        $dateAfterThreshold = Date::factory('today')->subDay(170);
+
+        // can't test more than day since today will change, causing the test to fail w/ other periods randomly
+        $this->insertArchiveRow(1, $dateBeforeThreshold, 'day');
+        $this->insertArchiveRow(1, $dateAfterThreshold, 'day');
+
+        /** @var ArchiveInvalidator $archiveInvalidator */
+        $archiveInvalidator = self::$fixture->piwikEnvironment->getContainer()->get('Piwik\Archive\ArchiveInvalidator');
+        $result = $archiveInvalidator->markArchivesAsInvalidated(array(1), array($dateBeforeThreshold, $dateAfterThreshold), 'day');
+
+        $this->assertEquals($thresholdDate->toString(), $result->minimumDateWithLogs);
+
+        $expectedProcessedDates = array($dateAfterThreshold->toString());
+        $this->assertEquals($expectedProcessedDates, $result->processedDates);
+
+        $expectedWarningDates = array($dateBeforeThreshold->toString());
+        $this->assertEquals($expectedWarningDates, $result->warningDates);
+
+        $expectedIdArchives = array(
+            '2015_03' => array(),
+            '2015_04' => array(1),
+        );
+        $this->assertEquals($expectedIdArchives, $this->getInvalidatedIdArchives());
     }
 
     public function test_markArchivesAsInvalidated_CorrectlyModifiesDistributedLists()
     {
-        // TODO
+        /** @var ArchiveInvalidator $archiveInvalidator */
+        $archiveInvalidator = self::$fixture->piwikEnvironment->getContainer()->get('Piwik\Archive\ArchiveInvalidator');
+
+        $idSites = array(1, 3, 5);
+        $dates = array(
+            Date::factory('2014-12-31'),
+            Date::factory('2015-01-01'),
+            Date::factory('2015-01-10'),
+        );
+        $archiveInvalidator->markArchivesAsInvalidated($idSites, $dates, 'day');
+
+        $idSites = array(1, 3, 5);
+        $dates = array(
+            Date::factory('2014-12-21'),
+            Date::factory('2015-01-01'),
+            Date::factory('2015-03-08'),
+        );
+        $archiveInvalidator->markArchivesAsInvalidated($idSites, $dates, 'week');
+
+        $expectedSitesToProcessListContents = array(1, 3, 5);
+        $this->assertEquals($expectedSitesToProcessListContents, $this->getSitesToReprocessListContents());
+
+        $expectedArchivesToPurgeListContents = array('2014_12', '2014_01', '2015_01', '2015_03');
+        $this->assertEquals($expectedArchivesToPurgeListContents, $this->getArchivesToPurgeListContents());
     }
 
     /**
      * @dataProvider getTestDataForMarkArchivesAsInvalidated
      */
-    public function test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated()
+    public function test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $cascadeDown,
+                                                                                     $expectedIdArchives)
     {
-        // TODO
+        $dates = array_map(array('Piwik\Date', 'factory'), $dates);
+
+        $this->insertArchiveRowsForTest();
+
+        /** @var ArchiveInvalidator $archiveInvalidator */
+        $archiveInvalidator = self::$fixture->piwikEnvironment->getContainer()->get('Piwik\Archive\ArchiveInvalidator');
+        $result = $archiveInvalidator->markArchivesAsInvalidated($idSites, $dates, $period, $cascadeDown);
+
+        $this->assertEquals($dates, $result->processedDates);
+
+        $idArchives = $this->getInvalidatedArchives();
+        $this->assertEquals($expectedIdArchives, $idArchives);
     }
 
-    private function getTestDataForMarkArchivesAsInvalidated()
+    public function getTestDataForMarkArchivesAsInvalidated()
     {
         return array(
-            // TODO
+            // day period, multiple sites, multiple dates across tables, cascade = true
+            array(
+                array(1, 2),
+                array('2015-01-01', '2015-02-05', '2015-04-30'),
+                'day',
+                true,
+                array(
+                    '2015_03' => array(),
+                    '2015_04' => array(
+                        '1.2015-04-30.2015-04-30.1.done',
+                        '2.2015-04-30.2015-04-30.1.done',
+                        '1.2015-04-27.2015-05-03.2.done',
+                        '2.2015-04-27.2015-05-03.2.done',
+                        '1.2015-04-01.2015-04-30.3.done',
+                        '2.2015-04-01.2015-04-30.3.done',
+                    ),
+                    '2014_12' => array(
+                        '1.2014-12-29.2015-01-04.2.done',
+                        '2.2014-12-29.2015-01-04.2.done',
+                        '1.2014-12-01.2014-12-31.3.done',
+                        '2.2014-12-01.2014-12-31.3.done',
+                    ),
+                    '2015_01' => array(
+                        '1.2015-01-01.2015-01-01.1.done',
+                        '2.2015-01-01.2015-01-01.1.done',
+                        '1.2015-01-01.2015-01-31.3.done',
+                        '2.2015-01-01.2015-01-31.3.done',
+                    ),
+                    '2015_02' => array(
+                        '1.2015-02-05.2015-02-05.1.done',
+                        '2.2015-02-05.2015-02-05.1.done',
+                        '1.2015-02-02.2015-02-08.2.done',
+                        '2.2015-02-02.2015-02-08.2.done',
+                        '1.2015-02-01.2015-02-28.3.done',
+                        '2.2015-02-01.2015-02-28.3.done',
+                    ),
+                    '2015_05' => array(
+                        '1.2015-05-01.2015-05-31.3.done',
+                        '2.2015-05-01.2015-05-31.3.done',
+                    ),
+                ),
+            ),
+
+            // month period, one site, one date, cascade = false
+            array(
+                array(1),
+                array('2015-01-01'),
+                'month',
+                false,
+                array(
+                    '2014_12' => array(),
+                    '2015_01' => array(
+                        '1.2015-01-01.2015-01-31.3.done',
+                    ),
+                    '2015_02' => array(),
+                    '2015_03' => array(),
+                    '2015_04' => array(),
+                    '2015_05' => array()
+                ),
+            ),
+
+            // month period, one site, one date, cascade = true
+            array(
+                array(1),
+                array('2015-01-15'),
+                'month',
+                true,
+                array(
+                    '2014_12' => array(
+                        '1.2014-12-29.2014-12-29.1.done',
+                        '1.2014-12-30.2014-12-30.1.done',
+                        '1.2014-12-31.2014-12-31.1.done',
+                        '1.2014-12-29.2015-01-04.2.done',
+                    ),
+                    '2015_01' => array(
+                        '1.2015-01-01.2015-01-01.1.done',
+                        '1.2015-01-02.2015-01-02.1.done',
+                        '1.2015-01-03.2015-01-03.1.done',
+                        '1.2015-01-04.2015-01-04.1.done',
+                        '1.2015-01-05.2015-01-05.1.done',
+                        '1.2015-01-06.2015-01-06.1.done',
+                        '1.2015-01-07.2015-01-07.1.done',
+                        '1.2015-01-08.2015-01-08.1.done',
+                        '1.2015-01-09.2015-01-09.1.done',
+                        '1.2015-01-10.2015-01-10.1.done',
+                        '1.2015-01-11.2015-01-11.1.done',
+                        '1.2015-01-12.2015-01-12.1.done',
+                        '1.2015-01-13.2015-01-13.1.done',
+                        '1.2015-01-14.2015-01-14.1.done',
+                        '1.2015-01-15.2015-01-15.1.done',
+                        '1.2015-01-16.2015-01-16.1.done',
+                        '1.2015-01-17.2015-01-17.1.done',
+                        '1.2015-01-18.2015-01-18.1.done',
+                        '1.2015-01-19.2015-01-19.1.done',
+                        '1.2015-01-20.2015-01-20.1.done',
+                        '1.2015-01-21.2015-01-21.1.done',
+                        '1.2015-01-22.2015-01-22.1.done',
+                        '1.2015-01-23.2015-01-23.1.done',
+                        '1.2015-01-24.2015-01-24.1.done',
+                        '1.2015-01-25.2015-01-25.1.done',
+                        '1.2015-01-26.2015-01-26.1.done',
+                        '1.2015-01-27.2015-01-27.1.done',
+                        '1.2015-01-28.2015-01-28.1.done',
+                        '1.2015-01-29.2015-01-29.1.done',
+                        '1.2015-01-30.2015-01-30.1.done',
+                        '1.2015-01-31.2015-01-31.1.done',
+                        '1.2015-01-05.2015-01-11.2.done',
+                        '1.2015-01-12.2015-01-18.2.done',
+                        '1.2015-01-19.2015-01-25.2.done',
+                        '1.2015-01-26.2015-02-01.2.done',
+                        '1.2015-01-01.2015-01-31.3.done',
+                    ),
+                    '2015_02' => array(
+                        '1.2015-02-01.2015-02-01.1.done',
+                    ),
+                    '2015_03' => array(),
+                    '2015_04' => array(),
+                    '2015_05' => array(),
+                ),
+            ),
+
+            // week period, one site, multiple dates w/ redundant dates & periods, cascade = true
+            array(
+                array(1),
+                array('2015-01-02', '2015-01-03', '2015-01-31'),
+                'week',
+                true,
+                array(
+                    '2014_12' => array(
+                        '1.2014-12-29.2014-12-29.1.done',
+                        '1.2014-12-30.2014-12-30.1.done',
+                        '1.2014-12-31.2014-12-31.1.done',
+                        '1.2014-12-29.2015-01-04.2.done',
+                        '1.2014-12-01.2014-12-31.3.done',
+                    ),
+                    '2015_01' => array(
+                        '1.2015-01-01.2015-01-01.1.done',
+                        '1.2015-01-02.2015-01-02.1.done',
+                        '1.2015-01-03.2015-01-03.1.done',
+                        '1.2015-01-04.2015-01-04.1.done',
+                        '1.2015-01-26.2015-01-26.1.done',
+                        '1.2015-01-27.2015-01-27.1.done',
+                        '1.2015-01-28.2015-01-28.1.done',
+                        '1.2015-01-29.2015-01-29.1.done',
+                        '1.2015-01-30.2015-01-30.1.done',
+                        '1.2015-01-31.2015-01-31.1.done',
+                        '1.2015-01-26.2015-02-01.2.done',
+                        '1.2015-01-01.2015-01-31.3.done',
+                    ),
+                    '2015_02' => array(
+                        '1.2015-02-01.2015-02-01.1.done',
+                        '1.2015-02-01.2015-02-28.3.done',
+                    ),
+                    '2015_03' => array(),
+                    '2015_04' => array(),
+                    '2015_05' => array(),
+                ),
+            ),
         );
     }
+
+    private function getInvalidatedIdArchives()
+    {
+        $result = array();
+        foreach (ArchiveTableCreator::getTablesArchivesInstalled(ArchiveTableCreator::NUMERIC_TABLE) as $table) {
+            $date = ArchiveTableCreator::getDateFromTableName($table);
+
+            $idArchives = Db::fetchAll("SELECT idarchive FROM $table WHERE name LIKE 'done%' AND value = ?", array(ArchiveWriter::DONE_INVALIDATED));
+            $idArchives = array_map('reset', $idArchives);
+
+            $result[$date] = $idArchives;
+        }
+        return $result;
+    }
+
+    private function getInvalidatedArchives()
+    {
+        $result = array();
+        foreach (ArchiveTableCreator::getTablesArchivesInstalled(ArchiveTableCreator::NUMERIC_TABLE) as $table) {
+            $date = ArchiveTableCreator::getDateFromTableName($table);
+
+            $sql = "SELECT CONCAT(idsite, '.', date1, '.', date2, '.', period, '.', name) FROM $table WHERE name LIKE 'done%' AND value = ?";
+
+            $archiveSpecs = Db::fetchAll($sql, array(ArchiveWriter::DONE_INVALIDATED));
+            $archiveSpecs = array_map('reset', $archiveSpecs);
+
+            $result[$date] = $archiveSpecs;
+        }
+        return $result;
+    }
+
+    private function insertArchiveRowsForTest()
+    {
+        $periods = array('day', 'week', 'month', 'year');
+        $sites = array(1,2,3);
+
+        $startDate = Date::factory('2014-12-01');
+        $endDate = Date::factory('2015-05-31');
+
+        foreach ($periods as $periodLabel) {
+            for ($date = $startDate; $date->isEarlier($endDate); $date = $date->addPeriod(1, $periodLabel)) {
+                foreach ($sites as $idSite) {
+                    $this->insertArchiveRow($idSite, $date, $periodLabel);
+                }
+            }
+        }
+    }
+
+    private function insertArchiveRow($idSite, Date $date, $periodLabel)
+    {
+        $table = ArchiveTableCreator::getNumericTable($date);
+
+        $idArchive = (int) Db::fetchOne("SELECT MAX(idarchive) FROM $table WHERE name LIKE 'done%'");
+        $idArchive = $idArchive + 1;
+
+        $periodObject = \Piwik\Period\Factory::build($periodLabel, $date->toString());
+        $dateStart = $periodObject->getDateStart();
+        $dateEnd = $periodObject->getDateEnd();
+
+        $periodId = Piwik::$idPeriods[$periodLabel];
+
+        $doneFlag = 'done';
+        if ($doneFlag % 3 == 1) {
+            $doneFlag .= "09348lakdjfslfjasldfjwaekht";
+        } else if ($doneFlag % 3 == 2) {
+            $doneFlag .= '.VisitsSummary';
+        }
+
+        $sql = "INSERT INTO $table (idarchive, name, idsite, date1, date2, period, ts_archived)
+                     VALUES ($idArchive, 'nb_visits', $idSite, '$dateStart', '$dateEnd', $periodId, NOW()),
+                            ($idArchive, '$doneFlag', $idSite, '$dateStart', '$dateEnd', $periodId, NOW())";
+        Db::query($sql);
+    }
+
+    private function getSitesToReprocessListContents()
+    {
+        $list = new SitesToReprocessDistributedList();
+        $values = $list->getAll();
+        return array_values($values);
+    }
+
+    private function getArchivesToPurgeListContents()
+    {
+        $list = new ArchivesToPurgeDistributedList();
+        $values = $list->getAll();
+        return array_values($values);
+    }
 }