Update tests

Author: stevebauman

tests/Unit/Models/ActiveDirectory/ModelTest.php

@@ -110,7 +110,8 @@ public function relation(): HasMany
 
         $this->assertInstanceOf(HasMany::class, $relation);
         $this->assertInstanceOf(ActiveDirectoryBuilder::class, $query = $relation->getQuery());
-        $this->assertEquals('(|(foo=\66\6f\6f))', $query->getQuery()->getQuery());
+        // With a single value, whereIn produces a single Equals filter (no OR wrapper needed)
+        $this->assertEquals('(foo=\66\6f\6f)', $query->getQuery()->getQuery());
     }
 }
 

tests/Unit/Models/ActiveDirectory/UserTest.php

@@ -142,19 +142,16 @@ public function test_reject_computer_object_class_is_a_default_scope()
 
     public function test_scope_where_has_mailbox_is_applied()
     {
-        $filters = User::whereHasMailbox()->getQuery()->filters;
+        $query = User::whereHasMailbox()->getQuery()->getQuery();
 
-        $this->assertEquals('msExchMailboxGuid', $filters['and'][4]['attribute']);
-        $this->assertEquals('*', $filters['and'][4]['operator']);
+        $this->assertStringContainsString('(msExchMailboxGuid=*)', $query);
     }
 
     public function test_scope_where_has_lockout_is_applied()
     {
-        $filters = User::whereHasLockout()->getQuery()->filters;
+        $query = User::whereHasLockout()->getQuery()->getQuery();
 
-        $this->assertEquals('lockoutTime', $filters['and'][4]['attribute']);
-        $this->assertEquals('>=', $filters['and'][4]['operator']);
-        $this->assertEquals('\31', $filters['and'][4]['value']);
+        $this->assertStringContainsString('(lockoutTime>=\31)', $query);
     }
 
     public function test_is_locked_out()

tests/Unit/Models/ModelHasManyTest.php

@@ -225,8 +225,9 @@ public function test_detaching_all()
 
     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

@@ -57,7 +57,7 @@ public function test_new_query_without_scopes()
         $query = $model->newQueryWithoutScopes();
 
         $this->assertEquals($model, $query->getModel());
-        $this->assertEquals(['and' => [], 'or' => [], 'raw' => []], $query->getQuery()->filters);
+        $this->assertNull($query->getQuery()->getFilter());
     }
 
     public function test_new_query_has_connection_base_dn()
@@ -80,8 +80,9 @@ public function test_new_queries_apply_object_class_scopes()
     {
         Container::addConnection(new Connection);
 
+        // 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()
         );
     }
@@ -447,9 +448,15 @@ public function test_date_objects_are_converted_to_ldap_timestamps_in_where_clau
             ->whereRaw('windows', '=', $datetime)
             ->whereRaw('windowsinteger', '=', $datetime);
 
-        $this->assertEquals((new Timestamp('ldap'))->fromDateTime($datetime), $query->getQuery()->filters['and'][0]['value']);
-        $this->assertEquals((new Timestamp('windows'))->fromDateTime($datetime), $query->getQuery()->filters['and'][1]['value']);
-        $this->assertEquals((new Timestamp('windows-int'))->fromDateTime($datetime), $query->getQuery()->filters['and'][2]['value']);
+        $ldapTimestamp = (new Timestamp('ldap'))->fromDateTime($datetime);
+        $windowsTimestamp = (new Timestamp('windows'))->fromDateTime($datetime);
+        $windowsIntTimestamp = (new Timestamp('windows-int'))->fromDateTime($datetime);
+
+        // Check that the filter string contains the converted timestamps
+        $filterString = (string) $query->getQuery()->getFilter();
+        $this->assertStringContainsString("(standard={$ldapTimestamp})", $filterString);
+        $this->assertStringContainsString("(windows={$windowsTimestamp})", $filterString);
+        $this->assertStringContainsString("(windowsinteger={$windowsIntTimestamp})", $filterString);
     }
 
     public function test_exception_is_thrown_when_date_objects_cannot_be_converted()

tests/Unit/Models/ModelRelationTest.php

@@ -62,9 +62,8 @@ public function test_has_default_model()
 
     public function test_query_has_no_filters()
     {
-        $this->assertEquals(
-            ['and' => [], 'or' => [], 'raw' => []],
-            (new ModelRelationTestStub)->relation()->getQuery()->getQuery()->filters
+        $this->assertNull(
+            (new ModelRelationTestStub)->relation()->getQuery()->getQuery()->getFilter()
         );
     }
 

tests/Unit/Models/ModelScopeTest.php

@@ -56,11 +56,7 @@ public function test_scopes_are_applied_to_query()
     {
         $query = ModelWithGlobalScopeTestStub::query();
 
-        $this->assertEquals([
-            'attribute' => 'foo',
-            'operator' => '=',
-            'value' => 'bar',
-        ], $query->toBase()->filters['and'][0]);
+        $this->assertStringContainsString('(foo=bar)', $query->toBase()->getQuery());
     }
 
     public function test_scopes_are_applied_to_pagination_request()
@@ -73,44 +69,36 @@ public function test_scopes_are_applied_to_pagination_request()
             ->expect(['search' => []]);
 
         $this->assertEmpty($query->paginate());
+        $this->assertEmpty($query->paginate());
+        $this->assertEmpty($query->paginate());
 
-        $this->assertEquals([
-            'attribute' => 'foo',
-            'operator' => '=',
-            'value' => 'bar',
-        ], $query->toBase()->filters['and'][0]);
+        $this->assertStringContainsString('(foo=bar)', $query->toBase()->getQuery());
     }
 
     public function test_scopes_are_not_stacked_multiple_times()
     {
         $query = ModelWithGlobalScopeTestStub::query();
-        $query->getQuery();
-        $query->getQuery();
+        // Call toBase() multiple times to verify scopes aren't stacked
+        $query->toBase();
+        $query->toBase();
 
-        $this->assertCount(1, $query->toBase()->filters['and']);
-        $this->assertEquals('(foo=bar)', $query->getQuery()->getQuery());
+        $this->assertEquals('(&(foo=bar))', $query->toBase()->getQuery());
     }
 
     public function test_local_scopes_can_be_called()
     {
         $query = ModelWithLocalScopeTestStub::fooBar();
 
         $this->assertInstanceOf(Builder::class, $query);
-        $this->assertCount(1, $query->toBase()->filters['and']);
-        $this->assertEquals('foo', $query->toBase()->filters['and'][0]['attribute']);
-        $this->assertEquals('=', $query->toBase()->filters['and'][0]['operator']);
-        $this->assertEquals('\62\61\72', $query->toBase()->filters['and'][0]['value']);
+        $this->assertEquals('(foo=\62\61\72)', $query->toBase()->getQuery());
     }
 
     public function test_local_scopes_accept_arguments()
     {
         $query = ModelWithLocalScopeTestStub::barBaz('zal');
 
         $this->assertInstanceOf(Builder::class, $query);
-        $this->assertCount(1, $query->toBase()->filters['and']);
-        $this->assertEquals('bar', $query->toBase()->filters['and'][0]['attribute']);
-        $this->assertEquals('=', $query->toBase()->filters['and'][0]['operator']);
-        $this->assertEquals('\7a\61\6c', $query->toBase()->filters['and'][0]['value']);
+        $this->assertEquals('(bar=\7a\61\6c)', $query->toBase()->getQuery());
     }
 
     public function test_scopes_do_not_impact_model_refresh()