Add tests

Author: stevebauman

tests/Unit/Models/ModelHasManyTest.php

@@ -227,7 +227,7 @@ public function test_only_related_with_many_relation_object_classes()
     {
         // Scopes are wrapped in their own AndGroup for isolation
         $this->assertEquals(
-            '(&(&(|(objectclass=top)(objectclass=person)(objectclass=organizationalperson)(objectclass=user))(|(objectclass=top)(objectclass=group))))',
+            '(&(|(objectclass=top)(objectclass=person)(objectclass=organizationalperson)(objectclass=user))(|(objectclass=top)(objectclass=group)))',
             (new ModelHasManyStubWithManyRelated)->relation()->onlyRelated()->getQuery()->getUnescapedQuery()
         );
     }

tests/Unit/Models/ModelQueryTest.php

@@ -82,7 +82,7 @@ public function test_new_queries_apply_object_class_scopes()
 
         // Scopes are wrapped in their own AndGroup for isolation
         $this->assertEquals(
-            '(&(&(objectclass=foo)(objectclass=bar)(objectclass=baz)))',
+            '(&(objectclass=foo)(objectclass=bar)(objectclass=baz))',
             ModelWithObjectClassStub::query()->getUnescapedQuery()
         );
     }

tests/Unit/Models/ModelScopeTest.php

@@ -167,7 +167,7 @@ public function test_scopes_remain_enforced_with_complex_queries()
     {
         // The scope (foo=bar) must always be present and enforced at the root AND level
         $this->assertEquals(
-            '(&(|(name=\4a\6f\68\6e)(name=\4a\61\6e\65))(active=\74\72\75\65)(&(foo=bar)))',
+            '(&(&(|(name=\4a\6f\68\6e)(name=\4a\61\6e\65))(active=\74\72\75\65))(&(foo=bar)))',
             ModelWithGlobalScopeTestStub::query()
                 ->where('name', '=', 'John')
                 ->orWhere('name', '=', 'Jane')

tests/Unit/Query/Model/ActiveDirectoryBuilderTest.php

@@ -165,4 +165,28 @@ public function test_add_select_with_variadic_arguments()
         $this->assertContains('mail', $selects);
         $this->assertContains('objectguid', $selects);
     }
+
+    public function test_or_filter_extracts_filters_from_nested_query()
+    {
+        $b = $this->newBuilder();
+
+        $query = $b->orFilter(function ($query) {
+            $query->whereEquals('foo', '1');
+            $query->whereEquals('foo', '2');
+        })->getUnescapedQuery();
+
+        $this->assertEquals('(|(foo=1)(foo=2))', $query);
+    }
+
+    public function test_and_filter_extracts_filters_from_nested_query()
+    {
+        $b = $this->newBuilder();
+
+        $query = $b->andFilter(function ($query) {
+            $query->whereEquals('foo', '1');
+            $query->whereEquals('foo', '2');
+        })->getUnescapedQuery();
+
+        $this->assertEquals('(&(foo=1)(foo=2))', $query);
+    }
 }