Index: /branches/release-40/t/driver-tests.pl
===================================================================
--- /branches/release-40/t/driver-tests.pl (revision 2590)
+++ /branches/release-40/t/driver-tests.pl (revision 2591)
@@ -418,21 +418,32 @@
     my $self = shift;
     $self->make_pc_data();
-
-    my $count = Foo->count( [{status => 10}, -or => {name => 'Apple'}] );
-    # ==> select count(*) from mt_foo where foo_status = 10 or foo_name = 'Apple'
-    is($count, 3, '-or count');
-
-    $count = Foo->count( [ { status => { '<=' => 20 }, name => 'Apple' }, -and_not => { status => 11 } ] );
-    # ==> select count(*) from mt_foo where (foo_status <= 20 and foo_name = 'Apple') and not (foo_status = 11)
-    is($count, 1, '-and_not count');
-
-    $count = Foo->count( [
+    my @foos = map { Foo->load($_) } (1..5);  # not a search
+
+    my @res = Foo->load([
+        {status => 10},
+        -or => {name => 'Apple'},
+    ]);
+    @res = sort { $a->id <=> $b->id } @res;
+    # where foo_status = 10 or foo_name = 'Apple'
+    are_objects(\@res, [ @foos[0,3,4] ], '-or results');
+
+    @res = Foo->load([
+        { status => { '<=' => 20 },
+          name => 'Apple' },
+        -and_not => { status => 11 },
+    ]);
+    @res = sort { $a->id <=> $b->id } @res;
+    # where (foo_status <= 20 and foo_name = 'Apple') and not (foo_status = 11)
+    are_objects(\@res, [ $foos[4] ], '-and_not results');
+
+    @res = Foo->load([
         { status => 10 },
         -or => { name => 'Apple' },
         -or => { name => { like => '%nux' } },
-    ] );
-    # ==> select count(*) from mt_foo where (foo_status = 10) or (foo_name = 'Apple') or (foo_name like '%nux')
+    ]);
+    @res = sort { $a->id <=> $b->id } @res;
+    # where (foo_status = 10) or (foo_name = 'Apple') or (foo_name like '%nux')
     # (selects Apple+MacBook, Apple+iBook, Microsoft+XP, Linux+Ubuntu)
-    is($count, 4, '-or count, 3 clauses');
+    are_objects(\@res, [ @foos[0,1,3,4] ], 'big -or results');
 }