diff options
| -rw-r--r-- | plugins/CoreAdminHome/Tasks.php | 1 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/tests/Integration/TasksTest.php | 88 | ||||
| -rw-r--r-- | tests/PHPUnit/Fixtures/RawArchiveDataWithTempAndInvalidated.php | 387 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/Archive/PurgerTest.php | 404 |
4 files changed, 492 insertions, 388 deletions
diff --git a/plugins/CoreAdminHome/Tasks.php b/plugins/CoreAdminHome/Tasks.php index e09d9ad03c..07398a83e3 100644 --- a/plugins/CoreAdminHome/Tasks.php +++ b/plugins/CoreAdminHome/Tasks.php @@ -16,7 +16,6 @@ use Piwik\Db; use Piwik\Log; use Piwik\Plugins\CoreAdminHome\Tasks\ArchivesToPurgeDistributedList; -// TODO: tests for Tasks class Tasks extends \Piwik\Plugin\Tasks { /** diff --git a/plugins/CoreAdminHome/tests/Integration/TasksTest.php b/plugins/CoreAdminHome/tests/Integration/TasksTest.php new file mode 100644 index 0000000000..aacc20d7f7 --- /dev/null +++ b/plugins/CoreAdminHome/tests/Integration/TasksTest.php @@ -0,0 +1,88 @@ +<?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\CoreAdminHome\tests\Integration; + +use Piwik\Archive\Purger; +use Piwik\Date; +use Piwik\Plugins\CoreAdminHome\Tasks; +use Piwik\Plugins\CoreAdminHome\Tasks\ArchivesToPurgeDistributedList; +use Piwik\Tests\Fixtures\RawArchiveDataWithTempAndInvalidated; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; + +/** + * @group Core + */ +class TasksTest extends IntegrationTestCase +{ + /** + * @var RawArchiveDataWithTempAndInvalidated + */ + public static $fixture; + + /** + * @var Tasks + */ + private $tasks; + + /** + * @var Date + */ + private $january; + + /** + * @var Date + */ + private $february; + + public function setUp() + { + parent::setUp(); + + $this->january = Date::factory('2015-01-01'); + $this->february = Date::factory('2015-02-01'); + + $archivePurger = new Purger(); + $archivePurger->setTodayDate(Date::factory('2015-02-27')); + $archivePurger->setYesterdayDate(Date::factory('2015-02-26')); + $archivePurger->setNow(Date::factory('2015-02-27 08:00:00')->getTimestamp()); + + $this->tasks = new Tasks($archivePurger); + } + + public function test_purgeInvalidatedArchives_PurgesCorrectInvalidatedArchives_AndOnlyPurgesDataForDatesAndSites_InInvalidatedReportsDistributedList() + { + $this->setUpInvalidatedReportsDistributedList($dates = array($this->february)); + + $this->tasks->purgeInvalidatedArchives(); + + self::$fixture->assertFebruaryInvalidatedArchivesPurged(); + self::$fixture->assertJanuaryInvalidatedArchivesNotPurged(); + + // assert invalidated reports distributed list has changed + $archivesToPurgeDistributedList = new ArchivesToPurgeDistributedList(); + $yearMonths = $archivesToPurgeDistributedList->getAll(); + + $this->assertEmpty($yearMonths); + } + + /** + * @param Date[] $dates + */ + private function setUpInvalidatedReportsDistributedList($dates) + { + $yearMonths = array(); + foreach ($dates as $date) { + $yearMonths[] = $date->toString('Y_m'); + } + + $archivesToPurgeDistributedList = new ArchivesToPurgeDistributedList(); + $archivesToPurgeDistributedList->add($yearMonths); + } +} + +TasksTest::$fixture = new RawArchiveDataWithTempAndInvalidated();
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/RawArchiveDataWithTempAndInvalidated.php b/tests/PHPUnit/Fixtures/RawArchiveDataWithTempAndInvalidated.php new file mode 100644 index 0000000000..080aa3c043 --- /dev/null +++ b/tests/PHPUnit/Fixtures/RawArchiveDataWithTempAndInvalidated.php @@ -0,0 +1,387 @@ +<?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\DataAccess\ArchiveTableCreator; +use Piwik\DataAccess\ArchiveWriter; +use Piwik\Date; +use Piwik\Db; +use Piwik\Tests\Framework\Fixture; + +/** + * Fixture that inserts rows into archive tables for Jan. 2015 + Feb. 2015. The rows include + * done rows + metrics/blobs, and the done rows have values of DONE_OK_TEMPORARY, + * DONE_OK, DONE_INVALIDATED. There are also some custom range archives. + * + * This class is used to test archive purging. + */ +class RawArchiveDataWithTempAndInvalidated extends Fixture +{ + private static $dummyArchiveData = array( + // outdated temporary + array( + 'idarchive' => 1, + 'idsite' => 1, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-03', + 'date2' => '2015-02-03', + 'period' => 1, + 'ts_archived' => '2015-02-03 12:12:12' + ), + + array( + 'idarchive' => 2, + 'idsite' => 2, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-01', + 'date2' => '2015-02-31', + 'period' => 3, + 'ts_archived' => '2015-02-18 10:10:10' + ), + + array( + 'idarchive' => 3, + 'idsite' => 3, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-04', + 'date2' => '2015-02-10', + 'period' => 2, + 'ts_archived' => '2015-02-10 12:34:56' + ), + + array( + 'idarchive' => 4, + 'idsite' => 1, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-15', + 'date2' => '2015-02-15', + 'period' => 1, + 'ts_archived' => '2015-02-15 08:12:13' + ), + + + // valid temporary + array( // only valid + 'idarchive' => 5, + 'idsite' => 1, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-27', + 'date2' => '2015-02-27', + 'period' => 1, + 'ts_archived' => '2015-02-27 08:08:08' + ), + + array( + 'idarchive' => 6, + 'idsite' => 2, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-26', + 'date2' => '2015-02-26', + 'period' => 1, + 'ts_archived' => '2015-02-26 07:07:07' + ), + + array( + 'idarchive' => 7, + 'idsite' => 3, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-01', + 'date2' => '2015-02-28', + 'period' => 3, + 'ts_archived' => '2015-02-15 00:00:00' + ), + + // custom ranges + array( + 'idarchive' => 8, + 'idsite' => 1, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK, + 'date1' => '2015-02-03', + 'date2' => '2015-02-14', + 'period' => 5, + 'ts_archived' => '2015-02-27 00:00:00' + ), + + array( + 'idarchive' => 9, + 'idsite' => 2, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK, + 'date1' => '2015-02-05', + 'date2' => '2015-02-14', + 'period' => 5, + 'ts_archived' => '2015-02-15 00:00:00' + ), + + array( + 'idarchive' => 10, + 'idsite' => 3, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-05', + 'date2' => '2015-03-05', + 'period' => 5, + 'ts_archived' => '2015-02-26 00:00:00' + ), + + // invalidated + array( + 'idarchive' => 11, + 'idsite' => 1, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_INVALIDATED, + 'date1' => '2015-02-10', + 'date2' => '2015-02-10', + 'period' => 1, + 'ts_archived' => '2015-02-10 12:13:14' + ), + + array( + 'idarchive' => 12, + 'idsite' => 2, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_INVALIDATED, + 'date1' => '2015-02-08', + 'date2' => '2015-02-14', + 'period' => 2, + 'ts_archived' => '2015-02-15 00:00:00' + ), + + array( + 'idarchive' => 13, + 'idsite' => 3, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_INVALIDATED, + 'date1' => '2015-02-01', + 'date2' => '2015-02-28', + 'period' => 3, + 'ts_archived' => '2015-02-27 13:13:13' + ), + + array( + 'idarchive' => 14, + 'idsite' => 1, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_INVALIDATED, + 'date1' => '2015-02-28', + 'date2' => '2015-02-28', + 'period' => 1, + 'ts_archived' => '2015-02-28 12:12:12' + ), + + array( + 'idarchive' => 15, + 'idsite' => 1, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_INVALIDATED, + 'date1' => '2015-02-27', + 'date2' => '2015-02-27', + 'period' => 1, + 'ts_archived' => '2015-02-28 12:12:12' + ), + + // reprocessed invalidated + array( + 'idarchive' => 16, + 'idsite' => 1, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK, + 'date1' => '2015-02-10', + 'date2' => '2015-02-10', + 'period' => 1, + 'ts_archived' => '2015-02-11 12:13:14' + ), + + array( + 'idarchive' => 17, + 'idsite' => 2, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK, + 'date1' => '2015-02-08', + 'date2' => '2015-02-14', + 'period' => 2, + 'ts_archived' => '2015-02-16 00:00:00' + ), + + array( + 'idarchive' => 18, + 'idsite' => 3, + 'name' => 'done', + 'value' => ArchiveWriter::DONE_OK, + 'date1' => '2015-02-01', + 'date2' => '2015-02-28', + 'period' => 3, + 'ts_archived' => '2015-02-28 13:13:13' + ), + + array( + 'idarchive' => 19, + 'idsite' => 1, + 'name' => 'doneDUMMYHASHSTR', + 'value' => ArchiveWriter::DONE_OK_TEMPORARY, + 'date1' => '2015-02-28', + 'date2' => '2015-02-28', + 'period' => 1, + 'ts_archived' => '2015-02-28 16:12:12' // must be late so it doesn't screw up the purgeOutdatedArchives test + ), + ); + + /** + * @var Date + */ + public $january; + + /** + * @var Date + */ + public $february; + + public function setUp() + { + parent::setUp(); + + $this->january = Date::factory('2015-01-01'); + $this->february = Date::factory('2015-02-01'); + + $this->insertOutdatedArchives($this->january); + $this->insertOutdatedArchives($this->february); + } + + private function insertOutdatedArchives(Date $archiveDate) + { + $dummyArchiveData = $this->getDummyArchiveDataForDate($archiveDate); + + $numericTable = ArchiveTableCreator::getNumericTable($archiveDate); + foreach ($dummyArchiveData as $row) { + // done row + $this->insertTestArchiveRow($numericTable, $row); + + // two metrics + $row['name'] = 'nb_visits'; + $row['value'] = 1; + $this->insertTestArchiveRow($numericTable, $row); + + $row['name'] = 'nb_actions'; + $row['value'] = 2; + $this->insertTestArchiveRow($numericTable, $row); + } + + $blobTable = ArchiveTableCreator::getBlobTable($archiveDate); + foreach ($dummyArchiveData as $row) { + // two blobs + $row['name'] = 'blobname'; + $row['value'] = 'dummyvalue'; + $this->insertTestArchiveRow($blobTable, $row); + + $row['name'] = 'blobname2'; + $row['value'] = 'dummyvalue'; + $this->insertTestArchiveRow($blobTable, $row); + } + } + + private function insertTestArchiveRow($table, $row) + { + $insertSqlTemplate = "INSERT INTO %s (idarchive, idsite, name, value, date1, date2, period, ts_archived) VALUES ('%s')"; + + Db::exec(sprintf($insertSqlTemplate, $table, implode("','", $row))); + } + + private function getDummyArchiveDataForDate($archiveDate) + { + $rows = self::$dummyArchiveData; + foreach ($rows as &$row) { + $row['date1'] = $this->setDateMonthAndYear($row['date1'], $archiveDate); + $row['date2'] = $this->setDateMonthAndYear($row['date1'], $archiveDate); + } + return$rows; + } + + private function setDateMonthAndYear($dateString, Date $archiveDate) + { + return $archiveDate->toString('Y-m') . '-' . Date::factory($dateString)->toString('d'); + } + + public function assertFebruaryTemporaryArchivesPurged($isBrowserTriggeredArchivingEnabled) + { + if ($isBrowserTriggeredArchivingEnabled) { + $expectedPurgedArchives = array(1,2,3,4,6,7); // only archives from 2 hours before "now" are purged + } else { + $expectedPurgedArchives = array(1,2,3,4,7); // only archives before start of "yesterday" are purged + } + + $this->assertArchivesDoNotExist($expectedPurgedArchives, $this->february); + } + + public function assertFebruaryCustomRangesPurged() + { + $expectedPurgedArchives = array(8,9,10); + $this->assertArchivesDoNotExist($expectedPurgedArchives, $this->february); + } + + public function assertJanuaryTemporaryArchivesNotPurged() + { + $expectedPresentArchives = array(1,2,3,4,5,6,7); + $this->assertArchivesExist($expectedPresentArchives, $this->january); + } + + public function assertJanuaryInvalidatedArchivesNotPurged() + { + $expectedPresentArchives = array(11, 12, 13, 14); + $this->assertArchivesExist($expectedPresentArchives, $this->january); + } + + public function assertArchivesDoNotExist($expectedPurgedArchiveIds, $archiveDate) + { + $numericTable = ArchiveTableCreator::getNumericTable($archiveDate); + $blobTable = ArchiveTableCreator::getBlobTable($archiveDate); + + $numericPurgedArchiveCount = $this->getArchiveRowCountWithId($numericTable, $expectedPurgedArchiveIds); + $this->assertEquals(0, $numericPurgedArchiveCount); + + $blobPurgedArchiveCount = $this->getArchiveRowCountWithId($blobTable, $expectedPurgedArchiveIds); + $this->assertEquals(0, $blobPurgedArchiveCount); + } + + public function assertArchivesExist($expectedPresentArchiveIds, $archiveDate) + { + $numericTable = ArchiveTableCreator::getNumericTable($archiveDate); + $blobTable = ArchiveTableCreator::getBlobTable($archiveDate); + + $numericArchiveCount = $this->getArchiveRowCountWithId($numericTable, $expectedPresentArchiveIds); + $expectedNumericRowCount = count($expectedPresentArchiveIds) * 3; // two metrics + 1 done row + $this->assertEquals($expectedNumericRowCount, $numericArchiveCount); + + $blobArchiveCount = $this->getArchiveRowCountWithId($blobTable, $expectedPresentArchiveIds); + $expectedBlobRowCount = count($expectedPresentArchiveIds) * 2; // two blob rows + $this->assertEquals($expectedBlobRowCount, $blobArchiveCount); + } + + private function getArchiveRowCountWithId($table, $archiveIds) + { + return Db::fetchOne("SELECT COUNT(*) FROM $table WHERE idarchive IN (".implode(',', $archiveIds).")"); + } + + public function assertFebruaryInvalidatedArchivesPurged() + { + // check invalidated archives for all sites are purged + $expectedPurgedArchives = array(11, 12, 13, 14); + $this->assertArchivesDoNotExist($expectedPurgedArchives, $this->february); + + // check archive 15 is not purged since it doesn't have newer DONE_OK/DONE_TEMPORARY archive + $expectedExistingArchives = array(15); + $this->assertArchivesExist($expectedExistingArchives, $this->february); + } +}
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/Archive/PurgerTest.php b/tests/PHPUnit/Integration/Archive/PurgerTest.php index 3963690b28..2f27127e71 100644 --- a/tests/PHPUnit/Integration/Archive/PurgerTest.php +++ b/tests/PHPUnit/Integration/Archive/PurgerTest.php @@ -10,11 +10,9 @@ namespace Piwik\Tests\Integration\Archive; use Piwik\Archive\Purger; use Piwik\Config; use Piwik\DataAccess\ArchiveTableCreator; -use Piwik\DataAccess\ArchiveWriter; -use Piwik\CronArchive\SitesToReprocessDistributedList; use Piwik\Date; use Piwik\Db; -use Piwik\Plugins\CoreAdminHome\Tasks\ArchivesToPurgeDistributedList; +use Piwik\Tests\Fixtures\RawArchiveDataWithTempAndInvalidated; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** @@ -26,222 +24,10 @@ class PurgerTest extends IntegrationTestCase * - that archive purging is done daily (when called through cron archiving and through API request for scheduled task running) [SYSTEM TESTS] */ - private static $dummyArchiveData = array( - // outdated temporary - array( - 'idarchive' => 1, - 'idsite' => 1, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-03', - 'date2' => '2015-02-03', - 'period' => 1, - 'ts_archived' => '2015-02-03 12:12:12' - ), - - array( - 'idarchive' => 2, - 'idsite' => 2, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-01', - 'date2' => '2015-02-31', - 'period' => 3, - 'ts_archived' => '2015-02-18 10:10:10' - ), - - array( - 'idarchive' => 3, - 'idsite' => 3, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-04', - 'date2' => '2015-02-10', - 'period' => 2, - 'ts_archived' => '2015-02-10 12:34:56' - ), - - array( - 'idarchive' => 4, - 'idsite' => 1, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-15', - 'date2' => '2015-02-15', - 'period' => 1, - 'ts_archived' => '2015-02-15 08:12:13' - ), - - - // valid temporary - array( // only valid - 'idarchive' => 5, - 'idsite' => 1, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-27', - 'date2' => '2015-02-27', - 'period' => 1, - 'ts_archived' => '2015-02-27 08:08:08' - ), - - array( - 'idarchive' => 6, - 'idsite' => 2, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-26', - 'date2' => '2015-02-26', - 'period' => 1, - 'ts_archived' => '2015-02-26 07:07:07' - ), - - array( - 'idarchive' => 7, - 'idsite' => 3, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-01', - 'date2' => '2015-02-28', - 'period' => 3, - 'ts_archived' => '2015-02-15 00:00:00' - ), - - // custom ranges - array( - 'idarchive' => 8, - 'idsite' => 1, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK, - 'date1' => '2015-02-03', - 'date2' => '2015-02-14', - 'period' => 5, - 'ts_archived' => '2015-02-27 00:00:00' - ), - - array( - 'idarchive' => 9, - 'idsite' => 2, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK, - 'date1' => '2015-02-05', - 'date2' => '2015-02-14', - 'period' => 5, - 'ts_archived' => '2015-02-15 00:00:00' - ), - - array( - 'idarchive' => 10, - 'idsite' => 3, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-05', - 'date2' => '2015-03-05', - 'period' => 5, - 'ts_archived' => '2015-02-26 00:00:00' - ), - - // invalidated - array( - 'idarchive' => 11, - 'idsite' => 1, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_INVALIDATED, - 'date1' => '2015-02-10', - 'date2' => '2015-02-10', - 'period' => 1, - 'ts_archived' => '2015-02-10 12:13:14' - ), - - array( - 'idarchive' => 12, - 'idsite' => 2, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_INVALIDATED, - 'date1' => '2015-02-08', - 'date2' => '2015-02-14', - 'period' => 2, - 'ts_archived' => '2015-02-15 00:00:00' - ), - - array( - 'idarchive' => 13, - 'idsite' => 3, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_INVALIDATED, - 'date1' => '2015-02-01', - 'date2' => '2015-02-28', - 'period' => 3, - 'ts_archived' => '2015-02-27 13:13:13' - ), - - array( - 'idarchive' => 14, - 'idsite' => 1, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_INVALIDATED, - 'date1' => '2015-02-28', - 'date2' => '2015-02-28', - 'period' => 1, - 'ts_archived' => '2015-02-28 12:12:12' - ), - - array( - 'idarchive' => 15, - 'idsite' => 1, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_INVALIDATED, - 'date1' => '2015-02-27', - 'date2' => '2015-02-27', - 'period' => 1, - 'ts_archived' => '2015-02-28 12:12:12' - ), - - // reprocessed invalidated - array( - 'idarchive' => 16, - 'idsite' => 1, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK, - 'date1' => '2015-02-10', - 'date2' => '2015-02-10', - 'period' => 1, - 'ts_archived' => '2015-02-11 12:13:14' - ), - - array( - 'idarchive' => 17, - 'idsite' => 2, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK, - 'date1' => '2015-02-08', - 'date2' => '2015-02-14', - 'period' => 2, - 'ts_archived' => '2015-02-16 00:00:00' - ), - - array( - 'idarchive' => 18, - 'idsite' => 3, - 'name' => 'done', - 'value' => ArchiveWriter::DONE_OK, - 'date1' => '2015-02-01', - 'date2' => '2015-02-28', - 'period' => 3, - 'ts_archived' => '2015-02-28 13:13:13' - ), - - array( - 'idarchive' => 19, - 'idsite' => 1, - 'name' => 'doneDUMMYHASHSTR', - 'value' => ArchiveWriter::DONE_OK_TEMPORARY, - 'date1' => '2015-02-28', - 'date2' => '2015-02-28', - 'period' => 1, - 'ts_archived' => '2015-02-28 16:12:12' // must be late so it doesn't screw up the purgeOutdatedArchives test - ), - ); + /** + * @var RawArchiveDataWithTempAndInvalidated + */ + public static $fixture; /** * @var Purger @@ -262,17 +48,14 @@ class PurgerTest extends IntegrationTestCase { parent::setUp(); - $this->january = Date::factory('2015-01-01'); - $this->february = Date::factory('2015-02-01'); + $this->january = self::$fixture->january; + $this->february = self::$fixture->february; $this->archivePurger = new Purger(); $this->archivePurger->setTodayDate(Date::factory('2015-02-27')); $this->archivePurger->setYesterdayDate(Date::factory('2015-02-26')); $this->archivePurger->setNow(Date::factory('2015-02-27 08:00:00')->getTimestamp()); - $this->insertOutdatedArchives($this->january); - $this->insertOutdatedArchives($this->february); - $this->configureCustomRangePurging(); } @@ -282,10 +65,10 @@ class PurgerTest extends IntegrationTestCase $this->archivePurger->purgeOutdatedArchives($this->february); - $this->assertFebruaryTemporaryArchivesPurged($browserTriggeringEnabled = true); - $this->assertFebruaryCustomRangesPurged(); + self::$fixture->assertFebruaryTemporaryArchivesPurged($browserTriggeringEnabled = true); + self::$fixture->assertFebruaryCustomRangesPurged(); - $this->assertJanuaryTemporaryArchivesNotPurged(); + self::$fixture->assertJanuaryTemporaryArchivesNotPurged(); } public function test_purgeOutdatedArchives_PurgesCorrectTemporaryArchives_AndRangeArchives_WhileKeepingNewerTemporaryArchives_WithBrowserTriggeringDisabled() @@ -294,34 +77,18 @@ class PurgerTest extends IntegrationTestCase $this->archivePurger->purgeOutdatedArchives($this->february); - $this->assertFebruaryTemporaryArchivesPurged($browserTriggeringEnabled = false); - $this->assertFebruaryCustomRangesPurged(); + self::$fixture->assertFebruaryTemporaryArchivesPurged($browserTriggeringEnabled = false); + self::$fixture->assertFebruaryCustomRangesPurged(); - $this->assertJanuaryTemporaryArchivesNotPurged(); - } - - public function test_purgeInvalidatedArchives_PurgesCorrectInvalidatedArchives_AndOnlyPurgesDataForDatesAndSites_InInvalidatedReportsDistributedList() - { - $this->setUpInvalidatedReportsDistributedList($dates = array($this->february)); - - $this->archivePurger->purgeInvalidatedArchives(); - - $this->assertFebruaryInvalidatedArchivesPurged(); - $this->assertJanuaryInvalidatedArchivesNotPurged(); - - // assert invalidated reports distributed list has changed - $archivesToPurgeDistributedList = new ArchivesToPurgeDistributedList(); - $yearMonths = $archivesToPurgeDistributedList->getAll(); - - $this->assertEmpty($yearMonths); + self::$fixture->assertJanuaryTemporaryArchivesNotPurged(); } public function test_purgeInvalidatedArchivesFrom_PurgesAllInvalidatedArchives_AndMarksDatesAndSitesAsInvalidated() { $this->archivePurger->purgeInvalidatedArchivesFrom($this->february); - $this->assertFebruaryInvalidatedArchivesPurged(); - $this->assertJanuaryInvalidatedArchivesNotPurged(); + self::$fixture->assertFebruaryInvalidatedArchivesPurged(); + self::$fixture->assertJanuaryInvalidatedArchivesNotPurged(); } private function configureCustomRangePurging() @@ -338,143 +105,6 @@ class PurgerTest extends IntegrationTestCase { Config::getInstance()->General['enable_browser_archiving_triggering'] = 0; } - - /** - * @param Date[] $dates - */ - private function setUpInvalidatedReportsDistributedList($dates) - { - $yearMonths = array(); - foreach ($dates as $date) { - $yearMonths[] = $date->toString('Y_m'); - } - - $archivesToPurgeDistributedList = new ArchivesToPurgeDistributedList(); - $archivesToPurgeDistributedList->add($yearMonths); - } - - private function insertOutdatedArchives(Date $archiveDate) - { - $dummyArchiveData = $this->getDummyArchiveDataForDate($archiveDate); - - $numericTable = ArchiveTableCreator::getNumericTable($archiveDate); - foreach ($dummyArchiveData as $row) { - // done row - $this->insertTestArchiveRow($numericTable, $row); - - // two metrics - $row['name'] = 'nb_visits'; - $row['value'] = 1; - $this->insertTestArchiveRow($numericTable, $row); - - $row['name'] = 'nb_actions'; - $row['value'] = 2; - $this->insertTestArchiveRow($numericTable, $row); - } - - $blobTable = ArchiveTableCreator::getBlobTable($archiveDate); - foreach ($dummyArchiveData as $row) { - // two blobs - $row['name'] = 'blobname'; - $row['value'] = 'dummyvalue'; - $this->insertTestArchiveRow($blobTable, $row); - - $row['name'] = 'blobname2'; - $row['value'] = 'dummyvalue'; - $this->insertTestArchiveRow($blobTable, $row); - } - } - - private function insertTestArchiveRow($table, $row) - { - $insertSqlTemplate = "INSERT INTO %s (idarchive, idsite, name, value, date1, date2, period, ts_archived) VALUES ('%s')"; - - Db::exec(sprintf($insertSqlTemplate, $table, implode("','", $row))); - } - - private function getDummyArchiveDataForDate($archiveDate) - { - $rows = self::$dummyArchiveData; - foreach ($rows as &$row) { - $row['date1'] = $this->setDateMonthAndYear($row['date1'], $archiveDate); - $row['date2'] = $this->setDateMonthAndYear($row['date1'], $archiveDate); - } - return$rows; - } - - private function setDateMonthAndYear($dateString, Date $archiveDate) - { - return $archiveDate->toString('Y-m') . '-' . Date::factory($dateString)->toString('d'); - } - - private function assertFebruaryTemporaryArchivesPurged($isBrowserTriggeredArchivingEnabled) - { - if ($isBrowserTriggeredArchivingEnabled) { - $expectedPurgedArchives = array(1,2,3,4,6,7); // only archives from 2 hours before "now" are purged - } else { - $expectedPurgedArchives = array(1,2,3,4,7); // only archives before start of "yesterday" are purged - } - - $this->assertArchivesDoNotExist($expectedPurgedArchives, $this->february); - } - - private function assertFebruaryCustomRangesPurged() - { - $expectedPurgedArchives = array(8,9,10); - $this->assertArchivesDoNotExist($expectedPurgedArchives, $this->february); - } - - private function assertJanuaryTemporaryArchivesNotPurged() - { - $expectedPresentArchives = array(1,2,3,4,5,6,7); - $this->assertArchivesExist($expectedPresentArchives, $this->january); - } - - private function assertJanuaryInvalidatedArchivesNotPurged() - { - $expectedPresentArchives = array(11, 12, 13, 14); - $this->assertArchivesExist($expectedPresentArchives, $this->january); - } - - private function assertArchivesDoNotExist($expectedPurgedArchiveIds, $archiveDate) - { - $numericTable = ArchiveTableCreator::getNumericTable($archiveDate); - $blobTable = ArchiveTableCreator::getBlobTable($archiveDate); - - $numericPurgedArchiveCount = $this->getArchiveRowCountWithId($numericTable, $expectedPurgedArchiveIds); - $this->assertEquals(0, $numericPurgedArchiveCount); - - $blobPurgedArchiveCount = $this->getArchiveRowCountWithId($blobTable, $expectedPurgedArchiveIds); - $this->assertEquals(0, $blobPurgedArchiveCount); - } - - private function assertArchivesExist($expectedPresentArchiveIds, $archiveDate) - { - $numericTable = ArchiveTableCreator::getNumericTable($archiveDate); - $blobTable = ArchiveTableCreator::getBlobTable($archiveDate); - - $numericArchiveCount = $this->getArchiveRowCountWithId($numericTable, $expectedPresentArchiveIds); - $expectedNumericRowCount = count($expectedPresentArchiveIds) * 3; // two metrics + 1 done row - $this->assertEquals($expectedNumericRowCount, $numericArchiveCount); - - $blobArchiveCount = $this->getArchiveRowCountWithId($blobTable, $expectedPresentArchiveIds); - $expectedBlobRowCount = count($expectedPresentArchiveIds) * 2; // two blob rows - $this->assertEquals($expectedBlobRowCount, $blobArchiveCount); - } - - private function getArchiveRowCountWithId($table, $archiveIds) - { - return Db::fetchOne("SELECT COUNT(*) FROM $table WHERE idarchive IN (".implode(',', $archiveIds).")"); - } - - private function assertFebruaryInvalidatedArchivesPurged() - { - // check invalidated archives for all sites are purged - $expectedPurgedArchives = array(11, 12, 13, 14); - $this->assertArchivesDoNotExist($expectedPurgedArchives, $this->february); - - // check archive 15 is not purged since it doesn't have newer DONE_OK/DONE_TEMPORARY archive - $expectedExistingArchives = array(15); - $this->assertArchivesExist($expectedExistingArchives, $this->february); - } } + +PurgerTest::$fixture = new RawArchiveDataWithTempAndInvalidated();
\ No newline at end of file |