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

Macro test maintenance.

Browse source
This commit is contained in:
Colin Kuskie 2009-10-31 12:05:07 -07:00
parent 058704d027
commit 5ea3f02520
6 changed files with 20 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

12
t/Macro/Env.t
View file

@ -15,6 +15,7 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use Data::Dumper;
use WebGUI::Macro::Env;
use Test::More; # increment this value for each test you create
@ -27,17 +28,10 @@ my $session = WebGUI::Test->session;
my %env = %{ $session->env->{_env} };
my @keys = keys %env;
my $numTests = 1 + 3 + scalar keys %env;
my $numTests = 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;
$output = WebGUI::Macro::Env::process($session, '');
@ -53,5 +47,3 @@ foreach my $key (keys %env) {
my $output = WebGUI::Macro::Env::process($session, $key);
is($output, $env{$key}, 'Fetching: '.$key);
}
}

12
t/Macro/FetchMimeType.t
View file

@ -14,6 +14,7 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Macro::FetchMimeType;
use Test::More; # increment this value for each test you create
@ -49,17 +50,8 @@ my @testSets = (
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 = $testSet->{input}
? join '/', WebGUI::Test->root, 'www/extras', $testSet->{input}
@ -67,5 +59,3 @@ foreach my $testSet (@testSets) {
my $output = WebGUI::Macro::FetchMimeType::process($session, $file);
is($output, $testSet->{output}, $testSet->{comment} );
}
}

20
t/Macro/FileUrl.t
View file

@ -16,6 +16,7 @@ use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Storage;
use Data::Dumper;
use WebGUI::Macro::FileUrl;
use Test::More; # increment this value for each test you create
@ -85,21 +86,13 @@ my @testSets = (
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);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
my $homeAsset = WebGUI::Asset->getDefault($session);
my ($versionTag, @testSets) = setupTest($session, $homeAsset, @testSets);
my @testSets = setupTest($session, $homeAsset, @testSets);
foreach my $testSet (@testSets) {
my $output = WebGUI::Macro::FileUrl::process($session, $testSet->{url});
@ -114,8 +107,6 @@ 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);
@ -145,9 +136,6 @@ sub setupTest {
++$testNum;
}
$versionTag->commit;
WebGUI::Test->tagsToRollback($versionTag);
return $versionTag, @testSets;
}
END { ##Clean-up after yourself, always
addToCleanup($versionTag);
return @testSets;
}

13
t/Macro/FormParam.t
View file

@ -14,6 +14,7 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Macro::FormParam;
use Test::More; # increment this value for each test you create
use Test::MockObject;
@ -53,23 +54,11 @@ my @testSets = (
my $numTests = scalar @testSets;
$numTests += 1; ##use_ok
$numTests += 1; ##testBlock has no name collisions
$numTests += 3; ##TODO block
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?");

27
t/Macro/GroupAdd.t
View file

@ -14,6 +14,7 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Macro::GroupAdd;
use Data::Dumper;
use Test::More; # increment this value for each test you create
@ -22,7 +23,7 @@ use HTML::TokeParser;
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my ($versionTag, $template, $groups, $users) = setupTest($session, $homeAsset);
my ($template, $groups, $users) = setupTest($session, $homeAsset);
my @testSets = (
{
@ -118,17 +119,8 @@ 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,
@ -144,8 +136,6 @@ foreach my $testSet (@testSets) {
}
}
}
sub setupTest {
my ($session, $defaultNode) = @_;
my @groups;
@ -156,13 +146,13 @@ sub setupTest {
$groups[1] = WebGUI::Group->new($session, "new");
$groups[1]->name('Regular Old Group');
$groups[1]->autoAdd(0);
WebGUI::Test->groupsToDelete(@groups);
addToCleanup(@groups);
##Three users. One in each group and one with no group membership
my @users = map { WebGUI::User->new($session, "new") } 0..2;
$users[0]->addToGroups([$groups[0]->getId]);
$users[1]->addToGroups([$groups[1]->getId]);
WebGUI::Test->usersToDelete(@users);
addToCleanup(@users);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"GroupAdd test"});
@ -178,8 +168,9 @@ sub setupTest {
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $versionTag, $asset, \@groups, \@users;
return $asset, \@groups, \@users;
}
sub simpleHTMLParser {
@ -201,9 +192,3 @@ sub simpleTextParser {
return ($url, $label);
}
END { ##Clean-up after yourself, always
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}
}

27
t/Macro/GroupDelete.t
View file

@ -14,6 +14,7 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Macro::GroupDelete;
use Data::Dumper;
use Test::More; # increment this value for each test you create
@ -22,7 +23,7 @@ use HTML::TokeParser;
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my ($versionTag, $template, $groups, $users) = setupTest($session, $homeAsset);
my ($template, $groups, $users) = setupTest($session, $homeAsset);
my @testSets = (
{
@ -118,17 +119,8 @@ 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,
@ -144,8 +136,6 @@ foreach my $testSet (@testSets) {
}
}
}
sub setupTest {
my ($session, $defaultNode) = @_;
my @groups;
@ -156,13 +146,13 @@ sub setupTest {
$groups[1] = WebGUI::Group->new($session, "new");
$groups[1]->name('Regular Old Group');
$groups[1]->autoDelete(0);
WebGUI::Test->groupsToDelete(@groups);
addToCleanup(@groups);
##Three users. One in each group and one with no group membership
my @users = map { WebGUI::User->new($session, "new") } 0..2;
$users[0]->addToGroups([$groups[0]->getId]);
$users[1]->addToGroups([$groups[1]->getId]);
WebGUI::Test->usersToDelete(@users);
addToCleanup(@users);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"GroupDelete test"});
@ -178,8 +168,9 @@ sub setupTest {
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $versionTag, $asset, \@groups, \@users;
return $asset, \@groups, \@users;
}
sub simpleHTMLParser {
@ -201,9 +192,3 @@ sub simpleTextParser {
return ($url, $label);
}
END { ##Clean-up after yourself, always
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}
}