RT 4.2.11, ticket#13852

[freeside.git] / rt / t / shredder / 02template.t

diff --git a/rt/t/shredder/02template.t b/rt/t/shredder/02template.t
index aeb318e..56dd852 100644 (file)
--- a/rt/t/shredder/02template.t
+++ b/rt/t/shredder/02template.t
@@ -3,20 +3,12 @@ use strict;
 use warnings;
 
 use Test::Deep;
-use File::Spec;
-use Test::More tests => 7 + 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 => 10;
+my $test = "RT::Test::Shredder";
 
 diag 'global template' if $ENV{TEST_VERBOSE};
 {
-       create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $template = RT::Template->new( RT->SystemUser );
     my ($id, $msg) = $template->Create(
         Name => 'my template',
@@ -24,15 +16,16 @@ diag 'global template' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'created template') or diag "error: $msg";
 
-       my $shredder = shredder_new();
-       $shredder->PutObjects( Objects => $template );
-       $shredder->WipeoutAll;
-       cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $template );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
 diag 'local template' if $ENV{TEST_VERBOSE};
 {
-       create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $template = RT::Template->new( RT->SystemUser );
     my ($id, $msg) = $template->Create(
         Name => 'my template',
@@ -41,15 +34,16 @@ diag 'local template' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'created template') or diag "error: $msg";
 
-       my $shredder = shredder_new();
-       $shredder->PutObjects( Objects => $template );
-       $shredder->WipeoutAll;
-       cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $template );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
 diag 'template used in scrip' if $ENV{TEST_VERBOSE};
 {
-       create_savepoint('clean');
+    $test->create_savepoint('clean');
     my $template = RT::Template->new( RT->SystemUser );
     my ($id, $msg) = $template->Create(
         Name => 'my template',
@@ -68,8 +62,9 @@ diag 'template used in scrip' if $ENV{TEST_VERBOSE};
     );
     ok($id, 'created scrip') or diag "error: $msg";
 
-       my $shredder = shredder_new();
-       $shredder->PutObjects( Objects => $template );
-       $shredder->WipeoutAll;
-       cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+    my $shredder = $test->shredder_new();
+    $shredder->PutObjects( Objects => $template );
+    $shredder->WipeoutAll;
+    $test->db_is_valid;
+    cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }