diff options
Diffstat (limited to 'tests/PHPUnit/Core')
28 files changed, 927 insertions, 815 deletions
diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php index 7e4a677274..5a36a79de3 100644 --- a/tests/PHPUnit/Core/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php @@ -1,18 +1,23 @@ <?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +use Piwik\ArchiveProcessor\Rules; use Piwik\Config; +use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Period; use Piwik\Piwik; use Piwik\Common; use Piwik\Access; +use Piwik\Date; +use Piwik\ArchiveProcessor; use Piwik\Segment; use Piwik\Site; -/** - * Piwik - Open source web analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ class ArchiveProcessingTest extends DatabaseTestCase { public function setUp() @@ -52,20 +57,20 @@ class ArchiveProcessingTest extends DatabaseTestCase * @param string $periodLabel * @param string $dateLabel * @param string $siteTimezone - * @return Piwik_ArchiveProcessor + * @return ArchiveProcessor */ private function _createArchiveProcessor($periodLabel, $dateLabel, $siteTimezone) { $site = $this->_createWebsite($siteTimezone); - $date = Piwik_Date::factory($dateLabel); + $date = Date::factory($dateLabel); $period = Period::factory($periodLabel, $date); $segment = new Segment('', $site->getId()); if($period->getLabel() == 'day') { - return new Piwik_ArchiveProcessor_Day($period, $site, $segment); + return new ArchiveProcessor\Day($period, $site, $segment); } else { - return new Piwik_ArchiveProcessor_Period($period, $site, $segment); + return new ArchiveProcessor\Period($period, $site, $segment); } } @@ -88,7 +93,7 @@ class ArchiveProcessingTest extends DatabaseTestCase $archiveProcessor->time = $now; // min finished timestamp considered when looking at archive timestamp - $timeout = Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); + $timeout = Rules::getTodayArchiveTimeToLive(); $this->assertTrue($timeout >= 10); $dateMinArchived = $now - $timeout; $this->compareTimestamps($dateMinArchived, $archiveProcessor->getMinTimeArchivedProcessed()); @@ -99,7 +104,7 @@ class ArchiveProcessingTest extends DatabaseTestCase private function compareTimestamps($expected, $processed) { - $messageIfFails = Piwik_Date::factory($expected)->getDatetime() . " != " . Piwik_Date::factory($processed)->getDatetime(); + $messageIfFails = Date::factory($expected)->getDatetime() . " != " . Date::factory($processed)->getDatetime(); $this->assertTrue( $expected == $processed || $expected == ($processed + 1) || ($expected + 1) == $processed, $messageIfFails); } @@ -113,7 +118,7 @@ class ArchiveProcessingTest extends DatabaseTestCase $archiveProcessor = $this->_createArchiveProcessor('day', '2010-01-01', 'UTC'); // min finished timestamp considered when looking at archive timestamp - $dateMinArchived = Piwik_Date::factory('2010-01-02')->getTimestamp(); + $dateMinArchived = Date::factory('2010-01-02')->getTimestamp(); $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed() + 1, $dateMinArchived); $this->assertEquals('2010-01-01 00:00:00', $archiveProcessor->getDateStart()->getDateStartUTC()); @@ -131,7 +136,7 @@ class ArchiveProcessingTest extends DatabaseTestCase $timezone = 'UTC+5.5'; $archiveProcessor = $this->_createArchiveProcessor('day', '2010-01-01', $timezone); // min finished timestamp considered when looking at archive timestamp - $dateMinArchived = Piwik_Date::factory('2010-01-01 18:30:00'); + $dateMinArchived = Date::factory('2010-01-01 18:30:00'); $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed() + 1, $dateMinArchived->getTimestamp()); $this->assertEquals('2009-12-31 18:30:00', $archiveProcessor->getDateStart()->getDateStartUTC()); @@ -149,7 +154,7 @@ class ArchiveProcessingTest extends DatabaseTestCase $timezone = 'UTC-5.5'; $archiveProcessor = $this->_createArchiveProcessor('month', '2010-01-02', $timezone); // min finished timestamp considered when looking at archive timestamp - $dateMinArchived = Piwik_Date::factory('2010-02-01 05:30:00'); + $dateMinArchived = Date::factory('2010-02-01 05:30:00'); $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed() + 1, $dateMinArchived->getTimestamp()); $this->assertEquals('2010-01-01 05:30:00', $archiveProcessor->getDateStart()->getDateStartUTC()); @@ -166,22 +171,22 @@ class ArchiveProcessingTest extends DatabaseTestCase { $now = time(); $siteTimezone = 'UTC-1'; - $timestamp = Piwik_Date::factory('now', $siteTimezone)->getTimestamp(); + $timestamp = Date::factory('now', $siteTimezone)->getTimestamp(); $dateLabel = date('Y-m-d', $timestamp); - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true); + Rules::setBrowserTriggerArchiving(true); $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone); $archiveProcessor->time = $now; // we look at anything processed within the time to live range - $dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); + $dateMinArchived = $now - Rules::getTodayArchiveTimeToLive(); $this->compareTimestamps($dateMinArchived, $archiveProcessor->getMinTimeArchivedProcessed() ); $this->assertTrue($archiveProcessor->isArchiveTemporary()); // when browsers don't trigger archives, we force ArchiveProcessor // to fetch any of the most recent archive - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(false); + Rules::setBrowserTriggerArchiving(false); // see isArchivingDisabled() // Running in CLI doesn't impact the time to live today's archive we are loading // From CLI, we will not return data that is 'stale' @@ -208,23 +213,23 @@ class ArchiveProcessingTest extends DatabaseTestCase $now = time(); $siteTimezone = 'Europe/Paris'; - $timestamp = Piwik_Date::factory('now', $siteTimezone)->getTimestamp(); + $timestamp = Date::factory('now', $siteTimezone)->getTimestamp(); $dateLabel = date('Y-m-d', $timestamp); - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true); + Rules::setBrowserTriggerArchiving(true); $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone); $archiveProcessor->time = $now; // we look at anything processed within the time to live range - $dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); + $dateMinArchived = $now - Rules::getTodayArchiveTimeToLive(); $minTimeArchivedProcessed = $archiveProcessor->getMinTimeArchivedProcessed(); $this->compareTimestamps($dateMinArchived, $minTimeArchivedProcessed); $this->assertTrue($archiveProcessor->isArchiveTemporary()); // when browsers don't trigger archives, we force ArchiveProcessor // to fetch any of the most recent archive - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(false); + Rules::setBrowserTriggerArchiving(false); // see isArchivingDisabled() // Running in CLI doesn't impact the time to live today's archive we are loading // From CLI, we will not return data that is 'stale' @@ -255,22 +260,22 @@ class ArchiveProcessingTest extends DatabaseTestCase $now = time(); $siteTimezone = 'America/Toronto'; - $timestamp = Piwik_Date::factory('now', $siteTimezone)->getTimestamp(); + $timestamp = Date::factory('now', $siteTimezone)->getTimestamp(); $dateLabel = date('Y-m-d', $timestamp); - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true); + Rules::setBrowserTriggerArchiving(true); $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone); $archiveProcessor->time = $now; // we look at anything processed within the time to live range - $dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); + $dateMinArchived = $now - Rules::getTodayArchiveTimeToLive(); $this->compareTimestamps($dateMinArchived, $archiveProcessor->getMinTimeArchivedProcessed() ); $this->assertTrue($archiveProcessor->isArchiveTemporary()); // when browsers don't trigger archives, we force ArchiveProcessor // to fetch any of the most recent archive - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(false); + Rules::setBrowserTriggerArchiving(false); // see isArchivingDisabled() // Running in CLI doesn't impact the time to live today's archive we are loading // From CLI, we will not return data that is 'stale' @@ -373,7 +378,7 @@ class ArchiveProcessingTest extends DatabaseTestCase { $siteTimezone = 'America/Toronto'; $dateLabel = '2011-03-31'; - $table = Piwik_DataAccess_ArchiveTableCreator::getBlobTable(Piwik_Date::factory($dateLabel)); + $table = ArchiveTableCreator::getBlobTable(Date::factory($dateLabel)); $data = $this->_getBlobDataInsert(); try { @@ -406,7 +411,7 @@ class ArchiveProcessingTest extends DatabaseTestCase { $siteTimezone = 'America/Toronto'; $dateLabel = '2011-03-31'; - $table = Piwik_DataAccess_ArchiveTableCreator::getBlobTable(Piwik_Date::factory($dateLabel)); + $table = ArchiveTableCreator::getBlobTable(Date::factory($dateLabel)); $data = $this->_getBlobDataInsert(); Piwik::tableInsertBatchIterate($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data); diff --git a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php index 5071d2b815..05136a1c27 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Filter\AddSummaryRow; +use Piwik\DataTable\Row; + class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase { /** @@ -17,10 +21,10 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase public function testOffsetIsCountSummaryRowShouldBeTheRow() { $table = $this->getDataTableCount5(); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table, 5); + $filter = new AddSummaryRow($table, 5); $filter->filter($table); $this->assertEquals(5, $table->getRowsCount()); - $this->assertTrue(Piwik_DataTable_Row::isEqual($table->getLastRow(), $this->getRow4())); + $this->assertTrue(Row::isEqual($table->getLastRow(), $this->getRow4())); } /** @@ -33,11 +37,11 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase public function testOffsetIsLessThanCountSummaryRowShouldBeTheSum() { $table = $this->getDataTableCount5(); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table, 2); + $filter = new AddSummaryRow($table, 2); $filter->filter($table); $this->assertEquals(3, $table->getRowsCount()); - $expectedRow = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'nb' => 111))); - $this->assertTrue(Piwik_DataTable_Row::isEqual($table->getLastRow(), $expectedRow)); + $expectedRow = new Row(array(Row::COLUMNS => array('label' => DataTable::LABEL_SUMMARY_ROW, 'nb' => 111))); + $this->assertTrue(Row::isEqual($table->getLastRow(), $expectedRow)); // check that column 'label' is forced to be first in summary row $this->assertEquals(array_keys($table->getLastRow()->getColumns()), array_keys($expectedRow->getColumns())); } @@ -52,10 +56,10 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase public function testOffsetIsMoreThanCountShouldNotAddSummaryRow() { $table = $this->getDataTableCount5(); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table, 6); + $filter = new AddSummaryRow($table, 6); $filter->filter($table); $this->assertEquals(5, $table->getRowsCount()); - $this->assertTrue(Piwik_DataTable_Row::isEqual($table->getLastRow(), $this->getRow4())); + $this->assertTrue(Row::isEqual($table->getLastRow(), $this->getRow4())); } /** @@ -68,13 +72,13 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase public function testWhenThereIsAlreadyASummaryRowShouldReplaceTheSummaryRow() { $table = $this->getDataTableCount5(); - $filter1 = new Piwik_DataTable_Filter_AddSummaryRow($table, 3); + $filter1 = new AddSummaryRow($table, 3); $filter1->filter($table); - $filter2 = new Piwik_DataTable_Filter_AddSummaryRow($table, 2); + $filter2 = new AddSummaryRow($table, 2); $filter2->filter($table); $this->assertEquals(3, $table->getRowsCount()); - $expectedRow = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'nb' => 111))); - $this->assertTrue(Piwik_DataTable_Row::isEqual($table->getLastRow(), $expectedRow)); + $expectedRow = new Row(array(Row::COLUMNS => array('label' => DataTable::LABEL_SUMMARY_ROW, 'nb' => 111))); + $this->assertTrue(Row::isEqual($table->getLastRow(), $expectedRow)); } /** @@ -88,23 +92,23 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase { // row0, row1, row2, rowSummary1 $table1 = $this->getDataTableCount5(); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table1, 3); + $filter = new AddSummaryRow($table1, 3); $filter->filter($table1); // row0, row1, rowSummary2 $table2 = $this->getDataTableCount5(); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table2, 2); + $filter = new AddSummaryRow($table2, 2); $filter->filter($table2); // we expect row0+row0, row1+row1, row2, rowSummary1+rowSummary2 - $expectedTable = new Piwik_DataTable; - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'amazon', 'nb' => 20000)))); - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'nb' => 2000)))); - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'piwik', 'nb' => 100)))); - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'nb' => 122)))); + $expectedTable = new DataTable; + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'amazon', 'nb' => 20000)))); + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'yahoo', 'nb' => 2000)))); + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'piwik', 'nb' => 100)))); + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => DataTable::LABEL_SUMMARY_ROW, 'nb' => 122)))); $table1->addDataTable($table2); - $this->assertTrue(Piwik_DataTable::isEqual($expectedTable, $table1)); + $this->assertTrue(DataTable::isEqual($expectedTable, $table1)); } /** @@ -118,23 +122,23 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase { // row0, row1, row2, rowSummary1 $table1 = $this->getDataTableCount5(); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table1, 3); + $filter = new AddSummaryRow($table1, 3); $filter->filter($table1); // row0, row1, row2, row3, row4 $table2 = $this->getDataTableCount5(); // we expect row0+row0, row1+row1, row2+row2, row3, row4, rowSummary1 - $expectedTable = new Piwik_DataTable; - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'amazon', 'nb' => 20000)))); - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'nb' => 2000)))); - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'piwik', 'nb' => 200)))); + $expectedTable = new DataTable; + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'amazon', 'nb' => 20000)))); + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'yahoo', 'nb' => 2000)))); + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => 'piwik', 'nb' => 200)))); $expectedTable->addRow($this->getRow3()); $expectedTable->addRow($this->getRow4()); - $expectedTable->addRow(new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'nb' => 11)))); + $expectedTable->addRow(new Row(array(Row::COLUMNS => array('label' => DataTable::LABEL_SUMMARY_ROW, 'nb' => 11)))); $table1->addDataTable($table2); - $this->assertTrue(Piwik_DataTable::isEqual($expectedTable, $table1)); + $this->assertTrue(DataTable::isEqual($expectedTable, $table1)); } @@ -147,28 +151,28 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase */ public function testWhenRowsInRandomOrderButSortSpecifiedShouldComputeSummaryRowAfterSort() { - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRow($this->getRow3()); $table->addRow($this->getRow2()); $table->addRow($this->getRow4()); $table->addRow($this->getRow1()); $table->addRow($this->getRow0()); - $filter = new Piwik_DataTable_Filter_AddSummaryRow($table, 2, Piwik_DataTable::LABEL_SUMMARY_ROW, $columnToSortBy = 'nb'); + $filter = new AddSummaryRow($table, 2, DataTable::LABEL_SUMMARY_ROW, $columnToSortBy = 'nb'); $filter->filter($table); $this->assertEquals(3, $table->getRowsCount()); - $expectedRow = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'nb' => 111))); - $this->assertTrue(Piwik_DataTable_Row::isEqual($table->getLastRow(), $expectedRow)); + $expectedRow = new Row(array(Row::COLUMNS => array('label' => DataTable::LABEL_SUMMARY_ROW, 'nb' => 111))); + $this->assertTrue(Row::isEqual($table->getLastRow(), $expectedRow)); } /** * Returns table used for the tests * - * @return Piwik_DataTable + * @return DataTable */ protected function getDataTableCount5() { - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRow($this->getRow0()); $table->addRow($this->getRow1()); $table->addRow($this->getRow2()); @@ -179,26 +183,26 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase protected function getRow0() { - return new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('nb' => 10000, 'label' => 'amazon'))); + return new Row(array(Row::COLUMNS => array('nb' => 10000, 'label' => 'amazon'))); } protected function getRow1() { - return new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'nb' => 1000))); + return new Row(array(Row::COLUMNS => array('label' => 'yahoo', 'nb' => 1000))); } protected function getRow2() { - return new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'piwik', 'nb' => 100))); + return new Row(array(Row::COLUMNS => array('label' => 'piwik', 'nb' => 100))); } protected function getRow3() { - return new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'nb' => 10))); + return new Row(array(Row::COLUMNS => array('label' => 'ask', 'nb' => 10))); } protected function getRow4() { - return new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => array('nb' => 1, 'label' => 'google'))); + return new Row(array(Row::COLUMNS => array('nb' => 1, 'label' => 'google'))); } } diff --git a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php index 5ebb772c72..084343329f 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php @@ -5,19 +5,23 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Filter\ExcludeLowPopulation; +use Piwik\DataTable\Row; + class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCase { protected function getTestDataTable() { - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray( array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'zero', 'count' => 0)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'one', 'count' => 1)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'onedotfive', 'count' => 1.5)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ten', 'count' => 10)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ninety', 'count' => 90)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'hundred', 'count' => 100)), + array(Row::COLUMNS => array('label' => 'zero', 'count' => 0)), + array(Row::COLUMNS => array('label' => 'one', 'count' => 1)), + array(Row::COLUMNS => array('label' => 'onedotfive', 'count' => 1.5)), + array(Row::COLUMNS => array('label' => 'ten', 'count' => 10)), + array(Row::COLUMNS => array('label' => 'ninety', 'count' => 90)), + array(Row::COLUMNS => array('label' => 'hundred', 'count' => 100)), ) ); return $table; @@ -33,7 +37,7 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa public function testStandardTable() { $table = $this->getTestDataTable(); - $filter = new Piwik_DataTable_Filter_ExcludeLowPopulation($table, 'count', 1.1); + $filter = new ExcludeLowPopulation($table, 'count', 1.1); $filter->filter($table); $this->assertEquals(4, $table->getRowsCount()); $this->assertEquals(array(1.5, 10, 90, 100), $table->getColumn('count')); @@ -49,7 +53,7 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa public function testFilterEqualOneDoesFilter() { $table = $this->getTestDataTable(); - $filter = new Piwik_DataTable_Filter_ExcludeLowPopulation($table, 'count', 1); + $filter = new ExcludeLowPopulation($table, 'count', 1); $filter->filter($table); $this->assertEquals(5, $table->getRowsCount()); } @@ -64,7 +68,7 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa public function testFilterEqualZeroDoesFilter() { $table = $this->getTestDataTable(); - $filter = new Piwik_DataTable_Filter_ExcludeLowPopulation($table, 'count', 0); + $filter = new ExcludeLowPopulation($table, 'count', 0); $filter->filter($table); $this->assertEquals(3, $table->getRowsCount()); $this->assertEquals(array(10, 90, 100), $table->getColumn('count')); @@ -80,7 +84,7 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa public function testFilterSpecifyExcludeLowPopulationThresholdDoesFilter() { $table = $this->getTestDataTable(); - $filter = new Piwik_DataTable_Filter_ExcludeLowPopulation($table, 'count', 0, 0.4); //40% + $filter = new ExcludeLowPopulation($table, 'count', 0, 0.4); //40% $filter->filter($table); $this->assertEquals(2, $table->getRowsCount()); $this->assertEquals(array(90, 100), $table->getColumn('count')); @@ -98,9 +102,9 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa public function testFilterLowpop1() { - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; - $table = new Piwik_DataTable(); + $table = new DataTable(); $rows = array( array($idcol => array('label' => 'google', 'nb_visits' => 897)), //0 array($idcol => array('label' => 'ask', 'nb_visits' => -152)), //1 @@ -114,7 +118,7 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa ); $table->addRowsFromArray($rows); - $expectedtable = new Piwik_DataTable(); + $expectedtable = new DataTable(); $rows = array( array($idcol => array('label' => 'google', 'nb_visits' => 897)), //0 array($idcol => array('label' => 'piwik', 'nb_visits' => 1.5)), //2 @@ -124,9 +128,9 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa ); $expectedtable->addRowsFromArray($rows); - $filter = new Piwik_DataTable_Filter_ExcludeLowPopulation($table, 'nb_visits', 1.4); + $filter = new ExcludeLowPopulation($table, 'nb_visits', 1.4); $filter->filter($table); - $this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtable)); + $this->assertTrue(DataTable::isEqual($table, $expectedtable)); } } diff --git a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php index 37a9e20d58..21d713c22e 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php @@ -5,17 +5,21 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Filter\Limit; +use Piwik\DataTable\Row; + class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase { /** * Returns table used for the tests * - * @return Piwik_DataTable + * @return DataTable */ protected function getDataTableCount10() { - $table = new Piwik_DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $table = new DataTable; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google', 'idRow' => 0)), array($idcol => array('label' => 'ask', 'idRow' => 1)), @@ -26,7 +30,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'test', 'idRow' => 6)), array($idcol => array('label' => 'amazing', 'idRow' => 7)), array($idcol => array('label' => 'great', 'idRow' => 8)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => 'summary row', 'idRow' => 9)), + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => 'summary row', 'idRow' => 9)), ); $table->addRowsFromArray($rows); return $table; @@ -44,7 +48,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 2; $limit = 3; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(3, $table->getRowsCount()); $this->assertEquals(2, $table->getFirstRow()->getColumn('idRow')); @@ -64,7 +68,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 2; $limit = 7; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(7, $table->getRowsCount()); $this->assertEquals(2, $table->getFirstRow()->getColumn('idRow')); @@ -85,7 +89,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $limit = 10; $table = $this->getDataTableCount10(); $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter()); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(10, $table->getRowsCount()); $this->assertEquals(0, $table->getFirstRow()->getColumn('idRow')); @@ -106,7 +110,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $limit = 20; $table = $this->getDataTableCount10(); $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter()); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(5, $table->getRowsCount()); $this->assertEquals(5, $table->getFirstRow()->getColumn('idRow')); @@ -125,7 +129,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase { $offset = 1; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset); + $filter = new Limit($table, $offset); $filter->filter($table); $this->assertEquals(9, $table->getRowsCount()); $this->assertEquals(1, $table->getFirstRow()->getColumn('idRow')); @@ -145,7 +149,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 9; $limit = 1; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(1, $table->getRowsCount()); $this->assertEquals(9, $table->getFirstRow()->getColumn('idRow')); @@ -165,7 +169,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 9; $limit = 100; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(1, $table->getRowsCount()); $this->assertEquals(9, $table->getFirstRow()->getColumn('idRow')); @@ -185,7 +189,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 8; $limit = 3; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(2, $table->getRowsCount()); $this->assertEquals(8, $table->getFirstRow()->getColumn('idRow')); @@ -205,7 +209,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 10; $limit = 10; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(0, $table->getRowsCount()); $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter()); @@ -223,7 +227,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $offset = 0; $limit = 0; $table = $this->getDataTableCount10(); - $filter = new Piwik_DataTable_Filter_Limit($table, $offset, $limit); + $filter = new Limit($table, $offset, $limit); $filter->filter($table); $this->assertEquals(0, $table->getRowsCount()); $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter()); @@ -239,9 +243,9 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase */ public function testFilterOffsetLimit() { - $table = new Piwik_DataTable; + $table = new DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google')), //0 @@ -258,7 +262,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $expectedtable = clone $table; $expectedtable->deleteRows(array(0, 1, 6)); - $filter = new Piwik_DataTable_Filter_Limit($table, 2, 4); + $filter = new Limit($table, 2, 4); $filter->filter($table); $colAfter = $colExpected = array(); @@ -278,9 +282,9 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase */ public function testFilterOffsetLimitOffbound() { - $table = new Piwik_DataTable; + $table = new DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google')), //0 @@ -297,7 +301,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $expectedtable = clone $table; $expectedtable->deleteRows(array(0, 1, 3, 4, 5, 6)); - $filter = new Piwik_DataTable_Filter_Limit($table, 2, 1); + $filter = new Limit($table, 2, 1); $filter->filter($table); $colAfter = $colExpected = array(); @@ -317,9 +321,9 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase */ public function testFilterOffsetLimit2() { - $table = new Piwik_DataTable; + $table = new DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google')), //0 @@ -335,7 +339,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $expectedtable = clone $table; - $filter = new Piwik_DataTable_Filter_Limit($table, 0, 15); + $filter = new Limit($table, 0, 15); $filter->filter($table); $colAfter = $colExpected = array(); @@ -355,9 +359,9 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase */ public function testFilterOffsetLimit3() { - $table = new Piwik_DataTable; + $table = new DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google')), //0 @@ -371,9 +375,9 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase $table->addRowsFromArray($rows); - $expectedtable = new Piwik_DataTable; + $expectedtable = new DataTable; - $filter = new Piwik_DataTable_Filter_Limit($table, 8, 15); + $filter = new Limit($table, 8, 15); $filter->filter($table); $colAfter = $colExpected = array(); diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php index 5efc2dac7a..f9e7e0da27 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php @@ -5,32 +5,35 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Row; + class DataTable_Filter_PatternRecursiveTest extends PHPUnit_Framework_TestCase { /** * Returns a data table for testing - * @return Piwik_DataTable + * @return DataTable */ protected function getTable() { - $subtableAskPath1 = new Piwik_DataTable(); + $subtableAskPath1 = new DataTable(); $subtableAskPath1->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'path1-index-page.html')), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'another-page')), + array(Row::COLUMNS => array('label' => 'path1-index-page.html')), + array(Row::COLUMNS => array('label' => 'another-page')), )); - $subtableAsk = new Piwik_DataTable(); + $subtableAsk = new DataTable(); $subtableAsk->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'path1'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtableAskPath1), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'index.html')), + array(Row::COLUMNS => array('label' => 'path1'), + Row::DATATABLE_ASSOCIATED => $subtableAskPath1), + array(Row::COLUMNS => array('label' => 'index.html')), )); - $table = new Piwik_DataTable; + $table = new DataTable; $rows = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'http://www.ask.com'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtableAsk), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo')), + array(Row::COLUMNS => array('label' => 'http://www.ask.com'), + Row::DATATABLE_ASSOCIATED => $subtableAsk), + array(Row::COLUMNS => array('label' => 'yahoo')), ); $table->addRowsFromArray($rows); return $table; diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php index d90de04a44..b6f1893d8b 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php @@ -5,6 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Row; + class DataTable_Filter_PatternTest extends PHPUnit_Framework_TestCase { /** @@ -33,16 +36,16 @@ class DataTable_Filter_PatternTest extends PHPUnit_Framework_TestCase */ public function testFilterPattern($test) { - $table = new Piwik_DataTable; + $table = new DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google')), array($idcol => array('label' => 'ask')), array($idcol => array('label' => 'piwik')), array($idcol => array('label' => 'yahoo')), - array(Piwik_DataTable_Row::METADATA => array('label' => 'amazon')), + array(Row::METADATA => array('label' => 'amazon')), array($idcol => array('label' => '2389752/47578949')), array($idcol => array('label' => 'Q*(%&*("$&%*(&"$*")"))')) ); diff --git a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php index 397333ce29..9a985f3b83 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Filter\RangeCheck; +use Piwik\DataTable\Row; + class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase { /** @@ -16,15 +20,15 @@ class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase */ public function testRangeCheckNormalDataTable() { - $table = new Piwik_DataTable(); + $table = new DataTable(); $table->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'count' => 3)), // --> 5 - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nintendo', 'count' => 5)), // --> 5 - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'test', 'count' => 7.5)), // --> 7.5 - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'google', 'count' => 9)), // --> 9 - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'count' => 10.1) // --> 10 + array(Row::COLUMNS => array('label' => 'ask', 'count' => 3)), // --> 5 + array(Row::COLUMNS => array('label' => 'nintendo', 'count' => 5)), // --> 5 + array(Row::COLUMNS => array('label' => 'test', 'count' => 7.5)), // --> 7.5 + array(Row::COLUMNS => array('label' => 'google', 'count' => 9)), // --> 9 + array(Row::COLUMNS => array('label' => 'yahoo', 'count' => 10.1) // --> 10 ))); - $filter = new Piwik_DataTable_Filter_RangeCheck($table, 'count', 5, 10); + $filter = new RangeCheck($table, 'count', 5, 10); $filter->filter($table); $expectedOrder = array(5, 5, 7.5, 9, 10); @@ -40,16 +44,16 @@ class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase */ public function testRangeCheckNormalDataTableNonIntegerValues() { - $table = new Piwik_DataTable(); + $table = new DataTable(); $table->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'count' => '3')), // 3 is below minimum - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nintendo', 'count' => 'test')), // no number is below minimum - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'test', 'count' => 0x1232)), // number is over maximum - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'piwik', 'count' => 0x005)), // converted to 5 is ok - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'google', 'count' => '9test')), // converted to 9 is ok, so string will be kept - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'count' => 'test4') // can't be converted to number + array(Row::COLUMNS => array('label' => 'ask', 'count' => '3')), // 3 is below minimum + array(Row::COLUMNS => array('label' => 'nintendo', 'count' => 'test')), // no number is below minimum + array(Row::COLUMNS => array('label' => 'test', 'count' => 0x1232)), // number is over maximum + array(Row::COLUMNS => array('label' => 'piwik', 'count' => 0x005)), // converted to 5 is ok + array(Row::COLUMNS => array('label' => 'google', 'count' => '9test')), // converted to 9 is ok, so string will be kept + array(Row::COLUMNS => array('label' => 'yahoo', 'count' => 'test4') // can't be converted to number ))); - $filter = new Piwik_DataTable_Filter_RangeCheck($table, 'count', 3.97, 10); + $filter = new RangeCheck($table, 'count', 3.97, 10); $filter->filter($table); $expectedOrder = array(3.97, 3.97, 10, 5, '9test', 3.97); diff --git a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php index eb793bd136..204d98f432 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Filter\Sort; +use Piwik\DataTable\Row; + class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase { /** @@ -16,13 +20,13 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase */ public function testNormalSortDescending() { - $table = new Piwik_DataTable(); + $table = new DataTable(); $table->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'count' => 100)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nintendo', 'count' => 0)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'count' => 10) + array(Row::COLUMNS => array('label' => 'ask', 'count' => 100)), + array(Row::COLUMNS => array('label' => 'nintendo', 'count' => 0)), + array(Row::COLUMNS => array('label' => 'yahoo', 'count' => 10) ))); - $filter = new Piwik_DataTable_Filter_Sort($table, 'count', 'desc'); + $filter = new Sort($table, 'count', 'desc'); $filter->filter($table); $expectedOrder = array('ask', 'yahoo', 'nintendo'); $this->assertEquals($expectedOrder, $table->getColumn('label')); @@ -37,13 +41,13 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase */ public function testNormalSortAscending() { - $table = new Piwik_DataTable(); + $table = new DataTable(); $table->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'count' => 100.5)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nintendo', 'count' => 0.5)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'yahoo', 'count' => 10.5) + array(Row::COLUMNS => array('label' => 'ask', 'count' => 100.5)), + array(Row::COLUMNS => array('label' => 'nintendo', 'count' => 0.5)), + array(Row::COLUMNS => array('label' => 'yahoo', 'count' => 10.5) ))); - $filter = new Piwik_DataTable_Filter_Sort($table, 'count', 'asc'); + $filter = new Sort($table, 'count', 'asc'); $filter->filter($table); $expectedOrder = array('nintendo', 'yahoo', 'ask'); $this->assertEquals($expectedOrder, $table->getColumn('label')); @@ -58,16 +62,16 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase */ public function testMissingColumnValuesShouldAppearLastAfterSortAsc() { - $table = new Piwik_DataTable(); + $table = new DataTable(); $table->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nintendo', 'count' => 1)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nocolumn')), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nocolumnbis')), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'count' => 2)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'amazing')), - Piwik_DataTable::ID_SUMMARY_ROW => array(Piwik_DataTable_Row::COLUMNS => array('label' => 'summary', 'count' => 10) + array(Row::COLUMNS => array('label' => 'nintendo', 'count' => 1)), + array(Row::COLUMNS => array('label' => 'nocolumn')), + array(Row::COLUMNS => array('label' => 'nocolumnbis')), + array(Row::COLUMNS => array('label' => 'ask', 'count' => 2)), + array(Row::COLUMNS => array('label' => 'amazing')), + DataTable::ID_SUMMARY_ROW => array(Row::COLUMNS => array('label' => 'summary', 'count' => 10) ))); - $filter = new Piwik_DataTable_Filter_Sort($table, 'count', 'asc'); + $filter = new Sort($table, 'count', 'asc'); $filter->filter($table); $expectedOrder = array('nintendo', 'ask', 'amazing', 'nocolumnbis', 'nocolumn', 'summary'); $this->assertEquals($expectedOrder, $table->getColumn('label')); @@ -82,14 +86,14 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase */ public function testMissingColumnValuesShouldAppearLastAfterSortDesc() { - $table = new Piwik_DataTable(); + $table = new DataTable(); $table->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'nintendo', 'count' => 1)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'count' => 2)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'amazing')), - Piwik_DataTable::ID_SUMMARY_ROW => array(Piwik_DataTable_Row::COLUMNS => array('label' => 'summary', 'count' => 10) + array(Row::COLUMNS => array('label' => 'nintendo', 'count' => 1)), + array(Row::COLUMNS => array('label' => 'ask', 'count' => 2)), + array(Row::COLUMNS => array('label' => 'amazing')), + DataTable::ID_SUMMARY_ROW => array(Row::COLUMNS => array('label' => 'summary', 'count' => 10) ))); - $filter = new Piwik_DataTable_Filter_Sort($table, 'count', 'desc'); + $filter = new Sort($table, 'count', 'desc'); $filter->filter($table); $expectedOrder = array('ask', 'nintendo', 'amazing', 'summary'); $this->assertEquals($expectedOrder, $table->getColumn('label')); @@ -105,8 +109,8 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase */ public function testFilterSortString() { - $idcol = Piwik_DataTable_Row::COLUMNS; - $table = new Piwik_DataTable(); + $idcol = Row::COLUMNS; + $table = new DataTable(); $rows = array( array($idcol => array('label' => 'google')), //0 array($idcol => array('label' => 'ask')), //1 @@ -117,7 +121,7 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'Q*(%&*("$&%*(&"$*")"))')) //6 ); $table->addRowsFromArray($rows); - $expectedtable = new Piwik_DataTable(); + $expectedtable = new DataTable(); $rows = array( array($idcol => array('label' => '238975247578949')), //5 array($idcol => array('label' => 'amazon')), //4 @@ -128,16 +132,16 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'yahoo')) //3 ); $expectedtable->addRowsFromArray($rows); - $expectedtableReverse = new Piwik_DataTable(); + $expectedtableReverse = new DataTable(); $expectedtableReverse->addRowsFromArray(array_reverse($rows)); - $filter = new Piwik_DataTable_Filter_Sort($table, 'label', 'asc'); + $filter = new Sort($table, 'label', 'asc'); $filter->filter($table); - $this->assertTrue(Piwik_DataTable::isEqual($expectedtable, $table)); + $this->assertTrue(DataTable::isEqual($expectedtable, $table)); - $filter = new Piwik_DataTable_Filter_Sort($table, 'label', 'desc'); + $filter = new Sort($table, 'label', 'desc'); $filter->filter($table); - $this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtableReverse)); + $this->assertTrue(DataTable::isEqual($table, $expectedtableReverse)); } /** @@ -150,8 +154,8 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase */ public function testFilterSortNumeric() { - $idcol = Piwik_DataTable_Row::COLUMNS; - $table = new Piwik_DataTable(); + $idcol = Row::COLUMNS; + $table = new DataTable(); $rows = array( array($idcol => array('label' => 'google', 'nb_visits' => 897)), //0 array($idcol => array('label' => 'ask', 'nb_visits' => -152)), //1 @@ -162,7 +166,7 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'Q*(%&*', 'nb_visits' => 1)) //6 ); $table->addRowsFromArray($rows); - $expectedtable = new Piwik_DataTable(); + $expectedtable = new DataTable(); $rows = array( array($idcol => array('label' => 'ask', 'nb_visits' => -152)), //1 array($idcol => array('label' => '238949', 'nb_visits' => 0)), //5 @@ -173,15 +177,15 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'google', 'nb_visits' => 897)) //0 ); $expectedtable->addRowsFromArray($rows); - $expectedtableReverse = new Piwik_DataTable(); + $expectedtableReverse = new DataTable(); $expectedtableReverse->addRowsFromArray(array_reverse($rows)); - $filter = new Piwik_DataTable_Filter_Sort($table, 'nb_visits', 'asc'); + $filter = new Sort($table, 'nb_visits', 'asc'); $filter->filter($table); - $this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtable)); + $this->assertTrue(DataTable::isEqual($table, $expectedtable)); - $filter = new Piwik_DataTable_Filter_Sort($table, 'nb_visits', 'desc'); + $filter = new Sort($table, 'nb_visits', 'desc'); $filter->filter($table); - $this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtableReverse)); + $this->assertTrue(DataTable::isEqual($table, $expectedtableReverse)); } } diff --git a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php index 1d46658e63..c499350066 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Filter\Truncate; +use Piwik\DataTable\Row; + class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase { /** @@ -17,20 +21,20 @@ class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase { // remark: this unit test would become invalid and would need to be rewritten if // AddSummaryRow filter stops calling getRowsCount() on the DataTable being filtered. - $mockedDataTable = $this->getMock('Piwik_DataTable', array('getRowsCount')); + $mockedDataTable = $this->getMock('\Piwik\DataTable', array('getRowsCount')); $mockedDataTable->expects($this->never())->method('getRowsCount'); - $dataTableBeingFiltered = new Piwik_DataTable(); - $rowBeingFiltered = new Piwik_DataTable_Row(); + $dataTableBeingFiltered = new DataTable(); + $rowBeingFiltered = new Row(); $dataTableBeingFiltered->addRow($rowBeingFiltered); - // we simulate the fact that the value of Piwik_DataTable_Row::DATATABLE_ASSOCIATED retrieved - // from the database is in conflict with one of the Piwik_DataTable_Manager managed table identifiers. + // we simulate the fact that the value of Row::DATATABLE_ASSOCIATED retrieved + // from the database is in conflict with one of the Manager managed table identifiers. // This is a rare but legitimate case as identifiers are not thoroughly synchronized // when the expanded parameter is false. - $rowBeingFiltered->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId(); + $rowBeingFiltered->c[Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId(); - $filter = new Piwik_DataTable_Filter_Truncate($dataTableBeingFiltered, 1); + $filter = new Truncate($dataTableBeingFiltered, 1); $filter->filter($dataTableBeingFiltered); } @@ -43,22 +47,22 @@ class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase */ public function testForInfiniteRecursion() { - $dataTableBeingFiltered = new Piwik_DataTable(); + $dataTableBeingFiltered = new DataTable(); // remark: this unit test would become invalid and would need to be rewritten if // Truncate filter stops calling getIdSubDataTable() on rows associated with a SubDataTable - $rowBeingFiltered = $this->getMock('Piwik_DataTable_Row', array('getIdSubDataTable')); + $rowBeingFiltered = $this->getMock('Row', array('getIdSubDataTable')); $rowBeingFiltered->expects($this->never())->method('getIdSubDataTable'); $dataTableBeingFiltered->addRow($rowBeingFiltered); - // we simulate a legitimate but rare circular reference between a Piwik_DataTable_Row and its - // enclosing Piwik_DataTable. + // we simulate a legitimate but rare circular reference between a Row and its + // enclosing DataTable. // This can happen because identifiers are not thoroughly synchronized when the expanded parameter // is false. - $rowBeingFiltered->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $dataTableBeingFiltered->getId(); + $rowBeingFiltered->c[Row::DATATABLE_ASSOCIATED] = $dataTableBeingFiltered->getId(); - $filter = new Piwik_DataTable_Filter_Truncate($dataTableBeingFiltered, 1); + $filter = new Truncate($dataTableBeingFiltered, 1); $filter->filter($dataTableBeingFiltered); } } diff --git a/tests/PHPUnit/Core/DataTable/ArrayTest.php b/tests/PHPUnit/Core/DataTable/MapTest.php index 2c1cc4e069..2ac19275a9 100755..100644 --- a/tests/PHPUnit/Core/DataTable/ArrayTest.php +++ b/tests/PHPUnit/Core/DataTable/MapTest.php @@ -1,22 +1,25 @@ <?php use Piwik\Config; +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Row; -class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase +class Test_DataTable_Map extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); Config::getInstance()->setTestEnvironment(); - Piwik_DataTable_Manager::getInstance()->deleteAll(); + Manager::getInstance()->deleteAll(); } private function createTestDataTable() { - $result = new Piwik_DataTable(); + $result = new DataTable(); $result->addRowsFromArray(array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'row1', 'col1' => 1)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'row2', 'col1' => 2)) + array(Row::COLUMNS => array('label' => 'row1', 'col1' => 1)), + array(Row::COLUMNS => array('label' => 'row2', 'col1' => 2)) )); return $result; @@ -24,7 +27,7 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase private function createInstanceWithDataTables() { - $dataTable = new Piwik_DataTable_Array(); + $dataTable = new DataTable\Map(); $subDataTable1 = $this->createTestDataTable(); $dataTable->addTable($subDataTable1, 'subDataTable1'); @@ -37,7 +40,7 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase private function createInstanceWithDataTableArrays() { - $dataTable = new Piwik_DataTable_Array(); + $dataTable = new DataTable\Map(); $subDataTableArray1 = $this->createInstanceWithDataTables(); $dataTable->addTable($subDataTableArray1, 'subArray1'); @@ -49,7 +52,7 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase } /** - * Tests that Piwik_DataTable_Array::mergeChildren works when the DataTable_Array contains DataTables. + * Tests that Set::mergeChildren works when the DataTable_Array contains DataTables. * @group Core * @group DataTable * @group DataTable_Array @@ -61,7 +64,7 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase $result = $dataTable->mergeChildren(); // check that the result is a DataTable w/ 4 rows - $this->assertInstanceOf('Piwik_DataTable', $result); + $this->assertInstanceOf('DataTable', $result); $this->assertEquals(4, $result->getRowsCount()); // check that the first two rows have 'subDataTable1' as the label @@ -80,7 +83,7 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase } /** - * Tests that Piwik_DataTable_Array::mergeChildren works when the DataTable_Array contains DataTable_Arrays. + * Tests that Set::mergeChildren works when the DataTable_Array contains DataTable_Arrays. * @group Core * @group DataTable * @group DataTable_Array @@ -92,12 +95,12 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase $result = $dataTable->mergeChildren(); // check that the result is a DataTable_Array w/ two DataTable children - $this->assertInstanceOf('Piwik_DataTable_Array', $result); + $this->assertInstanceOf('Set', $result); $this->assertEquals(2, $result->getRowsCount()); // check that the first sub-DataTable is a DataTable with 4 rows $subDataTable1 = $result->getTable('subDataTable1'); - $this->assertTrue($subDataTable1 instanceof Piwik_DataTable); + $this->assertTrue($subDataTable1 instanceof DataTable); $this->assertEquals(4, $subDataTable1->getRowsCount()); // check that the first two rows of the first sub-table have 'subArray1' as the label @@ -110,7 +113,7 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase // check that the second sub-DataTable is a DataTable with 4 rows $subDataTable2 = $result->getTable('subDataTable2'); - $this->assertTrue($subDataTable2 instanceof Piwik_DataTable); + $this->assertTrue($subDataTable2 instanceof DataTable); $this->assertEquals(4, $subDataTable2->getRowsCount()); // check that the first two rows of the second sub-table have 'subArray1' as the label diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php index 2780534248..52320105f6 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php @@ -5,12 +5,18 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Renderer\Csv; +use Piwik\DataTable\Simple; +use Piwik\DataTable\Row; + class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); - Piwik_DataTable_Manager::getInstance()->deleteAll(); + Manager::getInstance()->deleteAll(); } /** @@ -22,22 +28,22 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase */ protected function _getDataTableTest() { - $dataTable = new Piwik_DataTable(); + $dataTable = new DataTable(); $arraySubTableForRow2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), + array(Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), + array(Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), ); - $subDataTableForRow2 = new Piwik_DataTable(); + $subDataTableForRow2 = new DataTable(); $subDataTableForRow2->addRowsFromArray($arraySubTableForRow2); $array = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); $dataTable->addRowsFromArray($array); @@ -48,7 +54,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase { $array = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0, 'nb_visits' => 66.0, 'nb_actions' => 151.0, 'sum_visit_length' => 5118.0, 'bounce_count' => 44.0,); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -57,21 +63,21 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase { $array = array('nb_visits' => 14.0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } protected function _getDataTableEmpty() { - $table = new Piwik_DataTable; + $table = new DataTable; return $table; } protected function _getDataTableSimpleOneZeroRowTest() { $array = array('nb_visits' => 0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -79,7 +85,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneFalseRowTest() { $array = array('is_excluded' => false); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -95,7 +101,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase { $dataTable = $this->_getDataTableTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "label,bool,goals_idgoal=1_revenue,goals_idgoal=1_nb_conversions,nb_uniq_visitors,nb_visits,nb_actions,max_actions,sum_visit_length,bounce_count,metadata_url,metadata_logo\n" . @@ -115,7 +121,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVTest2() { $dataTable = $this->_getDataTableSimpleTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "max_actions,nb_uniq_visitors,nb_visits,nb_actions,sum_visit_length,bounce_count\n14,57,66,151,5118,44"; @@ -132,7 +138,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVTest3() { $dataTable = $this->_getDataTableSimpleOneRowTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "value\n14"; @@ -149,7 +155,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVTest4() { $dataTable = $this->_getDataTableEmpty(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = 'No data available'; @@ -166,7 +172,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVTest5() { $dataTable = $this->_getDataTableSimpleOneZeroRowTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "value\n0"; @@ -183,7 +189,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVTest6() { $dataTable = $this->_getDataTableSimpleOneFalseRowTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "value\n0"; @@ -199,32 +205,32 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableArrayTest() { $array1 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), ) ); - $table1 = new Piwik_DataTable(); + $table1 = new DataTable(); $table1->addRowsFromArray($array1); $array2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), + array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), + array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), ) ); - $table2 = new Piwik_DataTable(); + $table2 = new DataTable(); $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable(); + $table3 = new DataTable(); - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); $table->addTable($table2, 'date2'); @@ -236,16 +242,16 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleArrayTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('max_actions' => 140.0, 'nb_uniq_visitors' => 570.0,); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -257,15 +263,15 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneRowArrayTest() { $array1 = array('nb_visits' => 14.0); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('nb_visits' => 15.0); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -276,7 +282,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_normal() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableArrayTest(), 'idSite'); return $table; @@ -284,7 +290,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simple() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); return $table; @@ -292,7 +298,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simpleOneRow() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); return $table; @@ -307,7 +313,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVArrayTest1() { $dataTable = $this->_getDataTableArrayTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "testKey,label,nb_uniq_visitors,nb_visits,metadata_url,metadata_logo\n" . @@ -329,7 +335,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVArrayTest2() { $dataTable = $this->_getDataTableSimpleArrayTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "testKey,max_actions,nb_uniq_visitors\nrow1,14,57\nrow2,140,570"; @@ -347,7 +353,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVArrayTest3() { $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "testKey,value\nrow1,14\nrow2,15"; @@ -364,7 +370,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVArrayisMadeOfArrayTest1() { $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "parentArrayKey,testKey,label,nb_uniq_visitors,nb_visits,metadata_url,metadata_logo\n" . @@ -386,7 +392,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVArrayIsMadeOfArrayTest2() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "parentArrayKey,testKey,max_actions,nb_uniq_visitors\nidSite,row1,14,57\nidSite,row2,140,570"; @@ -404,7 +410,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase public function testCSVArrayIsMadeOfArrayTest3() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "parentArrayKey,testKey,value\nidSite,row1,14\nidSite,row2,15"; @@ -422,7 +428,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase { $data = array(); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($data); $render->convertToUnicode = false; $expected = 'No data available'; @@ -440,7 +446,7 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase { $data = array('a', 'b', 'c'); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($data); $render->convertToUnicode = false; $expected = 'a @@ -460,7 +466,7 @@ c'; { $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g'); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($data); $render->convertToUnicode = false; $expected = 'a,c,e,5 @@ -479,7 +485,7 @@ b,d,f,g'; { $data = array('a' => 'b'); - $render = new Piwik_DataTable_Renderer_Csv(); + $render = new Csv(); $render->setTable($data); $render->convertToUnicode = false; $expected = 'b'; diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php index 9af0b9b640..ddfb556209 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php @@ -5,12 +5,17 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Renderer\Console; +use Piwik\DataTable\Row; + class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); - Piwik_DataTable_Manager::getInstance()->deleteAll(); + Manager::getInstance()->deleteAll(); } /** @@ -25,36 +30,36 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase */ public function testConsole2SubLevelAnd2Different() { - $table = new Piwik_DataTable; - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 245, 'visitors' => 245), - Piwik_DataTable_Row::METADATA => array('logo' => 'test.png'),) + $table = new DataTable; + $table->addRowFromArray(array(Row::COLUMNS => array('visits' => 245, 'visitors' => 245), + Row::METADATA => array('logo' => 'test.png'),) ); - $subsubtable = new Piwik_DataTable; + $subsubtable = new DataTable; $idsubsubtable = $subsubtable->getId(); - $subsubtable->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 2))); + $subsubtable->addRowFromArray(array(Row::COLUMNS => array('visits' => 2))); - $subtable = new Piwik_DataTable; + $subtable = new DataTable; $idsubtable1 = $subtable->getId(); - $subtable->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 1), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subsubtable)); + $subtable->addRowFromArray(array(Row::COLUMNS => array('visits' => 1), + Row::DATATABLE_ASSOCIATED => $subsubtable)); - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 3), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtable) + $table->addRowFromArray(array(Row::COLUMNS => array('visits' => 3), + Row::DATATABLE_ASSOCIATED => $subtable) ); - $subtable2 = new Piwik_DataTable; + $subtable2 = new DataTable; $idsubtable2 = $subtable2->getId(); - $subtable2->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 5),)); + $subtable2->addRowFromArray(array(Row::COLUMNS => array('visits' => 5),)); - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 9), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtable2) + $table->addRowFromArray(array(Row::COLUMNS => array('visits' => 9), + Row::DATATABLE_ASSOCIATED => $subtable2) ); $expected = "- 1 ['visits' => 245, 'visitors' => 245] ['logo' => 'test.png'] [idsubtable = ]<br />\n- 2 ['visits' => 3] [] [idsubtable = $idsubtable1]<br />\n*- 1 ['visits' => 1] [] [idsubtable = $idsubsubtable]<br />\n**- 1 ['visits' => 2] [] [idsubtable = ]<br />\n- 3 ['visits' => 9] [] [idsubtable = $idsubtable2]<br />\n*- 1 ['visits' => 5] [] [idsubtable = ]<br />\n"; - $render = new Piwik_DataTable_Renderer_Console(); + $render = new Console(); $render->setTable($table); $render->setPrefixRow('*'); $rendered = $render->render(); @@ -73,15 +78,15 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase */ public function testConsoleSimple() { - $table = new Piwik_DataTable; - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 245, 'visitors' => 245), - Piwik_DataTable_Row::METADATA => array('logo' => 'test.png'),) + $table = new DataTable; + $table->addRowFromArray(array(Row::COLUMNS => array('visits' => 245, 'visitors' => 245), + Row::METADATA => array('logo' => 'test.png'),) ); $expected = "- 1 ['visits' => 245, 'visitors' => 245] ['logo' => 'test.png'] [idsubtable = ]<br />\n"; - $render = new Piwik_DataTable_Renderer_Console(); + $render = new Console(); $render->setTable($table); $rendered = $render->render(); @@ -98,7 +103,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase { $data = array(); - $render = new Piwik_DataTable_Renderer_Console(); + $render = new Console(); $render->setTable($data); $expected = 'Empty table<br /> '; @@ -116,7 +121,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase { $data = array('a', 'b', 'c'); - $render = new Piwik_DataTable_Renderer_Console(); + $render = new Console(); $render->setTable($data); $expected = "- 1 ['0' => 'a'] [] [idsubtable = ]<br /> - 2 ['0' => 'b'] [] [idsubtable = ]<br /> @@ -136,7 +141,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase { $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g'); - $render = new Piwik_DataTable_Renderer_Console(); + $render = new Console(); $render->setTable($data); $expected = "- 1 ['a' => 'b', 'c' => 'd', 'e' => 'f', '5' => 'g'] [] [idsubtable = ]<br /> "; @@ -154,7 +159,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase { $data = array('a' => 'b'); - $render = new Piwik_DataTable_Renderer_Console(); + $render = new Console(); $render->setTable($data); $expected = "- 1 ['0' => 'b'] [] [idsubtable = ]<br /> "; diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php index 1572ce1097..fa7597efeb 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php @@ -5,12 +5,18 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Renderer\Json; +use Piwik\DataTable\Simple; +use Piwik\DataTable\Row; + class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); - Piwik_DataTable_Manager::getInstance()->deleteAll(); + Manager::getInstance()->deleteAll(); } /** @@ -22,22 +28,22 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase */ protected function _getDataTableTest() { - $dataTable = new Piwik_DataTable(); + $dataTable = new DataTable(); $arraySubTableForRow2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), + array(Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), + array(Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), ); - $subDataTableForRow2 = new Piwik_DataTable(); + $subDataTableForRow2 = new DataTable(); $subDataTableForRow2->addRowsFromArray($arraySubTableForRow2); $array = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); $dataTable->addRowsFromArray($array); @@ -48,7 +54,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $array = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0, 'nb_visits' => 66.0, 'nb_actions' => 151.0, 'sum_visit_length' => 5118.0, 'bounce_count' => 44.0,); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -57,21 +63,21 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $array = array('nb_visits' => 14.0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } protected function _getDataTableEmpty() { - $table = new Piwik_DataTable; + $table = new DataTable; return $table; } protected function _getDataTableSimpleOneZeroRowTest() { $array = array('nb_visits' => 0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -79,7 +85,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneFalseRowTest() { $array = array('is_excluded' => false); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -94,7 +100,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONTest1() { $dataTable = $this->_getDataTableTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $render->setRenderSubTables(true); $expected = '[{"label":"Google\u00a9","bool":false,"goals":{"idgoal=1":{"revenue":5.5,"nb_conversions":10}},"nb_uniq_visitors":11,"nb_visits":11,"nb_actions":17,"max_actions":"5","sum_visit_length":517,"bounce_count":9,"url":"http:\/\/www.google.com\/display\"and,properly","logo":".\/plugins\/Referers\/images\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"bool":true,"nb_visits":151,"nb_actions":147,"max_actions":"50","sum_visit_length":517,"bounce_count":90,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Referers\/images\/searchEngines\/www.yahoo.com.png","idsubdatatable":2,"subtable":[{"label":"sub1","count":1,"bool":false},{"label":"sub2","count":2,"bool":true}]}]'; @@ -112,7 +118,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONTest2() { $dataTable = $this->_getDataTableSimpleTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $expected = '{"max_actions":14,"nb_uniq_visitors":57,"nb_visits":66,"nb_actions":151,"sum_visit_length":5118,"bounce_count":44}'; @@ -128,7 +134,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONTest3() { $dataTable = $this->_getDataTableSimpleOneRowTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $expected = '{"value":14}'; $this->assertEquals($expected, $render->render()); @@ -143,7 +149,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONTest4() { $dataTable = $this->_getDataTableEmpty(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $expected = '[]'; $this->assertEquals($expected, $render->render()); @@ -158,7 +164,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONTest5() { $dataTable = $this->_getDataTableSimpleOneZeroRowTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $expected = '{"value":0}'; $this->assertEquals($expected, $render->render()); @@ -173,7 +179,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONTest6() { $dataTable = $this->_getDataTableSimpleOneFalseRowTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $expected = '{"value":false}'; $this->assertEquals($expected, $render->render()); @@ -187,32 +193,32 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableArrayTest() { $array1 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), ) ); - $table1 = new Piwik_DataTable(); + $table1 = new DataTable(); $table1->addRowsFromArray($array1); $array2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), + array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), + array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), ) ); - $table2 = new Piwik_DataTable(); + $table2 = new DataTable(); $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable(); + $table3 = new DataTable(); - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); $table->addTable($table2, 'date2'); @@ -224,16 +230,16 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleArrayTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('max_actions' => 140.0, 'nb_uniq_visitors' => 570.0,); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -245,15 +251,15 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneRowArrayTest() { $array1 = array('nb_visits' => 14.0); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('nb_visits' => 15.0); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -264,7 +270,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_normal() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableArrayTest(), 'idSite'); return $table; @@ -272,7 +278,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simple() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); return $table; @@ -280,7 +286,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simpleOneRow() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); return $table; @@ -296,7 +302,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONArrayTest1() { $dataTable = $this->_getDataTableArrayTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); $expected = '{"date1":[{"label":"Google","nb_uniq_visitors":11,"nb_visits":11,"url":"http:\/\/www.google.com","logo":".\/plugins\/Referers\/images\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"nb_visits":151,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Referers\/images\/searchEngines\/www.yahoo.com.png"}],"date2":[{"label":"Google1\u00a9","nb_uniq_visitors":110,"nb_visits":110,"url":"http:\/\/www.google.com1","logo":".\/plugins\/Referers\/images\/searchEngines\/www.google.com.png1"},{"label":"Yahoo!1","nb_uniq_visitors":150,"nb_visits":1510,"url":"http:\/\/www.yahoo.com1","logo":".\/plugins\/Referers\/images\/searchEngines\/www.yahoo.com.png1"}],"date3":[]}'; @@ -313,7 +319,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONArrayTest2() { $dataTable = $this->_getDataTableSimpleArrayTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -331,7 +337,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONArrayTest3() { $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -348,7 +354,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONArrayIsMadeOfArrayTest1() { $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); $expected = '{"idSite":{"date1":[{"label":"Google","nb_uniq_visitors":11,"nb_visits":11,"url":"http:\/\/www.google.com","logo":".\/plugins\/Referers\/images\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"nb_visits":151,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Referers\/images\/searchEngines\/www.yahoo.com.png"}],"date2":[{"label":"Google1\u00a9","nb_uniq_visitors":110,"nb_visits":110,"url":"http:\/\/www.google.com1","logo":".\/plugins\/Referers\/images\/searchEngines\/www.google.com.png1"},{"label":"Yahoo!1","nb_uniq_visitors":150,"nb_visits":1510,"url":"http:\/\/www.yahoo.com1","logo":".\/plugins\/Referers\/images\/searchEngines\/www.yahoo.com.png1"}],"date3":[]}}'; @@ -364,7 +370,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONArrayIsMadeOfArrayTest2() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); @@ -382,7 +388,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase public function testJSONArrayIsMadeOfArrayTest3() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($dataTable); $expected = '{"idSite":{"row1":14,"row2":15,"row3":[]}}'; @@ -400,7 +406,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $data = array(); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($data); $expected = '[]'; @@ -417,7 +423,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $data = array('a', 'b', 'c', array('a' => 'b'), array(1, 2)); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($data); $expected = '["a","b","c",{"a":"b"},[1,2]]'; @@ -434,7 +440,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g'); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($data); $expected = '[{"a":"b","c":"d","e":"f","5":"g"}]'; @@ -451,7 +457,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $data = array('a' => 'b', 'c' => array(1, 2, 3, 4), 'e' => array('f' => 'g', 'h' => 'i', 'j' => 'k')); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($data); $expected = '{"a":"b","c":[1,2,3,4],"e":{"f":"g","h":"i","j":"k"}}'; @@ -468,7 +474,7 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase { $data = array('a' => 'b'); - $render = new Piwik_DataTable_Renderer_Json(); + $render = new Json(); $render->setTable($data); $expected = '[{"a":"b"}]'; diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php index 3058a513dd..89db87e012 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php @@ -5,12 +5,18 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Renderer\Php; +use Piwik\DataTable\Simple; +use Piwik\DataTable\Row; + class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); - Piwik_DataTable_Manager::getInstance()->deleteAll(); + Manager::getInstance()->deleteAll(); } /** @@ -22,22 +28,22 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase */ protected function _getDataTableTest() { - $dataTable = new Piwik_DataTable(); + $dataTable = new DataTable(); $arraySubTableForRow2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), + array(Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), + array(Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), ); - $subDataTableForRow2 = new Piwik_DataTable(); + $subDataTableForRow2 = new DataTable(); $subDataTableForRow2->addRowsFromArray($arraySubTableForRow2); $array = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); $dataTable->addRowsFromArray($array); @@ -48,7 +54,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase { $array = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0, 'nb_visits' => 66.0, 'nb_actions' => 151.0, 'sum_visit_length' => 5118.0, 'bounce_count' => 44.0,); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -57,21 +63,21 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase { $array = array('nb_visits' => 14.0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } protected function _getDataTableEmpty() { - $table = new Piwik_DataTable; + $table = new DataTable; return $table; } protected function _getDataTableSimpleOneZeroRowTest() { $array = array('nb_visits' => 0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -79,7 +85,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneFalseRowTest() { $array = array('is_excluded' => false); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -94,7 +100,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPTest1() { $dataTable = $this->_getDataTableTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $render->setRenderSubTables(true); @@ -161,7 +167,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPTest2() { $dataTable = $this->_getDataTableSimpleTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $expected = serialize(array( 'max_actions' => 14.0, @@ -183,7 +189,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPTest3() { $dataTable = $this->_getDataTableSimpleOneRowTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $expected = serialize(14.0); $this->assertEquals($expected, $render->render()); @@ -198,7 +204,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPTest4() { $dataTable = $this->_getDataTableEmpty(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $expected = serialize(array()); $this->assertEquals($expected, $render->render()); @@ -213,7 +219,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPTest5() { $dataTable = $this->_getDataTableSimpleOneZeroRowTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $expected = serialize(0); $this->assertEquals($expected, $render->render()); @@ -228,7 +234,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPTest6() { $dataTable = $this->_getDataTableSimpleOneFalseRowTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $expected = serialize(false); $this->assertEquals($expected, $render->render()); @@ -243,32 +249,32 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableArrayTest() { $array1 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), ) ); - $table1 = new Piwik_DataTable(); + $table1 = new DataTable(); $table1->addRowsFromArray($array1); $array2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), + array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), + array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), ) ); - $table2 = new Piwik_DataTable(); + $table2 = new DataTable(); $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable(); + $table3 = new DataTable(); - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); $table->addTable($table2, 'date2'); @@ -280,16 +286,16 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleArrayTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('max_actions' => 140.0, 'nb_uniq_visitors' => 570.0,); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -301,15 +307,15 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneRowArrayTest() { $array1 = array('nb_visits' => 14.0); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('nb_visits' => 15.0); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -320,7 +326,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_normal() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableArrayTest(), 'idSite'); return $table; @@ -328,7 +334,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simple() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); return $table; @@ -336,7 +342,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simpleOneRow() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); return $table; @@ -352,7 +358,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPArrayTest1() { $dataTable = $this->_getDataTableArrayTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -409,7 +415,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPArrayTest2() { $dataTable = $this->_getDataTableSimpleArrayTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -439,7 +445,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPArrayTest3() { $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -460,7 +466,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPArrayIsMadeOfArrayTest1() { $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -519,7 +525,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPArrayIsMadeOfArrayTest2() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); @@ -550,7 +556,7 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase public function testPHPArrayIsMadeOfArrayTest3() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); - $render = new Piwik_DataTable_Renderer_Php(); + $render = new Php(); $render->setTable($dataTable); $rendered = $render->render(); diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php index d4e676f5eb..205da80d09 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php @@ -5,12 +5,18 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Renderer\Xml; +use Piwik\DataTable\Simple; +use Piwik\DataTable\Row; + class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); - Piwik_DataTable_Manager::getInstance()->deleteAll(); + Manager::getInstance()->deleteAll(); } /** @@ -22,22 +28,22 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase */ protected function _getDataTableTest() { - $dataTable = new Piwik_DataTable(); + $dataTable = new DataTable(); $arraySubTableForRow2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), + array(Row::COLUMNS => array('label' => 'sub1', 'count' => 1, 'bool' => false)), + array(Row::COLUMNS => array('label' => 'sub2', 'count' => 2, 'bool' => true)), ); - $subDataTableForRow2 = new Piwik_DataTable(); + $subDataTableForRow2 = new DataTable(); $subDataTableForRow2->addRowsFromArray($arraySubTableForRow2); $array = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); $dataTable->addRowsFromArray($array); @@ -48,7 +54,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { $array = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0, 'nb_visits' => 66.0, 'nb_actions' => 151.0, 'sum_visit_length' => 5118.0, 'bounce_count' => 44.0,); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -57,21 +63,21 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { $array = array('nb_visits' => 14.0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } protected function _getDataTableEmpty() { - $table = new Piwik_DataTable; + $table = new DataTable; return $table; } protected function _getDataTableSimpleOneZeroRowTest() { $array = array('nb_visits' => 0); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -79,7 +85,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneFalseRowTest() { $array = array('is_excluded' => false); - $table = new Piwik_DataTable_Simple; + $table = new Simple; $table->addRowsFromArray($array); return $table; } @@ -94,7 +100,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLTest1() { $dataTable = $this->_getDataTableTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $render->setRenderSubTables(true); $expected = '<?xml version="1.0" encoding="utf-8" ?> @@ -156,7 +162,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLTest2() { $dataTable = $this->_getDataTableSimpleTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result> @@ -179,7 +185,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLTest3() { $dataTable = $this->_getDataTableSimpleOneRowTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result>14</result>'; @@ -195,7 +201,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLTest4() { $dataTable = $this->_getDataTableEmpty(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result />'; @@ -211,7 +217,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLTest5() { $dataTable = $this->_getDataTableSimpleOneZeroRowTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result>0</result>'; @@ -227,7 +233,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLTest6() { $dataTable = $this->_getDataTableSimpleOneFalseRowTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result>0</result>'; @@ -243,32 +249,32 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableArrayTest() { $array1 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), + array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), + array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png'), ) ); - $table1 = new Piwik_DataTable(); + $table1 = new DataTable(); $table1->addRowsFromArray($array1); $array2 = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), + array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referers/images/searchEngines/www.google.com.png1'), ), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Piwik_DataTable_Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), + array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referers/images/searchEngines/www.yahoo.com.png1'), ) ); - $table2 = new Piwik_DataTable(); + $table2 = new DataTable(); $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable(); + $table3 = new DataTable(); - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); $table->addTable($table2, 'date2'); @@ -280,16 +286,16 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleArrayTest() { $array1 = array('max_actions' => 14.0, 'nb_uniq_visitors' => 57.0,); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('max_actions' => 140.0, 'nb_uniq_visitors' => 570.0,); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -301,15 +307,15 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableSimpleOneRowArrayTest() { $array1 = array('nb_visits' => 14.0); - $table1 = new Piwik_DataTable_Simple; + $table1 = new Simple; $table1->addRowsFromArray($array1); $array2 = array('nb_visits' => 15.0); - $table2 = new Piwik_DataTable_Simple; + $table2 = new Simple; $table2->addRowsFromArray($array2); - $table3 = new Piwik_DataTable_Simple; + $table3 = new Simple; - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'row1'); $table->addTable($table2, 'row2'); @@ -320,7 +326,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_normal() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableArrayTest(), 'idSite'); return $table; @@ -328,7 +334,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simple() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleArrayTest(), 'idSite'); return $table; @@ -336,7 +342,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase protected function _getDataTableArray_containsDataTableArray_simpleOneRow() { - $table = new Piwik_DataTable_Array(); + $table = new DataTable\Map(); $table->setKeyName('parentArrayKey'); $table->addTable($this->_getDataTableSimpleOneRowArrayTest(), 'idSite'); return $table; @@ -351,7 +357,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLArrayTest1() { $dataTable = $this->_getDataTableArrayTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <results> @@ -402,7 +408,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { $dataTable = $this->_getDataTableArray_containsDataTableArray_normal(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <results> @@ -455,7 +461,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLArrayTest2() { $dataTable = $this->_getDataTableSimpleArrayTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> @@ -482,7 +488,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLArrayIsMadeOfArrayTest2() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simple(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <results> @@ -511,7 +517,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLArrayTest3() { $dataTable = $this->_getDataTableSimpleOneRowArrayTest(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> @@ -533,7 +539,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase public function testXMLArrayIsMadeOfArrayTest3() { $dataTable = $this->_getDataTableArray_containsDataTableArray_simpleOneRow(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($dataTable); $expected = '<?xml version="1.0" encoding="utf-8" ?> <results> @@ -557,7 +563,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { $data = array(); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($data); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result />'; @@ -578,7 +584,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase "secondElement"), "thirdElement"); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($data); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result> @@ -603,7 +609,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g'); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($data); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result> @@ -628,7 +634,7 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase { $data = array('c' => array(1, 2, 3, 4), 'e' => array('f' => 'g', 'h' => 'i', 'j' => 'k')); - $render = new Piwik_DataTable_Renderer_Xml(); + $render = new Xml(); $render->setTable($data); $expected = '<?xml version="1.0" encoding="utf-8" ?> <result> diff --git a/tests/PHPUnit/Core/DataTable/RowTest.php b/tests/PHPUnit/Core/DataTable/RowTest.php index 2effe961c4..1995fc0fdd 100644 --- a/tests/PHPUnit/Core/DataTable/RowTest.php +++ b/tests/PHPUnit/Core/DataTable/RowTest.php @@ -5,51 +5,54 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\DataTable; +use Piwik\DataTable\Row; + class RowTest extends PHPUnit_Framework_TestCase { /** * * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testDataTableAssociatedIsNegativeWhenSubDataTableInMemory() { $testRow = $this->getTestRowWithSubDataTableLoaded(); - $this->assertTrue($testRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] < 0); + $this->assertTrue($testRow->c[Row::DATATABLE_ASSOCIATED] < 0); } /** * * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testDataTableAssociatedIsNegativeWhenSubDataTableAdded() { $testRow = $this->getTestRowWithSubDataTableNotLoaded(); $testRow->addSubtable($this->getTestSubDataTable()); - $this->assertTrue($testRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] < 0); + $this->assertTrue($testRow->c[Row::DATATABLE_ASSOCIATED] < 0); } /** * * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testDataTableAssociatedIsNegativeWhenSubDataTableSetted() { $testRow = $this->getTestRowWithSubDataTableNotLoaded(); $testRow->setSubtable($this->getTestSubDataTable()); - $this->assertTrue($testRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] < 0); + $this->assertTrue($testRow->c[Row::DATATABLE_ASSOCIATED] < 0); } /** * * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testIdSubDataTabledIsPositiveWhenSubDataTableInMemory() { @@ -61,7 +64,7 @@ class RowTest extends PHPUnit_Framework_TestCase /** * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testDataTableAssociatedIsPositiveOnSerializedRow() { @@ -73,13 +76,13 @@ class RowTest extends PHPUnit_Framework_TestCase $serializedTestRow = serialize($testRow); $unserializedTestRow = unserialize($serializedTestRow); - $this->assertTrue($unserializedTestRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] > 0); + $this->assertTrue($unserializedTestRow->c[Row::DATATABLE_ASSOCIATED] > 0); } /** * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testDataTableAssociatedIsNegativeAfterSerialize() { @@ -89,14 +92,14 @@ class RowTest extends PHPUnit_Framework_TestCase $testRow->cleanPostSerialize(); - $this->assertTrue($testRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] < 0); + $this->assertTrue($testRow->c[Row::DATATABLE_ASSOCIATED] < 0); } /** * * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testIsSubDataTableLoadedIsTrueWhenSubDataTableInMemory() { @@ -108,7 +111,7 @@ class RowTest extends PHPUnit_Framework_TestCase * * @group Core * @group DataTable - * @group Piwik_DataTable_Row + * @group Row */ public function testIsSubDataTableLoadedIsFalseWhenSubDataTableNotInMemory() { @@ -120,9 +123,9 @@ class RowTest extends PHPUnit_Framework_TestCase { $testSubDataTable = $this->getTestSubDataTable(); - $testRow = new Piwik_DataTable_Row( + $testRow = new Row( array( - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $testSubDataTable + Row::DATATABLE_ASSOCIATED => $testSubDataTable ) ); @@ -131,14 +134,14 @@ class RowTest extends PHPUnit_Framework_TestCase protected function getTestSubDataTable() { - return new Piwik_DataTable(); + return new DataTable(); } protected function getTestRowWithSubDataTableNotLoaded() { - $testRow = new Piwik_DataTable_Row( + $testRow = new Row( array( - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => 50 + Row::DATATABLE_ASSOCIATED => 50 ) ); diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php index 2a7fdc1548..95e2c8d2fc 100644 --- a/tests/PHPUnit/Core/DataTableTest.php +++ b/tests/PHPUnit/Core/DataTableTest.php @@ -1,13 +1,17 @@ <?php - -use Piwik\Common; - /** * Piwik - Open source web analytics * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ + +use Piwik\Common; +use Piwik\DataTable; +use Piwik\DataTable\Manager; +use Piwik\DataTable\Row; + + class DataTableTest extends PHPUnit_Framework_TestCase { /** @@ -20,19 +24,19 @@ class DataTableTest extends PHPUnit_Framework_TestCase $this->assertEquals(4, $table->getRowsCount()); $table->filter('Limit', array(2, 2)); $this->assertEquals(2, $table->getRowsCount()); - $table->filter('Piwik_DataTable_Filter_Limit', array(0, 1)); + $table->filter('Limit', array(0, 1)); $this->assertEquals(1, $table->getRowsCount()); } protected function _getSimpleTestDataTable() { - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray( array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ten', 'count' => 10)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ninety', 'count' => 90)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'hundred', 'count' => 100)), - Piwik_DataTable::ID_SUMMARY_ROW => array(Piwik_DataTable_Row::COLUMNS => array('label' => 'summary', 'count' => 200)) + array(Row::COLUMNS => array('label' => 'ten', 'count' => 10)), + array(Row::COLUMNS => array('label' => 'ninety', 'count' => 90)), + array(Row::COLUMNS => array('label' => 'hundred', 'count' => 100)), + DataTable::ID_SUMMARY_ROW => array(Row::COLUMNS => array('label' => 'summary', 'count' => 200)) ) ); return $table; @@ -78,7 +82,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase $this->assertFalse($table->getRowFromId($idToDelete)); // summary row special case - $idToDelete = Piwik_DataTable::ID_SUMMARY_ROW; + $idToDelete = DataTable::ID_SUMMARY_ROW; $this->assertEquals(2, count($table->getRowFromId($idToDelete)->getColumns())); $table->deleteRow($idToDelete); $this->assertFalse($table->getRowFromId($idToDelete)); @@ -93,8 +97,8 @@ class DataTableTest extends PHPUnit_Framework_TestCase $table = $this->_getSimpleTestDataTable(); $rowsCount = $table->getRowsCount(); - $this->assertEquals($table->getLastRow(), $table->getRowFromId(Piwik_DataTable::ID_SUMMARY_ROW)); - $table->deleteRow(Piwik_DataTable::ID_SUMMARY_ROW); + $this->assertEquals($table->getLastRow(), $table->getRowFromId(DataTable::ID_SUMMARY_ROW)); + $table->deleteRow(DataTable::ID_SUMMARY_ROW); $this->assertEquals($table->getLastRow(), $table->getRowFromId($rowsCount - 2)); } @@ -129,8 +133,8 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testCountRowsSimple() { - $table = new Piwik_DataTable; - $idcol = Piwik_DataTable_Row::COLUMNS; + $table = new DataTable; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google')), array($idcol => array('label' => 'ask')), @@ -160,11 +164,11 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testCountRowsComplex() { - $idcol = Piwik_DataTable_Row::COLUMNS; - $idsubtable = Piwik_DataTable_Row::DATATABLE_ASSOCIATED; + $idcol = Row::COLUMNS; + $idsubtable = Row::DATATABLE_ASSOCIATED; // table to go in the SUB table of RoW1 - $tableSubOfSubOfRow1 = new Piwik_DataTable; + $tableSubOfSubOfRow1 = new DataTable; $rows1sub = array( array($idcol => array('label' => 'google')), array($idcol => array('label' => 'google78')), @@ -177,7 +181,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase $tableSubOfSubOfRow1->addRowsFromArray($rows1sub); // table to go in row1 - $tableSubOfRow1 = new Piwik_DataTable; + $tableSubOfRow1 = new DataTable; $rows1 = array( array($idcol => array('label' => 'google'), $idsubtable => $tableSubOfSubOfRow1), array($idcol => array('label' => 'ask')), @@ -186,7 +190,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase $tableSubOfRow1->addRowsFromArray($rows1); // table to go in row2 - $tableSubOfRow2 = new Piwik_DataTable; + $tableSubOfRow2 = new DataTable; $rows2 = array( array($idcol => array('label' => 'google')), array($idcol => array('label' => 'ask')), @@ -197,7 +201,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase $tableSubOfRow2->addRowsFromArray($rows2); // main parent table - $table = new Piwik_DataTable; + $table = new DataTable; $rows = array( array($idcol => array('label' => 'row1')), array($idcol => array('label' => 'row2'), @@ -227,11 +231,11 @@ class DataTableTest extends PHPUnit_Framework_TestCase $metadata = array('logo' => 'piwik.png', 'super' => array('this column has an array value, amazing')); $arrayRow = array( - Piwik_DataTable_Row::COLUMNS => $columns, - Piwik_DataTable_Row::METADATA => $metadata, + Row::COLUMNS => $columns, + Row::METADATA => $metadata, 'fake useless key' => 38959, 43905724897 => 'value'); - $row = new Piwik_DataTable_Row($arrayRow); + $row = new Row($arrayRow); $this->assertEquals($columns, $row->getColumns()); $this->assertEquals($metadata, $row->getMetadata()); @@ -257,11 +261,11 @@ class DataTableTest extends PHPUnit_Framework_TestCase $metadata = array('logo' => 'piwik.png', 'super' => array('this column has an array value, amazing')); $arrayRow = array( - Piwik_DataTable_Row::COLUMNS => $columns, - Piwik_DataTable_Row::METADATA => $metadata, + Row::COLUMNS => $columns, + Row::METADATA => $metadata, 'fake useless key' => 38959, 43905724897 => 'value'); - $row1 = new Piwik_DataTable_Row($arrayRow); + $row1 = new Row($arrayRow); $columns2 = array('test_int' => 5, 'test_float' => 4.5, @@ -270,7 +274,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase 0925824 => 'toto', 'integerArrayToSum' => array(1 => 5, 2 => 5.5, 3 => array(2 => 4)), ); - $finalRow = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => $columns2)); + $finalRow = new Row(array(Row::COLUMNS => $columns2)); $finalRow->sumRow($row1); $columnsWanted = array('test_int' => 150, 'test_float' => 150.0, @@ -283,19 +287,29 @@ class DataTableTest extends PHPUnit_Framework_TestCase ); // Also testing that metadata is copied over - $rowWanted = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => $columnsWanted, Piwik_DataTable_Row::METADATA => $metadata)); - $this->assertTrue(Piwik_DataTable_Row::isEqual($rowWanted, $finalRow)); + $rowWanted = new Row(array(Row::COLUMNS => $columnsWanted, Row::METADATA => $metadata)); + $this->assertTrue(Row::isEqual($rowWanted, $finalRow)); // testing that, 'sumRow' does not result in extra unwanted attributes being serialized - $expectedRow = 'O:19:"Piwik_DataTable_Row":1:{s:1:"c";a:3:{i:0;a:8:{s:8:"test_int";i:150;s:10:"test_float";d:150;s:11:"test_float2";d:14.5;s:14:"test_stringint";i:150;i:0;s:4:"toto";s:17:"integerArrayToSum";a:3:{i:1;i:6;i:2;d:15.5;i:3;a:2:{i:2;i:7;i:1;i:2;}}s:11:"test_float3";d:1.5;s:4:"test";s:11:"string fake";}i:1;a:2:{s:4:"logo";s:9:"piwik.png";s:5:"super";a:1:{i:0;s:39:"this column has an array value, amazing";}}i:3;N;}}'; - $this->assertEquals(serialize($finalRow), $expectedRow); + $expectedRow = 'O:19:"Piwik\DataTable\Row":1:{s:1:"c";a:3:{i:0;a:8:{s:8:"test_int";i:150;s:10:"test_float";d:150;s:11:"test_float2";d:14.5;s:14:"test_stringint";i:150;i:0;s:4:"toto";s:17:"integerArrayToSum";a:3:{i:1;i:6;i:2;d:15.5;i:3;a:2:{i:2;i:7;i:1;i:2;}}s:11:"test_float3";d:1.5;s:4:"test";s:11:"string fake";}i:1;a:2:{s:4:"logo";s:9:"piwik.png";s:5:"super";a:1:{i:0;s:39:"this column has an array value, amazing";}}i:3;N;}}'; + $this->assertEquals($expectedRow, serialize($finalRow)); // Testing sumRow with disabled metadata sum - $rowWanted = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => $columnsWanted)); // no metadata - $finalRow = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => $columns2)); + $rowWanted = new Row(array(Row::COLUMNS => $columnsWanted)); // no metadata + $finalRow = new Row(array(Row::COLUMNS => $columns2)); $finalRow->sumRow($row1, $enableCopyMetadata = false); - $this->assertTrue(Piwik_DataTable_Row::isEqual($rowWanted, $finalRow)); + $this->assertTrue(Row::isEqual($rowWanted, $finalRow)); + } + + public function test_unserializeWorks_WhenDataTableFormatPriorPiwik2() + { + // Prior Piwik 2.0, we didn't use namespaces. Some + $oldSerialized = 'O:19:"Piwik_DataTable_Row":1:{s:1:"c";a:3:{i:0;a:8:{s:8:"test_int";i:150;s:10:"test_float";d:150;s:11:"test_float2";d:14.5; + s:14:"test_stringint";i:150;i:0;s:4:"toto";s:17:"integerArrayToSum";a:3:{i:1;i:6;i:2;d:15.5;i:3;a:2:{i:2;i:7;i:1;i:2;}}s:11:"test_float3";d:1.5;s:4:"test";s:11:"string fake";}i:1;a:2:{s:4:"logo";s:9:"piwik.png";s:5:"super";a:1:{i:0;s:39:"this column has an array value, amazing";}}i:3;N;}}'; + + + } /** @@ -309,12 +323,12 @@ class DataTableTest extends PHPUnit_Framework_TestCase $columns = array( 'super' => array('this column has an array string that will be 0 when algorithm sums the value'), ); - $row1 = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => $columns)); + $row1 = new Row(array(Row::COLUMNS => $columns)); $columns2 = array( 'super' => array('this column has geagaean array value, amazing'), ); - $row2 = new Piwik_DataTable_Row(array(Piwik_DataTable_Row::COLUMNS => $columns2)); + $row2 = new Row(array(Row::COLUMNS => $columns2)); // TODO: when phpunit 3.7 is released, can do check w/ "@expectedException Exception" try { @@ -335,9 +349,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testSerializeWithInfiniteRecursion() { try { - $table = new Piwik_DataTable; - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 245, 'visitors' => 245), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $table,)); + $table = new DataTable; + $table->addRowFromArray(array(Row::COLUMNS => array('visits' => 245, 'visitors' => 245), + Row::DATATABLE_ASSOCIATED => $table,)); $table->getSerialized(); } catch (Exception $e) { @@ -356,9 +370,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testFilterQueueSortString() { - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; - $table = new Piwik_DataTable; + $table = new DataTable; $rows = array( array($idcol => array('label' => 'google')), //0 array($idcol => array('label' => 'tsk')), //1 @@ -366,7 +380,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase ); $table->addRowsFromArray($rows); - $expectedtable = new Piwik_DataTable; + $expectedtable = new DataTable; $rows = array( array($idcol => array('label' => 'google')), //0 array($idcol => array('label' => 'Q*(%&*("$&%*(&"$*")"))')), //2 @@ -374,31 +388,31 @@ class DataTableTest extends PHPUnit_Framework_TestCase ); $expectedtable->addRowsFromArray($rows); - $expectedtableReverse = new Piwik_DataTable; + $expectedtableReverse = new DataTable; $expectedtableReverse->addRowsFromArray(array_reverse($rows)); $tableCopy = clone $table; - $this->assertTrue(Piwik_DataTable::isEqual($tableCopy, $table)); + $this->assertTrue(DataTable::isEqual($tableCopy, $table)); // queue the filter and check the table didnt change $table->queueFilter("Sort", array('label', 'asc')); - $this->assertTrue(Piwik_DataTable::isEqual($tableCopy, $table)); + $this->assertTrue(DataTable::isEqual($tableCopy, $table)); // apply filter and check the table is sorted $table->applyQueuedFilters(); - $this->assertTrue(Piwik_DataTable::isEqual($expectedtable, $table)); + $this->assertTrue(DataTable::isEqual($expectedtable, $table)); // apply one more filter check it hasnt changed $table->queueFilter("Sort", array('label', 'desc')); - $this->assertTrue(Piwik_DataTable::isEqual($expectedtable, $table)); + $this->assertTrue(DataTable::isEqual($expectedtable, $table)); // now apply the second sort and check it is correctly sorted $table->applyQueuedFilters(); - $this->assertTrue(Piwik_DataTable::isEqual($expectedtableReverse, $table)); + $this->assertTrue(DataTable::isEqual($expectedtableReverse, $table)); // do one more time to make sure it doesnt change $table->applyQueuedFilters(); - $this->assertTrue(Piwik_DataTable::isEqual($expectedtableReverse, $table)); + $this->assertTrue(DataTable::isEqual($expectedtableReverse, $table)); } /** @@ -417,8 +431,8 @@ class DataTableTest extends PHPUnit_Framework_TestCase * create some fake tables to make sure that the serialized array of the first TABLE * does not take in consideration those tables */ - $useless1 = new Piwik_DataTable; - $useless1->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(13,),)); + $useless1 = new DataTable; + $useless1->addRowFromArray(array(Row::COLUMNS => array(13,),)); /* * end fake tables */ @@ -426,8 +440,8 @@ class DataTableTest extends PHPUnit_Framework_TestCase /* * MAIN TABLE */ - $table = new Piwik_DataTable; - $subtable = new Piwik_DataTable; + $table = new DataTable; + $subtable = new DataTable; $idtable = $table->getId(); $idsubtable = $subtable->getId(); @@ -436,42 +450,42 @@ class DataTableTest extends PHPUnit_Framework_TestCase * does not take in consideration those tables * -> we check that the DataTable_Manager is not impacting DataTable */ - $useless2 = new Piwik_DataTable; - $useless1->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(8487,),)); - $useless3 = new Piwik_DataTable; - $useless3->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(8487,),)); + $useless2 = new DataTable; + $useless1->addRowFromArray(array(Row::COLUMNS => array(8487,),)); + $useless3 = new DataTable; + $useless3->addRowFromArray(array(Row::COLUMNS => array(8487,),)); /* * end fake tables */ - $row = array(Piwik_DataTable_Row::COLUMNS => array(0 => 1554, 1 => 42, 2 => 657, 3 => 155744,), - Piwik_DataTable_Row::METADATA => array('logo' => 'test.png')); - $row = new Piwik_DataTable_Row($row); + $row = array(Row::COLUMNS => array(0 => 1554, 1 => 42, 2 => 657, 3 => 155744,), + Row::METADATA => array('logo' => 'test.png')); + $row = new Row($row); $table->addRow($row); - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(0 => 1554, 1 => 42,), - Piwik_DataTable_Row::METADATA => array('url' => 'piwik.org'))); + $table->addRowFromArray(array(Row::COLUMNS => array(0 => 1554, 1 => 42,), + Row::METADATA => array('url' => 'piwik.org'))); - $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(0 => 787877888787,), - Piwik_DataTable_Row::METADATA => array('url' => 'OUPLA ADDED'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtable)); + $table->addRowFromArray(array(Row::COLUMNS => array(0 => 787877888787,), + Row::METADATA => array('url' => 'OUPLA ADDED'), + Row::DATATABLE_ASSOCIATED => $subtable)); /* * SUB TABLE */ - $row = array(Piwik_DataTable_Row::COLUMNS => array(0 => 1554,), - Piwik_DataTable_Row::METADATA => array('searchengine' => 'google'), + $row = array(Row::COLUMNS => array(0 => 1554,), + Row::METADATA => array('searchengine' => 'google'), ); $subtable->addRowFromArray($row); - $row = array(Piwik_DataTable_Row::COLUMNS => array(0 => 84894,), - Piwik_DataTable_Row::METADATA => array('searchengine' => 'yahoo'), + $row = array(Row::COLUMNS => array(0 => 84894,), + Row::METADATA => array('searchengine' => 'yahoo'), ); $subtable->addRowFromArray($row); - $row = array(Piwik_DataTable_Row::COLUMNS => array(0 => 4898978989,), - Piwik_DataTable_Row::METADATA => array('searchengine' => 'ask'), + $row = array(Row::COLUMNS => array(0 => 4898978989,), + Row::METADATA => array('searchengine' => 'ask'), ); $subtable->addRowFromArray($row); @@ -479,18 +493,18 @@ class DataTableTest extends PHPUnit_Framework_TestCase /* * SUB SUB TABLE */ - $subsubtable = new Piwik_DataTable; - $subsubtable->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(245), - Piwik_DataTable_Row::METADATA => array('yes' => 'subsubmetadata1'),) + $subsubtable = new DataTable; + $subsubtable->addRowFromArray(array(Row::COLUMNS => array(245), + Row::METADATA => array('yes' => 'subsubmetadata1'),) ); - $subsubtable->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array(13,), - Piwik_DataTable_Row::METADATA => array('yes' => 'subsubmetadata2'),) + $subsubtable->addRowFromArray(array(Row::COLUMNS => array(13,), + Row::METADATA => array('yes' => 'subsubmetadata2'),) ); - $row = array(Piwik_DataTable_Row::COLUMNS => array(0 => 666666666666666,), - Piwik_DataTable_Row::METADATA => array('url' => 'NEW ROW ADDED'), - Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subsubtable); + $row = array(Row::COLUMNS => array(0 => 666666666666666,), + Row::METADATA => array('url' => 'NEW ROW ADDED'), + Row::DATATABLE_ASSOCIATED => $subsubtable); $subtable->addRowFromArray($row); @@ -510,26 +524,26 @@ class DataTableTest extends PHPUnit_Framework_TestCase foreach ($table->getRows() as $currentRow) { $expectedTableRow = clone $currentRow; - $currentRowAssociatedDatatableId = $currentRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED]; + $currentRowAssociatedDatatableId = $currentRow->c[Row::DATATABLE_ASSOCIATED]; if ($currentRowAssociatedDatatableId != null) { // making DATATABLE_ASSOCIATED ids positive - $expectedTableRow->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = -1 * $currentRowAssociatedDatatableId; + $expectedTableRow->c[Row::DATATABLE_ASSOCIATED] = -1 * $currentRowAssociatedDatatableId; } $expectedTableRows[] = $expectedTableRow; } - $tableAfter = new Piwik_DataTable; + $tableAfter = new DataTable; $tableAfter->addRowsFromSerializedArray($serialized[0]); $this->assertEquals($expectedTableRows, $tableAfter->getRows()); - $subsubtableAfter = new Piwik_DataTable; + $subsubtableAfter = new DataTable; $subsubtableAfter->addRowsFromSerializedArray($serialized[$idsubsubtable]); $this->assertEquals($subsubtable->getRows(), $subsubtableAfter->getRows()); - $this->assertEquals($table, Piwik_DataTable_Manager::getInstance()->getTable($idtable)); - $this->assertEquals($subsubtable, Piwik_DataTable_Manager::getInstance()->getTable($idsubsubtable)); + $this->assertEquals($table, Manager::getInstance()->getTable($idtable)); + $this->assertEquals($subsubtable, Manager::getInstance()->getTable($idsubsubtable)); } /** @@ -550,10 +564,10 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testAddSimpleNoRowTable2() { $table = $this->_getDataTable1ForTest(); - $tableEmpty = new Piwik_DataTable; + $tableEmpty = new DataTable; $tableAfter = clone $table; $tableAfter->addDataTable($tableEmpty); - $this->assertTrue(Piwik_DataTable::isEqual($table, $tableAfter)); + $this->assertTrue(DataTable::isEqual($table, $tableAfter)); } /** @@ -565,9 +579,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testAddSimpleNoRowTable1() { $table = $this->_getDataTable1ForTest(); - $tableEmpty = new Piwik_DataTable; + $tableEmpty = new DataTable; $tableEmpty->addDataTable($table); - $this->assertTrue(Piwik_DataTable::isEqual($tableEmpty, $table)); + $this->assertTrue(DataTable::isEqual($tableEmpty, $table)); } /** @@ -584,10 +598,10 @@ class DataTableTest extends PHPUnit_Framework_TestCase $table1->addDataTable($table2); $rowsExpected = array_merge($this->_getRowsDataTable1ForTest(), $this->_getRowsDataTable2ForTest()); - $tableExpected = new Piwik_DataTable; + $tableExpected = new DataTable; $tableExpected->addRowsFromArray($rowsExpected); - $this->assertTrue(Piwik_DataTable::isEqual($table1, $tableExpected)); + $this->assertTrue(DataTable::isEqual($table1, $tableExpected)); } /** @@ -599,15 +613,15 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testAddSimpleSomeCommonRow() { - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google', 'visits' => 1)), array($idcol => array('label' => 'ask', 'visits' => 2)), array($idcol => array('label' => '123', 'visits' => 2)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 7)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 7)) ); - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray($rows); $rows2 = array( @@ -616,7 +630,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => ' google ', 'visits' => 5)), array($idcol => array('label' => '123', 'visits' => 2)), ); - $table2 = new Piwik_DataTable; + $table2 = new DataTable; $table2->addRowsFromArray($rows2); $table->addDataTable($table2); @@ -627,12 +641,12 @@ class DataTableTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => '123', 'visits' => 4)), array($idcol => array('label' => 'test', 'visits' => 1)), array($idcol => array('label' => ' google ', 'visits' => 5)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 7)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 7)) ); - $tableExpected = new Piwik_DataTable; + $tableExpected = new DataTable; $tableExpected->addRowsFromArray($rowsExpected); - $this->assertTrue(Piwik_DataTable::isEqual($table, $tableExpected)); + $this->assertTrue(DataTable::isEqual($table, $tableExpected)); } /** @@ -643,24 +657,24 @@ class DataTableTest extends PHPUnit_Framework_TestCase */ public function testAddSimpleAllCommonRow() { - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google', 'visits' => 1)), array($idcol => array('label' => 'ask', 'visits' => 2)), array($idcol => array('label' => '123', 'visits' => 2)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 7)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 7)) ); - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray($rows); $rows2 = array( array($idcol => array('label' => 'google', 'visits' => -1)), array($idcol => array('label' => 'ask', 'visits' => 0)), array($idcol => array('label' => '123', 'visits' => 1.5)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 8)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 8)) ); - $table2 = new Piwik_DataTable; + $table2 = new DataTable; $table2->addRowsFromArray($rows2); $table->addDataTable($table2); @@ -669,12 +683,12 @@ class DataTableTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'google', 'visits' => 0)), array($idcol => array('label' => 'ask', 'visits' => 2)), array($idcol => array('label' => '123', 'visits' => 3.5)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 15)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 15)) ); - $tableExpected = new Piwik_DataTable; + $tableExpected = new DataTable; $tableExpected->addRowsFromArray($rowsExpected); - $this->assertTrue(Piwik_DataTable::isEqual($table, $tableExpected)); + $this->assertTrue(DataTable::isEqual($table, $tableExpected)); } /** @@ -686,15 +700,15 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testAddDataTable2times() { - $idcol = Piwik_DataTable_Row::COLUMNS; + $idcol = Row::COLUMNS; $rows = array( array($idcol => array('label' => 'google', 'visits' => 1)), array($idcol => array('label' => 'ask', 'visits' => 0)), array($idcol => array('label' => '123', 'visits' => 2)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 1)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 1)) ); - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray($rows); $rows2 = array( @@ -702,16 +716,16 @@ class DataTableTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'ask', 'visits' => 100)), array($idcol => array('label' => '123456', 'visits' => 1.5)), ); - $table2 = new Piwik_DataTable; + $table2 = new DataTable; $table2->addRowsFromArray($rows2); $rows3 = array( array($idcol => array('label' => 'google2', 'visits' => -1)), array($idcol => array('label' => 'ask', 'visits' => -10)), array($idcol => array('label' => '123ab', 'visits' => 1.5)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 3)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 3)) ); - $table3 = new Piwik_DataTable; + $table3 = new DataTable; $table3->addRowsFromArray($rows3); // add the 2 tables @@ -725,12 +739,12 @@ class DataTableTest extends PHPUnit_Framework_TestCase array($idcol => array('label' => 'google2', 'visits' => -2)), array($idcol => array('label' => '123456', 'visits' => 1.5)), array($idcol => array('label' => '123ab', 'visits' => 1.5)), - Piwik_DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 4)) + DataTable::ID_SUMMARY_ROW => array($idcol => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 4)) ); - $tableExpected = new Piwik_DataTable; + $tableExpected = new DataTable; $tableExpected->addRowsFromArray($rowsExpected); - $this->assertTrue(Piwik_DataTable::isEqual($table, $tableExpected)); + $this->assertTrue(DataTable::isEqual($table, $tableExpected)); } @@ -740,16 +754,16 @@ class DataTableTest extends PHPUnit_Framework_TestCase */ public function testUnrelatedDataTableNotDestructed() { - $mockedDataTable = $this->getMock('Piwik_DataTable', array('__destruct')); + $mockedDataTable = $this->getMock('\Piwik\DataTable', array('__destruct')); $mockedDataTable->expects($this->never())->method('__destruct'); - $rowBeingDestructed = new Piwik_DataTable_Row(); + $rowBeingDestructed = new Row(); - // we simulate the fact that the value of Piwik_DataTable_Row::DATATABLE_ASSOCIATED retrieved - // from the database is in conflict with one of the Piwik_DataTable_Manager managed table identifiers. + // we simulate the fact that the value of Row::DATATABLE_ASSOCIATED retrieved + // from the database is in conflict with one of the Manager managed table identifiers. // This is a rare but legitimate case as identifiers are not thoroughly synchronized // when the expanded parameter is false. - $rowBeingDestructed->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId(); + $rowBeingDestructed->c[Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId(); Common::destroy($rowBeingDestructed); } @@ -760,10 +774,10 @@ class DataTableTest extends PHPUnit_Framework_TestCase */ public function testGetSerializedCallsCleanPostSerialize() { - $mockedDataTableRow = $this->getMock('Piwik_DataTable_Row', array('cleanPostSerialize')); + $mockedDataTableRow = $this->getMock('Row', array('cleanPostSerialize')); $mockedDataTableRow->expects($this->once())->method('cleanPostSerialize'); - $dataTableBeingSerialized = new Piwik_DataTable(); + $dataTableBeingSerialized = new DataTable(); $dataTableBeingSerialized->addRow($mockedDataTableRow); $dataTableBeingSerialized->getSerialized(); @@ -775,10 +789,10 @@ class DataTableTest extends PHPUnit_Framework_TestCase */ public function testSubDataTableIsDestructed() { - $mockedDataTable = $this->getMock('Piwik_DataTable', array('__destruct')); + $mockedDataTable = $this->getMock('\Piwik\DataTable', array('__destruct')); $mockedDataTable->expects($this->once())->method('__destruct'); - $rowBeingDestructed = new Piwik_DataTable_Row(); + $rowBeingDestructed = new Row(); $rowBeingDestructed->setSubtable($mockedDataTable); Common::destroy($rowBeingDestructed); @@ -787,7 +801,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase protected function _getDataTable1ForTest() { $rows = $this->_getRowsDataTable1ForTest(); - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray($rows); return $table; } @@ -795,7 +809,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase protected function _getDataTable2ForTest() { $rows = $this->_getRowsDataTable2ForTest(); - $table = new Piwik_DataTable; + $table = new DataTable; $table->addRowsFromArray($rows); return $table; } @@ -803,10 +817,10 @@ class DataTableTest extends PHPUnit_Framework_TestCase protected function _getRowsDataTable1ForTest() { $rows = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'google', 'visits' => 1)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'ask', 'visits' => 2)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => '123', 'visits' => 2)), - Piwik_DataTable::ID_SUMMARY_ROW => array(Piwik_DataTable_Row::COLUMNS => array('label' => Piwik_DataTable::LABEL_SUMMARY_ROW, 'visits' => 4)) + array(Row::COLUMNS => array('label' => 'google', 'visits' => 1)), + array(Row::COLUMNS => array('label' => 'ask', 'visits' => 2)), + array(Row::COLUMNS => array('label' => '123', 'visits' => 2)), + DataTable::ID_SUMMARY_ROW => array(Row::COLUMNS => array('label' => DataTable::LABEL_SUMMARY_ROW, 'visits' => 4)) ); return $rows; @@ -815,9 +829,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase protected function _getRowsDataTable2ForTest() { $rows = array( - array(Piwik_DataTable_Row::COLUMNS => array('label' => 'test', 'visits' => 1)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => ' google ', 'visits' => 3)), - array(Piwik_DataTable_Row::COLUMNS => array('label' => '123a', 'visits' => 2)), + array(Row::COLUMNS => array('label' => 'test', 'visits' => 1)), + array(Row::COLUMNS => array('label' => ' google ', 'visits' => 3)), + array(Row::COLUMNS => array('label' => '123a', 'visits' => 2)), ); return $rows; } diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Core/DateTest.php index 4b80aa3abd..0f9d706011 100644 --- a/tests/PHPUnit/Core/DateTest.php +++ b/tests/PHPUnit/Core/DateTest.php @@ -1,12 +1,13 @@ <?php -use Piwik\Piwik; - /** * Piwik - Open source web analytics * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Piwik; +use Piwik\Date; + class DateTest extends PHPUnit_Framework_TestCase { /** @@ -17,7 +18,7 @@ class DateTest extends PHPUnit_Framework_TestCase */ public function testToday() { - $date = Piwik_Date::today(); + $date = Date::today(); $this->assertEquals(strtotime(date("Y-m-d ") . " 00:00:00"), $date->getTimestamp()); // test getDatetime() @@ -34,7 +35,7 @@ class DateTest extends PHPUnit_Framework_TestCase */ public function testYesterday() { - $date = Piwik_Date::yesterday(); + $date = Date::yesterday(); $this->assertEquals(strtotime(date("Y-m-d", strtotime('-1day')) . " 00:00:00"), $date->getTimestamp()); } @@ -45,7 +46,7 @@ class DateTest extends PHPUnit_Framework_TestCase public function testInvalidDateThrowsException() { try { - Piwik_Date::factory('0001-01-01'); + Date::factory('0001-01-01'); } catch (Exception $e) { return; } @@ -59,28 +60,28 @@ class DateTest extends PHPUnit_Framework_TestCase public function testFactoryTimezone() { // now in UTC converted to UTC+10 means adding 10 hours - $date = Piwik_Date::factory('now', 'UTC+10'); - $dateExpected = Piwik_Date::now()->addHour(10); + $date = Date::factory('now', 'UTC+10'); + $dateExpected = Date::now()->addHour(10); $this->assertEquals($dateExpected->getDatetime(), $date->getDatetime()); // Congo is in UTC+1 all year long (no DST) - $date = Piwik_Date::factory('now', 'Africa/Brazzaville'); - $dateExpected = Piwik_Date::factory('now')->addHour(1); + $date = Date::factory('now', 'Africa/Brazzaville'); + $dateExpected = Date::factory('now')->addHour(1); $this->assertEquals($dateExpected->getDatetime(), $date->getDatetime()); // yesterday same time in Congo is the same as today in Congo - 24 hours - $date = Piwik_Date::factory('yesterdaySameTime', 'Africa/Brazzaville'); - $dateExpected = Piwik_Date::factory('now', 'Africa/Brazzaville')->subHour(24); + $date = Date::factory('yesterdaySameTime', 'Africa/Brazzaville'); + $dateExpected = Date::factory('now', 'Africa/Brazzaville')->subHour(24); $this->assertEquals($dateExpected->getDatetime(), $date->getDatetime()); if (Piwik::isTimezoneSupportEnabled()) { // convert to/from local time $now = time(); - $date = Piwik_Date::factory($now, 'America/New_York'); + $date = Date::factory($now, 'America/New_York'); $time = $date->getTimestamp(); $this->assertTrue($time < $now); - $date = Piwik_Date::factory($time)->setTimezone('America/New_York'); + $date = Date::factory($time)->setTimezone('America/New_York'); $time = $date->getTimestamp(); $this->assertEquals($now, $time); } @@ -92,7 +93,7 @@ class DateTest extends PHPUnit_Framework_TestCase */ public function testSetTimezoneDayInUTC() { - $date = Piwik_Date::factory('2010-01-01'); + $date = Date::factory('2010-01-01'); $dayStart = '2010-01-01 00:00:00'; $dayEnd = '2010-01-01 23:59:59'; @@ -143,7 +144,7 @@ class DateTest extends PHPUnit_Framework_TestCase */ public function testModifyDateWithTimezone() { - $date = Piwik_Date::factory('2010-01-01'); + $date = Date::factory('2010-01-01'); $date = $date->setTimezone('UTC-1'); $timestamp = $date->getTimestamp(); @@ -152,7 +153,7 @@ class DateTest extends PHPUnit_Framework_TestCase if (Piwik::isTimezoneSupportEnabled()) { - $date = Piwik_Date::factory('2010-01-01')->setTimezone('Europe/Paris'); + $date = Date::factory('2010-01-01')->setTimezone('Europe/Paris'); $dateExpected = clone $date; $date = $date->addHour(2); $dateExpected = $dateExpected->addHour(1.1)->addHour(0.9)->addHour(1)->subHour(1); @@ -167,7 +168,7 @@ class DateTest extends PHPUnit_Framework_TestCase public function testGetDateStartUTCEndDuringDstTimezone() { if (Piwik::isTimezoneSupportEnabled()) { - $date = Piwik_Date::factory('2010-03-28'); + $date = Date::factory('2010-03-28'); $date = $date->setTimezone('Europe/Paris'); $utcDayStart = '2010-03-27 23:00:00'; @@ -187,19 +188,19 @@ class DateTest extends PHPUnit_Framework_TestCase // add partial hours less than 1 $dayStart = '2010-03-28 00:00:00'; $dayExpected = '2010-03-28 00:18:00'; - $date = Piwik_Date::factory($dayStart)->addHour(0.3); + $date = Date::factory($dayStart)->addHour(0.3); $this->assertEquals($dayExpected, $date->getDatetime()); $date = $date->subHour(0.3); $this->assertEquals($dayStart, $date->getDatetime()); // add partial hours $dayExpected = '2010-03-28 05:45:00'; - $date = Piwik_Date::factory($dayStart)->addHour(5.75); + $date = Date::factory($dayStart)->addHour(5.75); $this->assertEquals($dayExpected, $date->getDatetime()); // remove partial hours $dayExpected = '2010-03-27 18:15:00'; - $date = Piwik_Date::factory($dayStart)->subHour(5.75); + $date = Date::factory($dayStart)->subHour(5.75); $this->assertEquals($dayExpected, $date->getDatetime()); } @@ -211,8 +212,8 @@ class DateTest extends PHPUnit_Framework_TestCase { $dateTime = '2010-01-03 11:22:33'; $expectedTime = '2010-01-05 11:28:33'; - $this->assertEquals($expectedTime, Piwik_Date::factory($dateTime)->addHour(48.1)->getDatetime()); - $this->assertEquals($dateTime, Piwik_Date::factory($dateTime)->addHour(48.1)->subHour(48.1)->getDatetime()); + $this->assertEquals($expectedTime, Date::factory($dateTime)->addHour(48.1)->getDatetime()); + $this->assertEquals($dateTime, Date::factory($dateTime)->addHour(48.1)->subHour(48.1)->getDatetime()); } /** @@ -221,13 +222,13 @@ class DateTest extends PHPUnit_Framework_TestCase */ public function testAddPeriod() { - $date = Piwik_Date::factory('2010-01-01'); - $dateExpected = Piwik_Date::factory('2010-01-06'); + $date = Date::factory('2010-01-01'); + $dateExpected = Date::factory('2010-01-06'); $date = $date->addPeriod(5, 'day'); $this->assertEquals($dateExpected->getTimestamp(), $date->getTimestamp()); - $date = Piwik_Date::factory('2010-03-01'); - $dateExpected = Piwik_Date::factory('2010-04-05'); + $date = Date::factory('2010-03-01'); + $dateExpected = Date::factory('2010-04-05'); $date = $date->addPeriod(5, 'week'); $this->assertEquals($dateExpected->getTimestamp(), $date->getTimestamp()); } @@ -238,13 +239,13 @@ class DateTest extends PHPUnit_Framework_TestCase */ public function testSubPeriod() { - $date = Piwik_Date::factory('2010-03-01'); - $dateExpected = Piwik_Date::factory('2010-02-15'); + $date = Date::factory('2010-03-01'); + $dateExpected = Date::factory('2010-02-15'); $date = $date->subPeriod(2, 'week'); $this->assertEquals($dateExpected->getTimestamp(), $date->getTimestamp()); - $date = Piwik_Date::factory('2010-12-15'); - $dateExpected = Piwik_Date::factory('2005-12-15'); + $date = Date::factory('2010-12-15'); + $dateExpected = Date::factory('2005-12-15'); $date = $date->subPeriod(5, 'year'); $this->assertEquals($dateExpected->getTimestamp(), $date->getTimestamp()); } diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Core/Period/DayTest.php index 41117c4177..9a55298569 100644 --- a/tests/PHPUnit/Core/Period/DayTest.php +++ b/tests/PHPUnit/Core/Period/DayTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; +use Piwik\Period\Day; +use Piwik\Translate; + /** * Testing Period_Day */ @@ -18,7 +22,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testInvalidDate() { try { - $period = new Piwik_Period_Day('Invalid Date'); + $period = new Day('Invalid Date'); } catch (Exception $e) { return; } @@ -32,7 +36,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testToString() { - $period = new Piwik_Period_Day(Piwik_Date::today()); + $period = new Day(Date::today()); $this->assertEquals(date("Y-m-d"), $period->getPrettyString()); $this->assertEquals(date("Y-m-d"), (string)$period); $this->assertEquals(date("Y-m-d"), $period->toString()); @@ -46,7 +50,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testDayIsFinishedToday() { - $period = new Piwik_Period_Day(Piwik_Date::today()); + $period = new Day(Date::today()); $this->assertEquals(date("Y-m-d"), $period->toString()); $this->assertEquals(array(), $period->getSubperiods()); $this->assertEquals(0, $period->getNumberOfSubperiods()); @@ -61,7 +65,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayIsFinishedYesterday() { - $period = new Piwik_Period_Day(Piwik_Date::yesterday()); + $period = new Day(Date::yesterday()); $this->assertEquals(date("Y-m-d", time() - 86400), $period->toString()); $this->assertEquals(array(), $period->getSubperiods()); $this->assertEquals(0, $period->getNumberOfSubperiods()); @@ -75,7 +79,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testDayIsFinishedTomorrow() { - $period = new Piwik_Period_Day(Piwik_Date::factory(date("Y-m-d", time() + 86400))); + $period = new Day(Date::factory(date("Y-m-d", time() + 86400))); $this->assertEquals(date("Y-m-d", time() + 86400), $period->toString()); $this->assertEquals(array(), $period->getSubperiods()); $this->assertEquals(0, $period->getNumberOfSubperiods()); @@ -89,7 +93,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testDayIsFinished31stfeb() { - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-02-31")); + $period = new Day(Date::factory("2007-02-31")); $this->assertEquals("2007-03-03", $period->toString()); $this->assertEquals(array(), $period->getSubperiods()); $this->assertEquals(0, $period->getNumberOfSubperiods()); @@ -104,7 +108,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayGetDateStart1() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-02-31")); + $period = new Day(Date::factory("2007-02-31")); // start date $startDate = $period->getDateStart(); @@ -125,7 +129,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayGetDateStart2() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-01-03")); + $period = new Day(Date::factory("2007-01-03")); // start date $startDate = $period->getDateStart(); @@ -146,7 +150,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayGetDateStart3() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-12-31")); + $period = new Day(Date::factory("2007-12-31")); // start date $startDate = $period->getDateStart(); @@ -167,7 +171,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayGetDateEnd1() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-02-31")); + $period = new Day(Date::factory("2007-02-31")); // end date $endDate = $period->getDateEnd(); @@ -185,7 +189,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayGetDateEnd2() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-04-15")); + $period = new Day(Date::factory("2007-04-15")); // end date $endDate = $period->getDateEnd(); @@ -203,7 +207,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testDayGetDateEnd3() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-12-31")); + $period = new Day(Date::factory("2007-12-31")); // end date $endDate = $period->getDateEnd(); @@ -221,7 +225,7 @@ class Period_DayTest extends PHPUnit_Framework_TestCase public function testAddSubperiodFails() { // create the period - $period = new Piwik_Period_Day(Piwik_Date::factory("2007-12-31")); + $period = new Day(Date::factory("2007-12-31")); try { $period->addSubperiod(''); @@ -239,8 +243,8 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedShortString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Piwik_Period_Day(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Day(Date::factory('2024-10-09')); $shouldBe = 'Wed 9 Oct'; $this->assertEquals($shouldBe, $month->getLocalizedShortString()); } @@ -252,8 +256,8 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedLongString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Piwik_Period_Day(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Day(Date::factory('2024-10-09')); $shouldBe = 'Wednesday 9 October 2024'; $this->assertEquals($shouldBe, $month->getLocalizedLongString()); } @@ -265,8 +269,8 @@ class Period_DayTest extends PHPUnit_Framework_TestCase */ public function testGetPrettyString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Piwik_Period_Day(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Day(Date::factory('2024-10-09')); $shouldBe = '2024-10-09'; $this->assertEquals($shouldBe, $month->getPrettyString()); } diff --git a/tests/PHPUnit/Core/Period/MonthTest.php b/tests/PHPUnit/Core/Period/MonthTest.php index 4d74cbc434..1996863a03 100644 --- a/tests/PHPUnit/Core/Period/MonthTest.php +++ b/tests/PHPUnit/Core/Period/MonthTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; +use Piwik\Period\Month; +use Piwik\Translate; + /** * Testing Period_Month */ @@ -18,7 +22,7 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testMonthDec() { - $month = new Piwik_Period_Month(Piwik_Date::factory("2006-12-31")); + $month = new Month(Date::factory("2006-12-31")); $correct = array( "2006-12-01", "2006-12-02", @@ -63,7 +67,7 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testMonthFebLeap() { - $month = new Piwik_Period_Month(Piwik_Date::factory("2024-02-11")); + $month = new Month(Date::factory("2024-02-11")); $correct = array( "2024-02-01", "2024-02-02", @@ -106,7 +110,7 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testMonthFebNonLeap() { - $month = new Piwik_Period_Month(Piwik_Date::factory("2023-02-11")); + $month = new Month(Date::factory("2023-02-11")); $correct = array( "2023-02-01", "2023-02-02", @@ -148,7 +152,7 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testMonthJan() { - $month = new Piwik_Period_Month(Piwik_Date::factory("2007-01-01")); + $month = new Month(Date::factory("2007-01-01")); $correct = array( "2007-01-01", "2007-01-02", @@ -193,7 +197,7 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testMonthDSTChangeMarch() { - $month = new Piwik_Period_Month(Piwik_Date::factory("2007-02-31")); + $month = new Month(Date::factory("2007-02-31")); $correct = array( "2007-03-01", "2007-03-02", @@ -237,7 +241,7 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testMonthDSTChangeOct() { - $month = new Piwik_Period_Month(Piwik_Date::factory("2017-10-31")); + $month = new Month(Date::factory("2017-10-31")); $correct = array( "2017-10-01", "2017-10-02", @@ -281,8 +285,8 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedShortString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Piwik_Period_Month(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Month(Date::factory('2024-10-09')); $shouldBe = 'Oct 2024'; $this->assertEquals($shouldBe, $month->getLocalizedShortString()); } @@ -294,8 +298,8 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedLongString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Piwik_Period_Month(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Month(Date::factory('2024-10-09')); $shouldBe = '2024, October'; $this->assertEquals($shouldBe, $month->getLocalizedLongString()); } @@ -307,8 +311,8 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase */ public function testGetPrettyString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Piwik_Period_Month(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Month(Date::factory('2024-10-09')); $shouldBe = '2024-10'; $this->assertEquals($shouldBe, $month->getPrettyString()); } diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Core/Period/RangeTest.php index 8103e3abae..dc7799e732 100644 --- a/tests/PHPUnit/Core/Period/RangeTest.php +++ b/tests/PHPUnit/Core/Period/RangeTest.php @@ -5,7 +5,11 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Period_Range; +use Piwik\Period\Month; +use Piwik\Period\Week; +use Piwik\Period\Range; +use Piwik\Date; +use Piwik\Translate; class Period_RangeTest extends PHPUnit_Framework_TestCase { @@ -13,12 +17,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeToday() { - $range = new Period_Range('day', 'last1'); - $today = Piwik_Date::today(); + $range = new Range('day', 'last1'); + $today = Date::today(); $correct = array( $today->toString(), @@ -32,13 +36,13 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeTodayUtcPlus12() { // rather ugly test, UTC+23 doesn't exist, but it's a way to test that last1 in UTC+23 will be "our" UTC tomorrow - $range = new Period_Range('day', 'last1', 'UTC+23'); - $today = Piwik_Date::now()->addHour(23); + $range = new Range('day', 'last1', 'UTC+23'); + $today = Date::now()->addHour(23); $correct = array( $today->toString(), @@ -53,12 +57,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRange2days() { - $range = new Period_Range('day', 'last2'); - $today = Piwik_Date::today(); + $range = new Range('day', 'last2'); + $today = Date::today(); $correct = array( $today->toString(), @@ -74,12 +78,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRange5days() { - $range = new Period_Range('day', 'last50'); - $today = Piwik_Date::today(); + $range = new Range('day', 'last50'); + $today = Date::today(); $correct = array(); for ($i = 0; $i < 50; $i++) { @@ -95,12 +99,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangePrevious3days() { - $range = new Period_Range('day', 'previous3'); - $yesterday = Piwik_Date::yesterday(); + $range = new Range('day', 'previous3'); + $yesterday = Date::yesterday(); $correct = array(); for ($i = 0; $i < 3; $i++) { @@ -116,12 +120,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeComma1() { - $range = new Period_Range('day', '2008-01-01,2008-01-03'); + $range = new Range('day', '2008-01-01,2008-01-03'); $correct = array( '2008-01-01', @@ -137,12 +141,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeComma2() { - $range = new Period_Range('day', '2007-12-22,2008-01-03'); + $range = new Range('day', '2007-12-22,2008-01-03'); $correct = array( '2007-12-22', @@ -168,12 +172,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeWeekcomma1() { - $range = new Period_Range('week', '2007-12-22,2008-01-03'); - $range2 = new Period_Range('week', '2007-12-19,2008-01-03'); + $range = new Range('week', '2007-12-22,2008-01-03'); + $range2 = new Range('week', '2007-12-19,2008-01-03'); $correct = array( array( @@ -215,11 +219,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeYearcomma1() { - $range = new Period_Range('year', '2006-12-22,2007-01-03'); + $range = new Range('year', '2006-12-22,2007-01-03'); $correct = array( array( @@ -260,11 +264,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeMonthcomma1() { - $range = new Period_Range('month', '2006-12-22,2007-01-03'); + $range = new Range('month', '2006-12-22,2007-01-03'); $correct = array( array( @@ -343,17 +347,17 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeWeek() { - $range = new Period_Range('week', 'last50'); - $today = Piwik_Date::today(); + $range = new Range('week', 'last50'); + $today = Date::today(); $correct = array(); for ($i = 0; $i < 50; $i++) { $date = $today->subDay($i * 7); - $week = new Piwik_Period_Week($date); + $week = new Week($date); $correct[] = $week->toString(); } @@ -368,12 +372,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeWeekLast1() { - $range = new Period_Range('week', 'last1'); - $currentWeek = new Piwik_Period_Week(Piwik_Date::today()); + $range = new Range('week', 'last1'); + $currentWeek = new Week(Date::today()); $this->assertEquals(1, $range->getNumberOfSubperiods()); $this->assertEquals(array($currentWeek->toString()), $range->toString()); } @@ -382,17 +386,17 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeMonth() { - $range = new Period_Range('month', 'last20'); - $today = Piwik_Date::today(); + $range = new Range('month', 'last20'); + $today = Date::today(); $correct = array(); for ($i = 0; $i < 20; $i++) { $date = $today->subMonth($i); - $week = new Piwik_Period_Month($date); + $week = new Month($date); $correct[] = $week->toString(); } @@ -406,12 +410,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeMonthLast1() { - $range = new Period_Range('month', 'last1'); - $month = new Piwik_Period_Month(Piwik_Date::today()); + $range = new Range('month', 'last1'); + $month = new Month(Date::today()); $this->assertEquals(1, $range->getNumberOfSubperiods()); $this->assertEquals(array($month->toString()), $range->toString()); } @@ -420,18 +424,18 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangePreviousmonth() { - $range = new Period_Range('month', 'previous10'); - $end = Piwik_Date::today(); + $range = new Range('month', 'previous10'); + $end = Date::today(); $end = $end->subMonth(1); $correct = array(); for ($i = 0; $i < 10; $i++) { $date = $end->subMonth($i); - $week = new Piwik_Period_Month($date); + $week = new Month($date); $correct[] = $week->toString(); } @@ -446,12 +450,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeYear() { - $range = new Period_Range('year', 'last10'); - $today = Piwik_Date::today(); + $range = new Range('year', 'last10'); + $today = Date::today(); $correct = array(); for ($i = 0; $i < 10; $i++) { @@ -470,12 +474,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testRangeYearLast1() { - $range = new Period_Range('year', 'last1'); - $currentYear = new Piwik_Period_Year(Piwik_Date::today()); + $range = new Range('year', 'last1'); + $currentYear = new Piwik_Period_Year(Date::today()); $this->assertEquals(1, $range->getNumberOfSubperiods()); $this->assertEquals(array($currentYear->toString()), $range->toString()); } @@ -483,11 +487,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeWeekInsideEndingToday() { - $range = new Period_Range('range', '2007-12-22,2008-01-03', 'UTC', Piwik_Date::factory('2008-01-03')); + $range = new Range('range', '2007-12-22,2008-01-03', 'UTC', Date::factory('2008-01-03')); $correct = array( '2007-12-22', @@ -518,20 +522,20 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeWeekInsideEndingYesterday() { $todays = array( - Piwik_Date::factory('2008-01-04'), - Piwik_Date::factory('2008-01-05'), - Piwik_Date::factory('2008-01-14'), - Piwik_Date::factory('2008-02-14'), - Piwik_Date::factory('2009-02-14'), + Date::factory('2008-01-04'), + Date::factory('2008-01-05'), + Date::factory('2008-01-14'), + Date::factory('2008-02-14'), + Date::factory('2009-02-14'), ); foreach ($todays as $today) { - $range = new Period_Range('range', '2007-12-22,2008-01-03', 'UTC', $today); + $range = new Range('range', '2007-12-22,2008-01-03', 'UTC', $today); $correct = array( '2007-12-22', @@ -558,11 +562,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeOnlyDaysLessThanOneWeek() { - $range = new Period_Range('range', '2007-12-30,2008-01-01'); + $range = new Range('range', '2007-12-30,2008-01-01'); $correct = array( '2007-12-30', @@ -576,11 +580,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeOneWeekOnly() { - $range = new Period_Range('range', '2007-12-31,2008-01-06'); + $range = new Range('range', '2007-12-31,2008-01-06'); $correct = array( array( @@ -600,11 +604,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeStartsWithWeek() { - $range = new Period_Range('range', '2007-12-31,2008-01-08'); + $range = new Range('range', '2007-12-31,2008-01-08'); $correct = array( array( @@ -626,11 +630,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeEndsWithWeek() { - $range = new Period_Range('range', '2007-12-21,2008-01-06'); + $range = new Range('range', '2007-12-21,2008-01-06'); $correct = array( '2007-12-21', @@ -662,11 +666,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeContainsMonthAndWeek() { - $range = new Period_Range('range', '2011-09-18,2011-11-02', 'UTC', Piwik_Date::factory('2012-01-01')); + $range = new Range('range', '2011-09-18,2011-11-02', 'UTC', Date::factory('2012-01-01')); $correct = array( @@ -729,22 +733,22 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeContainsSeveralMonthsAndWeeksStartingWithMonth() { // Testing when "today" is in the same month, or later in the future $todays = array( - Piwik_Date::factory('2011-10-18'), - Piwik_Date::factory('2011-10-19'), - Piwik_Date::factory('2011-10-24'), - Piwik_Date::factory('2011-11-01'), - Piwik_Date::factory('2011-11-30'), - Piwik_Date::factory('2011-12-31'), - Piwik_Date::factory('2021-10-18') + Date::factory('2011-10-18'), + Date::factory('2011-10-19'), + Date::factory('2011-10-24'), + Date::factory('2011-11-01'), + Date::factory('2011-11-30'), + Date::factory('2011-12-31'), + Date::factory('2021-10-18') ); foreach ($todays as $today) { - $range = new Period_Range('range', '2011-08-01,2011-10-17', 'UTC', $today); + $range = new Range('range', '2011-08-01,2011-10-17', 'UTC', $today); $correct = array( @@ -845,11 +849,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeOneMonthOnly() { - $range = new Period_Range('range', '2011-09-01,2011-09-30'); + $range = new Range('range', '2011-09-01,2011-09-30'); $correct = array( array( @@ -891,11 +895,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function test_CustomRange_startsWithWeek_EndsWithMonth() { - $range = new Period_Range('range', '2011-07-25,2011-08-31'); + $range = new Range('range', '2011-07-25,2011-08-31'); $correct = array( @@ -948,12 +952,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeBeforeIsAfterYearRight() { try { - $range = new Period_Range('range', '2007-02-09,2007-02-01'); + $range = new Range('range', '2007-02-09,2007-02-01'); $this->assertEquals(0, $range->getNumberOfSubperiods()); $this->assertEquals(array(), $range->toString()); @@ -967,12 +971,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangeLastN() { - $range = new Period_Range('range', 'last4'); - $range->setDefaultEndDate(Piwik_Date::factory('2008-01-03')); + $range = new Range('range', 'last4'); + $range->setDefaultEndDate(Date::factory('2008-01-03')); $correct = array( '2007-12-31', '2008-01-01', @@ -986,12 +990,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangePreviousN() { - $range = new Period_Range('range', 'previous3'); - $range->setDefaultEndDate(Piwik_Date::factory('2008-01-03')); + $range = new Range('range', 'previous3'); + $range->setDefaultEndDate(Date::factory('2008-01-03')); $correct = array( '2007-12-31', '2008-01-01', @@ -1004,11 +1008,11 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testCustomRangePreviousNEndToday() { - $range = new Period_Range('range', 'previous3'); + $range = new Range('range', 'previous3'); $correct = array( date('Y-m-d', time() - 86400 * 3), date('Y-m-d', time() - 86400 * 2), @@ -1021,12 +1025,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testInvalidRangeThrows() { try { - $range = new Period_Range('range', '0001-01-01,today'); + $range = new Range('range', '0001-01-01,today'); $range->getLocalizedLongString(); } catch (Exception $e) { return; @@ -1037,12 +1041,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testGetLocalizedShortString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Period_Range('range', '2000-12-09,2001-02-01'); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Range('range', '2000-12-09,2001-02-01'); $shouldBe = '9 Dec 00 - 1 Feb 01'; $this->assertEquals($shouldBe, $month->getLocalizedShortString()); } @@ -1050,12 +1054,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testGetLocalizedLongString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Period_Range('range', '2023-05-09,2023-05-21'); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Range('range', '2023-05-09,2023-05-21'); $shouldBe = '8 May 23 - 21 May 23'; $this->assertEquals($shouldBe, $month->getLocalizedLongString()); } @@ -1063,12 +1067,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range */ public function testGetPrettyString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $month = new Period_Range('range', '2007-02-09,2007-03-15'); + Translate::getInstance()->loadEnglishTranslation(); + $month = new Range('range', '2007-02-09,2007-03-15'); $shouldBe = 'From 2007-02-09 to 2007-03-15'; $this->assertEquals($shouldBe, $month->getPrettyString()); } @@ -1087,12 +1091,12 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core * @group Period - * @group Period_Range + * @group Range * @dataProvider getDataForLastNLimitsTest */ public function testLastNLimits($period, $lastN, $expectedLastN) { - $range = new Period_Range($period, 'last' . $lastN); + $range = new Range($period, 'last' . $lastN); $this->assertEquals($expectedLastN, $range->getNumberOfSubperiods()); } } diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Core/Period/WeekTest.php index a6f1c758e2..2fda0433c9 100644 --- a/tests/PHPUnit/Core/Period/WeekTest.php +++ b/tests/PHPUnit/Core/Period/WeekTest.php @@ -5,6 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; +use Piwik\Period\Week; +use Piwik\Translate; + /** * Testing Period_Week */ @@ -18,7 +22,7 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase */ public function testWeekBetween2years() { - $week = new Piwik_Period_Week(Piwik_Date::factory("2006-01-01")); + $week = new Week(Date::factory("2006-01-01")); $correct = array( "2005-12-26", "2005-12-27", @@ -39,7 +43,7 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase */ public function testWeekBetween2month() { - $week = new Piwik_Period_Week(Piwik_Date::factory("2006-05-29")); + $week = new Week(Date::factory("2006-05-29")); $correct = array( "2006-05-29", "2006-05-30", @@ -69,10 +73,10 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase '2023-03-04', '2023-03-05',); - $week = new Piwik_Period_Week(Piwik_Date::factory('2023-02-27')); + $week = new Week(Date::factory('2023-02-27')); $this->assertEquals($correct, $week->toString()); $this->assertEquals(7, $week->getNumberOfSubperiods()); - $week = new Piwik_Period_Week(Piwik_Date::factory('2023-03-01')); + $week = new Week(Date::factory('2023-03-01')); $this->assertEquals($correct, $week->toString()); $this->assertEquals(7, $week->getNumberOfSubperiods()); } @@ -94,10 +98,10 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase '2024-03-02', '2024-03-03',); - $week = new Piwik_Period_Week(Piwik_Date::factory('2024-02-27')); + $week = new Week(Date::factory('2024-02-27')); $this->assertEquals($correct, $week->toString()); $this->assertEquals(7, $week->getNumberOfSubperiods()); - $week = new Piwik_Period_Week(Piwik_Date::factory('2024-03-01')); + $week = new Week(Date::factory('2024-03-01')); $this->assertEquals($correct, $week->toString()); $this->assertEquals(7, $week->getNumberOfSubperiods()); } @@ -119,7 +123,7 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase '2024-10-12', '2024-10-13',); - $week = new Piwik_Period_Week(Piwik_Date::factory('2024-10-09')); + $week = new Week(Date::factory('2024-10-09')); $this->assertEquals($correct, $week->toString()); $this->assertEquals(7, $week->getNumberOfSubperiods()); } @@ -131,8 +135,8 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedShortString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $week = new Piwik_Period_Week(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $week = new Week(Date::factory('2024-10-09')); $shouldBe = '7 Oct - 13 Oct 24'; $this->assertEquals($shouldBe, $week->getLocalizedShortString()); } @@ -144,8 +148,8 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedLongString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $week = new Piwik_Period_Week(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $week = new Week(Date::factory('2024-10-09')); $shouldBe = 'Week 7 October - 13 October 2024'; $this->assertEquals($shouldBe, $week->getLocalizedLongString()); } @@ -157,8 +161,8 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase */ public function testGetPrettyString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $week = new Piwik_Period_Week(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $week = new Week(Date::factory('2024-10-09')); $shouldBe = 'From 2024-10-07 to 2024-10-13'; $this->assertEquals($shouldBe, $week->getPrettyString()); } diff --git a/tests/PHPUnit/Core/Period/YearTest.php b/tests/PHPUnit/Core/Period/YearTest.php index 11ea08b2b0..191790424e 100644 --- a/tests/PHPUnit/Core/Period/YearTest.php +++ b/tests/PHPUnit/Core/Period/YearTest.php @@ -5,6 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; +use Piwik\Translate; + /** * Testing Period_Year */ @@ -32,7 +35,7 @@ class Period_YearTest extends PHPUnit_Framework_TestCase '2024-11-01', '2024-12-01',); - $year = new Piwik_Period_Year(Piwik_Date::factory('2024-10-09')); + $year = new Piwik_Period_Year(Date::factory('2024-10-09')); $this->assertEquals(12, $year->getNumberOfSubperiods()); $this->assertEquals($correct, $year->toString()); } @@ -60,7 +63,7 @@ class Period_YearTest extends PHPUnit_Framework_TestCase '2000-12-01', ); - $year = new Piwik_Period_Year(Piwik_Date::factory('2000-02-15')); + $year = new Piwik_Period_Year(Date::factory('2000-02-15')); $this->assertEquals(12, $year->getNumberOfSubperiods()); $this->assertEquals($correct, $year->toString()); } @@ -72,8 +75,8 @@ class Period_YearTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedShortString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $year = new Piwik_Period_Year(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $year = new Piwik_Period_Year(Date::factory('2024-10-09')); $shouldBe = '2024'; $this->assertEquals($shouldBe, $year->getLocalizedShortString()); } @@ -85,8 +88,8 @@ class Period_YearTest extends PHPUnit_Framework_TestCase */ public function testGetLocalizedLongString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $year = new Piwik_Period_Year(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $year = new Piwik_Period_Year(Date::factory('2024-10-09')); $shouldBe = '2024'; $this->assertEquals($shouldBe, $year->getLocalizedLongString()); } @@ -98,8 +101,8 @@ class Period_YearTest extends PHPUnit_Framework_TestCase */ public function testGetPrettyString() { - Piwik_Translate::getInstance()->loadEnglishTranslation(); - $year = new Piwik_Period_Year(Piwik_Date::factory('2024-10-09')); + Translate::getInstance()->loadEnglishTranslation(); + $year = new Piwik_Period_Year(Date::factory('2024-10-09')); $shouldBe = '2024'; $this->assertEquals($shouldBe, $year->getPrettyString()); } diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php index 6021218214..0b315b2527 100644 --- a/tests/PHPUnit/Core/PeriodTest.php +++ b/tests/PHPUnit/Core/PeriodTest.php @@ -6,6 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Period; +use Piwik\Date; +use Piwik\Period\Month; +use Piwik\Period\Day; +use Piwik\Period\Week; class PeriodTest extends PHPUnit_Framework_TestCase { @@ -15,13 +19,13 @@ class PeriodTest extends PHPUnit_Framework_TestCase */ public function testGetId() { - $period = new Piwik_Period_Day(Piwik_Date::today()); + $period = new Day(Date::today()); $this->assertNotEquals(0, $period->getId()); - $period = new Piwik_Period_Week(Piwik_Date::today()); + $period = new Week(Date::today()); $this->assertNotEquals(0, $period->getId()); - $period = new Piwik_Period_Month(Piwik_Date::today()); + $period = new Month(Date::today()); $this->assertNotEquals(0, $period->getId()); - $period = new Piwik_Period_Year(Piwik_Date::today()); + $period = new Piwik_Period_Year(Date::today()); $this->assertNotEquals(0, $period->getId()); } @@ -31,19 +35,19 @@ class PeriodTest extends PHPUnit_Framework_TestCase */ public function testGetLabel() { - $period = new Piwik_Period_Day(Piwik_Date::today()); + $period = new Day(Date::today()); $label = $period->getLabel(); $this->assertInternalType('string', $label); $this->assertNotEmpty($label); - $period = new Piwik_Period_Week(Piwik_Date::today()); + $period = new Week(Date::today()); $label = $period->getLabel(); $this->assertInternalType('string', $label); $this->assertNotEmpty($label); - $period = new Piwik_Period_Month(Piwik_Date::today()); + $period = new Month(Date::today()); $label = $period->getLabel(); $this->assertInternalType('string', $label); $this->assertNotEmpty($label); - $period = new Piwik_Period_Year(Piwik_Date::today()); + $period = new Piwik_Period_Year(Date::today()); $label = $period->getLabel(); $this->assertInternalType('string', $label); $this->assertNotEmpty($label); @@ -55,8 +59,8 @@ class PeriodTest extends PHPUnit_Framework_TestCase */ public function testFactoryDay() { - $period = Period::factory('day', Piwik_Date::today()); - $this->assertInstanceOf('Piwik_Period_Day', $period); + $period = Period::factory('day', Date::today()); + $this->assertInstanceOf('Day', $period); } /** @@ -65,8 +69,8 @@ class PeriodTest extends PHPUnit_Framework_TestCase */ public function testFactoryMonth() { - $period = Period::factory('month', Piwik_Date::today()); - $this->assertInstanceOf('Piwik_Period_Month', $period); + $period = Period::factory('month', Date::today()); + $this->assertInstanceOf('Month', $period); } /** @@ -75,8 +79,8 @@ class PeriodTest extends PHPUnit_Framework_TestCase */ public function testFactoryWeek() { - $period = Period::factory('week', Piwik_Date::today()); - $this->assertInstanceOf('Piwik_Period_Week', $period); + $period = Period::factory('week', Date::today()); + $this->assertInstanceOf('Week', $period); } /** @@ -85,7 +89,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase */ public function testFactoryYear() { - $period = Period::factory('year', Piwik_Date::today()); + $period = Period::factory('year', Date::today()); $this->assertInstanceOf('Piwik_Period_Year', $period); } @@ -96,7 +100,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase public function testFactoryInvalid() { try { - $period = Period::factory('inValid', Piwik_Date::today()); + $period = Period::factory('inValid', Date::today()); } catch (Exception $e) { return; } diff --git a/tests/PHPUnit/Core/PiwikTest.php b/tests/PHPUnit/Core/PiwikTest.php index e1697dde83..26a0339309 100644 --- a/tests/PHPUnit/Core/PiwikTest.php +++ b/tests/PHPUnit/Core/PiwikTest.php @@ -1,13 +1,14 @@ <?php -use Piwik\Piwik; -use Piwik\Access; - /** * Piwik - Open source web analytics * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Piwik; +use Piwik\Access; +use Piwik\Translate; + class PiwikTest extends DatabaseTestCase { /** @@ -113,14 +114,14 @@ class PiwikTest extends DatabaseTestCase $this->markTestSkipped("Will not pass on 32-bit machine."); } - Piwik_Translate::getInstance()->loadEnglishTranslation(); + Translate::getInstance()->loadEnglishTranslation(); $sentenceExpected = str_replace(' ', ' ', $expected[0]); $numericExpected = $expected[1]; $this->assertEquals($sentenceExpected, Piwik::getPrettyTimeFromSeconds($seconds, $sentence = true)); $this->assertEquals($numericExpected, Piwik::getPrettyTimeFromSeconds($seconds, $sentence = false)); - Piwik_Translate::getInstance()->unloadEnglishTranslation(); + Translate::getInstance()->unloadEnglishTranslation(); } /** @@ -211,7 +212,7 @@ class PiwikTest extends DatabaseTestCase */ public function testGetPrettyValue($columnName, $value, $expected) { - Piwik_Translate::getInstance()->loadEnglishTranslation(); + Translate::getInstance()->loadEnglishTranslation(); $access = Access::getInstance(); $access->setSuperUser(true); @@ -223,7 +224,7 @@ class PiwikTest extends DatabaseTestCase Piwik::getPrettyValue($idsite, $columnName, $value, false, false) ); - Piwik_Translate::getInstance()->unloadEnglishTranslation(); + Translate::getInstance()->unloadEnglishTranslation(); } /** diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php index 1e582af3ef..4ae0c32140 100644 --- a/tests/PHPUnit/Core/TaskSchedulerTest.php +++ b/tests/PHPUnit/Core/TaskSchedulerTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\EventDispatcher; + class TaskSchedulerTest extends PHPUnit_Framework_TestCase { private static function getTestTimetable() @@ -50,7 +52,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $getTimetableFromOptionValue = new ReflectionMethod( 'Piwik_TaskScheduler', 'getTimetableFromOptionValue' ); - $getTimetableFromOptionValue->setAccessible(TRUE); + $getTimetableFromOptionValue->setAccessible(true); $this->assertEquals($expectedTimetable, $getTimetableFromOptionValue->invoke(new Piwik_TaskScheduler(), $option)); } @@ -79,7 +81,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $taskHasBeenScheduledOnce = new ReflectionMethod( 'Piwik_TaskScheduler', 'taskHasBeenScheduledOnce' ); - $taskHasBeenScheduledOnce->setAccessible(TRUE); + $taskHasBeenScheduledOnce->setAccessible(true); $this->assertEquals($expectedDecision, $taskHasBeenScheduledOnce->invoke(new Piwik_TaskScheduler(), $taskName, $timetable)); } @@ -142,7 +144,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $taskShouldBeExecuted = new ReflectionMethod( 'Piwik_TaskScheduler', 'taskShouldBeExecuted' ); - $taskShouldBeExecuted->setAccessible(TRUE); + $taskShouldBeExecuted->setAccessible(true); $this->assertEquals($expectedDecision, $taskShouldBeExecuted->invoke(new Piwik_TaskScheduler(), $taskName, $timetable)); } @@ -171,7 +173,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $mock->expects($this->once())->method($methodName)->with($this->equalTo($parameterValue)); $executeTask = new ReflectionMethod('Piwik_TaskScheduler', 'executeTask'); - $executeTask->setAccessible(TRUE); + $executeTask->setAccessible(true); $this->assertNotEmpty($executeTask->invoke( new Piwik_TaskScheduler(), @@ -278,9 +280,9 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase public function testRunTasks($expectedTimetable, $expectedExecutedTasks, $timetableBeforeTaskExecution, $configuredTasks) { // temporarily unload plugins - $plugins = PluginsManager::getInstance()->getLoadedPlugins(); + $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins(); $plugins = array_map(function ($p) { return $p->getPluginName(); }, $plugins); - PluginsManager::getInstance()->unloadPlugins(); + \Piwik\PluginsManager::getInstance()->unloadPlugins(); // make sure the get tasks event returns our configured tasks Piwik_AddAction(Piwik_TaskScheduler::GET_TASKS_EVENT, function(&$tasks) use($configuredTasks) { @@ -307,8 +309,8 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $this->assertEquals($expectedTimetable, $getTimetableFromOptionTable->invoke(new Piwik_TaskScheduler())); // restore loaded plugins & piwik options - Piwik_EventDispatcher::getInstance()->clearObservers(Piwik_TaskScheduler::GET_TASKS_EVENT); - PluginsManager::getInstance()->loadPlugins($plugins); + EventDispatcher::getInstance()->clearObservers(Piwik_TaskScheduler::GET_TASKS_EVENT); + \Piwik\PluginsManager::getInstance()->loadPlugins($plugins); self::resetPiwikOption(); } diff --git a/tests/PHPUnit/Core/Tracker/ActionTest.php b/tests/PHPUnit/Core/Tracker/ActionTest.php index 4a608d5745..95a8fee7b4 100644 --- a/tests/PHPUnit/Core/Tracker/ActionTest.php +++ b/tests/PHPUnit/Core/Tracker/ActionTest.php @@ -1,6 +1,7 @@ <?php use Piwik\Config; use Piwik\Access; +use Piwik\Translate; /** * Piwik - Open source web analytics @@ -18,9 +19,9 @@ class Tracker_ActionTest extends DatabaseTestCase $config->clear(); $config->setTestEnvironment($userFile, false); - PluginsManager::getInstance()->loadPlugins(array('SitesManager')); + \Piwik\PluginsManager::getInstance()->loadPlugins(array('SitesManager')); - Piwik_Translate::getInstance()->loadEnglishTranslation(); + Translate::getInstance()->loadEnglishTranslation(); } protected function setUpRootAccess() diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Core/Tracker/VisitTest.php index 3a3bbd415d..762900a935 100644 --- a/tests/PHPUnit/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Core/Tracker/VisitTest.php @@ -18,7 +18,7 @@ class Tracker_VisitTest extends DatabaseTestCase FakeAccess::$superUser = true; Access::setSingletonInstance($pseudoMockAccess); - PluginsManager::getInstance()->loadPlugins(array('SitesManager')); + \Piwik\PluginsManager::getInstance()->loadPlugins(array('SitesManager')); } /** |