conditional load conversion, default parameter updates

Added a TODO for D_date to find a way to test not sending an explicit time.
This commit is contained in:
Colin Kuskie 2006-07-30 03:55:21 +00:00
parent 4c65000be5
commit 55b60631c9
4 changed files with 71 additions and 35 deletions

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::At_username;
use WebGUI::Session;
use Data::Dumper;
@ -21,10 +20,17 @@ my $session = WebGUI::Test->session;
use Test::More; # increment this value for each test you create
my $numTests = 2;
my $numTests = 2 + 1; # For conditional load and skip
plan tests => $numTests;
my $macro = 'WebGUI::Macro::At_username';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
my $output;
$session->user({userId => 1});
@ -34,3 +40,5 @@ is($output, 'Visitor', 'username = Visitor');
$session->user({userId => 3});
$output = WebGUI::Macro::At_username::process($session);
is($output, 'Admin', 'username = Admin');
}

View file

@ -13,7 +13,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::CanEditText;
use WebGUI::Session;
use Data::Dumper;
@ -21,9 +20,6 @@ my $session = WebGUI::Test->session;
use Test::More; # increment this value for each test you create
my $adminText = "^CanEditText(editor);";
my $output;
my $homeAsset = WebGUI::Asset->getDefault($session);
$session->asset($homeAsset);
my ($versionTag, $asset, $group, @users) = setupTest($session, $homeAsset);
@ -66,10 +62,17 @@ my @testSets = (
},
);
my $numTests = scalar @testSets;
my $numTests = scalar @testSets + 1;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::CanEditText';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
foreach my $testSet (@testSets) {
$session->user({userId=>$testSet->{userId}});
$session->asset($testSet->{asset});
@ -77,6 +80,7 @@ foreach my $testSet (@testSets) {
is($output, $testSet->{output}, $testSet->{comment});
}
}
sub setupTest {
my ($session, $defaultNode) = @_;

View file

@ -14,7 +14,6 @@ use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Macro::D_date;
use WebGUI::Session;
use Data::Dumper;
# ---- END DO NOT EDIT ----
@ -34,13 +33,27 @@ my @testSets = (
},
);
my $numTests = scalar @testSets;
my $numTests = scalar @testSets + 1 + 1;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::D_date';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
my $session = WebGUI::Test->session;
foreach my $testSet (@testSets) {
my $output = WebGUI::Macro::D_date::process($session, $testSet->{format}, $wgbday);
is($output, $testSet->{output}, 'testing '.$testSet->{format});
}
TODO: {
local $TODO = "Ideas for other tests";
ok(0, 'Test macro without a date argument');
}
}

View file

@ -34,8 +34,8 @@ my @testSets = (
userId => 1,
adminStatus => 'off',
asset => $homeAsset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => '',
},
@ -44,8 +44,8 @@ my @testSets = (
userId => 1,
adminStatus => 'on',
asset => $homeAsset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => '',
},
@ -54,8 +54,8 @@ my @testSets = (
userId => 3,
adminStatus => 'off',
asset => $homeAsset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => \&simpleHTMLParser,
},
@ -64,8 +64,8 @@ my @testSets = (
userId => 3,
adminStatus => 'on',
asset => $homeAsset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => \&simpleHTMLParser,
},
@ -74,8 +74,8 @@ my @testSets = (
userId => 3,
adminStatus => 'off',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => \&simpleHTMLParser,
},
@ -84,8 +84,8 @@ my @testSets = (
userId => 3,
adminStatus => 'on',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => \&simpleHTMLParser,
},
@ -94,8 +94,8 @@ my @testSets = (
userId => $users[0]->userId,
adminStatus => 'off',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => '',
},
@ -104,8 +104,8 @@ my @testSets = (
userId => $users[0]->userId,
adminStatus => 'on',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => '',
},
@ -114,8 +114,8 @@ my @testSets = (
userId => $users[1]->userId,
adminStatus => 'off',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => '',
},
@ -124,8 +124,8 @@ my @testSets = (
userId => $users[1]->userId,
adminStatus => 'on',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => '',
},
@ -134,8 +134,8 @@ my @testSets = (
userId => $users[2]->userId,
adminStatus => 'off',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => \&simpleHTMLParser,
},
@ -144,8 +144,8 @@ my @testSets = (
userId => $users[2]->userId,
adminStatus => 'on',
asset => $asset,
onText => $i18n->get(516),
offText => $i18n->get(517),
onText => '',
offText => '',
template => q!!,
output => \&simpleHTMLParser,
},
@ -186,19 +186,28 @@ foreach my $testSet (@testSets) {
$numTests += 1 + (ref $testSet->{output} eq 'CODE');
}
$numTests += 1;
plan tests => $numTests;
my $macro = 'WebGUI::Macro::EditableToggle';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
foreach my $testSet (@testSets) {
$session->user({userId=>$testSet->{userId}});
$session->asset($testSet->{asset});
if ($testSet->{adminStatus} eq 'off') {
$session->var->switchAdminOff();
$testSet->{label} = $testSet->{onText};
$testSet->{label} = $testSet->{onText} || $i18n->get(516);
$testSet->{url} = $session->url->page('op=switchOnAdmin'),
}
elsif ($testSet->{adminStatus} eq 'on') {
$session->var->switchAdminOn();
$testSet->{label} = $testSet->{offText};
$testSet->{label} = $testSet->{offText} || $i18n->get(517);
$testSet->{url} = $session->url->page('op=switchOffAdmin'),
}
else {
@ -216,6 +225,8 @@ foreach my $testSet (@testSets) {
}
}
}
sub simpleHTMLParser {
my ($text) = @_;
my $p = HTML::TokeParser->new(\$text);