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

Some coverage tests for setRank. Added tests and a new folder

Browse source 
for getDescendantCount.
Pushed the reversal of order back into getLineage.  WGBP indentation.
This commit is contained in:
Colin Kuskie 2007-04-15 03:41:38 +00:00
parent 483daf6671
commit 450aab40a0
2 changed files with 52 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/WebGUI/AssetLineage.pm
View file

@ -613,15 +613,15 @@ Lineage string.
sub newByLineage {
my $class = shift;
my $session = shift;
my $lineage = shift;
my $lineage = shift;
my $assetLineage = $session->stow->get("assetLineage");
my $id = $assetLineage->{$lineage}{id};
$class = $assetLineage->{$lineage}{class};
unless ($id && $class) {
($id,$class) = $session->db->quickArray("select assetId, className from asset where lineage=".$session->db->quote($lineage));
$assetLineage->{$lineage}{id} = $id;
$assetLineage->{$lineage}{class} = $class;
$session->stow->set("assetLineage",$assetLineage);
unless ($id && $class) {
($id,$class) = $session->db->quickArray("select assetId, className from asset where lineage=".$session->db->quote($lineage));
$assetLineage->{$lineage}{id} = $id;
$assetLineage->{$lineage}{class} = $class;
$session->stow->set("assetLineage",$assetLineage);
}
return WebGUI::Asset->new($session, $id, $class);
}
@ -704,11 +704,11 @@ sub setRank {
my $currentRank = $self->getRank;
return 1 if ($newRank == $currentRank); # do nothing if we're moving to ourself
my $parentLineage = $self->getParentLineage;
my $siblings = $self->getLineage(["siblings"],{returnObjects=>1});
my $reverse = ($newRank < $currentRank) ? 1 : 0;
my $siblings = $self->getLineage(["siblings"],{returnObjects=>1, invertTree=>$reverse});
my $temp = substr($self->session->id->generate(),0,6);
if ($newRank < $currentRank) { # have to do the ordering in reverse when the new rank is above the old rank
@{$siblings} = reverse @{$siblings};
}
my $previous = $self->get("lineage");
$self->session->db->beginTransaction;
$self->cascadeLineage($temp);

46
t/Asset/AssetLineage.t
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::User;
use WebGUI::Asset;
use Test::More tests => 49; # increment this value for each test you create
use Test::More tests => 59; # increment this value for each test you create
use Test::Deep;
# Test the methods in WebGUI::AssetLineage
@ -33,7 +33,15 @@ my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"AssetLineage Test"});
my $root = WebGUI::Asset->getRoot($session);
my $folder = $root->addChild({
my $topFolder = $root->addChild({
url => 'TopFolder',
title => 'TopFolder',
menuTitle => 'topFolderMenuTitle',
groupIdEdit => 3,
className => 'WebGUI::Asset::Wobject::Folder',
});
my $folder = $topFolder->addChild({
url => 'testFolder',
title => 'folder',
menuTitle => 'folderMenuTitle',
@ -41,7 +49,7 @@ my $folder = $root->addChild({
className => 'WebGUI::Asset::Wobject::Folder',
});
my $folder2 = $root->addChild({
my $folder2 = $topFolder->addChild({
url => 'testFolder2',
title => 'folder2',
menuTitle => 'folder2MenuTitle',
@ -104,6 +112,16 @@ is($snippets[-1]->getId, $folder->getLastChild->getId, 'getLastChild');
is(scalar @snippets, $folder->getChildCount, 'getChildCount on folder with several children');
is(1, $folder2->getChildCount, 'getChildCount on folder with 1 child');
####################################################
#
# getDescendantCount
#
####################################################
is(10, $topFolder->getDescendantCount, 'getDescendantCount on top folder');
is(scalar @snippets, $folder->getDescendantCount, 'getDescendantCount on folder with several children');
is(1, $folder2->getDescendantCount, 'getDescendantCount on folder with 1 child');
####################################################
#
# getParent
@ -161,10 +179,10 @@ $session->user({userId => $editor->userId});
ok(!$snippet2->setParent(), 'setParent: new parent must be passed in');
ok(!$snippet2->setParent($snippet2), 'setParent: cannot be your own parent');
ok(!$snippet2->setParent($folder2), 'setParent: will not move self to current parent');
ok(!$folder2->setParent($snippet2), 'setParent: will not move self to my child');
ok(!$snippet2->setParent($folder), 'setParent: user cannot edit parent');
$session->user({userId => 3});
ok(!$folder2->setParent($snippet2), 'setParent: will not move self to my child');
ok($snippet2->setParent($folder), 'setParent: successfully set');
is($snippet2->getParent->getId, $folder->getId, 'setParent successfully set parent');
@ -293,6 +311,26 @@ cmp_bag(
#
####################################################
ok($snippet2->setRank($snippet2->getRank), 'setRank: returns true if the rank is set to itself');
##Note, setRank ALWAYS returns 1, whether the setRank worked or not
ok($snippet2->setRank('000002'), 'setRank: try to change rank on snippet2 to 2');
is($folder2->getNextChildRank, '000002', 'setRank: will not change rank on an Asset with no siblings');
$snippets[6]->setRank('100000');
is($snippets[6]->getRank(), '7', 'setRank: will not set an arbitrary rank');
$snippets[6]->setRank('000005');
is($snippets[6]->getRank(), '5', 'setRank was able to set an arbitrary rank(lower) on an Asset with siblings');
@snipIds = map { $_->getId } @snippets[0..3,6,4..5];
$lineageIds = $folder->getLineage(['descendants']);
cmp_bag(\@snipIds, $lineageIds, 'setRank reordered the other siblings appropiately');
$snippets[6]->setRank('000007');
is($snippets[6]->getRank(), '7', 'setRank: move the Asset back (higher rank)');
@snipIds = map { $_->getId } @snippets;
$lineageIds = $folder->getLineage(['descendants']);
cmp_bag(\@snipIds, $lineageIds, 'setRank: put them back in order');
END {
$versionTag->rollback;