Added tests for MultiCollection as well as a Base Collection test class

nozavroni · Dec 5, 2016 · c57c829 · c57c829
1 parent be4772b
commit c57c829
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/src/CSVelte/Collection/AbstractCollection.php b/src/CSVelte/Collection/AbstractCollection.php
@@ -680,6 +680,12 @@ public static function isTabular($data)
                     return false;
                 }
             }
+            // if row contains an array it isn't tabular
+            if (array_reduce($row, function($carry, $item){
+                return is_array($item) && $carry;
+            }, true)) {
+                return false;
+            }
         }
         return true;
     }

diff --git a/src/CSVelte/Collection/MultiCollection.php b/src/CSVelte/Collection/MultiCollection.php
@@ -21,4 +21,24 @@ protected function isConsistentDataStructure($data)
     {
         return static::isMultiDimensional($data);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function contains($value, $index = null)
+    {
+        if (parent::contains($value, $index)) {
+            return true;
+        } else {
+            foreach ($this->data as $key => $arr) {
+                if (is_traversable($arr)) {
+                    $coll = static::factory($arr);
+                    if ($coll->contains($value, $index)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/tests/CSVelte/Collection/CharCollectionTest.php b/tests/CSVelte/Collection/CharCollectionTest.php
@@ -14,9 +14,8 @@
 namespace CSVelteTest\Collection;
 
 use CSVelte\Collection\CharCollection;
-use CSVelteTest\UnitTestCase;
 
-class CharCollectionTest extends UnitTestCase
+class CharCollectionTest extends AbstractCollectionTest
 {
     public function testCharCollectionAcceptsString()
     {

diff --git a/tests/CSVelte/Collection/CollectionTest.php b/tests/CSVelte/Collection/CollectionTest.php
@@ -23,11 +23,10 @@
 use \ArrayIterator;
 use CSVelte\Collection\AbstractCollection;
 use CSVelte\Collection\Collection;
-use CSVelte\Contract\Collectable;
-use CSVelteTest\UnitTestCase;
+//use CSVelte\Contract\Collectable;
 use function CSVelte\is_traversable;
 
-class CollectionTest extends UnitTestCase
+class CollectionTest extends AbstractCollectionTest
 {
 //    public function testCollectFactoryReturnsCollectable()
 //    {

diff --git a/tests/CSVelte/Collection/NumericCollectionTest.php b/tests/CSVelte/Collection/NumericCollectionTest.php
@@ -3,9 +3,8 @@
 
 use CSVelte\Collection\Collection;
 use CSVelte\Collection\NumericCollection;
-use CSVelteTest\UnitTestCase;
 
-class NumericCollectionTest extends UnitTestCase
+class NumericCollectionTest extends AbstractCollectionTest
 {
     public function testIncrementDecrementAddsSubtractsOneFromGivenKey()
     {