Another batch of clean-ups for users and groups.

t/Asset/Asset.t

@@ -37,7 +37,6 @@ my @fixTitleTests = getFixTitleTests($session);
 my @getTitleTests = getTitleTests($session);
 
 my $rootAsset = WebGUI::Asset->getRoot($session);
-my $originalAssetOverrides = dclone($session->config->get('assets'));
 
 ##Test users.
 ##All users in here will be deleted at the end of the test.  DO NOT PUT
@@ -71,6 +70,7 @@ $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);
 
 my $canAddMaker = WebGUI::Test::Maker::Permission->new();
 $canAddMaker->prepare({
@@ -369,9 +369,9 @@ $session->setting->set('urlExtension', undef);
 is($importNode->fixUrl('1234'.'-'x235 . 'abcdefghij'), '1234'.'-'x235 . 'abcdefghij', 'fixUrl leaves long URLs under 250 characters alone');
 is($importNode->fixUrl('1234'.'-'x250 . 'abcdefghij'), '1234'.'-'x216, 'fixUrl truncates long URLs over 250 characters to 220 characters');
 
-my $origExtras   = $session->config->get('extrasURL');
+WebGUI::Test->originalConfig('extrasURL');
-my $origUploads  = $session->config->get('uploadsURL');
+WebGUI::Test->originalConfig('uploadsURL');
-my $origPassthru = $session->config->get('passthruUrls');
+WebGUI::Test->originalConfig('assets');
 
 $session->config->set('extrasURL',    '/extras');
 $session->config->set('uploadsURL',   '/uploads');
@@ -416,8 +416,6 @@ TODO: {
     $session->setting->set('urlExtension', $origUrlExtension);
 }
 
-$session->config->set('extrasURL', $origExtras);
-
 ################################################################
 #
 # fixId
@@ -478,7 +476,9 @@ foreach my $test (@getTitleTests) {
 like($importNode->getIcon,    qr{folder.gif$},       'getIcon gets correct icon for importNode');
 like($importNode->getIcon(1), qr{small/folder.gif$}, 'getIcon gets small icon for importNode');
 
-like($importNode->getIcon(),  qr{$origExtras}, 'getIcon returns an icon from the extras URL');
+my $extras = $session->config->get('extrasURL');
+
+like($importNode->getIcon(),  qr{$extras}, 'getIcon returns an icon from the extras URL');
 
 like($defaultAsset->getIcon,  qr{layout.gif$},       'getIcon gets icon for a layout');
 like($fixTitleAsset->getIcon, qr{snippet.gif$},      'getIcon gets icon for a snippet');
@@ -809,19 +809,9 @@ is($iufpAsset3->getUrl, '/inheriturlfromparent01/inheriturlfromparent02/inheritu
 
 
 END {
-    $session->config->set( 'extrasURL',    $origExtras)
-        if defined $origExtras;
-    $session->config->set( 'uploadsURL',   $origUploads)
-        if defined $origUploads;
-    if (defined $originalAssetOverrides) {
-        $session->config->set('assets', $originalAssetOverrides);
-    }
     foreach my $vTag ($versionTag, $versionTag2, $versionTag3, $versionTag4, ) {
         $vTag->rollback;
     }
-    foreach my $user (values %testUsers) {
-        $user->delete;
-    }
 }
 
 ##Return an array of hashrefs.  Each hashref describes a test

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

@@ -34,6 +34,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
+WebGUI::Test->usersToDelete($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
@@ -136,8 +137,6 @@ END {
         $tag->rollback;
     }
 
-    $user->delete;
-
 }
 
 #----------------------------------------------------------------------------

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

@@ -33,10 +33,12 @@ $versionTags[-1]->set({name=>"Photo Test, add Gallery, Album and 1 Photo"});
 
 # Add a new user to the test user's friends list
 my $friend  = WebGUI::User->new($session, "new");
+WebGUI::Test->usersToDelete($friend);
 WebGUI::Friends->new($session)->add( [ $friend->userId ] );
 
 # Add a new registered user
 my $notFriend   = WebGUI::User->new( $session, "new" );
+WebGUI::Test->usersToDelete($notFriend);
 
 my $gallery
     = $node->addChild({
@@ -132,6 +134,4 @@ END {
     for my $versionTag ( @versionTags ) {
         $versionTag->rollback;
     }
-    $friend->delete;
-    $notFriend->delete;
 }

t/Asset/Post.t

@@ -60,6 +60,8 @@ my $otherUser           = WebGUI::User->new($session, 'new');
 my $groupIdEditUser     = WebGUI::User->new($session, 'new');
 my $groupToEditPost     = WebGUI::Group->new($session, $collab->get('groupToEditPost'));
 my $groupIdEditGroup    = WebGUI::Group->new($session, $collab->get('groupIdEdit'));
+WebGUI::Test->usersToDelete($postingUser, $otherUser, $groupIdEditUser);
+WebGUI::Test->groupsToDelete($groupToEditPost, $groupIdEditGroup);
 $postingUser->username('userForPosting');
 $otherUser->username('otherUser');
 
@@ -117,9 +119,6 @@ TODO: {
 END {
     # Clean up after thyself
     $versionTag->rollback();
-    $postingUser->delete();
-    $otherUser->delete();
-    $groupIdEditUser->delete();
 }
 
 

t/Asset/Post/Thread/permission.t

@@ -30,6 +30,7 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
+WebGUI::Test->usersToDelete($user{'2'});
 $user{"2"}->addToGroups( ['2'] ); # Registered user
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
@@ -122,8 +123,7 @@ $thread->unlock;
 #----------------------------------------------------------------------------
 # Cleanup
 END {
-    for my $user ( values %user ) {
+    my $subscriptionGroup = WebGUI::Group->new($session, $thread->get('subscriptionGroupId'));
-        $user->delete;
+    WebGUI::Test->groupsToDelete($subscriptionGroup);
-    }
     $versionTag->rollback;
 }

t/Asset/Wobject/StoryArchive.t

@@ -50,6 +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);
 
 my $archive = 'placeholder for Test::Maker::Permission';
 
@@ -616,9 +617,6 @@ END {
     if ($versionTag) {
         $versionTag->rollback;
     }
-    foreach my $user ($editor, $reporter, $reader) {
-        $user->delete if defined $user;
-    }
     $creationDateSth->finish;
 }