moving the csv property from AbstractCsv to Writer class

3 files changed, 34 insertions, 4 deletions

diff --git a/test/CsvTest.php b/test/CsvTest.php
index f2a70b7..73df606 100644
--- a/test/CsvTest.php
+++ b/test/CsvTest.php
@@ -66,7 +66,7 @@ class CsvTest extends PHPUnit_Framework_TestCase
      */
     public function testConstructorWithWrongType()
     {
-        (new Reader(['/usr/bin/foo.csv']))->getIterator();
+        new Reader(['/usr/bin/foo.csv']);
     }
 
     public function testCreateFromString()
@@ -272,6 +272,9 @@ EOF;
         $csv->addStreamFilter(new DateTime);
     }
 
+    /**
+     * @expectedException OutOfBoundsException
+     */
     public function testaddMultipleStreamFilter()
     {
         $path = __DIR__.'/foo.csv';
@@ -288,6 +291,15 @@ EOF;
         }
         $csv->clearStreamFilter();
         $this->assertFalse($csv->hasStreamFilter('string.rot13'));
+
+        $csv->addStreamFilter('string.toupper');
+        $this->assertSame(STREAM_FILTER_READ, $csv->getStreamFilterMode());
+        $csv->setStreamFilterMode(STREAM_FILTER_WRITE);
+        $this->assertSame(STREAM_FILTER_WRITE, $csv->getStreamFilterMode());
+        foreach ($csv->getIterator() as $row) {
+            $this->assertSame($row, ['john', 'doe', 'john.doe@example.com']);
+        }
+        $csv->setStreamFilterMode(34);
     }
 
     /**
diff --git a/test/WriterTest.php b/test/WriterTest.php
index 490d197..9efeb04 100644
--- a/test/WriterTest.php
+++ b/test/WriterTest.php
@@ -2,11 +2,14 @@
 
 namespace League\Csv\test;
 
-use SplTempFileObject;
 use ArrayIterator;
 use LimitIterator;
-use PHPUnit_Framework_TestCase;
+use SplFileObject;
+use SplTempFileObject;
+
 use DateTime;
+
+use PHPUnit_Framework_TestCase;
 use League\Csv\Writer;
 
 date_default_timezone_set('UTC');
@@ -24,6 +27,12 @@ class WriterTest extends PHPUnit_Framework_TestCase
         $this->csv = new Writer(new SplTempFileObject);
     }
 
+    public function tearDown()
+    {
+        $csv = new SplFileObject(__DIR__.'/foo.csv', 'w');
+        $csv->fputcsv(["john", "doe", "john.doe@example.com"]);
+    }
+
     public function testInsert()
     {
         $expected = [
@@ -50,6 +59,15 @@ class WriterTest extends PHPUnit_Framework_TestCase
         $this->csv->setNullHandlingMode(23);
     }
 
+    public function testInsertNormalFile()
+    {
+        $csv = new Writer(__DIR__.'/foo.csv', 'a+');
+        $csv->insertOne(['jane', 'doe', 'jane.doe@example.com']);
+        $iterator = new LimitIterator($csv->getIterator(), 1, 1);
+        $iterator->rewind();
+        $this->assertSame(['jane', 'doe', 'jane.doe@example.com'], $iterator->getInnerIterator()->current());
+    }
+
     public function testInsertNullToSkipCell()
     {
         $expected = [
diff --git a/test/foo.csv b/test/foo.csv
index 0c85eae..2f6d89f 100644
--- a/test/foo.csv
+++ b/test/foo.csv
@@ -1 +1 @@
-"john","doe","john.doe@example.com"
\ No newline at end of file
+john,doe,john.doe@example.com