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

add a few additional macro tests

Browse source
This commit is contained in:
Graham Knop 2009-08-20 19:24:39 +00:00
parent 4984e19d68
commit ac9be28857
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Macro.pm
View file

@ -162,7 +162,7 @@ sub _processMacro {
$parameters =~ s/\)$//;
my @params;
while ($parameters =~ /
while ($parameters =~ m{
(?<!\z) # don't try to match if we are at the end of the string
(?: # either
\s* " # white space followed by a double quote
@ -188,9 +188,9 @@ sub _processMacro {
| # or
, # a comma
)
/xg) {
}xg) {
# three matches, only one will exist per run
push @params, defined $1 ? $1 : defined $2 ? $2 : $3;
push @params, $+;
}
for my $param (@params) {

5
t/Macro.t
View file

@ -44,7 +44,7 @@ foreach my $macro (qw/
}
$session->config->addToHash('macros', "Ex'tras", "Extras");
plan tests => 39;
plan tests => 42;
my $macroText = "CompanyName: ^c;";
my $companyName = $session->setting->get('companyName');
@ -236,6 +236,9 @@ tie my %quotingEdges, 'Tie::IxHash';
=> '@MacroCall[`@MacroCall[`something`.`something else`]:`.`more still`]:',
q{^VisualMacro("^VisualMacro('something', 'something else');", "more still");}
=> '@MacroCall[`@MacroCall[`something`.`something else`]:`.`more still`]:',
'^VisualMacro(,,);' => '@MacroCall[``.``]:',
'^VisualMacro("","",);' => '@MacroCall[``.``]:',
'^VisualMacro(,,"");' => '@MacroCall[``.``.``]:',
);
while (my ($inText, $outText) = each %quotingEdges) {
my $procText = $inText;