More exception tests

Author: Juuso Leinonen

tests/Unit/DataLoaderAbuseTest.php

@@ -58,8 +58,7 @@ public function load_many_requires_actual_keys()
     /**
      * @test
      * @expectedException \RuntimeException
-     * @expectedExceptionMessage leinonen\DataLoader\DataLoader must be constructed with a function which accepts
-     * an array of keys and returns a Promise which resolves to an array of values not return a Promise: null.
+     * @expectedExceptionMessage leinonen\DataLoader\DataLoader must be constructed with a function which accepts an array of keys and returns a Promise which resolves to an array of values not return a Promise: NULL.
      */
     public function batch_function_must_return_a_promise_not_null()
     {
@@ -73,14 +72,43 @@ public function batch_function_must_return_a_promise_not_null()
     /**
      * @test
      * @expectedException \RuntimeException
-     * @expectedExceptionMessage leinonen\DataLoader\DataLoader must be constructed with a function which accepts
-     * an array of keys and returns a Promise which resolves to an array of values not return a Promise: 1.
+     * @expectedExceptionMessage leinonen\DataLoader\DataLoader must be constructed with a function which accepts an array of keys and returns a Promise which resolves to an array of values not return a Promise: array.
+     */
+    public function batch_function_must_return_a_promise_not_a_array()
+    {
+        $badLoader = $this->createDataLoader(function ($keys) {
+            return $keys;
+        });
+
+        $badLoader->load(1);
+        $this->eventLoop->run();
+    }
+
+    /**
+     * @test
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage leinonen\DataLoader\DataLoader must be constructed with a function which accepts an array of keys and returns a Promise which resolves to an array of values not return a Promise: integer.
      */
     public function batch_function_must_return_a_promise_not_a_value()
+    {
+        $badLoader = $this->createDataLoader(function ($keys) {
+            return 1;
+        });
+
+        $badLoader->load(1);
+        $this->eventLoop->run();
+    }
+
+    /**
+     * @test
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage leinonen\DataLoader\DataLoader must be constructed with a function which accepts an array of keys and returns a Promise which resolves to an array of values not return a Promise: object.
+     */
+    public function batch_function_must_return_a_promise_not_an_object()
     {
         $badLoader = new DataLoader(
             function ($keys) {
-                return $keys;
+                return new \stdClass();
             }, $this->eventLoop, new CacheMap()
         );
 

tests/Unit/DataLoaderTest.php

@@ -130,6 +130,31 @@ public function it_batches_multiple_requests_with_max_batch_sizes()
         $this->assertEquals([[1, 2], [3]], $this->loadCalls);
     }
 
+    /** @test */
+    public function if_max_batch_size_is_set_to_0_it_still_batches_calls_normally()
+    {
+        $options = new DataLoaderOptions(0);
+        $identityLoader = $this->createIdentityLoader($options);
+
+        $promise1 = $identityLoader->load(1);
+        $promise2 = $identityLoader->load(2);
+        $promise3 = $identityLoader->load(3);
+
+        $values = [];
+
+        \React\Promise\all([$promise1, $promise2, $promise3])->then(function ($returnedValues) use (&$values) {
+            $values = $returnedValues;
+        });
+
+        $this->eventLoop->run();
+
+        $this->assertEquals(1, $values[0]);
+        $this->assertEquals(2, $values[1]);
+        $this->assertEquals(3, $values[2]);
+
+        $this->assertEquals([[1, 2, 3]], $this->loadCalls);
+    }
+
     /** @test */
     public function it_coalesces_identical_requests()
     {