rt 4.0.23

[freeside.git] / rt / t / shredder / 02user.t

diff --git a/rt/t/shredder/02user.t b/rt/t/shredder/02user.t
index 03abd6c..9f15770 100644 (file)
--- a/rt/t/shredder/02user.t
+++ b/rt/t/shredder/02user.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 8;
+use Test::More tests => 8 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
@@ -17,16 +16,16 @@ init_db();
 
 create_savepoint('clean');
 
-my $queue = RT::Queue->new( $RT::SystemUser );
+my $queue = RT::Queue->new( RT->SystemUser );
 my ($qid) = $queue->Load( 'General' );
 ok( $qid, "loaded queue" );
 
-my $ticket = RT::Ticket->new( $RT::SystemUser );
+my $ticket = RT::Ticket->new( RT->SystemUser );
 my ($tid) = $ticket->Create( Queue => $qid, Subject => 'test' );
 ok( $tid, "ticket created" );
 
 create_savepoint('bucreate'); # berfore user create
-my $user = RT::User->new( $RT::SystemUser );
+my $user = RT::User->new( RT->SystemUser );
 my ($uid, $msg) = $user->Create( Name => 'new user', Privileged => 1, Disabled => 0 );
 ok( $uid, "created new user" ) or diag "error: $msg";
 is( $user->id, $uid, "id is correct" );
@@ -38,7 +37,7 @@ create_savepoint('aucreate'); # after user create
     my $resolver = sub {
         my %args = (@_);
         my $t =        $args{'TargetObject'};
-        my $resolver_uid = $RT::SystemUser->id;
+        my $resolver_uid = RT->SystemUser->id;
         foreach my $method ( qw(Creator LastUpdatedBy) ) {
             next unless $t->_Accessible( $method => 'read' );
             $t->__Set( Field => $method, Value => $resolver_uid );
@@ -52,7 +51,7 @@ create_savepoint('aucreate'); # after user create
 
 {
     restore_savepoint('aucreate');
-    my $user = RT::User->new( $RT::SystemUser );
+    my $user = RT::User->new( RT->SystemUser );
     $user->Load($uid);
     ok($user->id, "loaded user after restore");
     my $shredder = shredder_new();