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

Fix the RootTitle macro.

Browse source
This commit is contained in:
Colin Kuskie 2010-01-27 21:38:12 -08:00
parent c1c4256d06
commit 193d30ec41
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/Macro/RootTitle.pm
View file

@ -12,6 +12,7 @@ package WebGUI::Macro::RootTitle;
use strict; use strict;
use WebGUI::Asset; use WebGUI::Asset;
use WebGUI::Exception;
=head1 NAME =head1 NAME
@ -40,9 +41,13 @@ sub process {
##Get my root. ##Get my root.
$lineage = substr($lineage,0,12); $lineage = substr($lineage,0,12);
my $root = WebGUI::Asset->newByLineage($session,$lineage); my $root = eval { WebGUI::Asset->newByLineage($session,$lineage); };
if (Exception::Class->caught()) {
$session->log->error('RootTitle macro: '.$@);
return "";
}
return "" unless defined $root;
return $root->get("title"); return $root->get("title");
} }

17
t/Macro/RootTitle.t
View file

@ -32,6 +32,7 @@ my $session = WebGUI::Test->session;
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Adding assets for RootTitle tests"}); $versionTag->set({name=>"Adding assets for RootTitle tests"});
addToCleanup($versionTag);
my $root = WebGUI::Asset->getRoot($session); my $root = WebGUI::Asset->getRoot($session);
my %properties_A = ( my %properties_A = (
@ -117,7 +118,7 @@ my $asset_ = $root->addChild(\%properties__, $properties__{id});
$versionTag->commit; $versionTag->commit;
my $origLineage = $asset_->get('lineage'); my $origLineage = $asset_->lineage;
my $newLineage = substr $origLineage, 0, length($origLineage)-1; my $newLineage = substr $origLineage, 0, length($origLineage)-1;
$session->db->write('update asset set lineage=? where assetId=?',[$newLineage, $asset_->getId]); $session->db->write('update asset set lineage=? where assetId=?',[$newLineage, $asset_->getId]);
@ -160,16 +161,11 @@ my @testSets = (
); );
my $numTests = scalar @testSets; my $numTests = scalar @testSets;
$numTests += 2; $numTests += 1;
plan tests => $numTests; plan tests => $numTests;
my $macro = 'WebGUI::Macro::RootTitle'; use WebGUI::Macro::RootTitle;
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
is( is(
WebGUI::Macro::RootTitle::process($session), WebGUI::Macro::RootTitle::process($session),
@ -184,11 +180,6 @@ foreach my $testSet (@testSets) {
is($output, $testSet->{title}, $testSet->{comment}); is($output, $testSet->{title}, $testSet->{comment});
} }
}
END { ##Clean-up after yourself, always END { ##Clean-up after yourself, always
$session->db->write('update asset set lineage=? where assetId=?',[$origLineage, $asset_->getId]); $session->db->write('update asset set lineage=? where assetId=?',[$origLineage, $asset_->getId]);
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}
} }