Reporting API: showColumns and hideColumns are now applied recursively (#11115)

1 files changed, 11 insertions, 13 deletions

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
index a6b229acb9..dae312f6da 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
@@ -35,14 +35,14 @@ class ColumnDeleteTest extends \PHPUnit\Framework\TestCase
     protected function makeDataTable_withoutVisitsColumn($appendRowWithSubtable = true)
     {
         $table = new DataTable();
-        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10))));
-        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11))));
-        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12))));
+        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('columnWithin' => 10))));
+        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('columnWithin' => 11))));
+        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('columnWithin' => 12))));
 
         if($appendRowWithSubtable) {
             $subTable = $this->makeDataTable_withoutVisitsColumn( $appendRowWithSubtable = false );
             $table->addRowFromArray(array(
-                Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('visits' => 3, 'columnWithin' => 13)),
+                Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('columnWithin' => 13)),
                 Row::DATATABLE_ASSOCIATED => $subTable
             ));
         }
@@ -82,7 +82,7 @@ class ColumnDeleteTest extends \PHPUnit\Framework\TestCase
     public function test_filter_DataTable_removeExistingColumn()
     {
         $table = $this->makeDataTable();
-        $table->filter($this->filter, array('visits'));
+        $table->filter($this->filter, array('visits', array(), false, true));
 
         $this->assertSameDataTable($this->makeDataTable_withoutVisitsColumn(), $table);
     }
@@ -107,7 +107,7 @@ class ColumnDeleteTest extends \PHPUnit\Framework\TestCase
 
     public function test_filter_array_removeExistingColumn()
     {
-        $columnDelete = new DataTable\Filter\ColumnDelete(new DataTable(), $hideColumns = 'visits', $showColumns = array());
+        $columnDelete = new DataTable\Filter\ColumnDelete(new DataTable(), $hideColumns = 'visits', $showColumns = array(), false, true);
         $filteredArray = $columnDelete->filter($this->makeArray());
 
         $this->assertSame($this->makeArray_withoutVisitsColumns(), $filteredArray);
@@ -139,12 +139,11 @@ class ColumnDeleteTest extends \PHPUnit\Framework\TestCase
      */
     protected function makeArray_withoutVisitsColumns()
     {
-        $array = array(
-            array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10)),
-            array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11)),
-            array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12)),
+        return array(
+            array('label' => 'row1', 'arrayColumn' => array('columnWithin' => 10)),
+            array('label' => 'row2', 'arrayColumn' => array('columnWithin' => 11)),
+            array('label' => 'row3', 'arrayColumn' => array('columnWithin' => 12)),
         );
-        return $array;
     }
 
     /**
@@ -152,12 +151,11 @@ class ColumnDeleteTest extends \PHPUnit\Framework\TestCase
      */
     protected function makeArray_showVisitsColumns()
     {
-        $array = array(
+        return array(
             array('label' => 'row1', 'visits' => 1),
             array('label' => 'row2', 'visits' => 2),
             array('label' => 'row3', 'visits' => 3),
         );
-        return $array;
     }
 
 }