From c22c5ef3f762adc46e830aa11baad58538af8ec5 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 27 Oct 2009 19:30:09 -0700 Subject: [PATCH] Test maintenance on Macro tests. --- t/Macro/AdminBar.t | 22 ++-------------------- t/Macro/AdminText.t | 14 ++------------ t/Macro/AdminToggle.t | 23 +++++------------------ t/Macro/At_username.t | 11 ++--------- t/Macro/CanEditText.t | 17 +++-------------- t/Macro/a_account.t | 23 ++++------------------- 6 files changed, 18 insertions(+), 92 deletions(-) diff --git a/t/Macro/AdminBar.t b/t/Macro/AdminBar.t index 2e844e210..9f82f421f 100644 --- a/t/Macro/AdminBar.t +++ b/t/Macro/AdminBar.t @@ -14,26 +14,14 @@ use lib "$FindBin::Bin/../lib"; use WebGUI::Test; use WebGUI::Session; +use WebGUI::Macro::AdminBar; use HTML::TokeParser; use Test::More; # increment this value for each test you create my $session = WebGUI::Test->session; -my $numTests = 2; - -$numTests += 1; #For the use_ok - -plan tests => $numTests; - -my $macro = 'WebGUI::Macro::AdminBar'; -my $loaded = use_ok($macro); - -my $originalAssets = $session->config->get('assets'); - -SKIP: { - -skip "Unable to load $macro", $numTests-1 unless $loaded; +plan tests => 2; my $output; $output = WebGUI::Macro::AdminBar::process($session); @@ -42,9 +30,3 @@ $session->var->switchAdminOn; $output = WebGUI::Macro::AdminBar::process($session); ok($output, 'AdminBar returns something when admin is on'); - -} - -END: { - $session->config->set('assets', $originalAssets); -} diff --git a/t/Macro/AdminText.t b/t/Macro/AdminText.t index 2b4c6ee74..e3616ccdb 100644 --- a/t/Macro/AdminText.t +++ b/t/Macro/AdminText.t @@ -14,22 +14,14 @@ use lib "$FindBin::Bin/../lib"; use WebGUI::Test; use WebGUI::Session; +use WebGUI::Macro::AdminText; use Data::Dumper; my $session = WebGUI::Test->session; use Test::More; # increment this value for each test you create -my $numTests = 6 + 1; - -plan tests => $numTests; - -my $macro = 'WebGUI::Macro::AdminText'; -my $loaded = use_ok($macro); - -SKIP: { - -skip "Unable to load $macro", $numTests-1 unless $loaded; +plan tests => 6; my $output; @@ -54,5 +46,3 @@ is($output, undef, 'undef text'); $session->var->switchAdminOff; $output = WebGUI::Macro::AdminText::process($session, 'admin'); is($output, '', 'user is admin, not in admin mode'); - -} diff --git a/t/Macro/AdminToggle.t b/t/Macro/AdminToggle.t index 80435a523..3fa875a03 100644 --- a/t/Macro/AdminToggle.t +++ b/t/Macro/AdminToggle.t @@ -16,12 +16,13 @@ use WebGUI::Test; use WebGUI::Session; use HTML::TokeParser; use Data::Dumper; +use WebGUI::Macro::AdminToggle; use Test::More; # increment this value for each test you create my $session = WebGUI::Test->session; -my ($versionTag, $template) = addTemplate(); +my $template = addTemplate(); my $homeAsset = WebGUI::Asset->getDefault($session); $session->asset($homeAsset); @@ -105,14 +106,7 @@ foreach my $testSet (@testSets) { $numTests += 1 + (ref $testSet->{output} eq 'CODE'); } -plan tests => $numTests + 2; ##conditional module load and TODO at end - -my $macro = 'WebGUI::Macro::AdminToggle'; -my $loaded = use_ok($macro); - -SKIP: { - -skip "Unable to load $macro", $numTests-1 unless $loaded; +plan tests => $numTests + 1; ##conditional module load and TODO at end foreach my $testSet (@testSets) { $session->user({userId=>$testSet->{userId}}); @@ -136,8 +130,6 @@ foreach my $testSet (@testSets) { } } -} - TODO: { local $TODO = 'Tests to make later'; ok(0, 'Run tests with a user other than Admin'); @@ -159,7 +151,8 @@ sub addTemplate { }; my $template = $importNode->addChild($properties, $properties->{id}); $versionTag->commit; - return ($versionTag, $template); + addToCleanup($versionTag); + return $template; } sub simpleHTMLParser { @@ -181,9 +174,3 @@ sub simpleTextParser { return ($url, $label); } - -END { - if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') { - $versionTag->rollback; - } -} diff --git a/t/Macro/At_username.t b/t/Macro/At_username.t index 9e7135a7f..cb81b9cad 100644 --- a/t/Macro/At_username.t +++ b/t/Macro/At_username.t @@ -14,23 +14,17 @@ use lib "$FindBin::Bin/../lib"; use WebGUI::Test; use WebGUI::Session; +use WebGUI::Macro::At_username; use Data::Dumper; my $session = WebGUI::Test->session; use Test::More; # increment this value for each test you create -my $numTests = 2 + 1; # For conditional load and skip +my $numTests = 2; # 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}); @@ -41,4 +35,3 @@ $session->user({userId => 3}); $output = WebGUI::Macro::At_username::process($session); is($output, 'Admin', 'username = Admin'); -} diff --git a/t/Macro/CanEditText.t b/t/Macro/CanEditText.t index c6007a2b6..a0af7a479 100644 --- a/t/Macro/CanEditText.t +++ b/t/Macro/CanEditText.t @@ -21,7 +21,7 @@ my $session = WebGUI::Test->session; use Test::More; # increment this value for each test you create my $homeAsset = WebGUI::Asset->getDefault($session); -my ($versionTag, $asset, $group, @users) = setupTest($session, $homeAsset); +my ($asset, $group, @users) = setupTest($session, $homeAsset); my @testSets = ( { @@ -111,17 +111,6 @@ sub setupTest { $users[1]->addToGroups([$cm->getId]); ##User 2 is a member of a content manager sub-group $users[2]->addToGroups([$editGroup->getId]); - return ($versionTag, $asset, $editGroup, @users); -} - -END { ##Clean-up after yourself, always - if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') { - $versionTag->rollback; - } - foreach my $testGroup ($group) { - $testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group'); - } - foreach my $dude (@users) { - $dude->delete if (defined $dude and ref $dude eq 'WebGUI::User'); - } + addToCleanup($versionTag, $editGroup, @users); + return ($asset, $editGroup, @users); } diff --git a/t/Macro/a_account.t b/t/Macro/a_account.t index f46bc8f68..772948e6f 100644 --- a/t/Macro/a_account.t +++ b/t/Macro/a_account.t @@ -16,13 +16,14 @@ use WebGUI::Test; use WebGUI::Session; use HTML::TokeParser; use Data::Dumper; +use WebGUI::Macro::a_account; use Test::More; # increment this value for each test you create my $session = WebGUI::Test->session; # -my ($versionTag, $template) = addTemplate(); +my $template = addTemplate(); my $homeAsset = WebGUI::Asset->getDefault($session); @@ -65,17 +66,8 @@ foreach my $testSet (@testSets) { $numTests += 1 + (ref $testSet->{output} eq 'CODE'); } -$numTests += 1; #For the use_ok - plan tests => $numTests; -my $macro = 'WebGUI::Macro::a_account'; -my $loaded = use_ok($macro); - -SKIP: { - -skip "Unable to load $macro", $numTests-1 unless $loaded; - foreach my $testSet (@testSets) { my $output = WebGUI::Macro::a_account::process( $session, $testSet->{label}, $testSet->{template} ); @@ -90,8 +82,6 @@ foreach my $testSet (@testSets) { } } -} - sub addTemplate { $session->user({userId=>3}); my $importNode = WebGUI::Asset->getImportNode($session); @@ -108,7 +98,8 @@ sub addTemplate { }; my $template = $importNode->addChild($properties, $properties->{id}); $versionTag->commit; - return ($versionTag, $template); + addToCleanup($versionTag); + return $template; } sub simpleHTMLParser { @@ -130,9 +121,3 @@ sub simpleTextParser { return ($url, $label); } - -END { - if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') { - $versionTag->rollback; - } -}