Batch of test cleaups for leaking objects.

This commit is contained in:
Colin Kuskie 2011-04-04 16:06:49 -07:00
parent 28e4f9f245
commit 73261e4651
6 changed files with 7 additions and 8 deletions

View file

@ -214,20 +214,22 @@ my $process = Test::MockObject::Extends->new( 'WebGUI::Fork' );
$process->mock( "update" => sub { } ); # do nothing on update. we don't care $process->mock( "update" => sub { } ); # do nothing on update. we don't care
$process->mock( "session" => sub { return $session } ); $process->mock( "session" => sub { return $session } );
# Try with a Collaboration and some Threads # Try with a Collaboration and some Threads
my $tag = WebGUI::VersionTag->getWorking( $session ); my $tag = WebGUI::VersionTag->getWorking( $session );
WebGUI::Test->addToCleanup($tag);
my $collab = $tempspace->addChild({ my $collab = $tempspace->addChild({
className => 'WebGUI::Asset::Wobject::Collaboration', className => 'WebGUI::Asset::Wobject::Collaboration',
groupIdEdit => "3", groupIdEdit => "3",
status => "pending", status => "pending",
tagId => $tag->getId, tagId => $tag->getId,
}); }, undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 });
my $thread = $collab->addChild({ my $thread = $collab->addChild({
className => 'WebGUI::Asset::Post::Thread', className => 'WebGUI::Asset::Post::Thread',
groupIdEdit => "3", groupIdEdit => "3",
status => "pending", status => "pending",
tagId => $tag->getId, tagId => $tag->getId,
}, undef, undef, { skipAutoCommitWorkflows => 1 }); }, undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 });
$tag->commit; $tag->commit;
$thread->cut; $thread->cut;
WebGUI::Asset::pasteInFork( $process, { assetId => $collab->getId, list => [ $thread->getId ] } ); WebGUI::Asset::pasteInFork( $process, { assetId => $collab->getId, list => [ $thread->getId ] } );

View file

@ -124,7 +124,6 @@ cmp_deeply(
my $newRev = $asset->addRevision( { groupIdView => '7' }, time + 8 ); my $newRev = $asset->addRevision( { groupIdView => '7' }, time + 8 );
WebGUI::Test::addToCleanup( WebGUI::VersionTag->getWorking( $session ) ); WebGUI::Test::addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
is( $newRev->getStorageLocation->getFileContentsAsScalar('.wgaccess'), undef, "wgaccess doesn't exist" ); is( $newRev->getStorageLocation->getFileContentsAsScalar('.wgaccess'), undef, "wgaccess doesn't exist" );
note( @{ $newRev->getStorageLocation->getFiles() } );
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# commit on new revision trashes old revision # commit on new revision trashes old revision

View file

@ -54,7 +54,7 @@ my @threads = (
$_->setSkipNotification for @threads; # 100+ messages later... $_->setSkipNotification for @threads; # 100+ messages later...
my $versionTag = WebGUI::VersionTag->getWorking( $session ); my $versionTag = WebGUI::VersionTag->getWorking( $session );
$versionTag->commit; $versionTag->commit;
addToCleanup($versionTag); WebGUI::Test->addToCleanup($versionTag);
my $templateVars; my $templateVars;
my $posts; my $posts;

View file

@ -35,7 +35,7 @@ my @threads = (
className => 'WebGUI::Asset::Post::Thread', className => 'WebGUI::Asset::Post::Thread',
status => 'archived', status => 'archived',
title => 'Archived', title => 'Archived',
}, undef, undef, { skipAutoCommitWorkflows => 1 }), }, undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 }),
); );
my $tag = WebGUI::VersionTag->getWorking( $session ); my $tag = WebGUI::VersionTag->getWorking( $session );

View file

@ -418,8 +418,6 @@ isnt($untarStorage->getPath, $tarStorage->getPath, 'untar did not reuse the same
$tarStorage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('extensions.tar')); $tarStorage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('extensions.tar'));
my $extensionStorage = $tarStorage->untar('extensions.tar'); my $extensionStorage = $tarStorage->untar('extensions.tar');
WebGUI::Test->addToCleanup($extensionStorage); WebGUI::Test->addToCleanup($extensionStorage);
use Data::Dumper;
diag Dumper $extensionStorage->getFiles;
cmp_bag( cmp_bag(
$extensionStorage->getFiles, $extensionStorage->getFiles,
[ qw{ extension_pm.txt extension_perl.txt extension_html.txt extensions extensions/extension_html.txt }], [ qw{ extension_pm.txt extension_perl.txt extension_html.txt extensions extensions/extension_html.txt }],

View file

@ -41,7 +41,7 @@ my $cs = $root->addChild({
}); });
my $tag = WebGUI::VersionTag->getWorking($session); my $tag = WebGUI::VersionTag->getWorking($session);
$tag->commit; $tag->commit;
WebGUI::Test->addToCleanup($tag, $subscriberGroup, $betterGroup, $oldUser, $betterUser, $otherUser); WebGUI::Test->addToCleanup($tag, $oldGroup, $subscriberGroup, $betterGroup, $oldUser, $betterUser, $otherUser);
$subscriberGroup->addUsers([$oldUser->getId, $betterUser->getId, ]); $subscriberGroup->addUsers([$oldUser->getId, $betterUser->getId, ]);
$betterGroup->addUsers([$betterUser->getId, ]); $betterGroup->addUsers([$betterUser->getId, ]);