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

Yet more END block cleanups.

Browse source
This commit is contained in:
Colin Kuskie 2010-06-15 16:40:06 -07:00
parent 9bc7208c48
commit fecc2bec54
11 changed files with 32 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
t/Asset/Wobject/Gallery/00base.t
View file

@ -25,6 +25,7 @@ my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Gallery Test"}); $versionTag->set({name=>"Gallery Test"});
WebGUI::Test->addToCleanup($versionTag);
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Tests # Tests
@ -66,9 +67,4 @@ is(
"Gallery no longer able to be instanciated", "Gallery no longer able to be instanciated",
); );
#vim:ft=perl
#----------------------------------------------------------------------------
# Cleanup
END {
$versionTag->rollback();
}

7
t/Asset/Wobject/GalleryAlbum/00base.t
View file

@ -25,6 +25,7 @@ my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"}); $versionTag->set({name=>"Album Test"});
WebGUI::Test->addToCleanup($versionTag);
my $gallery my $gallery
= $node->addChild({ = $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery", className => "WebGUI::Asset::Wobject::Gallery",
@ -72,8 +73,4 @@ is(
); );
#---------------------------------------------------------------------------- #vim:ft=perl
# Cleanup
END {
$versionTag->rollback();
}

7
t/Asset/Wobject/GalleryAlbum/ajax.t
View file

@ -24,6 +24,7 @@ use Test::More;
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
my %user; my %user;
$user{'1'} = WebGUI::User->new( $session, "new" ); $user{'1'} = WebGUI::User->new( $session, "new" );
@ -257,8 +258,4 @@ sub callAjaxService {
return decode_json( $album->www_ajax() ); return decode_json( $album->www_ajax() );
} }
#---------------------------------------------------------------------------- #vim:ft=perl
# Cleanup
END {
$versionTag->rollback();
}

7
t/Asset/Wobject/GalleryAlbum/delete.t
View file

@ -28,6 +28,7 @@ $session->user({ userId => 3 });
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"}); $versionTag->set({name=>"Album Test"});
WebGUI::Test->addToCleanup($versionTag);
my $gallery my $gallery
= $node->addChild({ = $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery", className => "WebGUI::Asset::Wobject::Gallery",
@ -102,8 +103,4 @@ is(
); );
#---------------------------------------------------------------------------- #vim:ft=perl
# Cleanup
END {
$versionTag->rollback();
}

7
t/Asset/Wobject/GalleryAlbum/navigation.t
View file

@ -23,6 +23,7 @@ use Test::More;
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->set({name=>"Album Test"}); $versionTag->set({name=>"Album Test"});
@ -99,8 +100,4 @@ is( $album->getNextFileId(''), undef, 'Return undef if empty string specified');
is( $album->getNextFileId('123456'), undef, 'Return undef if non-existing id specified'); is( $album->getNextFileId('123456'), undef, 'Return undef if non-existing id specified');
is( $album->getNextFileId($album->getId), undef, 'Return undef if non-child id specified'); is( $album->getNextFileId($album->getId), undef, 'Return undef if non-child id specified');
#---------------------------------------------------------------------------- #vim:ft=perl
# Cleanup
END {
$versionTag->rollback();
}

7
t/Asset/Wobject/GalleryAlbum/slideshow.t
View file

@ -61,6 +61,7 @@ for my $i ( 0 .. 5 ) {
} }
$versionTag->commit; $versionTag->commit;
WebGUI::Test->addToCleanup($versionTag);
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Tests # Tests
@ -78,8 +79,4 @@ TODO: {
# Test www_slideshow # Test www_slideshow
#---------------------------------------------------------------------------- #vim:ft=perl
# Cleanup
END {
$versionTag->rollback();
}

7
t/Asset/Wobject/GalleryAlbum/thumbnails.t
View file

@ -26,6 +26,7 @@ my $maker = WebGUI::Test::Maker::HTML->new;
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->set({name=>"Album Test"}); $versionTag->set({name=>"Album Test"});
my $gallery my $gallery
= $node->addChild({ = $node->addChild({
@ -77,8 +78,4 @@ TODO: {
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Test www_thumbnails # Test www_thumbnails
#---------------------------------------------------------------------------- #vim:ft=perl
# Cleanup
END {
$versionTag->rollback();
}

8
t/Asset/Wobject/GalleryAlbum/view.t
View file

@ -27,6 +27,7 @@ my $maker = WebGUI::Test::Maker::HTML->new;
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session); my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->set({name=>"Album Test"}); $versionTag->set({name=>"Album Test"});
my $gallery my $gallery
= $node->addChild({ = $node->addChild({
@ -150,8 +151,5 @@ SKIP: {
}); });
$maker->run; $maker->run;
} }
#----------------------------------------------------------------------------
# Cleanup #vim:ft=perl
END {
$versionTag->rollback();
}

24
t/Asset/Wobject/Survey/Reports.t
View file

@ -26,22 +26,19 @@ plan tests => $tests + 1;
# put your tests here # put your tests here
my $usedOk = use_ok('WebGUI::Asset::Wobject::Survey'); my $usedOk = use_ok('WebGUI::Asset::Wobject::Survey');
my ($survey);
# Returns the contents of the Survey_tempReport table
sub getAll { $session->db->buildArrayRefOfHashRefs('select * from Survey_tempReport where assetId = ?', [$survey->getId]) }
SKIP: {
skip $tests, "Unable to load Survey" unless $usedOk;
my $user = WebGUI::User->new( $session, 'new' ); my $user = WebGUI::User->new( $session, 'new' );
WebGUI::Test->addToCleanup($user); WebGUI::Test->addToCleanup($user);
my $import_node = WebGUI::Asset->getImportNode($session); my $import_node = WebGUI::Asset->getImportNode($session);
# Create a Survey # Create a Survey
$survey = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } ); my $survey = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
WebGUI::Test->addToCleanup($survey);
isa_ok($survey, 'WebGUI::Asset::Wobject::Survey'); isa_ok($survey, 'WebGUI::Asset::Wobject::Survey');
# Returns the contents of the Survey_tempReport table
sub getAll { $session->db->buildArrayRefOfHashRefs('select * from Survey_tempReport where assetId = ?', [$survey->getId]) }
my $sJSON = $survey->surveyJSON; my $sJSON = $survey->surveyJSON;
# Load bare-bones survey, containing a single section (S0) # Load bare-bones survey, containing a single section (S0)
@ -128,14 +125,5 @@ superhashof({
value => 20, # e.g. score value => 20, # e.g. score
})]); })]);
}
#vim:ft=perl
#----------------------------------------------------------------------------
# Cleanup
END {
$survey->purge() if $survey;
my $versionTag = WebGUI::VersionTag->getWorking( $session, 1 );
$versionTag->rollback() if $versionTag;
}

