X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Ft%2Flifecycles%2Fdates.t;h=a8dd8cfb68ee569d1e79c7b58ca7fd4abc24d068;hp=4f613f8d34e8e9163c472709fa0d95e1a7ef830f;hb=de9d037528895f7151a9aead6724ce2df95f9586;hpb=7588a4ac90a9b07c08a3107cd1107d773be1c991

diff --git a/rt/t/lifecycles/dates.t b/rt/t/lifecycles/dates.t
index 4f613f8d3..a8dd8cfb6 100644
--- a/rt/t/lifecycles/dates.t
+++ b/rt/t/lifecycles/dates.t
@@ -1,9 +1,7 @@
-
 use strict;
 use warnings;
-use Data::Dumper;
 
-BEGIN {require 't/lifecycles/utils.pl'};
+BEGIN {require './t/lifecycles/utils.pl'};
 
 my $general = RT::Test->load_or_create_queue(
     Name => 'General',
@@ -23,16 +21,13 @@ my $tstatus = sub {
     return $ticket->Status;
 };
 
-my ($baseurl, $m) = RT::Test->started_ok;
-ok $m->login, 'logged in';
-
 diag "check basic API";
 {
-    my $schema = $general->Lifecycle;
+    my $schema = $general->LifecycleObj;
     isa_ok($schema, 'RT::Lifecycle');
     is $schema->Name, 'default', "it's a default schema";
 
-    $schema = $delivery->Lifecycle;
+    $schema = $delivery->LifecycleObj;
     isa_ok($schema, 'RT::Lifecycle');
     is $schema->Name, 'delivery', "it's a delivery schema";
 }
@@ -47,8 +42,8 @@ diag "dates on create for default schema";
             Status => 'new',
         );
         ok $id, 'created a ticket';
-        ok $ticket->StartedObj->Unix <= 0, 'started is not set';
-        ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+        ok !$ticket->StartedObj->IsSet, 'started is not set';
+        ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
     }
     {
         my $ticket = RT::Ticket->new( RT->SystemUser );
@@ -58,8 +53,8 @@ diag "dates on create for default schema";
             Status => 'open',
         );
         ok $id, 'created a ticket';
-        ok $ticket->StartedObj->Unix > 0, 'started is set';
-        ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+        ok $ticket->StartedObj->IsSet, 'started is set';
+        ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
     }
     {
         my $ticket = RT::Ticket->new( RT->SystemUser );
@@ -69,8 +64,8 @@ diag "dates on create for default schema";
             Status => 'resolved',
         );
         ok $id, 'created a ticket';
-        ok $ticket->StartedObj->Unix > 0, 'started is set';
-        ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
+        ok $ticket->StartedObj->IsSet, 'started is set';
+        ok $ticket->ResolvedObj->IsSet, 'resolved is set';
     }
 
     my $test_date = '2008-11-28 12:00:00';
@@ -140,7 +135,7 @@ diag "dates on create for delivery schema";
         is $ticket->Status, 'ordered', "Status is ordered";
         my ($statusval,$statusmsg) = $ticket->SetStatus('on way');
         ok($statusval,$statusmsg);
-        ok $ticket->StartedObj->Unix > 0, 'started is set to ' .$ticket->StartedObj->AsString ;
+        ok $ticket->StartedObj->IsSet, 'started is set to ' .$ticket->StartedObj->AsString ;
         is $ticket->ResolvedObj->Unix, 0, 'resolved is not set';
     }
     {
@@ -157,8 +152,8 @@ diag "dates on create for delivery schema";
         ($statusval,$statusmsg) = $ticket->SetStatus('delivered');
         ok($statusval,$statusmsg);
 
-        ok $ticket->StartedObj->Unix > 0, 'started is set';
-        ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
+        ok $ticket->StartedObj->IsSet, 'started is set';
+        ok $ticket->ResolvedObj->IsSet, 'resolved is set';
     }
 
     my $test_date = '2008-11-28 12:00:00';
@@ -220,30 +215,30 @@ diag "dates on status change for default schema";
         Status => 'new',
     );
     ok $id, 'created a ticket';
-    ok $ticket->StartedObj->Unix <= 0, 'started is not set';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok !$ticket->StartedObj->IsSet, 'started is not set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     (my $status, $msg) = $ticket->SetStatus('open');
     ok $status, 'changed status' or diag "error: $msg";
-    ok $ticket->StartedObj->Unix > 0, 'started is set';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok $ticket->StartedObj->IsSet, 'started is set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     my $started = $ticket->StartedObj->Unix;
 
     ($status, $msg) = $ticket->SetStatus('stalled');
     ok $status, 'changed status' or diag "error: $msg";
     is $ticket->StartedObj->Unix, $started, 'started is set and the same';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     ($status, $msg) = $ticket->SetStatus('open');
     ok $status, 'changed status' or diag "error: $msg";
     is $ticket->StartedObj->Unix, $started, 'started is set and the same';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     ($status, $msg) = $ticket->SetStatus('resolved');
     ok $status, 'changed status' or diag "error: $msg";
     is $ticket->StartedObj->Unix, $started, 'started is set and the same';
-    ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
+    ok $ticket->ResolvedObj->IsSet, 'resolved is set';
 }
 
 diag "dates on status change for delivery schema";
@@ -255,25 +250,25 @@ diag "dates on status change for delivery schema";
         Status => 'ordered',
     );
     ok $id, 'created a ticket';
-    ok $ticket->StartedObj->Unix <= 0, 'started is not set';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok !$ticket->StartedObj->IsSet, 'started is not set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     (my $status, $msg) = $ticket->SetStatus('delayed');
     ok $status, 'changed status' or diag "error: $msg";
-    ok $ticket->StartedObj->Unix > 0, 'started is set';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok $ticket->StartedObj->IsSet, 'started is set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     my $started = $ticket->StartedObj->Unix;
 
     ($status, $msg) = $ticket->SetStatus('on way');
     ok $status, 'changed status' or diag "error: $msg";
     is $ticket->StartedObj->Unix, $started, 'started is set and the same';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     ($status, $msg) = $ticket->SetStatus('delivered');
     ok $status, 'changed status' or diag "error: $msg";
     is $ticket->StartedObj->Unix, $started, 'started is set and the same';
-    ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
+    ok $ticket->ResolvedObj->IsSet, 'resolved is set';
 }
 
 diag "add partial map between general->delivery";
@@ -299,18 +294,20 @@ diag "check date changes on moving a ticket";
         Status => 'new',
     );
     ok $id, 'created a ticket';
-    ok $ticket->StartedObj->Unix <= 0, 'started is not set';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok !$ticket->StartedObj->IsSet, 'started is not set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     (my $status, $msg) = $ticket->SetQueue( $delivery->id );
     ok $status, "moved ticket between queues with different schemas";
     is $ticket->Status, 'on way', 'status has been changed';
-    ok $ticket->StartedObj->Unix > 0, 'started is set';
-    ok $ticket->ResolvedObj->Unix <= 0, 'resolved is not set';
+    ok $ticket->StartedObj->IsSet, 'started is set';
+    ok !$ticket->ResolvedObj->IsSet, 'resolved is not set';
 
     ($status, $msg) = $ticket->SetQueue( $general->id );
     ok $status, "moved ticket between queues with different schemas";
     is $ticket->Status, 'resolved', 'status has been changed';
-    ok $ticket->StartedObj->Unix > 0, 'started is set';
-    ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
+    ok $ticket->StartedObj->IsSet, 'started is set';
+    ok $ticket->ResolvedObj->IsSet, 'resolved is set';
 }
+
+done_testing;