oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More test cleanup for deleting users and groups.

Browse source
This commit is contained in:
Colin Kuskie 2009-04-30 20:10:00 +00:00
parent 51ce57d7fc
commit 25231d3fe5
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
t/Macro/GroupAdd.t
View file

@ -156,13 +156,13 @@ sub setupTest {
$groups[1] = WebGUI::Group->new($session, "new");
$groups[1]->name('Regular Old Group');
$groups[1]->autoAdd(0);
WebGUI::Test->groupsToDelete(@{ $groups });
WebGUI::Test->groupsToDelete(@groups);
##Three users. One in each group and one with no group membership
my @users = map { WebGUI::User->new($session, "new") } 0..2;
$users[0]->addToGroups([$groups[0]->getId]);
$users[1]->addToGroups([$groups[1]->getId]);
WebGUI::Test->usersToDelete(@{ $users });
WebGUI::Test->usersToDelete(@users);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"GroupAdd test"});
@ -202,12 +202,6 @@ sub simpleTextParser {
}
END { ##Clean-up after yourself, always
foreach my $testGroup (@{ $groups }, ) {
$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
}
foreach my $dude (@{ $users }, ) {
$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
}
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}

8
t/Macro/GroupDelete.t
View file

@ -156,11 +156,13 @@ sub setupTest {
$groups[1] = WebGUI::Group->new($session, "new");
$groups[1]->name('Regular Old Group');
$groups[1]->autoDelete(0);
WebGUI::Test->groupsToDelete(@groups);
##Three users. One in each group and one with no group membership
my @users = map { WebGUI::User->new($session, "new") } 0..2;
$users[0]->addToGroups([$groups[0]->getId]);
$users[1]->addToGroups([$groups[1]->getId]);
WebGUI::Test->usersToDelete(@users);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"GroupDelete test"});
@ -200,12 +202,6 @@ sub simpleTextParser {
}
END { ##Clean-up after yourself, always
foreach my $testGroup (@{ $groups }, ) {
$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
}
foreach my $dude (@{ $users }, ) {
$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
}
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}