Merge pull request #36 from peter279k/test_enhancement

Test enhancement
jwage · May 11, 2018 · 7693a63 · 7693a63
2 parents 352781c + e729a2f
commit 7693a63
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,14 @@ php:
   - 5.6
   - hhvm
   - 7.0
+  - 7.1
+  - 7.2
+  - nightly
 
 before_script: composer install
 
 matrix:
   allow_failures:
     - php: hhvm
-    - php: 7.0
+    - php: nightly
   fast_finish: true
diff --git a/composer.json b/composer.json
@@ -9,11 +9,21 @@
         {"name": "Jonathan H. Wage", "email": "[email protected]"}
     ],
     "autoload": {
-        "psr-0": {"EasyCSV": "lib/"}
+        "psr-4": {
+            "EasyCSV\\": "lib/EasyCSV"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "EasyCSV\\Tests\\": "tests/EasyCSV/Tests"
+        }
     },
     "require": {
     	"php": ">=5.4.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.5|^6.5"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0.x-dev"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,7 +9,7 @@
 
     <filter>
         <whitelist>
-            <directory suffix=".php">./src/Purl/</directory>
+            <directory suffix=".php">./lib/EasyCSV</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/tests/EasyCSV/Tests/ReaderTest.php b/tests/EasyCSV/Tests/ReaderTest.php
@@ -3,8 +3,9 @@
 namespace EasyCSV\Tests;
 
 use EasyCSV\Reader;
+use PHPUnit\Framework\TestCase;
 
-class ReaderTest extends \PHPUnit_Framework_TestCase
+class ReaderTest extends TestCase
 {
     protected $headers = array("column1", "column2", "column3");
 
@@ -206,11 +207,12 @@ public function testAdvanceToNoHeadersFirstRow(Reader $reader)
     }
 
     /**
-     * @dataProvider getReaders
+     * @dataProvider advanceToLastLineProvider
      */
-    public function testAdvanceToLastLine(Reader $reader)
+    public function testAdvanceToLastLine($expectedRows, Reader $reader)
     {
         $reader->advanceTo(5);
+        $this->assertSame($expectedRows, $reader->getCurrentRow());
     }
 
     /**
@@ -300,6 +302,17 @@ public function getReaders()
         );
     }
 
+    public function advanceToLastLineProvider()
+    {
+        $readerSemiColon = new Reader(__DIR__ . '/read_sc.csv');
+        $readerSemiColon->setDelimiter(';');
+
+        return array(
+            array(array('5column2value', '5column3value', '5column4value'), new Reader(__DIR__ . '/read.csv')),
+            array(array('5column2value', '5column3value', '5column4value'), $readerSemiColon),
+        );
+    }
+
     public function getReadersNoHeadersFirstRow()
     {
         $readerSemiColon = new Reader(__DIR__ . '/read_header_line_sc.csv', 'r+', false);

diff --git a/tests/EasyCSV/Tests/WriterTest.php b/tests/EasyCSV/Tests/WriterTest.php
@@ -2,24 +2,28 @@
 
 namespace EasyCSV\Tests;
 
-class WriterTest extends \PHPUnit_Framework_TestCase
+use EasyCSV\Reader;
+use EasyCSV\Writer;
+use PHPUnit\Framework\TestCase;
+
+class WriterTest extends TestCase
 {
     private $writer;
 
     public function setUp()
     {
-        $this->writer = new \EasyCSV\Writer(__DIR__ . '/write.csv');
-        $this->writerBOM = new \EasyCSV\Writer(__DIR__ . '/write_bom.csv', 'r+', true);
+        $this->writer = new Writer(__DIR__ . '/write.csv');
+        $this->writerBOM = new Writer(__DIR__ . '/write_bom.csv', 'r+', true);
     }
 
     public function testWriteRow()
     {
-        $this->writer->writeRow('test1, test2, test3');
+        $this->assertEquals(18, $this->writer->writeRow('test1, test2, test3'));
     }
 
     public function testWriteBOMRow()
     {
-        $this->writerBOM->writeRow('колонка 1, колонка 2, колонка 3');
+        $this->assertEquals(57, $this->writerBOM->writeRow('колонка 1, колонка 2, колонка 3'));
     }
 
     public function testWriteFromArray()
@@ -29,6 +33,13 @@ public function testWriteFromArray()
             '1test1, 1test2ing this out, 1test3',
             array('2test1', '2test2 ing this out ok', '2test3')
         ));
+        $reader = new Reader(__DIR__ . '/write.csv');
+        $results = $reader->getRow();
+        $this->assertEquals(array(
+            'column1' => '1test1',
+            'column2' => '1test2ing this out',
+            'column3' => '1test3'
+        ), $results);   
     }
 
     public function testWriteBOMFromArray()
@@ -38,11 +49,18 @@ public function testWriteBOMFromArray()
             'значение 1, значение 2, значение 3',
             array('значение 4', 'значение 5', 'значение 6')
         ));
+        $reader = new Reader(__DIR__ . '/write_bom.csv');
+        $results = $reader->getRow();
+        $this->assertEquals(array(
+            'колонка 1' => 'значение 1',
+            'колонка 2' => 'значение 2',
+            'колонка 3' => 'значение 3'
+        ), $results);  
     }
 
     public function testReadWrittenFile()
     {
-        $reader = new \EasyCSV\Reader(__DIR__ . '/write.csv');
+        $reader = new Reader(__DIR__ . '/write.csv');
         $results = $reader->getAll();
         $expected = array(
             array(
@@ -61,7 +79,7 @@ public function testReadWrittenFile()
 
     public function testReadWrittenBOMFile()
     {
-        $reader = new \EasyCSV\Reader(__DIR__ . '/write_bom.csv');
+        $reader = new Reader(__DIR__ . '/write_bom.csv');
         $results = $reader->getAll();
         $expected = array(
             array(

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,9 +1,3 @@
 <?php
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
-
-call_user_func(function () {
-    $loader = new \Composer\Autoload\ClassLoader();
-    $loader->add('EasyCSV\Test', __DIR__);
-    $loader->register();
-});