Move Query/Builder unit tests to a dedicated test class

Author: GromNaN

tests/Query/BuilderTest.php

@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jenssegers\Mongodb\Tests\Query;
+
+use DateTimeImmutable;
+use Jenssegers\Mongodb\Connection;
+use Jenssegers\Mongodb\Query\Builder;
+use Jenssegers\Mongodb\Query\Processor;
+use Mockery as m;
+use MongoDB\BSON\UTCDateTime;
+use PHPUnit\Framework\TestCase;
+
+class BuilderTest extends TestCase
+{
+    /**
+     * @dataProvider provideQueryBuilderToMql
+     */
+    public function testMql(array $expected, \Closure $build): void
+    {
+        $builder = $build(self::getBuilder());
+        $this->assertInstanceOf(Builder::class, $builder);
+        $mql = $builder->toMql();
+
+        // Operations that return a Cursor expect a "typeMap" option.
+        if (isset($expected['find'][1])) {
+            $expected['find'][1]['typeMap'] = ['root' => 'array', 'document' => 'array'];
+        }
+        if (isset($expected['aggregate'][1])) {
+            $expected['aggregate'][1]['typeMap'] = ['root' => 'array', 'document' => 'array'];
+        }
+
+        // Compare with assertEquals because the query can contain BSON objects.
+        $this->assertEquals($expected, $mql, var_export($mql, true));
+    }
+
+    public static function provideQueryBuilderToMql(): iterable
+    {
+        /**
+         * Builder::aggregate() and Builder::count() cannot be tested because they return the result,
+         * without modifying the builder.
+         */
+        $date = new DateTimeImmutable('2016-07-12 15:30:00');
+
+        yield [
+            ['find' => [['foo' => 'bar'], []]],
+            fn (Builder $builder) => $builder->where('foo', 'bar'),
+        ];
+
+        yield [
+            ['find' => [['foo' => ['$gt' => new UTCDateTime($date)]], []]],
+            fn (Builder $builder) => $builder->where('foo', '>', $date),
+        ];
+
+        yield [
+            ['find' => [['foo' => ['$in' => ['bar', 'baz']]], []]],
+            fn (Builder $builder) => $builder->whereIn('foo', ['bar', 'baz']),
+        ];
+
+        yield [
+            ['find' => [[], ['limit' => 10, 'skip' => 5, 'projection' => ['foo' => 1, 'bar' => 1]]]],
+            fn (Builder $builder) => $builder->limit(10)->offset(5)->select('foo', 'bar'),
+        ];
+
+        yield [
+            ['distinct' => ['foo', [], []]],
+            fn (Builder $builder) => $builder->distinct('foo'),
+        ];
+
+        yield [
+            ['aggregate' => [[['$group' => ['_id' => ['foo' => '$foo'], 'foo' => ['$last' => '$foo']]]], []]],
+            fn (Builder $builder) => $builder->groupBy('foo'),
+        ];
+    }
+
+    private static function getBuilder(): Builder
+    {
+        $connection = m::mock(Connection::class);
+        $processor = m::mock(Processor::class);
+        $connection->shouldReceive('getSession')->andReturn(null);
+
+        return new Builder($connection, $processor);
+    }
+}

tests/QueryBuilderTest.php

@@ -11,12 +11,9 @@
 use Illuminate\Support\LazyCollection;
 use Illuminate\Testing\Assert;
 use Jenssegers\Mongodb\Collection;
-use Jenssegers\Mongodb\Connection;
 use Jenssegers\Mongodb\Query\Builder;
-use Jenssegers\Mongodb\Query\Processor;
 use Jenssegers\Mongodb\Tests\Models\Item;
 use Jenssegers\Mongodb\Tests\Models\User;
-use Mockery as m;
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\Regex;
 use MongoDB\BSON\UTCDateTime;
@@ -34,73 +31,13 @@ public function tearDown(): void
         DB::collection('items')->truncate();
     }
 
