[Rt-commit] r16023 - in rt/branches/3.999-DANGEROUS: t/shredder
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu Sep 18 09:24:45 EDT 2008
Author: sunnavy
Date: Thu Sep 18 09:24:44 2008
New Revision: 16023
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/t/shredder/00load.t
rt/branches/3.999-DANGEROUS/t/shredder/00skeleton.t
rt/branches/3.999-DANGEROUS/t/shredder/01basics.t
rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t
rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t
rt/branches/3.999-DANGEROUS/t/shredder/02queue.t
rt/branches/3.999-DANGEROUS/t/shredder/02template.t
rt/branches/3.999-DANGEROUS/t/shredder/02user.t
rt/branches/3.999-DANGEROUS/t/shredder/03plugin.t
rt/branches/3.999-DANGEROUS/t/shredder/03plugin_summary.t
rt/branches/3.999-DANGEROUS/t/shredder/03plugin_tickets.t
rt/branches/3.999-DANGEROUS/t/shredder/03plugin_users.t
Log:
r16783 at sunnavys-mb: sunnavy | 2008-09-18 21:16:55 +0800
update shredder tests to use RT::Test::Shredder
Modified: rt/branches/3.999-DANGEROUS/t/shredder/00load.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/00load.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/00load.t Thu Sep 18 09:24:44 2008
@@ -5,11 +5,7 @@
use RT::Test;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
+use RT::Test::Shredder;
use_ok("RT::Shredder");
Modified: rt/branches/3.999-DANGEROUS/t/shredder/00skeleton.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/00skeleton.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/00skeleton.t Thu Sep 18 09:24:44 2008
@@ -6,20 +6,16 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
-init_db();
+use RT::Test::Shredder;
+RT::Test::Shredder::init_db();
plan tests => 1;
-create_savepoint('clean'); # backup of the clean RT DB
-my $shredder = shredder_new(); # new shredder object
+RT::Test::Shredder::create_savepoint('clean'); # backup of the clean RT DB
+my $shredder = RT::Test::Shredder::shredder_new(); # new shredder object
# ....
# create and wipe RT objects
#
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
Modified: rt/branches/3.999-DANGEROUS/t/shredder/01basics.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/01basics.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/01basics.t Thu Sep 18 09:24:44 2008
@@ -5,17 +5,14 @@
use RT::Test; use Test::More;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
use Test::Deep;
-init_db();
+use RT::Test::Shredder;
+
+RT::Test::Shredder::init_db();
plan tests => 3;
-create_savepoint();
+RT::Test::Shredder::create_savepoint();
use RT::Model::TicketCollection;
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
@@ -26,7 +23,7 @@
my ($status, $msg) = $ticket->load( $id );
ok( $id, "load ticket" ) or diag( "error: $msg" );
-my $shredder = shredder_new();
+my $shredder = RT::Test::Shredder::shredder_new();
$shredder->wipeout( object => $ticket );
-cmp_deeply( dump_current_and_savepoint(), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint(), "current DB equal to savepoint");
Modified: rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t Thu Sep 18 09:24:44 2008
@@ -9,14 +9,10 @@
plan tests => 15;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
+use RT::Test::Shredder;
-init_db();
-create_savepoint('clean');
+RT::Test::Shredder::init_db();
+RT::Test::Shredder::create_savepoint('clean');
use RT::Model::Ticket;
use RT::Model::TicketCollection;
@@ -33,17 +29,17 @@
$tickets->limit_status( value => 'deleted' );
is( $tickets->count, 1, "found one deleted ticket" );
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $tickets );
$shredder->wipeout_all;
}
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
{
my $parent = RT::Model::Ticket->new(current_user => RT->system_user );
my ($pid) = $parent->create( subject => 'test', queue => 1 );
ok( $pid, "Created new ticket" );
- create_savepoint('parent_ticket');
+ RT::Test::Shredder::create_savepoint('parent_ticket');
my $child = RT::Model::Ticket->new(current_user => RT->system_user );
my ($cid) = $child->create( subject => 'test', queue => 1 );
@@ -51,15 +47,15 @@
my ($status, $msg) = $parent->add_link( type => 'MemberOf', target => $cid );
ok( $status, "Added link between tickets") or diag("error: $msg");
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $child );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('parent_ticket'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('parent_ticket'), "current DB equal to savepoint");
$shredder->put_objects( objects => $parent );
$shredder->wipeout_all;
}
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
{
my $parent = RT::Model::Ticket->new(current_user => RT->system_user );
@@ -67,7 +63,7 @@
ok( $pid, "Created new ticket" );
my ($status, $msg) = $parent->set_status('deleted');
ok( $status, 'deleted parent ticket');
- create_savepoint('parent_ticket');
+ RT::Test::Shredder::create_savepoint('parent_ticket');
my $child = RT::Model::Ticket->new(current_user => RT->system_user );
my ($cid) = $child->create( subject => 'test', queue => 1 );
@@ -75,12 +71,12 @@
($status, $msg) = $parent->add_link( type => 'DependsOn', target => $cid );
ok( $status, "Added link between tickets") or diag("error: $msg");
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $child );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('parent_ticket'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('parent_ticket'), "current DB equal to savepoint");
$shredder->put_objects( objects => $parent );
$shredder->wipeout_all;
}
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t Thu Sep 18 09:24:44 2008
@@ -6,18 +6,14 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
-init_db();
+use RT::Test::Shredder;
+RT::Test::Shredder::init_db();
plan tests => 22;
### nested membership check
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $pgroup = RT::Model::Group->new(current_user => RT->system_user );
my ($pgid) = $pgroup->create_user_defined_group( name => 'Parent group' );
ok( $pgid, "Created parent group" );
@@ -31,14 +27,14 @@
my ($status, $msg) = $pgroup->add_member( $cgroup->id );
ok( $status, "added child group to parent") or diag "error: $msg";
- create_savepoint('bucreate'); # before user create
+ RT::Test::Shredder::create_savepoint('bucreate'); # before user create
my $user = RT::Model::User->new(current_user => RT->system_user );
my $uid;
($uid, $msg) = $user->create( name => 'new user', privileged => 1, disabled => 0 );
ok( $uid, "Created new user $msg " ) or diag "error: $msg";
is( $user->id, $uid, "id is correct" );
- create_savepoint('buadd'); # before group add
+ RT::Test::Shredder::create_savepoint('buadd'); # before group add
($status, $msg) = $cgroup->add_member( $user->id );
ok( $status, "added user to child group") or diag "error: $msg";
@@ -47,23 +43,23 @@
$members->limit( column => 'group_id', value => $cgid );
is( $members->count, 1, "find membership record" );
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $members );
$shredder->wipeout_all();
- cmp_deeply( dump_current_and_savepoint('buadd'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('buadd'), "current DB equal to savepoint");
$shredder->put_objects( objects => $user );
$shredder->wipeout_all();
- cmp_deeply( dump_current_and_savepoint('bucreate'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('bucreate'), "current DB equal to savepoint");
$shredder->put_objects( objects => [$pgroup, $cgroup] );
$shredder->wipeout_all();
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
### deleting member of the ticket Owner role group
{
- restore_savepoint('clean');
+ RT::Test::Shredder::restore_savepoint('clean');
my $user = RT::Model::User->new(current_user => RT->system_user );
my ($uid, $msg) = $user->create( name => 'new user', privileged => 1, disabled => 0 );
@@ -90,7 +86,7 @@
is( $ticket->owner, $user->id, "owner successfuly set") or diag( "error: $msg" );
my $member = $ticket->owner_obj;
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $member );
$shredder->wipeout_all();
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02queue.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02queue.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02queue.t Thu Sep 18 09:24:44 2008
@@ -6,31 +6,27 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
-init_db();
+use RT::Test::Shredder;
+RT::Test::Shredder::init_db();
plan tests => 16;
diag 'simple queue' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $queue = RT::Model::Queue->new(current_user => RT->system_user );
my ($id, $msg) = $queue->create( name => 'my queue' );
ok($id, 'Created queue') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $queue );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
diag 'queue with scrip' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $queue = RT::Model::Queue->new(current_user => RT->system_user );
my ($id, $msg) = $queue->create( name => 'my queue' );
ok($id, 'Created queue') or diag "error: $msg";
@@ -45,15 +41,15 @@
);
ok($id, 'Created scrip') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $queue );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
diag 'queue with template' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $queue = RT::Model::Queue->new(current_user => RT->system_user );
my ($id, $msg) = $queue->create( name => 'my queue' );
ok($id, 'Created queue') or diag "error: $msg";
@@ -66,15 +62,15 @@
);
ok($id, 'Created template') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $queue );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
diag 'queue with a Right granted' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $queue = RT::Model::Queue->new(current_user => RT->system_user );
my ($id, $msg) = $queue->create( name => 'my queue' );
ok($id, 'Created queue') or diag "error: $msg";
@@ -89,21 +85,21 @@
);
ok($id, 'granted right') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $queue );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::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');
+# RT::Test::Shredder::create_savepoint('clean');
my $group = RT::Model::Group->new(current_user => RT->system_user );
my ($id, $msg) = $group->create_user_defined_group(name => 'my group');
ok($id, 'Created group') or diag "error: $msg";
- create_savepoint('bqcreate');
+ RT::Test::Shredder::create_savepoint('bqcreate');
my $queue = RT::Model::Queue->new(current_user => RT->system_user );
($id, $msg) = $queue->create( name => 'my queue' );
ok($id, 'Created queue') or diag "error: $msg";
@@ -114,12 +110,12 @@
);
ok($id, 'added watcher') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $queue );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('bqcreate'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('bqcreate'), "current DB equal to savepoint");
# $shredder->put_objects( objects => $group );
# $shredder->wipeout_all;
-# cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+# cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02template.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02template.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02template.t Thu Sep 18 09:24:44 2008
@@ -6,18 +6,14 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
-init_db();
+use RT::Test::Shredder;
+RT::Test::Shredder::init_db();
plan tests => 7;
diag 'global template' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $template = RT::Model::Template->new(current_user => RT->system_user );
my ($id, $msg) = $template->create(
name => 'my template',
@@ -25,15 +21,15 @@
);
ok($id, 'Created template') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $template );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
diag 'local template' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $template = RT::Model::Template->new(current_user => RT->system_user );
my ($id, $msg) = $template->create(
name => 'my template',
@@ -42,15 +38,15 @@
);
ok($id, 'Created template') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $template );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
diag 'template used in scrip' if $ENV{'TEST_VERBOSE'};
{
- create_savepoint('clean');
+ RT::Test::Shredder::create_savepoint('clean');
my $template = RT::Model::Template->new(current_user => RT->system_user );
my ($id, $msg) = $template->create(
name => 'my template',
@@ -69,8 +65,8 @@
);
ok($id, 'Created scrip') or diag "error: $msg";
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => $template );
$shredder->wipeout_all;
- cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
}
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02user.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02user.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02user.t Thu Sep 18 09:24:44 2008
@@ -6,16 +6,12 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
-init_db();
+use RT::Test::Shredder;
+RT::Test::Shredder::init_db();
plan tests => 8;
-create_savepoint('clean');
+RT::Test::Shredder::create_savepoint('clean');
my $queue = RT::Model::Queue->new(current_user => RT->system_user );
my ($qid) = $queue->load( 'General' );
@@ -25,14 +21,14 @@
my ($tid) = $ticket->create( queue => $qid, subject => 'test' );
ok( $tid, "ticket Created" );
-create_savepoint('bucreate'); # berfore user create
+RT::Test::Shredder::create_savepoint('bucreate'); # berfore user create
my $user = RT::Model::User->new(current_user => RT->system_user );
my ($uid, $msg) = $user->create( name => 'new user', privileged => 1, disabled => 0 );
ok( $uid, "Created new user" ) or diag "error: $msg";
is( $user->id, $uid, "id is correct" );
# HACK: set ticket props to enable VARIABLE dependencies
$ticket->__set( column => 'last_updated_by', value => $uid );
-create_savepoint('aucreate'); # after user create
+RT::Test::Shredder::create_savepoint('aucreate'); # after user create
{
my $resolver = sub {
@@ -44,19 +40,19 @@
$t->__set( column => $method, value => $resolver_uid );
}
};
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_resolver( base_class => 'RT::Model::User', code => $resolver );
$shredder->wipeout( object => $user );
- cmp_deeply( dump_current_and_savepoint('bucreate'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('bucreate'), "current DB equal to savepoint");
}
{
- restore_savepoint('aucreate');
+ RT::Test::Shredder::restore_savepoint('aucreate');
my $user = RT::Model::User->new(current_user => RT->system_user );
$user->load($uid);
ok($user->id, "loaded user after restore");
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
eval { $shredder->wipeout( object => $user ) };
ok($@, "wipeout throw exception if no resolvers");
- cmp_deeply( dump_current_and_savepoint('aucreate'), "current DB equal to savepoint");
+ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('aucreate'), "current DB equal to savepoint");
}
Modified: rt/branches/3.999-DANGEROUS/t/shredder/03plugin.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/03plugin.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/03plugin.t Thu Sep 18 09:24:44 2008
@@ -6,11 +6,7 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
+use RT::Test::Shredder;
my @PLUGINS = sort qw(Attachments Base Objects SQLDump Summary Tickets Users);
plan tests => 7 + 3 * @PLUGINS;
Modified: rt/branches/3.999-DANGEROUS/t/shredder/03plugin_summary.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/03plugin_summary.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/03plugin_summary.t Thu Sep 18 09:24:44 2008
@@ -6,11 +6,7 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
+use RT::Test::Shredder;
plan tests => 4;
Modified: rt/branches/3.999-DANGEROUS/t/shredder/03plugin_tickets.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/03plugin_tickets.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/03plugin_tickets.t Thu Sep 18 09:24:44 2008
@@ -6,11 +6,7 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
+use RT::Test::Shredder;
plan tests => 44;
@@ -22,8 +18,8 @@
is(lc $plugin->type, 'search', 'correct type');
}
-init_db();
-create_savepoint('clean');
+RT::Test::Shredder::init_db();
+RT::Test::Shredder::create_savepoint('clean');
use_ok('RT::Model::Ticket');
use_ok('RT::Model::TicketCollection');
@@ -60,11 +56,11 @@
ok($has{$pid}, "parent is in the result set");
ok($has{$cid}, "child is in the result set");
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => \@objs );
$shredder->wipeout_all;
}
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
{ # create parent and child and link them reqursively to check that we don't hang
my $parent = RT::Model::Ticket->new(current_user => RT->system_user );
@@ -102,11 +98,11 @@
ok($has{$pid}, "parent is in the result set");
ok($has{$cid}, "child is in the result set");
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => \@objs );
$shredder->wipeout_all;
}
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
{ # create parent and child and check functionality of 'apply_query_to_linked' arg
my $parent = RT::Model::Ticket->new(current_user => RT->system_user );
@@ -136,7 +132,7 @@
ok(!$has{$cid1}, "first child is in the result set");
ok($has{$cid2}, "second child is in the result set");
- my $shredder = shredder_new();
+ my $shredder = RT::Test::Shredder::shredder_new();
$shredder->put_objects( objects => \@objs );
$shredder->wipeout_all;
@@ -147,4 +143,4 @@
$shredder->put_objects( objects => $ticket );
$shredder->wipeout_all;
}
-cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
+cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB equal to savepoint");
Modified: rt/branches/3.999-DANGEROUS/t/shredder/03plugin_users.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/03plugin_users.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/03plugin_users.t Thu Sep 18 09:24:44 2008
@@ -6,11 +6,7 @@
use RT::Test; use Test::More;
use Test::Deep;
use File::Spec;
-BEGIN {
- my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
- File::Spec->curdir());
- require $shredder_utils;
-}
+use RT::Test::Shredder;
plan tests => 9;
More information about the Rt-commit
mailing list