1 files changed, 34 insertions, 0 deletions
diff --git a/tests/units/Core/CsvTest.php b/tests/units/Core/CsvTest.php
index 71542c20..da0be4a3 100644
--- a/tests/units/Core/CsvTest.php
+++ b/tests/units/Core/CsvTest.php
@@ -14,9 +14,43 @@ class CsvTest extends Base
         $this->assertEquals(1, Csv::getBooleanValue('TRUE'));
         $this->assertEquals(1, Csv::getBooleanValue('true'));
         $this->assertEquals(1, Csv::getBooleanValue('T'));
+        $this->assertEquals(1, Csv::getBooleanValue('Y'));
+        $this->assertEquals(1, Csv::getBooleanValue('y'));
+        $this->assertEquals(1, Csv::getBooleanValue('yes'));
+        $this->assertEquals(1, Csv::getBooleanValue('Yes'));
 
         $this->assertEquals(0, Csv::getBooleanValue('0'));
         $this->assertEquals(0, Csv::getBooleanValue('123'));
         $this->assertEquals(0, Csv::getBooleanValue('anything'));
     }
+
+    public function testGetEnclosures()
+    {
+        $this->assertCount(3, Csv::getEnclosures());
+        $this->assertCount(4, Csv::getDelimiters());
+    }
+
+    public function testReadWrite()
+    {
+        $filename = tempnam(sys_get_temp_dir(), 'UT');
+        $rows = array(
+            array('Column A', 'Column B'),
+            array('value a', 'value b'),
+        );
+
+        $csv = new Csv;
+        $csv->write($filename, $rows);
+        $csv->setColumnMapping(array('A', 'B', 'C'));
+        $csv->read($filename, array($this, 'readRow'));
+
+        unlink($filename);
+
+        $this->expectOutputString('"Column A","Column B"'."\n".'"value a","value b"'."\n", $csv->output($rows));
+    }
+
+    public function readRow(array $row, $line)
+    {
+        $this->assertEquals(array('value a', 'value b', ''), $row);
+        $this->assertEquals(1, $line);
+    }
 }