first pass RT4 merge, RT#13852

1 files changed, 11 insertions, 12 deletions

diff --git a/rt/t/api/record.t b/rt/t/api/record.t
index 6bf1af81e..4b6b0b89c 100644
--- a/rt/t/api/record.t
+++ b/rt/t/api/record.t
@@ -14,8 +14,8 @@ ok (require RT::Record);
 
 {
 
-my $ticket = RT::Ticket->new($RT::SystemUser);
-my $group = RT::Group->new($RT::SystemUser);
+my $ticket = RT::Ticket->new(RT->SystemUser);
+my $group = RT::Group->new(RT->SystemUser);
 is($ticket->ObjectTypeStr, 'Ticket', "Ticket returns correct typestring");
 is($group->ObjectTypeStr, 'Group', "Group returns correct typestring");
 
@@ -24,14 +24,14 @@ is($group->ObjectTypeStr, 'Group', "Group returns correct typestring");
 
 {
 
-my $t1 = RT::Ticket->new($RT::SystemUser);
+my $t1 = RT::Ticket->new(RT->SystemUser);
 my ($id, $trans, $msg) = $t1->Create(Subject => 'DepTest1', Queue => 'general');
 ok($id, "Created dep test 1 - $msg");
 
-my $t2 = RT::Ticket->new($RT::SystemUser);
+my $t2 = RT::Ticket->new(RT->SystemUser);
 (my $id2, $trans, my $msg2) = $t2->Create(Subject => 'DepTest2', Queue => 'general');
 ok($id2, "Created dep test 2 - $msg2");
-my $t3 = RT::Ticket->new($RT::SystemUser);
+my $t3 = RT::Ticket->new(RT->SystemUser);
 (my $id3, $trans, my $msg3) = $t3->Create(Subject => 'DepTest3', Queue => 'general', Type => 'approval');
 ok($id3, "Created dep test 3 - $msg3");
 my ($addid, $addmsg);
@@ -40,7 +40,7 @@ ok ($addid, $addmsg);
 ok (($addid, $addmsg) =$t1->AddLink( Type => 'DependsOn', Target => $t3->id));
 
 ok ($addid, $addmsg);
-my $link = RT::Link->new($RT::SystemUser);
+my $link = RT::Link->new(RT->SystemUser);
 (my $rv, $msg) = $link->Load($addid);
 ok ($rv, $msg);
 is ($link->LocalTarget , $t3->id, "Link LocalTarget is correct");
@@ -52,19 +52,18 @@ ok ($t1->HasUnresolvedDependencies( Type => 'approval' ), "Ticket ".$t1->Id." ha
 ok (!$t2->HasUnresolvedDependencies, "Ticket ".$t2->Id." has no unresolved deps");
 ;
 
-my ($rid, $rmsg)= $t1->Resolve();
+my ($rid, $rmsg)= $t1->SetStatus('resolved');
 ok(!$rid, $rmsg);
-my ($rid2, $rmsg2) = $t2->Resolve();
+my ($rid2, $rmsg2) = $t2->SetStatus('resolved');
 ok ($rid2, $rmsg2);
-($rid, $rmsg)= $t1->Resolve();
+($rid, $rmsg)= $t1->SetStatus('resolved');
 ok(!$rid, $rmsg);
-my ($rid3,$rmsg3) = $t3->Resolve;
+my ($rid3,$rmsg3) = $t3->SetStatus('resolved');
 ok ($rid3,$rmsg3);
-($rid, $rmsg)= $t1->Resolve();
+($rid, $rmsg)= $t1->SetStatus('resolved');
 ok($rid, $rmsg);
 
 
 
 }
 
-1;