diff options
Diffstat (limited to 'tests/PHPUnit/Core/DataTable')
15 files changed, 496 insertions, 431 deletions
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 ) ); |