X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Ft%2Fshredder%2F02group_member.t;h=9dc4f6126455330f5fd5d58d7f2ccf75d47c810f;hb=0c07b9072cd4da266d4e56f888bf33512af7d17f;hp=b68557a8b5301e3e878977828bc747a039c15e54;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/rt/t/shredder/02group_member.t b/rt/t/shredder/02group_member.t
index b68557a8b..9dc4f6126 100644
--- a/rt/t/shredder/02group_member.t
+++ b/rt/t/shredder/02group_member.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl -w
 
 use strict;
 use warnings;
 
 use Test::Deep;
 use File::Spec;
-use Test::More tests => 22;
+use Test::More tests => 22 + 1; # plus one for warnings check
 use RT::Test ();
 BEGIN {
     my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
@@ -18,12 +17,12 @@ init_db();
 ### nested membership check
 {
 	create_savepoint('clean');
-	my $pgroup = RT::Group->new( $RT::SystemUser );
+	my $pgroup = RT::Group->new( RT->SystemUser );
 	my ($pgid) = $pgroup->CreateUserDefinedGroup( Name => 'Parent group' );
 	ok( $pgid, "created parent group" );
 	is( $pgroup->id, $pgid, "id is correct" );
 	
-	my $cgroup = RT::Group->new( $RT::SystemUser );
+	my $cgroup = RT::Group->new( RT->SystemUser );
 	my ($cgid) = $cgroup->CreateUserDefinedGroup( Name => 'Child group' );
 	ok( $cgid, "created child group" );
 	is( $cgroup->id, $cgid, "id is correct" );
@@ -32,7 +31,7 @@ init_db();
 	ok( $status, "added child group to parent") or diag "error: $msg";
 	
 	create_savepoint('bucreate'); # before user create
-	my $user = RT::User->new( $RT::SystemUser );
+	my $user = RT::User->new( RT->SystemUser );
 	my $uid;
 	($uid, $msg) = $user->Create( Name => 'new user', Privileged => 1, Disabled => 0 );
 	ok( $uid, "created new user" ) or diag "error: $msg";
@@ -42,7 +41,7 @@ init_db();
 	($status, $msg) = $cgroup->AddMember( $user->id );
 	ok( $status, "added user to child group") or diag "error: $msg";
 	
-	my $members = RT::GroupMembers->new( $RT::SystemUser );
+	my $members = RT::GroupMembers->new( RT->SystemUser );
 	$members->Limit( FIELD => 'MemberId', VALUE => $uid );
 	$members->Limit( FIELD => 'GroupId', VALUE => $cgid );
 	is( $members->Count, 1, "find membership record" );
@@ -65,23 +64,23 @@ init_db();
 {
 	restore_savepoint('clean');
 
-	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" );
 
 	use RT::Queue;
-	my $queue = new RT::Queue( $RT::SystemUser );
+	my $queue = RT::Queue->new( RT->SystemUser );
 	$queue->Load('general');
 	ok( $queue->id, "queue loaded succesfully" );
 
 	$user->PrincipalObj->GrantRight( Right => 'OwnTicket', Object => $queue );
 
 	use RT::Tickets;
-	my $ticket = RT::Ticket->new( $RT::SystemUser );
+	my $ticket = RT::Ticket->new( RT->SystemUser );
 	my ($id) = $ticket->Create( Subject => 'test', Queue => $queue->id );
 	ok( $id, "created new ticket" );
-	$ticket = RT::Ticket->new( $RT::SystemUser );
+	$ticket = RT::Ticket->new( RT->SystemUser );
 	my $status;
 	($status, $msg) = $ticket->Load( $id );
 	ok( $id, "load ticket" ) or diag( "error: $msg" );
@@ -95,9 +94,9 @@ init_db();
 	$shredder->PutObjects( Objects => $member );
 	$shredder->WipeoutAll();
 
-	$ticket = RT::Ticket->new( $RT::SystemUser );
+	$ticket = RT::Ticket->new( RT->SystemUser );
 	($status, $msg) = $ticket->Load( $id );
 	ok( $id, "load ticket" ) or diag( "error: $msg" );
-	is( $ticket->Owner, $RT::Nobody->id, "owner switched back to nobody" );
-	is( $ticket->OwnerGroup->MembersObj->First->MemberId, $RT::Nobody->id, "and owner role group member is nobody");
+	is( $ticket->Owner, RT->Nobody->id, "owner switched back to nobody" );
+	is( $ticket->OwnerGroup->MembersObj->First->MemberId, RT->Nobody->id, "and owner role group member is nobody");
 }