END block cleanup for session/scratch.t

This commit is contained in:
Colin Kuskie 2010-06-13 21:25:08 -07:00
parent f50d3b7adb
commit 8bcf653f66

View file

@ -55,6 +55,7 @@ for (my $count = 1; $count <= $maxCount; $count++){
##Creating a new session with the previous session's Id should clone the scratch data
my $newSession = WebGUI::Session->open(WebGUI::Test->root, WebGUI::Test->file, undef, undef, $session->getId);
WebGUI::Test->addToCleanup($newSession);
is($newSession->getId, $session->getId, "Successful session duplication");
@ -83,6 +84,8 @@ is($scratch->set('','value'), undef, 'set returns undef unless it gets a name ev
my @sessionBank = map { WebGUI::Session->open(WebGUI::Test->root, WebGUI::Test->file) } 0..3;
WebGUI::Test->addToCleanup(@sessionBank);
##Set variables to be deleted by name
foreach my $i (0..3) {
$sessionBank[$i]->scratch->set('deletableName', $i);
@ -127,14 +130,4 @@ $scratch->setLanguageOverride('English');
$scratch->setLanguageOverride();
is($scratch->getLanguageOverride, 'English', 'A empty string is falsely recognised as a language');
END {
$session->scratch->deleteAll;
foreach my $wgSess ($newSession, @sessionBank) {
if (defined $wgSess and ref $wgSess eq 'WebGUI::Session') {
note "Closing session";
$wgSess->scratch->deleteAll;
$wgSess->var->end;
$wgSess->close;
}
}
}
#vim:ft=perl