fix tests

kunicmarko20 · Jul 21, 2018 · be81b5d · be81b5d
1 parent 560025e
commit be81b5d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/tests/Fixtures/ChunkImportClass.php b/tests/Fixtures/ChunkImportClass.php
@@ -14,7 +14,7 @@
  */
 class ChunkImportClass extends TestCase implements Import, ChunkImport, BeforeImport
 {
-    public function before(Iterator $items): Iterator
+    public function before(Iterator $items, array $additionalData): Iterator
     {
         $items->next();
 
@@ -26,12 +26,12 @@ public function chunkSize(): int
         return 50;
     }
 
-    public function map(array $item)
+    public function map(array $item, array $additionalData)
     {
         return $item;
     }
 
-    public function save(array $items): void
+    public function save(array $items, array $additionalData): void
     {
         $this->assertLessThanOrEqual(50, count($items));
     }

diff --git a/tests/Fixtures/ImportClass.php b/tests/Fixtures/ImportClass.php
@@ -12,19 +12,23 @@
  */
 class ImportClass extends TestCase implements Import, BeforeImport
 {
-    public function before(Iterator $items): Iterator
+    public function before(Iterator $items, array $additionalData): Iterator
     {
         $items->next();
 
         return $items;
     }
 
-    public function map(array $item)
+    public function map(array $item, array $additionalData)
     {
+        if ($additionalData) {
+            $this->assertSame('testing', reset($additionalData));
+        }
+
         return $item;
     }
 
-    public function save(array $items): void
+    public function save(array $items, array $additionalData): void
     {
         $this->assertCount(999, $items);
 

diff --git a/tests/Fixtures/ImportNestedJsonClass.php b/tests/Fixtures/ImportNestedJsonClass.php
@@ -12,9 +12,8 @@ class ImportNestedJsonClass extends ImportClass
 {
     /**
      * @param ArrayIterator|Iterator $items
-     * @return Iterator
      */
-    public function before(Iterator $items): Iterator
+    public function before(Iterator $items, array $additionalData): Iterator
     {
         $iterator = new ArrayIterator($items->getArrayCopy()['data']);
 

diff --git a/tests/ImporterTest.php b/tests/ImporterTest.php
@@ -120,6 +120,16 @@ public function testExcelImportFromFile(): void
             ->import();
     }
 
+    public function testWithAdditionalData(): void
+    {
+        $importer = $this->importerFactory->getImporter('xlsx');
+
+        $importer->fromFile(__DIR__ . '/Fixtures/fake.xlsx')
+            ->useImportClass($this->importClass)
+            ->withAdditionalData(['test' => 'testing'])
+            ->import();
+    }
+
     /**
      * @expectedException \KunicMarko\Importer\Exception\NotSupportedException
      */