convert all test cleanup to addToCleanup

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