conditional load check and fix default param tests

This commit is contained in:
Colin Kuskie 2006-07-30 04:03:46 +00:00
parent 55b60631c9
commit 818ab4a690
5 changed files with 46 additions and 8 deletions

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::EditableToggle;
use WebGUI::Session;
use HTML::TokeParser;
use Data::Dumper;

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::Env;
use WebGUI::Session;
use Data::Dumper;
@ -28,7 +27,16 @@ my $session = WebGUI::Test->session;
my %env = %{ $session->env->{_env} };
my @keys = keys %env;
plan tests => 3 + scalar keys %env;
my $numTests = 1 + 3 + scalar keys %env;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::Env';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
my $output;
@ -45,3 +53,5 @@ foreach my $key (keys %env) {
my $output = WebGUI::Macro::Env::process($session, $key);
is($output, $env{$key}, 'Fetching: '.$key);
}
}

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::Extras;
use WebGUI::Session;
use Test::More; # increment this value for each test you create
@ -50,10 +49,20 @@ my @testSets = (
my $numTests = scalar @testSets;
$numTests += 1;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::Extras';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
foreach my $testSet (@testSets) {
my $output = WebGUI::Macro::Extras::process($session, $testSet->{path});
is($output, $testSet->{output}, $testSet->{comment});
}
}

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::c_companyName;
use WebGUI::Session;
use Data::Dumper;
@ -21,9 +20,20 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
plan tests => 1;
my $numTests = 1+1;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::c_companyName';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
my ($value) = $session->dbSlave->quickArray(
"select value from settings where name='companyName'");
my $output = WebGUI::Macro::c_companyName::process($session);
is($output, $value, sprintf "Testing companyName");
}

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::e_companyEmail;
use WebGUI::Session;
use Data::Dumper;
@ -21,9 +20,20 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
plan tests => 1;
my $numTests = 1 + 1;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::e_companyEmail';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
my ($value) = $session->dbSlave->quickArray(
"select value from settings where name='companyEmail'");
my $output = WebGUI::Macro::e_companyEmail::process($session);
is($output, $value, sprintf "Testing companyEmail");
}