-    /**
-     * @dataProvider provideQueryBuilderToMql
-     */
-    public function testMql(array $expected, \Closure $build): void
-    {
-        $builder = $build(self::getBuilder());
-        $this->assertInstanceOf(Builder::class, $builder);
-        $mql = $builder->toMql();
-
-        // Operations that return a Cursor expect a "typeMap" option.
-        if (isset($expected['find'][1])) {
-            $expected['find'][1]['typeMap'] = ['root' => 'array', 'document' => 'array'];
-        }
-        if (isset($expected['aggregate'][1])) {
-            $expected['aggregate'][1]['typeMap'] = ['root' => 'array', 'document' => 'array'];
-        }
-
-        // Compare with assertEquals because the query can contain BSON objects.
-        $this->assertEquals($expected, $mql, var_export($mql, true));
-    }
-
-    public static function provideQueryBuilderToMql(): iterable
-    {
-        /**
-         * Builder::aggregate() and Builder::count() cannot be tested because they return the result,
-         * without modifying the builder.
-         */
-        $date = new DateTimeImmutable('2016-07-12 15:30:00');
-
-        yield [
-            ['find' => [['foo' => 'bar'], []]],
-            fn (Builder $builder) => $builder->where('foo', 'bar'),
-        ];
-
-        yield [
-            ['find' => [['foo' => ['$gt' => new UTCDateTime($date)]], []]],
-            fn (Builder $builder) => $builder->where('foo', '>', $date),
-        ];
-
-        yield [
-            ['find' => [['foo' => ['$in' => ['bar', 'baz']]], []]],
-            fn (Builder $builder) => $builder->whereIn('foo', ['bar', 'baz']),
-        ];
-
-        yield [
-            ['find' => [[], ['limit' => 10, 'skip' => 5, 'projection' => ['foo' => 1, 'bar' => 1]]]],
-            fn (Builder $builder) => $builder->limit(10)->offset(5)->select('foo', 'bar'),
-        ];
-
-        yield [
-            ['distinct' => ['foo', [], []]],
-            fn (Builder $builder) => $builder->distinct('foo'),
-        ];
-
-        yield [
-            ['aggregate' => [[['$group' => ['_id' => ['foo' => '$foo'], 'foo' => ['$last' => '$foo']]]], []]],
-            fn (Builder $builder) => $builder->groupBy('foo'),
-        ];
-    }
-
     public function testDeleteWithId()
     {
         $user = DB::collection('users')->insertGetId([
             ['name' => 'Jane Doe', 'age' => 20],
         ]);
 
-        $user_id = (string) $user;
+        $user_id = (string)$user;
 
         DB::collection('items')->insert([
             ['name' => 'one thing', 'user_id' => $user_id],
@@ -111,7 +48,7 @@ public function testDeleteWithId()
 
         $product = DB::collection('items')->first();
 
-        $pid = (string) ($product['_id']);
+        $pid = (string)($product['_id']);
 
         DB::collection('items')->where('user_id', $user_id)->delete($pid);
 
@@ -892,7 +829,7 @@ public function testValue()
     public function testHintOptions()
     {
         DB::collection('items')->insert([
-            ['name' => 'fork',  'tags' => ['sharp', 'pointy']],
+            ['name' => 'fork', 'tags' => ['sharp', 'pointy']],
             ['name' => 'spork', 'tags' => ['sharp', 'pointy', 'round', 'bowl']],
             ['name' => 'spoon', 'tags' => ['round', 'bowl']],
         ]);
@@ -926,13 +863,4 @@ public function testCursor()
             $this->assertEquals($data[$i]['name'], $result['name']);
         }
     }
-
-    private static function getBuilder(): Builder
-    {
-        $connection = m::mock(Connection::class);
-        $processor = m::mock(Processor::class);
-        $connection->shouldReceive('getSession')->andReturn(null);
-
-        return new Builder($connection, $processor);
-    }
 }