oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

END block cleanups

Browse source
This commit is contained in:
Colin Kuskie 2010-06-13 21:19:17 -07:00
parent 2c1e2b9d3e
commit f50d3b7adb
5 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
t/Session/DateTime.t
View file

@ -20,6 +20,7 @@ use WebGUI::Session;
use Test::More tests => 90; # increment this value for each test you create use Test::More tests => 90; # increment this value for each test you create
installBadLocale(); installBadLocale();
WebGUI::Test->addToCleanup(sub { unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n BadLocale.pm/); });
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
@ -305,6 +306,4 @@ sub installBadLocale {
); );
} }
END { #vim:ft=perl
unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n BadLocale.pm/);
}

7
t/Session/Icon.t
View file

@ -39,6 +39,7 @@ my $session = WebGUI::Test->session;
#################################################### ####################################################
my $origToolbar = $session->user->profileField('toolbar'); my $origToolbar = $session->user->profileField('toolbar');
WebGUI::Test->addToCleanup(sub { $session->user->profileField('toolbar', $origToolbar); },);
my $toolbars = $session->url->extras('toolbar/'); my $toolbars = $session->url->extras('toolbar/');
my $newRequest = Test::MockObject->new; my $newRequest = Test::MockObject->new;
@ -168,12 +169,6 @@ sub linkAndText {
return @parsedParams; return @parsedParams;
} }
my $icon = $session->icon->drag();
END {
$session->user->profileField('toolbar', $origToolbar);
}
sub fetchTestSet { sub fetchTestSet {
return ( return (
{ {

8
t/Session/Privilege.t
View file

@ -73,6 +73,7 @@ my $session = WebGUI::Test->session;
my $privilege = $session->privilege; my $privilege = $session->privilege;
my ($versionTag, $userTemplate) = setup_assets($session); my ($versionTag, $userTemplate) = setup_assets($session);
WebGUI::Test->addToCleanup($versionTag);
isa_ok($privilege, 'WebGUI::Session::Privilege', 'session has correct object type'); isa_ok($privilege, 'WebGUI::Session::Privilege', 'session has correct object type');
@ -144,9 +145,4 @@ sub setup_assets {
return ($versionTag, $userTemplate); return ($versionTag, $userTemplate);
} }
#vim:ft=perl
END {
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}
}

4
t/Session/Stow.t
View file

@ -99,6 +99,4 @@ is( $session->stow->get( 'possibilities', { noclone => 1 } ), $arr,
"With noclone returns same reference" "With noclone returns same reference"
); );
END { #vim:ft=perl
$session->config->set('disableCache',$disableCache);
}

7
t/Session/Style.t
View file

@ -176,6 +176,7 @@ is($macroOutput, 1, 'generateAdditionalHeadTags: process a macro');
#################################################### ####################################################
my ($versionTag, $templates, $article, $snippet) = setup_assets($session); my ($versionTag, $templates, $article, $snippet) = setup_assets($session);
WebGUI::Test->addToCleanup($versionTag);
$style->sent(0); $style->sent(0);
is($style->sent, 0, 'process: setup sent to 0'); is($style->sent, 0, 'process: setup sent to 0');
@ -557,9 +558,3 @@ sub setup_assets {
$versionTag->commit; $versionTag->commit;
return ($versionTag, $templates, $asset, $snippet); return ($versionTag, $templates, $asset, $snippet);
} }
END {
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}
}