From 62607a51e11f7ec885421804938603d69e88ac85 Mon Sep 17 00:00:00 2001 From: mattab <matthieu.aubry@gmail.com> Date: Wed, 12 Nov 2014 00:08:31 +1300 Subject: [PATCH] fixing a unit test now that the function does not throw exception refs #6485 --- core/DataAccess/ArchiveWriter.php | 9 +-------- tests/PHPUnit/Unit/DataTableTest.php | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php index 7e0086d795..92baae214f 100644 --- a/core/DataAccess/ArchiveWriter.php +++ b/core/DataAccess/ArchiveWriter.php @@ -253,14 +253,7 @@ class ArchiveWriter protected function getTableNumeric() { return ArchiveTableCreator::getNumericTable($this->dateStart); - } - - protected function getInsertFields() - { - return $this->fields; - } - - protected function isRecordZero($value) + }TRecordZero($value) { return ($value === '0' || $value === false || $value === 0 || $value === 0.0); } diff --git a/tests/PHPUnit/Unit/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php index 355b717118..9e9297cb16 100644 --- a/tests/PHPUnit/Unit/DataTableTest.php +++ b/tests/PHPUnit/Unit/DataTableTest.php @@ -328,7 +328,7 @@ class DataTableTest extends \PHPUnit_Framework_TestCase $row2 = new Row(array(Row::COLUMNS => $columns2)); $row2->sumRow($row1); - $this->fail("sumRow did not throw when adding two string columns."); + } /** -- GitLab