Rework all tests to call the Macro's process subroutine directly.

Add RootTitle.t test.
Broke up the SettingMacros.t test into individual tests.
This commit is contained in:
Colin Kuskie 2006-07-26 19:02:22 +00:00
parent 60e9523f7b
commit 6aab9a6eec
32 changed files with 433 additions and 623 deletions

View file

@ -13,17 +13,13 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro;
use WebGUI::Macro::LastModified;
use WebGUI::Session;
use WebGUI::Macro_Config;
use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my @added_macros = ();
push @added_macros, WebGUI::Macro_Config::enable_macro($session, 'LastModified', 'LastModified');
my $homeAsset = WebGUI::Asset->getDefault($session);
##Make the homeAsset the default asset in the session.
@ -33,25 +29,22 @@ my ($time) = $session->dbSlave->quickArray("SELECT max(revisionDate) FROM assetD
my @testSets = (
{
macroText => q!^LastModified();!,
label => q!!,
format => q!!,
output => $session->datetime->epochToHuman($time,'%z'),
comment => 'checking defaults with empty args',
label => q!!,
format => q!!,
output => $session->datetime->epochToHuman($time,'%z'),
comment => 'checking defaults with empty args',
},
{
macroText => q!^LastModified("%s");!,
label => q!Last modified on: !,
format => q!!,
output => 'Last modified on: '.$session->datetime->epochToHuman($time,'%z'),
comment => 'checking label, empty format',
label => q!Last modified on: !,
format => q!!,
output => 'Last modified on: '.$session->datetime->epochToHuman($time,'%z'),
comment => 'checking label, empty format',
},
{
macroText => q!^LastModified("%s","%s");!,
label => '',
format => q!%c %y!,
output => $session->datetime->epochToHuman($time,'%c %y'),
comment => 'checking format, empty label',
label => '',
format => q!%c %y!,
output => $session->datetime->epochToHuman($time,'%c %y'),
comment => 'checking format, empty label',
},
);
@ -60,8 +53,7 @@ my $numTests = scalar @testSets + 2;
plan tests => $numTests;
foreach my $testSet (@testSets) {
my $output = sprintf $testSet->{macroText}, $testSet->{label}, $testSet->{format};
WebGUI::Macro::process($session, \$output);
my $output = WebGUI::Macro::LastModified::process($session, $testSet->{label}, $testSet->{format});
is($output, $testSet->{output}, $testSet->{comment});
}
@ -70,10 +62,3 @@ TODO: {
ok(0, 'Check label and format');
ok(0, 'Create asset with revisionDate = 0 and check label "never"');
}
END {
foreach my $macro (@added_macros) {
next unless $macro;
$session->config->deleteFromHash("macros", $macro);
}
}