convert all test cleanup to addToCleanup

t/Asset/AssetClipboard.t

@@ -29,7 +29,7 @@ $session->user({userId => 3});
 my $root = WebGUI::Asset->getRoot($session);
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Asset Clipboard test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my $snippet = $root->addChild({
     url => 'testSnippet',
@@ -86,7 +86,7 @@ is($duplicatedSnippet->getParent->getId, $root->getId, 'duplicated snippet is al
 
 my $newVersionTag = WebGUI::VersionTag->getWorking($session);
 $newVersionTag->commit;
-WebGUI::Test->tagsToRollback($newVersionTag);
+WebGUI::Test->addToCleanup($newVersionTag);
 
 ####################################################
 #

t/Asset/AssetExportHtml.t

@@ -293,7 +293,7 @@ is($gcAsPath->absolute($exportPath)->stringify, $litmus->absolute($exportPath)->
 
 # now let's get tricky and test different file extensions
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage->getId);
+WebGUI::Test->addToCleanup($storage->getId);
 my $filename = 'somePerlFile_pl.txt';
 $storage->addFileFromScalar($filename, $filename);
 $session->user({userId=>3});
@@ -326,7 +326,7 @@ is($fileAsPath->absolute($exportPath)->stringify, $litmus->absolute($exportPath)
 
 # test a different extension, the .foobar extension
 $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage->getId);
+WebGUI::Test->addToCleanup($storage);
 $filename = 'someFoobarFile.foobar';
 $storage->addFileFromScalar($filename, $filename);
 $properties = {

t/Asset/AssetLineage.t

@@ -32,7 +32,7 @@ is($asset->formatRank(76), "000076", "formatRank()");
 is($asset->getLineageLength(), (length($asset->get("lineage")) / 6), "getLineageLength()");
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set({name=>"AssetLineage Test"});
 
 my $root = WebGUI::Asset->getRoot($session);
@@ -60,7 +60,7 @@ my $folder2 = $topFolder->addChild({
 });
 
 my $editor = WebGUI::User->new($session, 'new');
-WebGUI::Test->usersToDelete($editor);
+WebGUI::Test->addToCleanup($editor);
 $editor->addToGroups([4]);
 
 my @snippets = ();
@@ -517,7 +517,7 @@ ok(!exists $session->stow->get('assetLineage')->{assetLineage}, '... no entry fo
 
 my $vTag2 = WebGUI::VersionTag->getWorking($session);
 $vTag2->set({name=>"deep addChild test"});
-WebGUI::Test->tagsToRollback($vTag2);
+WebGUI::Test->addToCleanup($vTag2);
 
 WebGUI::Test->interceptLogging();
 

t/Asset/AssetPackage.t

@@ -32,7 +32,7 @@ my $root = WebGUI::Asset->getRoot($session);
 is(scalar @{ $root->getPackageList }, 0, 'WebGUI does not ship with packages');
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set({name=>"Asset Package test"});
 
 my $time = time() -2;
@@ -88,7 +88,7 @@ cmp_ok( $snippetRev->get('revisionDate'), '>', $snippet->get('revisionDate'), '.
 
 my $vt2 = WebGUI::VersionTag->getWorking($session);
 $vt2->commit;
-WebGUI::Test->tagsToRollback($vt2);
+WebGUI::Test->addToCleanup($vt2);
 
 $targetFolder->www_deployPackage();
 
@@ -109,7 +109,7 @@ isa_ok($deployedFolderChildren->[0] , 'WebGUI::Asset::Snippet', 'deployed child
 $folder->addRevision({isPackage => 0});
 
 my $newVersionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($newVersionTag);
+WebGUI::Test->addToCleanup($newVersionTag);
 $newVersionTag->commit;
 
 my $newFolder = WebGUI::Asset->newById($session, $folder->getId);
@@ -125,7 +125,7 @@ is($updatedSnippet->get('snippet'), 'Always upgrade to the latest version', 'imp
 cmp_ok( $updatedSnippet->get('revisionDate'), '>', $snippetRev->get('revisionDate'), '... revisionDate check on imported package with overwriteLatest');
 
 my $lastTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($lastTag);
+WebGUI::Test->addToCleanup($lastTag);
 
 TODO: {
     local $TODO = "Tests to make later";

t/Asset/AssetTrash.t

@@ -26,7 +26,7 @@ my $session = WebGUI::Test->session;
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"AssetLineage Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my $root = WebGUI::Asset->getRoot($session);
 my $topFolder = $root->addChild({

t/Asset/AssetVersion.t

@@ -87,12 +87,12 @@ is($versionTagCheck, $originalVersionTags, 'version tag cleaned up by deleting l
 $snippet = $root->addChild($propertyHash);
 my $tag1 = WebGUI::VersionTag->getWorking($session);
 $tag1->commit;
-WebGUI::Test->tagsToRollback($tag1);
+WebGUI::Test->addToCleanup($tag1);
 sleep 1;
 $snippetv2 = $snippet->addRevision({snippet => 'Vie gates.  Ich bin ein snippetr.'});
 my $tag2 = WebGUI::VersionTag->getWorking($session);
 $tag2->commit;
-WebGUI::Test->tagsToRollback($tag2);
+WebGUI::Test->addToCleanup($tag2);
 note "purge";
 checkTableEntries($snippetv2->getId, 1,2,2);
 $versionTagCheck = $session->db->quickScalar(q{select count(*) from assetVersionTag});

t/Asset/EMSSubmissionForm.t

@@ -58,9 +58,9 @@ $submitGroupA->addUsers([$userA->userId,$userC->userId]);
 $submitGroupB->addUsers([$userB->userId,$userC->userId]);
 $attendees->addUsers([$userA->getId, $userB->getId, $userC->getId]);
 
-WebGUI::Test->groupsToDelete($submitGroupA,$submitGroupB);
-WebGUI::Test->groupsToDelete($registrars, $attendees);
-WebGUI::Test->usersToDelete($userA,$userB,$userC,$registrar);
+WebGUI::Test->addToCleanup($submitGroupA,$submitGroupB);
+WebGUI::Test->addToCleanup($registrars, $attendees);
+WebGUI::Test->addToCleanup($userA,$userB,$userC,$registrar);
 
 sub loginAdmin { $session->user({userId => 3}); }
 sub loginRgstr { $session->user({userId => $registrar->userId}); }
@@ -77,7 +77,7 @@ loginAdmin;
 # Create a version tag to work in
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"EventManagementSystem Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 # Do our work in the import node
 my $node = WebGUI::Asset->getImportNode($session);
@@ -121,7 +121,7 @@ my $i18n = $ems->i18n;
 
 $versionTag->commit;
 $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $ems = $ems->cloneFromDb;
 
 my $id1 = $ems->getNextSubmissionId;
@@ -211,7 +211,7 @@ my $submission = {
         };
 $session->request->setup_body($submission);
 my $sub1 = $frmA->addSubmission;
-WebGUI::Test->assetsToPurge( $sub1 );
+WebGUI::Test->addToCleanup( $sub1 );
 print join( "\n", @{$sub1->{errors}} ),"\n" if defined $sub1->{errors};
 my $isa1 = isa_ok( $sub1, 'WebGUI::Asset::EMSSubmission', "userA/formA valid submission succeeded" );
 ok( $ems->hasSubmissions, 'UserA has submissions on this ems' );
@@ -229,7 +229,7 @@ $submission = {
         };
 $session->request->setup_body($submission);
 my $sub2 = $frmB->addSubmission;
-WebGUI::Test->assetsToPurge( $sub2 );
+WebGUI::Test->addToCleanup( $sub2 );
 my $isa2 = isa_ok( $sub2, 'WebGUI::Asset::EMSSubmission', "userB/FormB valid submission succeeded" );
 
 loginUserC;
@@ -355,7 +355,7 @@ $sub1 = $sub1->cloneFromDb;
 is( $sub1->get('submissionStatus'),'created','approval successfull');
 
 my $ticket = WebGUI::Asset->newById($session, $sub1->get('ticketId'));
-WebGUI::Test->assetsToPurge( $ticket ) if $ticket ;
+WebGUI::Test->addToCleanup( $ticket ) if $ticket ;
 SKIP: {
 skip 'no ticket created', 1 unless isa_ok( $ticket, 'WebGUI::Asset::Sku::EMSTicket', 'approval created a ticket');
 is( $ticket->get('title'), $sub1->get('title'), 'Ticket title matches submission title' );

t/Asset/Event.t

@@ -25,7 +25,7 @@ my $session = WebGUI::Test->session;
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Adding Calendar for Event Asset Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $defaultAsset = WebGUI::Asset->getDefault($session);
 my $cal = $defaultAsset->addChild({className=>'WebGUI::Asset::Wobject::Calendar'});
 $versionTag->commit;
@@ -119,7 +119,7 @@ $properties3->{url}       = 'event-asset-test6';
 $properties3->{className} = 'WebGUI::Asset::Event';
 
 my $eventStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($eventStorage);
+WebGUI::Test->addToCleanup($eventStorage);
 $properties3->{storageId} = $eventStorage->getId;
 
 my $event6 = $cal->addChild($properties3, $properties3->{id});
@@ -130,7 +130,7 @@ my $event6a = $event6->addRevision({ title => 'Event with storage', }, undef, {
 ok($session->id->valid($event6a->get('storageId')), 'addRevision gives the new revision a valid storageId');
 isnt($event6a->get('storageId'), $event6->get('storageId'), '... and it is different from the previous revision');
 my $versionTag2 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag2);
+WebGUI::Test->addToCleanup($versionTag2);
 $versionTag2->commit;
 
 my $event7 = $cal->addChild(

t/Asset/Event/edit.t

@@ -37,7 +37,7 @@ $session->setting->set( 'defaultVersionTagWorkflow', 'pbworkflow000000000003' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );

t/Asset/Event/permissions.t

@@ -33,7 +33,7 @@ push @versionTags, WebGUI::VersionTag->getWorking($session);
 $versionTags[-1]->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
 
 my $registeredUser  = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($registeredUser);
+WebGUI::Test->addToCleanup($registeredUser);
 
 # Make a Calendar to add events do
 my $calendar = $node->addChild({

t/Asset/File/GalleryFile/Photo/edit.t

@@ -35,7 +35,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );

t/Asset/File/GalleryFile/Photo/permissions.t

@@ -29,16 +29,16 @@ my $maker           = WebGUI::Test::Maker::Permission->new;
 $session->user({ userId => 3 });
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 # Add a new user to the test user's friends list
 my $friend  = WebGUI::User->new($session, "new");
-WebGUI::Test->usersToDelete($friend);
+WebGUI::Test->addToCleanup($friend);
 WebGUI::Friends->new($session)->add( [ $friend->userId ] );
 
 # Add a new registered user
 my $notFriend   = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($notFriend);
+WebGUI::Test->addToCleanup($notFriend);
 
 my $gallery
     = $node->addChild({

t/Asset/Post.t

@@ -54,7 +54,7 @@ my $otherUser           = WebGUI::User->new($session, 'new');
 my $groupIdEditUser     = WebGUI::User->new($session, 'new');
 my $groupToEditPostId   = $collab->get('groupToEditPost');
 my $groupIdEdit         = $collab->get('groupIdEdit');
-WebGUI::Test->usersToDelete($postingUser, $otherUser, $groupIdEditUser);
+WebGUI::Test->addToCleanup($postingUser, $otherUser, $groupIdEditUser);
 $postingUser->username('userForPosting');
 $otherUser->username('otherUser');
 
@@ -83,7 +83,7 @@ my $props = {
 my $post = $collab->addChild($props, @addArgs);
 
 $versionTag->commit();
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $post = $post->cloneFromDb;
 
 # Test for a sane object type
@@ -148,7 +148,7 @@ my $post2 = $collab->addChild({
     ownerUserId => 1,
 }, @addArgs);
 $versionTag2->commit();
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $variables;
 $session->user({userId => 1});
 $variables = $post1->getTemplateVars();

t/Asset/Post/Thread/permission.t

@@ -30,11 +30,11 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 $user{"2"}->addToGroups( ['2'] ); # Registered user
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set( { name => "Collaboration Test" } );
 
 my @addArgs = ( undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 } );

t/Asset/Post/permission.t

@@ -30,12 +30,12 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 $user{"2"}->addToGroups( ['2'] ); # Registered user
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
 $versionTag->set( { name => "Collaboration Test" } );
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 my @addArgs = ( undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1 } );
 

t/Asset/Redirect/mech.t

@@ -37,7 +37,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );

t/Asset/Shortcut/010-linked-asset.t

@@ -148,7 +148,7 @@ ok(
 sub init {
     my $versionTag      = WebGUI::VersionTag->getWorking($session);
     $versionTag->set({name=>"Shortcut Test"});
-    WebGUI::Test->tagsToRollback($versionTag);
+    WebGUI::Test->addToCleanup($versionTag);
     # Make a snippet to shortcut
     $snippet 
         = $node->addChild({

t/Asset/Sku/Product.t

@@ -57,7 +57,7 @@ foreach my $file_property (qw/image1 image2 image3 brochure manual warranty/) {
 }
 
 my $image = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($image);
+WebGUI::Test->addToCleanup($image);
 $image->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('lamp.jpg'));
 $image->generateThumbnail('lamp.jpg');
 
@@ -72,7 +72,7 @@ ok($imagedProduct->getThumbnailUrl(), 'getThumbnailUrl is not empty');
 is($imagedProduct->getThumbnailUrl(), $image->getThumbnailUrl('lamp.jpg'), 'getThumbnailUrl returns the right path to the URL');
 
 my $otherImage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($otherImage);
+WebGUI::Test->addToCleanup($otherImage);
 $otherImage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('gooey.jpg'));
 $otherImage->generateThumbnail('gooey.jpg');
 
@@ -118,7 +118,7 @@ cmp_deeply(
 
 my $tag = WebGUI::VersionTag->getWorking($session);
 $tag->commit;
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 
 ####################################################
 #
@@ -132,7 +132,7 @@ my $newImagedProduct = $imagedProduct->addRevision({title => 'Bible and hammer'}
 like($newImagedProduct->get('image1'), $session->id->getValidator, 'addRevision: new product rev got an image1 storage location');
 isnt($newImagedProduct->get('image1'), $imagedProduct->get('image1'), '... and it is not the same as the old one');
 
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));
 WebGUI::VersionTag->getWorking($session)->commit;
 
 ####################################################
@@ -169,7 +169,7 @@ my $viewProduct = $node->addChild({
 
 my $tag2 = WebGUI::VersionTag->getWorking($session);
 $tag2->commit;
-WebGUI::Test->tagsToRollback($tag2);
+WebGUI::Test->addToCleanup($tag2);
 
 ##Fetch a copy from the db, just like a page fetch
 $viewProduct = WebGUI::Asset->newById($session, $viewProduct->getId);

t/Asset/Sku/Subscription.t

@@ -37,9 +37,9 @@ plan tests => 4;        # Increment this number for each test you create
 # put your tests here
 my $root  = WebGUI::Asset->getRoot($session);
 my $group = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($group);
+WebGUI::Test->addToCleanup($group);
 my $user  = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 
 my $sku = $root->addChild({
         className => "WebGUI::Asset::Sku::Subscription",
@@ -50,7 +50,7 @@ my $sku = $root->addChild({
         duration              => 'Monthly',
         });
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 isa_ok($sku, "WebGUI::Asset::Sku::Subscription");
 
 is($sku->getPrice, 50.00, "Price should be 50.00");

t/Asset/Story.t

@@ -39,8 +39,8 @@ my $reader       = WebGUI::User->create($session);
 $postUser->username('Can Post User');
 $reader->username('Average Reader');
 $archiveOwner->username('Archive Owner');
-WebGUI::Test->groupsToDelete($canPostGroup);
-WebGUI::Test->usersToDelete($postUser, $archiveOwner, $reader);
+WebGUI::Test->addToCleanup($canPostGroup);
+WebGUI::Test->addToCleanup($postUser, $archiveOwner, $reader);
 
 my $canEditMaker = WebGUI::Test::Maker::Permission->new();
 $canEditMaker->prepare({
@@ -70,11 +70,11 @@ my $topic       = $defaultNode->addChild({
 });
 my $archiveTag  = WebGUI::VersionTag->getWorking($session);
 $archiveTag->commit;
-WebGUI::Test->tagsToRollback($archiveTag);
+WebGUI::Test->addToCleanup($archiveTag);
 
 my $storage1 = WebGUI::Storage->create($session);
 my $storage2 = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage1, $storage2);
+WebGUI::Test->addToCleanup($storage1, $storage2);
 
 ############################################################
 #
@@ -412,7 +412,7 @@ cmp_deeply(
 isnt($newPhotoData->[0]->{storageId}, $photoData->[0]->{storageId}, '... and storage 0 is duplicated');
 isnt($newPhotoData->[1]->{storageId}, $photoData->[1]->{storageId}, '... and storage 1 is duplicated');
 
-WebGUI::Test->storagesToDelete( map { $_->{storageId} } @{ $newPhotoData } );
+WebGUI::Test->addToCleanup( map { 'WebGUI::Storage' => $_->{storageId} } @{ $newPhotoData } );
 
 ############################################################
 #

t/Asset/Template.t

@@ -178,5 +178,5 @@ like($logError, qr/$brokenUrl/, 'process: logged error has the url');
 like($logError, qr/$brokenId/, '... and the template id');
 WebGUI::Test->restoreLogging;
 
-WebGUI::Test->tagsToRollback(WebGUI::VersionTag->getWorking($session));
+WebGUI::Test->addToCleanup(WebGUI::VersionTag->getWorking($session));
 

t/Asset/Template/packed.t

@@ -36,7 +36,7 @@ my $templates       = WebGUI::Asset->getRoot( $session )
                     ->getLineage( ['descendants'], { 
                         includeOnlyClasses => [ 'WebGUI::Asset::Template' ],
                     } );
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/WikiPage.t

@@ -53,7 +53,7 @@ is($article, undef, "Can't add an Article wobject as a child to a Wiki Page.");
 my $wikiPageCopy = $wikipage->duplicate();
 isa_ok($wikiPageCopy, 'WebGUI::Asset::WikiPage');
 my $thirdVersionTag = WebGUI::VersionTag->new($session,$wikiPageCopy->get("tagId"));
-WebGUI::Test->tagsToRollback($thirdVersionTag);
+WebGUI::Test->addToCleanup($thirdVersionTag);
 
 ## isProtected
 

t/Asset/WikiPage/subscribable.t

@@ -36,7 +36,7 @@ my $page
         className               => 'WebGUI::Asset::WikiPage',
     }, undef, undef, { skipAutoCommitWorkflows => 1 } );
 
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/Article.t

@@ -40,7 +40,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Article Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
 
 # Test for a sane object type
@@ -71,7 +71,7 @@ my $pathedFile = WebGUI::Test->getTestCollateralPath($filename);
 
 # Use some test collateral to create a storage location and assign it to our article
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 my $storedFilename = $storage->addFileFromFilesystem($pathedFile);
 my $filenameOK = is ($storedFilename, $filename, 'storage created correctly');
 

t/Asset/Wobject/Collaboration/permission.t

@@ -31,7 +31,7 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
 $user{"2"}->addToGroups( ['2'] ); # Registered user
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
 $versionTag->set( { name => "Collaboration Test" } );

t/Asset/Wobject/Collaboration/unarchiveAll.t

@@ -40,7 +40,7 @@ my @threads = (
 
 my $tag = WebGUI::VersionTag->getWorking( $session );
 $tag->commit;
-WebGUI::Test->tagsToRollback($tag);
+WebGUI::Test->addToCleanup($tag);
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/DataForm.t

@@ -43,7 +43,7 @@ my $dform = WebGUI::Asset->getDefault($session)->addChild({
 $dform->createField('gotCaptcha', { type => 'Captcha', name => 'humanCheck', });
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->commit;
 
 #----------------------------------------------------------------------------

t/Asset/Wobject/EventManagementSystem.t

@@ -32,10 +32,10 @@ my $session         = WebGUI::Test->session;
 my $registrar = WebGUI::User->create($session);
 my $attender  = WebGUI::User->create($session);
 my $crasher   = WebGUI::User->create($session);
-WebGUI::Test->usersToDelete($registrar, $attender, $crasher);
+WebGUI::Test->addToCleanup($registrar, $attender, $crasher);
 my $registrars = WebGUI::Group->new($session, 'new');
 my $attendees  = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($registrars, $attendees);
+WebGUI::Test->addToCleanup($registrars, $attendees);
 $registrars->addUsers([$registrar->getId]);
 $attendees->addUsers([$attender->getId]);
 
@@ -71,7 +71,7 @@ my $ems = $node->addChild({
     groupIdView              => $attendees->getId
 });
 $versionTag->commit;
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 # Test for a sane object type
 isa_ok($ems, 'WebGUI::Asset::Wobject::EventManagementSystem');

t/Asset/Wobject/Gallery/permission.t

@@ -25,12 +25,12 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Gallery Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $maker           = WebGUI::Test::Maker::Permission->new;
 my $gallery;
 
 my $nonAdmin    = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($nonAdmin);
+WebGUI::Test->addToCleanup($nonAdmin);
 
 
 #----------------------------------------------------------------------------

t/Asset/Wobject/GalleryAlbum/ajax.t

@@ -28,9 +28,9 @@ my $versionTag      = WebGUI::VersionTag->getWorking($session);
 my %user;
 $user{'1'} = WebGUI::User->new( $session, "new" );
 $user{'1'}->addToGroups( ['3'] ); # Admins
-WebGUI::Test->usersToDelete($user{'1'});
+WebGUI::Test->addToCleanup($user{'1'});
 $user{'2'} = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 
 # Create everything as user no. 1
 $session->user({ user => $user{'1'} });

t/Asset/Wobject/GalleryAlbum/edit.t

@@ -36,7 +36,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
@@ -59,7 +59,7 @@ my $gallery
     } );
 
 $versionTags[-1]->commit;
-WebGUI::Test->tagsToRollback(@versionTags);
+WebGUI::Test->addToCleanup(@versionTags);
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/GalleryAlbum/permission.t

@@ -28,7 +28,7 @@ my $node            = WebGUI::Asset->getImportNode($session);
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
 $user{"2"}->addToGroups( ['2'] ); # Registered user
-WebGUI::Test->usersToDelete($user{'2'});
+WebGUI::Test->addToCleanup($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Album Test"});

t/Asset/Wobject/GalleryAlbum/rss.t

@@ -28,7 +28,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Album Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $gallery
     = $node->addChild({
         className           => "WebGUI::Asset::Wobject::Gallery",

t/Asset/Wobject/InOutBoard.t

@@ -44,14 +44,14 @@ foreach my $name (@names) {
     $user->username($name);
     push @users, $user;
 }
-WebGUI::Test->usersToDelete(@users);
+WebGUI::Test->addToCleanup(@users);
 
 # Do our work in the import node
 my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"InOutBoard Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $board = $node->addChild({
     className       => 'WebGUI::Asset::Wobject::InOutBoard',
     inOutTemplateId => $templateId,

t/Asset/Wobject/Matrix.t

@@ -29,7 +29,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Matrix Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $matrix = $node->addChild({className=>'WebGUI::Asset::Wobject::Matrix'});
 
 # Test for a sane object type
@@ -108,7 +108,7 @@ my $matrixListing = $matrix->addChild({className=>'WebGUI::Asset::MatrixListing'
 
 my $secondVersionTag = WebGUI::VersionTag->new($session,$matrixListing->get("tagId"));
 $secondVersionTag->commit;
-WebGUI::Test->tagsToRollback($secondVersionTag);
+WebGUI::Test->addToCleanup($secondVersionTag);
 $matrixListing = $matrixListing->cloneFromDb;
 
 # Test for sane object type

t/Asset/Wobject/Poll.t

@@ -77,7 +77,7 @@ my $poll = $defaultNode->addChild({
 });
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->commit;
 
 isa_ok($poll, 'WebGUI::Asset::Wobject::Poll');

t/Asset/Wobject/Shelf.t

@@ -447,7 +447,7 @@ SKIP: {
     ##Clear out this tag so we can do downstream work.
     my $tag = WebGUI::VersionTag->getWorking($session);
     $tag->commit;
-    WebGUI::Test->tagsToRollback($tag);
+    WebGUI::Test->addToCleanup($tag);
 
     #######################################################################
     #
@@ -457,9 +457,9 @@ SKIP: {
 
     my $tommy  = WebGUI::User->create($session);
     my $warden = WebGUI::User->create($session);
-    WebGUI::Test->usersToDelete($tommy, $warden);
+    WebGUI::Test->addToCleanup($tommy, $warden);
     my $inGroup = WebGUI::Group->new($session, 'new');
-    WebGUI::Test->groupsToDelete($inGroup);
+    WebGUI::Test->addToCleanup($inGroup);
     $inGroup->addUsers([$tommy->getId]);
 
     my $testTemplate = $root->addChild({
@@ -471,7 +471,7 @@ SKIP: {
         templateId => $testTemplate->getId,
     });
     my $tag2 = WebGUI::VersionTag->getWorking($session);
-    WebGUI::Test->tagsToRollback($tag2);
+    WebGUI::Test->addToCleanup($tag2);
     $tag2->commit;
     $session->user({userId => 1});
     $testShelf->prepareView;
@@ -486,7 +486,7 @@ SKIP: {
         title       => 'Private Product',
     });
     my $tag3 = WebGUI::VersionTag->getWorking($session);
-    WebGUI::Test->tagsToRollback($tag3);
+    WebGUI::Test->addToCleanup($tag3);
     $tag3->commit;
 
     $session->user({user => $tommy});

t/Asset/Wobject/StoryArchive.t

@@ -40,7 +40,7 @@ use DateTime;
 my $session         = WebGUI::Test->session;
 
 my $staff = WebGUI::Group->new($session, 'new');
-WebGUI::Test->groupsToDelete($staff);
+WebGUI::Test->addToCleanup($staff);
 $staff->name('Reporting Staff');
 
 my $reporter = WebGUI::User->new($session, 'new');
@@ -50,7 +50,7 @@ $editor->username('editor');
 my $reader   = WebGUI::User->new($session, 'new');
 $reader->username('reader');
 $staff->addUsers([$reporter->userId]);
-WebGUI::Test->usersToDelete($reporter, $editor, $reader);
+WebGUI::Test->addToCleanup($reporter, $editor, $reader);
 
 my $archive = 'placeholder for Test::Maker::Permission';
 
@@ -84,7 +84,7 @@ $archive    = $home->addChild({
               });
 $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->commit;
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 
 $archive = $archive->cloneFromDb;
 
@@ -164,7 +164,7 @@ $child->purge;
 $child = $archive->addChild({className => 'WebGUI::Asset::Story', title => 'First Story'}, @skipAutoCommit);
 my $tag1 = WebGUI::VersionTag->getWorking($session);
 $tag1->commit;
-WebGUI::Test->tagsToRollback($tag1);
+WebGUI::Test->addToCleanup($tag1);
 isa_ok($child, 'WebGUI::Asset::Story', 'addChild added and returned a Story');
 is($archive->getChildCount, 1, '... added it to the archive');
 my $folder = $archive->getFirstChild();
@@ -202,7 +202,7 @@ my $story = $oldFolder->addChild({ className => 'WebGUI::Asset::Story', title =>
 $creationDateSth->execute([$wgBday, $story->getId]);
 my $tag2 = WebGUI::VersionTag->getWorking($session);
 $tag2->commit;
-WebGUI::Test->tagsToRollback($tag2);
+WebGUI::Test->addToCleanup($tag2);
 
 {
     my $storyDB = WebGUI::Asset->newByUrl($session, $story->getUrl);
@@ -213,7 +213,7 @@ my $pastStory = $newFolder->addChild({ className => 'WebGUI::Asset::Story', titl
 $creationDateSth->execute([$yesterday, $pastStory->getId]);
 my $tag3 = WebGUI::VersionTag->getWorking($session);
 $tag3->commit;
-WebGUI::Test->tagsToRollback($tag3);
+WebGUI::Test->addToCleanup($tag3);
 
 my $templateVars;
 $templateVars = $archive->viewTemplateVariables();
@@ -289,7 +289,7 @@ foreach my $storilet ($story2, $story3, $story4) {
 $archive->update({storiesPerPage => 3});
 my $tag4 = WebGUI::VersionTag->getWorking($session);
 $tag4->commit;
-WebGUI::Test->tagsToRollback($tag4);
+WebGUI::Test->addToCleanup($tag4);
 
 ##Don't assume that Admin and Visitor have the same timezone.
 $session->user({userId => 3});
@@ -571,7 +571,7 @@ cmp_deeply(
 ################################################################
 
 my $exportStorage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($exportStorage);
+WebGUI::Test->addToCleanup($exportStorage);
 my $basedir = Path::Class::Dir->new($exportStorage->getPath);
 $exportStorage->addFileFromScalar('index', 'export story archive content');
 my $assetDir  = $basedir->subdir('mystories');

t/Asset/Wobject/StoryTopic.t

@@ -189,7 +189,7 @@ is($templateVars->{topStoryCreationDate}, $now, '... topStoryCreationDate');
 ok($templateVars->{standAlone}, '... standAlone mode=1');
 
 my $storage = WebGUI::Storage->create($session);
-WebGUI::Test->storagesToDelete($storage);
+WebGUI::Test->addToCleanup($storage);
 $storyHandler->{bogs}->setPhotoData([{
     caption   => "Octopus seen at the scene of Mrs. Dufresne's murder.",
     byLine    => 'Elmo Blatch',

t/Asset/Wobject/Survey.t

@@ -26,7 +26,7 @@ plan tests => 47;
 my ($survey);
 
 my $user = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
 # Create a Survey
@@ -119,7 +119,7 @@ ok($survey->responseId, '..(and similarly for responseId)');
 $survey->update({maxResponsesPerUser => 1});
 is($survey->takenCount( { userId => 1 } ), 0, 'Visitor has no responses');
 my $u = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($u);
+WebGUI::Test->addToCleanup($u);
 is($survey->takenCount( { userId => $u->userId } ), 0, 'New user has no responses');
 delete $survey->{canTake};
 delete $survey->{responseId};
@@ -240,7 +240,7 @@ cmp_deeply(from_json($surveyEnd), { type => 'forward', url => '/getting_started'
 
     # Create another response (this one will use the new revision)
     my $newUser = WebGUI::User->new( $session, 'new' );
-    WebGUI::Test->usersToDelete($newUser);
+    WebGUI::Test->addToCleanup($newUser);
     $session->user({ user => $newUser });
     my $newResponseId = $survey->responseId;
     is($newerSurvey->responseJSON->nextResponseSection()->{text}, 'newer text', 'New response uses the new text');

t/Asset/Wobject/Survey/ExpressionEngine.t

@@ -188,7 +188,7 @@ SKIP: {
 
     # Create a test user
     $user = WebGUI::User->new( $session, 'new' );
-    WebGUI::Test->usersToDelete($user);
+    WebGUI::Test->addToCleanup($user);
     
     # Create a Survey
     $versionTag = WebGUI::VersionTag->getWorking($session);
@@ -244,7 +244,7 @@ SKIP: {
         # Create a second test user
         my $survey2 = WebGUI::Asset::Wobject::Survey->new($session, $survey->getId);
         my $user2 = WebGUI::User->new( $session, 'new' );
-        WebGUI::Test->usersToDelete($user2);
+        WebGUI::Test->addToCleanup($user2);
         $session->user({userId => $user2->userId});
         my $responseId2 = $survey2->responseId( { userId => $user2->userId } );
         my $rJSON2 = $survey2->responseJSON(undef, $responseId2);

t/Asset/Wobject/Survey/Reports.t

@@ -35,7 +35,7 @@ SKIP: {
 
 skip $tests, "Unable to load Survey" unless $usedOk;
 my $user = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
 # Create a Survey

t/Asset/Wobject/Survey/Test.t

@@ -37,7 +37,7 @@ skip "Unable to load TAP::Parser and TAP::Parser::Aggregator", 88 unless $tp &&
 use_ok('WebGUI::Asset::Wobject::Survey::Test');
 
 my $user = WebGUI::User->new( $session, 'new' );
-WebGUI::Test->usersToDelete($user);
+WebGUI::Test->addToCleanup($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
 WebGUI::Test->originalConfig('enableSurveyExpressionEngine');

t/Asset/Wobject/Thingy.t

@@ -36,7 +36,7 @@ $templateMock->mock('process', sub { $templateVars = $_[1]; } );
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Thingy Test"});
-WebGUI::Test->tagsToRollback($versionTag);
+WebGUI::Test->addToCleanup($versionTag);
 my $thingy = $node->addChild({className=>'WebGUI::Asset::Wobject::Thingy'});
 
 # Test for a sane object type
@@ -385,7 +385,7 @@ is($table, undef, '... drops thing specific table');
     $thingy->editThingDataSave($newThingId, 'new', {"field_".$newFieldId => 'value 3'} );
 
     my $andy = WebGUI::User->create($session);
-    WebGUI::Test->usersToDelete($andy);
+    WebGUI::Test->addToCleanup($andy);
     $session->user({userId => $andy->userId});
 
     my $form = $thingy->getFormPlugin({

t/Asset/Wobject/WikiMaster/featured.t

@@ -44,7 +44,7 @@ my $featuredPage
         content         => 'A how-to book',
     }, undef, undef, { skipAutoCommitWorkflows => 1 } );
 
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/Wobject/WikiMaster/subscribable.t

@@ -32,7 +32,7 @@ my $wiki
         groupIdView             => '7', # Everyone
     } );
 
-WebGUI::Test->tagsToRollback( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
 
 #----------------------------------------------------------------------------
 # Tests

t/Asset/permissions.t

@@ -59,15 +59,15 @@ $testGroups{'canEdit asset'}     = WebGUI::Group->new($session, 'new');
 $testUsers{'canEdit group user'} = WebGUI::User->new($session, 'new');
 $testUsers{'canEdit group user'}->addToGroups([$testGroups{'canEdit asset'}->getId]);
 $testUsers{'canEdit group user'}->username('Edit Group User');
-WebGUI::Test->groupsToDelete($testGroups{'canEdit asset'});
+WebGUI::Test->addToCleanup($testGroups{'canEdit asset'});
 
 ##A group and user for groupIdEdit
 $testGroups{'canAdd asset'}     = WebGUI::Group->new($session, 'new');
 $testUsers{'canAdd group user'} = WebGUI::User->new($session, 'new');
 $testUsers{'canAdd group user'}->addToGroups([$testGroups{'canAdd asset'}->getId]);
 $testUsers{'canEdit group user'}->username('Can Add Group User');
-WebGUI::Test->groupsToDelete($testGroups{'canAdd asset'});
-WebGUI::Test->usersToDelete(values %testUsers);
+WebGUI::Test->addToCleanup($testGroups{'canAdd asset'});
+WebGUI::Test->addToCleanup(values %testUsers);
 
 my $canAddMaker = WebGUI::Test::Maker::Permission->new();
 $canAddMaker->prepare({
@@ -100,7 +100,7 @@ $properties = {
 };
 
 my $versionTag2 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag2);
+WebGUI::Test->addToCleanup($versionTag2);
 
 my $canEditAsset = $rootAsset->addChild($properties, $properties->{id});
 
@@ -116,7 +116,7 @@ $canEditMaker->prepare({
 });
 
 my $versionTag3 = WebGUI::VersionTag->getWorking($session);
-WebGUI::Test->tagsToRollback($versionTag3);
+WebGUI::Test->addToCleanup($versionTag3);
 $properties = {
 	#            '1234567890123456789012'
 	id          => 'canViewAsset0000000010',