From 23fa58ca114ed6d435bc4cee0ac364a2496070de Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sun, 12 Feb 2006 05:50:06 +0000 Subject: [PATCH] 4 more WebGUI::Group tests More Operation::Group.pm subs without session calls fixed. --- lib/WebGUI/Operation/Group.pm | 8 ++++---- t/Group.t | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm index f65f4d9ab..313214337 100644 --- a/lib/WebGUI/Operation/Group.pm +++ b/lib/WebGUI/Operation/Group.pm @@ -162,7 +162,7 @@ sub www_addGroupsToGroupSave { my $group = WebGUI::Group->new($session,$_[0]); my @groups = $session->form->group('groups'); $group->addGroups(\@groups); - return www_manageGroupsInGroup(); + return www_manageGroupsInGroup($session); } #------------------------------------------------------------------- @@ -172,7 +172,7 @@ sub www_addUsersToGroupSave { my @users = $session->form->selectList('users'); my $group = WebGUI::Group->new($session,$session->form->process("gid")); $group->addUsers(\@users); - return www_manageUsersInGroup(); + return www_manageUsersInGroup($session); } #------------------------------------------------------------------- @@ -228,7 +228,7 @@ sub www_deleteGroupGrouping { return $session->privilege->adminOnly() unless ($session->user->isInGroup('3') || _hasSecondaryPrivilege($session,$session->form->process("gid"))); my $group = WebGUI::Group->new($session,$session->form->process("gid")); $group->deleteGroups([$session->form->process("delete")]); - return www_manageGroupsInGroup(); + return www_manageGroupsInGroup($session); } #------------------------------------------------------------------- @@ -429,7 +429,7 @@ sub www_editGroupSave { $g->ldapGroup($session->form->text("ldapGroup")); $g->ldapGroupProperty($session->form->text("ldapGroupProperty")); $g->ldapRecursiveProperty($session->form->text("ldapRecursiveProperty")); - return www_listGroups($session); + return www_listGroups($session); } #------------------------------------------------------------------- diff --git a/t/Group.t b/t/Group.t index 05424f149..1488c2ffc 100644 --- a/t/Group.t +++ b/t/Group.t @@ -18,7 +18,7 @@ use WebGUI::Utility; use WebGUI::User; use WebGUI::Group; -use Test::More tests => 4; # increment this value for each test you create +use Test::More tests => 8; # increment this value for each test you create my $session = WebGUI::Test->session; @@ -26,11 +26,23 @@ my $g = WebGUI::Group->new($session, "new"); diag("Object creation and defaults"); is( ref $g, "WebGUI::Group", "Group object creation"); -isnt( $g->getId, "new", "Group assigned new groupId, not new"); -is( length($g->getId), 22, "GroupId is proper length"); - my $gid = $g->getId; +isnt( $gid, "new", "Group assigned new groupId, not new"); +is( length($gid), 22, "GroupId is proper length"); +is ($g->name('**TestGroup**'), '**TestGroup**', 'Set name'); +is ($g->name(), '**TestGroup**', 'Get name via accessor'); +is ($g->get('groupName'), '**TestGroup**', 'Get name via generic accessor'); + +my $g2 = WebGUI::Group->find($session, '**TestGroup**'); +my $skipFindGroup = is(ref $g2, 'WebGUI::Group', 'find returns a group'); + +SKIP: { + skip('find did not return a WebGUI::Group object', !$skipFindGroup); + is( $g->getId, $g2->getId, 'find returns correct group'); +} + +undef $g2; $g->delete(); my $matchingGroups = $session->db->quickArray("select groupId from groups where groupId=".$session->db->quote($gid));