7
t/PassiveProfiling.t
View file

@ -31,6 +31,8 @@ plan tests => 1 + $numTests;
my $loaded = use_ok('WebGUI::PassiveProfiling'); my $loaded = use_ok('WebGUI::PassiveProfiling');
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup(SQL => ['delete from passiveProfileLog where dateOfEntry >= ?', $startingTime-1]);
WebGUI::Test->addToCleanup($versionTag);
my $home = WebGUI::Asset->getDefault($session); my $home = WebGUI::Asset->getDefault($session);
my $pageProperties = { my $pageProperties = {
@ -120,7 +122,4 @@ cmp_bag(
} }
END { #vim:ft=perl
$session->db->write('delete from passiveProfileLog where dateOfEntry >= ?',[$startingTime-1]);
$versionTag->rollback;
}

12
t/Workflow/Activity/BucketPassiveAnalytics.t
View file

@ -17,6 +17,9 @@ plan tests => 1; # increment this value for each test you create
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
$session->user({userId => 3}); $session->user({userId => 3});
WebGUI::Test->addToCleanup(SQL => 'delete from passiveLog');
WebGUI::Test->addToCleanup(SQL => 'delete from analyticRule');
my $workflow = WebGUI::Workflow->new($session, 'PassiveAnalytics000001'); my $workflow = WebGUI::Workflow->new($session, 'PassiveAnalytics000001');
my $activities = $workflow->getActivities(); my $activities = $workflow->getActivities();
##Note, they're in order, and the order is known. ##Note, they're in order, and the order is known.
@ -30,6 +33,7 @@ my $instance = WebGUI::Workflow::Instance->create($session,
priority => 1, priority => 1,
} }
); );
WebGUI::Test->addToCleanup($instance);
##Rule label, url, and regexp ##Rule label, url, and regexp
my @ruleSets = ( my @ruleSets = (
['home', '/home', '^\/home' ], ['home', '/home', '^\/home' ],
@ -76,12 +80,6 @@ PAUSE: while (my $retval = $instance->run()) {
ok(1, 'One test'); ok(1, 'One test');
END {
$session->db->write('delete from passiveLog');
$session->db->write('delete from analyticRule');
$instance->delete;
}
sub loadLogData { sub loadLogData {
my ($session, @urls) = @_; my ($session, @urls) = @_;
$session->db->write('delete from passiveLog'); $session->db->write('delete from passiveLog');
@ -99,3 +97,5 @@ sub loadLogData {
$startTime += int(rand(10))+1; $startTime += int(rand(10))+1;
} }
} }
#vim:ft=perl