X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Ft%2Fapi%2Frights_show_ticket.t;h=b7bec70de073eef7cc1323b099681f3aedaa0112;hb=681a340f6be4184b1472a8e1fa9cd5d074f6f325;hp=3e1d0740ff8fde461c77d284cbe3828d04a3a475;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git

diff --git a/rt/t/api/rights_show_ticket.t b/rt/t/api/rights_show_ticket.t
index 3e1d0740f..b7bec70de 100644
--- a/rt/t/api/rights_show_ticket.t
+++ b/rt/t/api/rights_show_ticket.t
@@ -1,6 +1,5 @@
-#!/usr/bin/perl -w
 
-use RT::Test tests => 264;
+use RT::Test nodata => 1, tests => 264;
 
 use strict;
 use warnings;
@@ -208,7 +207,6 @@ diag "Testing with UseSQLForACLChecks => $option";
 }
 
 sub have_no_rights {
-    $SIG{'INT'} = $SIG{'TERM'} = sub { print STDERR Carp::longmess('boo'); exit 1 };
     local $Test::Builder::Level = $Test::Builder::Level + 1;
     foreach my $u ( @_ ) {
         foreach my $q (
@@ -228,7 +226,7 @@ sub create_tickets_set{
     my @res;
     foreach my $q ($queue_a, $queue_b) {
         foreach my $n (1 .. 2) {
-            my $ticket = RT::Ticket->new( $RT::SystemUser );
+            my $ticket = RT::Ticket->new( RT->SystemUser );
             my ($tid) = $ticket->Create(
                 Queue => $q->id, Subject => $q->Name .' - '. $n
             );
@@ -239,24 +237,8 @@ sub create_tickets_set{
     return @res;
 }
 
-sub cleanup { delete_tickets(); delete_watchers() }; 
-
-sub delete_tickets {
-    my $tickets = RT::Tickets->new( $RT::SystemUser );
-    $tickets->FromSQL( "Queue = $qa_id OR Queue = $qb_id" );
-    while ( my $ticket = $tickets->Next ) {
-        $ticket->Delete;
-    }
-}
-
-sub delete_watchers {
-    foreach my $q ($queue_a, $queue_b) {
-        foreach my $u ($user_a, $user_b) {
-            foreach my $t (qw(Cc AdminCc) ) {
-                $q->DeleteWatcher( Type => $t, PrincipalId => $u->id )
-                    if $q->IsWatcher( Type => $t, PrincipalId => $u->id );
-            }
-        }
-    }
-}
+sub cleanup {
+    RT::Test->delete_tickets( "Queue = $qa_id OR Queue = $qb_id" );
+    RT::Test->delete_queue_watchers( $queue_a, $queue_b );
+};