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

Add tests for urlExists and fix bugs in the method. It now handles

Browse source 
placeholders correctly and does exactly what the POD says, assetId
requires that the url be with that assetId, rather than not in that
assetId.
This commit is contained in:
Colin Kuskie 2007-02-25 06:18:15 +00:00
parent 70d7bb2513
commit 5a379fe91e
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Asset.pm
View file

@ -1895,10 +1895,12 @@ sub urlExists {
my $url = lc(shift);
my $options = shift || {};
my $limit = "";
if (defined $options->{assetId}) {
$limit = "and assetId<>?"
my $placeholders = [ $url ];
if (exists $options->{assetId}) {
$limit = "and assetId=?";
push @{ $placeholders }, $options->{assetId};
}
my ($test) = $session->db->quickArray("select count(url) from assetData where url=? $limit", [$url, $options->{assetId}]);
my ($test) = $session->db->quickArray("select count(url) from assetData where url=? $limit", $placeholders);
return $test;
}

19
t/Asset/Asset.t
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::Asset;
use WebGUI::Asset::Wobject::Navigation;
use Test::More tests => 20; # increment this value for each test you create
use Test::More tests => 25; # increment this value for each test you create
my $session = WebGUI::Test->session;
@ -95,3 +95,20 @@ my $importNode = WebGUI::Asset->getImportNode($session);
isa_ok($importNode, 'WebGUI::Asset::Wobject::Folder');
is($importNode->getId, 'PBasset000000000000002', 'Import Node Asset ID check');
is($importNode->getParent->getId, $rootAsset->getId, 'Import Nodes parent is Root Asset');
################################################################
#
# urlExists
#
################################################################
##We need as asset with a URL for this one.
my $importUrl = $importNode->get('url');
my $importId = $importNode->getId;
ok( WebGUI::Asset->urlExists($session, $importUrl), 'url for import node exists');
ok( !WebGUI::Asset->urlExists($session, '/foo/bar/baz'), 'made up url does not exist');
ok( WebGUI::Asset->urlExists($session, $importUrl, {assetId => $importId}), 'url for import node exists at specific id');
ok( !WebGUI::Asset->urlExists($session, '/foo/bar/baz', {assetId => $importId}), 'imaginary url does not exist at specific id');
ok( !WebGUI::Asset->urlExists($session, $importUrl, {assetId => 'notAnWebGUIId'}), 'imaginary url does not exist at wrong id');