Added corner tests for empty string and undef.
Converted tests to handle skipping if the macro can't be loaded.
This commit is contained in:
parent
818ab4a690
commit
78c33c54ff
5 changed files with 81 additions and 10 deletions
|
|
@ -13,7 +13,6 @@ use strict;
|
|||
use lib "$FindBin::Bin/../lib";
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Macro::FetchMimeType;
|
||||
use WebGUI::Session;
|
||||
|
||||
use Test::More; # increment this value for each test you create
|
||||
|
|
@ -41,15 +40,37 @@ my @testSets = (
|
|||
output => 'application/octet-stream',
|
||||
comment => q|octet-stream for unknown type|,
|
||||
},
|
||||
{
|
||||
input => '',
|
||||
output => 'application/octet-stream',
|
||||
comment => q|Null path returns application/octet-stream|,
|
||||
},
|
||||
{
|
||||
input => undef,
|
||||
output => undef,
|
||||
comment => q|Undef path returns undef|,
|
||||
},
|
||||
);
|
||||
|
||||
my $numTests = scalar @testSets;
|
||||
|
||||
$numTests += 1; #For the use_ok
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
my $macro = 'WebGUI::Macro::FetchMimeType';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $numTests-1 unless $loaded;
|
||||
|
||||
foreach my $testSet (@testSets) {
|
||||
my $file = join '/', WebGUI::Test->root, 'www/extras', $testSet->{input};
|
||||
my $file = $testSet->{input}
|
||||
? join '/', WebGUI::Test->root, 'www/extras', $testSet->{input}
|
||||
: $testSet->{input};
|
||||
my $output = WebGUI::Macro::FetchMimeType::process($session, $file);
|
||||
is($output, $testSet->{output}, $testSet->{comment} );
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ use strict;
|
|||
use lib "$FindBin::Bin/../lib";
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Macro::FileUrl;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Storage;
|
||||
use Data::Dumper;
|
||||
|
|
@ -85,10 +84,22 @@ my @testSets = (
|
|||
);
|
||||
|
||||
|
||||
plan tests => scalar(@testSets) + 1;
|
||||
my $numTests = scalar(@testSets);
|
||||
$numTests += 1; #For the use_ok
|
||||
$numTests += 1; #non-existant URL
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
my $macro = 'WebGUI::Macro::FileUrl';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
my $versionTag;
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $numTests-1 unless $loaded;
|
||||
|
||||
my $homeAsset = WebGUI::Asset->getDefault($session);
|
||||
my $versionTag;
|
||||
|
||||
($versionTag, @testSets) = setupTest($session, $homeAsset, @testSets);
|
||||
|
||||
|
|
@ -105,6 +116,8 @@ foreach my $testSet (@testSets) {
|
|||
my $output = WebGUI::Macro::FileUrl::process($session, "non-existant-url");
|
||||
is($output, $i18n->get('invalid url'), "Non-existant url returns error message");
|
||||
|
||||
}
|
||||
|
||||
sub setupTest {
|
||||
my ($session, $homeAsset, @testSets) = @_;
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
|
|
|
|||
|
|
@ -53,12 +53,30 @@ my @testSets = (
|
|||
|
||||
my $numTests = scalar @testSets;
|
||||
|
||||
plan tests => $numTests + 2;
|
||||
$numTests += 1; ##use_ok
|
||||
$numTests += 1; ##testBlock has no name collisions
|
||||
$numTests += 3; ##TODO block
|
||||
|
||||
use_ok('WebGUI::Macro::FormParam');
|
||||
plan tests => $numTests;
|
||||
|
||||
my $macro = 'WebGUI::Macro::FormParam';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $numTests-1 unless $loaded;
|
||||
|
||||
auto_check($session, \@testSets);
|
||||
|
||||
}
|
||||
|
||||
TODO: {
|
||||
local $TODO = "Tests to write later";
|
||||
ok(0, "What will this do with a non-existant form param?");
|
||||
ok(0, "Also try null");
|
||||
ok(0, "Also try undef");
|
||||
}
|
||||
|
||||
sub auto_check {
|
||||
my ($session, $testBlock) = @_;
|
||||
my $origSessionRequest = $session->{_request};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ use strict;
|
|||
use lib "$FindBin::Bin/../lib";
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Macro::GroupAdd;
|
||||
use WebGUI::Session;
|
||||
use Data::Dumper;
|
||||
|
||||
|
|
@ -115,13 +114,21 @@ my @testSets = (
|
|||
);
|
||||
|
||||
my $numTests = 0;
|
||||
|
||||
foreach my $testSet (@testSets) {
|
||||
$numTests += 1 + ($testSet->{empty} == 0);
|
||||
}
|
||||
|
||||
$numTests += 1; #For the use_ok
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
my $macro = 'WebGUI::Macro::GroupAdd';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $numTests-1 unless $loaded;
|
||||
|
||||
foreach my $testSet (@testSets) {
|
||||
$session->user({ userId => $testSet->{userId} });
|
||||
my $output = WebGUI::Macro::GroupAdd::process($session,
|
||||
|
|
@ -137,6 +144,8 @@ foreach my $testSet (@testSets) {
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub setupTest {
|
||||
my ($session, $defaultNode) = @_;
|
||||
my @groups;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ use strict;
|
|||
use lib "$FindBin::Bin/../lib";
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Macro::GroupDelete;
|
||||
use WebGUI::Session;
|
||||
use Data::Dumper;
|
||||
|
||||
|
|
@ -119,8 +118,17 @@ foreach my $testSet (@testSets) {
|
|||
$numTests += 1 + ($testSet->{empty} == 0);
|
||||
}
|
||||
|
||||
$numTests += 1; #For the use_ok
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
my $macro = 'WebGUI::Macro::GroupDelete';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $numTests-1 unless $loaded;
|
||||
|
||||
foreach my $testSet (@testSets) {
|
||||
$session->user({ userId => $testSet->{userId} });
|
||||
my $output = WebGUI::Macro::GroupDelete::process($session,
|
||||
|
|
@ -136,6 +144,8 @@ foreach my $testSet (@testSets) {
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub setupTest {
|
||||
my ($session, $defaultNode) = @_;
|
||||
my @groups;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue