X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Ft%2Fshredder%2F02queue.t;h=0c65c5daf56855b4b25868611eeeccdb01009fe3;hb=1c538bfabc2cd31f27067505f0c3d1a46cba6ef0;hp=dd5581754ce43400980938e895c3c037cf443b5b;hpb=4f5619288413a185e9933088d9dd8c5afbc55dfa;p=freeside.git

diff --git a/rt/t/shredder/02queue.t b/rt/t/shredder/02queue.t
index dd5581754..0c65c5daf 100644
--- a/rt/t/shredder/02queue.t
+++ b/rt/t/shredder/02queue.t
@@ -3,33 +3,26 @@ use strict;
 use warnings;
 
 use Test::Deep;
-use File::Spec;
-use Test::More tests => 16 + 1; # plus one for warnings check
-use RT::Test ();
-BEGIN {
-    my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
-        File::Spec->curdir());
-    require $shredder_utils;
-}
-init_db();
-
+use RT::Test::Shredder tests => 21;
+my $test = "RT::Test::Shredder";
 
 diag 'simple queue' if $ENV{TEST_VERBOSE};
 {
-	create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $queue = RT::Queue->new( RT->SystemUser );
     my ($id, $msg) = $queue->Create( Name => 'my queue' );
     ok($id, 'created queue') or diag "error: $msg";
 
-	my $shredder = shredder_new();
-	$shredder->PutObjects( Objects => $queue );
-	$shredder->WipeoutAll;
-	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $queue );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
 diag 'queue with scrip' if $ENV{TEST_VERBOSE};
 {
-	create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $queue = RT::Queue->new( RT->SystemUser );
     my ($id, $msg) = $queue->Create( Name => 'my queue' );
     ok($id, 'created queue') or diag "error: $msg";
@@ -44,15 +37,16 @@ diag 'queue with scrip' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'created scrip') or diag "error: $msg";
 
-	my $shredder = shredder_new();
-	$shredder->PutObjects( Objects => $queue );
-	$shredder->WipeoutAll;
-	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $queue );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
 diag 'queue with template' if $ENV{TEST_VERBOSE};
 {
-	create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $queue = RT::Queue->new( RT->SystemUser );
     my ($id, $msg) = $queue->Create( Name => 'my queue' );
     ok($id, 'created queue') or diag "error: $msg";
@@ -65,15 +59,16 @@ diag 'queue with template' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'created template') or diag "error: $msg";
 
-	my $shredder = shredder_new();
-	$shredder->PutObjects( Objects => $queue );
-	$shredder->WipeoutAll;
-	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $queue );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
 diag 'queue with a right granted' if $ENV{TEST_VERBOSE};
 {
-	create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $queue = RT::Queue->new( RT->SystemUser );
     my ($id, $msg) = $queue->Create( Name => 'my queue' );
     ok($id, 'created queue') or diag "error: $msg";
@@ -88,21 +83,22 @@ diag 'queue with a right granted' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'granted right') or diag "error: $msg";
 
-	my $shredder = shredder_new();
-	$shredder->PutObjects( Objects => $queue );
-	$shredder->WipeoutAll;
-	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $queue );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
 diag 'queue with a watcher' if $ENV{TEST_VERBOSE};
 {
 # XXX, FIXME: if uncomment these lines then we'll get 'Bizarre...'
-#	create_savepoint('clean');
+#    $test->create_savepoint('clean');
     my $group = RT::Group->new( RT->SystemUser );
     my ($id, $msg) = $group->CreateUserDefinedGroup(Name => 'my group');
     ok($id, 'created group') or diag "error: $msg";
 
-	create_savepoint('bqcreate');
+    $test->create_savepoint('bqcreate');
     my $queue = RT::Queue->new( RT->SystemUser );
     ($id, $msg) = $queue->Create( Name => 'my queue' );
     ok($id, 'created queue') or diag "error: $msg";
@@ -113,12 +109,13 @@ diag 'queue with a watcher' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'added watcher') or diag "error: $msg";
 
-	my $shredder = shredder_new();
-	$shredder->PutObjects( Objects => $queue );
-	$shredder->WipeoutAll;
-	cmp_deeply( dump_current_and_savepoint('bqcreate'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $queue );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('bqcreate'), "current DB equal to savepoint");
 
-#	$shredder->PutObjects( Objects => $group );
-#	$shredder->WipeoutAll;
-#	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+#    $shredder->PutObjects( Objects => $group );
+#    $shredder->WipeoutAll;
+#    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }