1 files changed, 8 insertions, 21 deletions
diff --git a/rt/t/ticket/sort-by-queue.t b/rt/t/ticket/sort-by-queue.t
index df6e1ad0f..bf2934bc2 100644
--- a/rt/t/ticket/sort-by-queue.t
+++ b/rt/t/ticket/sort-by-queue.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-use RT::Test tests => 8;
+use RT::Test nodata => 1, tests => 12;
 
 use strict;
 use warnings;
@@ -14,12 +14,12 @@ use RT::CustomField;
 #########################################################
 
 
-diag "Create queues to test with." if $ENV{TEST_VERBOSE};
+diag "Create queues to test with.";
 my @qids;
 my @queues;
 # create them in reverse order to avoid false positives
 foreach my $name ( qw(sort-by-queue-Z sort-by-queue-A) ) {
-    my $queue = RT::Queue->new( $RT::SystemUser );
+    my $queue = RT::Queue->new( RT->SystemUser );
     my ($ret, $msg) = $queue->Create(
         Name => $name ."-$$",
         Description => 'queue to test sorting by queue'
@@ -29,21 +29,7 @@ foreach my $name ( qw(sort-by-queue-Z sort-by-queue-A) ) {
     push @qids, $queue->id;
 }
 
-my ($total, @data, @tickets, @test) = (0, ());
-
-sub add_tix_from_data {
-    my @res = ();
-    @data = sort { rand(100) <=> rand(100) } @data;
-    while (@data) {
-        my $t = RT::Ticket->new($RT::SystemUser);
-        my %args = %{ shift(@data) };
-        my ( $id, undef, $msg ) = $t->Create( %args );
-        ok( $id, "ticket created" ) or diag("error: $msg");
-        push @res, $t;
-        $total++;
-    }
-    return @res;
-}
+my ($total, @tickets, @test) = (0, ());
 
 sub run_tests {
     my $query_prefix = join ' OR ', map 'id = '. $_->id, @tickets;
@@ -53,7 +39,7 @@ sub run_tests {
 
         foreach my $order (qw(ASC DESC)) {
             my $error = 0;
-            my $tix = RT::Tickets->new( $RT::SystemUser );
+            my $tix = RT::Tickets->new( RT->SystemUser );
             $tix->FromSQL( $query );
             $tix->OrderBy( FIELD => $test->{'Order'}, ORDER => $order );
 
@@ -88,13 +74,14 @@ sub run_tests {
     }
 }
 
-@data = (
+@tickets = RT::Test->create_tickets(
+    { RandomOrder => 1 },
     { Queue => $qids[0], Subject => 'z' },
     { Queue => $qids[1], Subject => 'a' },
 );
-@tickets = add_tix_from_data();
 @test = (
     { Order => "Queue" },
 );
 run_tests();
 
+@tickets = ();