first pass RT4 merge, RT#13852

[freeside.git] / rt / t / api / group.t

diff --git a/rt/t/api/group.t b/rt/t/api/group.t
index 551d4f1..3ce3da9 100644 (file)
--- a/rt/t/api/group.t
+++ b/rt/t/api/group.t
@@ -2,20 +2,19 @@
 use strict;
 use warnings;
 use RT;
-use RT::Test tests => 38;
+use RT::Test nodata => 1, tests => 38;
 
 
 {
 
-# {{{ Tests
 ok (require RT::Group);
 
-ok (my $group = RT::Group->new($RT::SystemUser), "instantiated a group object");
+ok (my $group = RT::Group->new(RT->SystemUser), "instantiated a group object");
 ok (my ($id, $msg) = $group->CreateUserDefinedGroup( Name => 'TestGroup', Description => 'A test group',
                     ), 'Created a new group');
 isnt ($id , 0, "Group id is $id");
 is ($group->Name , 'TestGroup', "The group's name is 'TestGroup'");
-my $ng = RT::Group->new($RT::SystemUser);
+my $ng = RT::Group->new(RT->SystemUser);
 
 ok($ng->LoadUserDefinedGroup('TestGroup'), "Loaded testgroup");
 is($ng->id , $group->id, "Loaded the right group");
@@ -30,7 +29,7 @@ ok($id, $msg);
 
 # Group 1 now has members 1, 2 ,3
 
-my $group_2 = RT::Group->new($RT::SystemUser);
+my $group_2 = RT::Group->new(RT->SystemUser);
 ok (my ($id_2, $msg_2) = $group_2->CreateUserDefinedGroup( Name => 'TestGroup2', Description => 'A second test group'), , 'Created a new group');
 isnt ($id_2 , 0, "Created group 2 ok- $msg_2 ");
 ok (($id,$msg) = $group_2->AddMember($ng->PrincipalId), "Made TestGroup a member of testgroup2");
@@ -40,7 +39,7 @@ ok($id, $msg);
 
 # Group 2 how has 1, g1->{1, 2,3}
 
-my $group_3 = RT::Group->new($RT::SystemUser);
+my $group_3 = RT::Group->new(RT->SystemUser);
 ok (my ($id_3, $msg_3) = $group_3->CreateUserDefinedGroup( Name => 'TestGroup3', Description => 'A second test group'), 'Created a new group');
 isnt ($id_3 , 0, "Created group 3 ok - $msg_3");
 ok (($id,$msg) =$group_3->AddMember($group_2->PrincipalId), "Made TestGroup a member of testgroup2");
@@ -48,10 +47,10 @@ ok($id, $msg);
 
 # g3 now has g2->{1, g1->{1,2,3}}
 
-my $principal_1 = RT::Principal->new($RT::SystemUser);
+my $principal_1 = RT::Principal->new(RT->SystemUser);
 $principal_1->Load('1');
 
-my $principal_2 = RT::Principal->new($RT::SystemUser);
+my $principal_2 = RT::Principal->new(RT->SystemUser);
 $principal_2->Load('2');
 
 ok (($id,$msg) = $group_3->AddMember('1' ), "Added  member RT_System to the group TestGroup2");
@@ -81,14 +80,13 @@ is($group_2->HasMemberRecursively($principal_2), undef, "group 2 doesn't have me
 is($ng->HasMember($principal_2), undef, "group 1 doesn't have member 2");
 is($group_3->HasMemberRecursively($principal_2), undef, "group 3 has member 2 recursively");
 
-# }}}
 
 
 }
 
 {
 
-ok(my $u = RT::Group->new($RT::SystemUser));
+ok(my $u = RT::Group->new(RT->SystemUser));
 ok($u->Load(4), "Loaded the first user");
 is($u->PrincipalObj->ObjectId , 4, "user 4 is the fourth principal");
 is($u->PrincipalObj->PrincipalType , 'Group' , "Principal 4 is a group");
@@ -96,4 +94,3 @@ is($u->PrincipalObj->PrincipalType , 'Group' , "Principal 4 is a group");
 
 }
 
-1;