Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2016-12-30 04:24:29 +0300
committerGitHub <noreply@github.com>2016-12-30 04:24:29 +0300
commitdd6b278823f13e9126aa4fe39669b5f95dc42930 (patch)
tree8cd84e585adaf19c1ea070a016248d7b054b6f4b /tests/PHPUnit
parent071a9f7cb301900a28b12a9661746950a2dcf48e (diff)
Revert #11100 (#11113)
* Revert #11100 * Added new field <generationTimeMilliseconds> from #11095
Diffstat (limited to 'tests/PHPUnit')
-rw-r--r--tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
index 79fe1619cc..773482d603 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('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))));
+ $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))));
if($appendRowWithSubtable) {
$subTable = $this->makeDataTable_withoutVisitsColumn( $appendRowWithSubtable = false );
$table->addRowFromArray(array(
- Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('columnWithin' => 13)),
+ Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('visits' => 3, 'columnWithin' => 13)),
Row::DATATABLE_ASSOCIATED => $subTable
));
}
@@ -140,9 +140,9 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase
protected function makeArray_withoutVisitsColumns()
{
$array = array(
- array('label' => 'row1', 'arrayColumn' => array( 'columnWithin' => 10)),
- array('label' => 'row2', 'arrayColumn' => array( 'columnWithin' => 11)),
- array('label' => 'row3', 'arrayColumn' => array( 'columnWithin' => 12)),
+ 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;
}