diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CsvTest.php | 6 | ||||
| -rw-r--r-- | test/ReaderTest.php | 10 | ||||
| -rw-r--r-- | test/WriterTest.php | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/test/CsvTest.php b/test/CsvTest.php index 2898180..cc6c9c7 100644 --- a/test/CsvTest.php +++ b/test/CsvTest.php @@ -164,10 +164,10 @@ class CsvTest extends PHPUnit_Framework_TestCase public function testEncoding() { $expected = 'iso-8859-15'; - $this->csv->setEncodingFrom($expected); - $this->assertSame(strtoupper($expected), $this->csv->getEncodingFrom()); + $this->csv->setEncoding($expected); + $this->assertSame(strtoupper($expected), $this->csv->getEncoding()); - $this->csv->setEncodingFrom(''); + $this->csv->setEncoding(''); } public function testToString() diff --git a/test/ReaderTest.php b/test/ReaderTest.php index 54deea4..fb3f919 100644 --- a/test/ReaderTest.php +++ b/test/ReaderTest.php @@ -68,7 +68,7 @@ class ReaderTest extends PHPUnit_Framework_TestCase $func = function ($row) { return ! in_array('jane', $row); }; - $this->csv->addFilter($func); + $this->csv->setFilter($func); $this->assertCount(1, $this->csv->fetchAll()); @@ -94,7 +94,7 @@ class ReaderTest extends PHPUnit_Framework_TestCase $func = function ($rowA, $rowB) { return strcmp($rowA[0], $rowB[0]); }; - $this->csv->addSortBy($func); + $this->csv->setSortBy($func); $this->assertSame(array_reverse($this->expected), $this->csv->fetchAll()); $this->csv->addSortBy($func); @@ -111,7 +111,7 @@ class ReaderTest extends PHPUnit_Framework_TestCase $func = function ($rowA, $rowB) { return strcmp($rowA[0], $rowB[0]); }; - $csv->addSortBy($func); + $csv->setSortBy($func); $this->assertSame([ ['john', 'doe', 'john.doe@example.com'], ['john', 'doe', 'john.doe@example.com'] @@ -178,7 +178,7 @@ class ReaderTest extends PHPUnit_Framework_TestCase public function testFetchCol() { - $this->assertSame(['john', 'jane'], $this->csv->fetchColumn(0)); + $this->assertSame(['john', 'jane'], $this->csv->fetchCol(0)); $this->assertSame(['john', 'jane'], $this->csv->fetchColumn()); } @@ -276,7 +276,7 @@ EOF; public function testGetWriter2() { - $csv = (new Reader(__DIR__.'/foo.csv'))->newWriter('a+'); + $csv = (new Reader(__DIR__.'/foo.csv'))->getWriter('a+'); $this->assertInstanceOf('\League\Csv\Writer', $csv); } } diff --git a/test/WriterTest.php b/test/WriterTest.php index 86db64a..ff67e73 100644 --- a/test/WriterTest.php +++ b/test/WriterTest.php @@ -115,7 +115,7 @@ class WriterTest extends PHPUnit_Framework_TestCase } /** - * @expectedException InvalidArgumentException + * @expectedException RuntimeException */ public function testColumsCountConsistency() { @@ -127,7 +127,7 @@ class WriterTest extends PHPUnit_Framework_TestCase } /** - * @expectedException InvalidArgumentException + * @expectedException RuntimeException */ public function testAutoDetectColumnsCount() { @@ -189,7 +189,7 @@ class WriterTest extends PHPUnit_Framework_TestCase $this->csv->insertOne($row); } - $reader = $this->csv->newReader(); + $reader = $this->csv->getReader(); $this->assertSame(['john', 'doe', 'john.doe@example.com'], $reader->fetchOne(0)); } } |