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

Use WebGUI::Test rollback methods instead of an END block.

Browse source
This commit is contained in:
Colin Kuskie 2009-07-09 20:31:25 +00:00
parent 80b5c57155
commit 2d64657165
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
t/Asset/Asset.t
View file

@ -104,6 +104,7 @@ $properties = {
}; };
my $versionTag2 = WebGUI::VersionTag->getWorking($session); my $versionTag2 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($versionTag2);
my $canEditAsset = $rootAsset->addChild($properties, $properties->{id}); my $canEditAsset = $rootAsset->addChild($properties, $properties->{id});
@ -119,6 +120,7 @@ $canEditMaker->prepare({
}); });
my $versionTag3 = WebGUI::VersionTag->getWorking($session); my $versionTag3 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($versionTag3);
$properties = { $properties = {
# '1234567890123456789012' # '1234567890123456789012'
id => 'canViewAsset0000000010', id => 'canViewAsset0000000010',
@ -301,6 +303,7 @@ $session->{_request} = $origRequest;
################################################################ ################################################################
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($versionTag);
$versionTag->set({name=>"Asset tests"}); $versionTag->set({name=>"Asset tests"});
$properties = { $properties = {
@ -744,6 +747,7 @@ $product3->purge;
################################################################ ################################################################
my $versionTag4 = WebGUI::VersionTag->getWorking($session); my $versionTag4 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($versionTag4);
$versionTag4->set( { name => 'inheritUrlFromParent tests' } ); $versionTag4->set( { name => 'inheritUrlFromParent tests' } );
$properties = { $properties = {
@ -816,6 +820,7 @@ is($iufpAsset3->getUrl, '/inheriturlfromparent01/inheriturlfromparent02/inheritu
################################################################ ################################################################
my $versionTag5 = WebGUI::VersionTag->getWorking($session); my $versionTag5 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($versionTag5);
$versionTag5->set( { name => 'move commit of child to uncommitted parent on requestAutoCommit tests vt1' } ); $versionTag5->set( { name => 'move commit of child to uncommitted parent on requestAutoCommit tests vt1' } );
$properties = { $properties = {
@ -832,6 +837,7 @@ is($parentVersionTag->get('isCommitted'),0, 'built non-committed parent asset');
my $versionTag6 = WebGUI::VersionTag->create($session, {}); my $versionTag6 = WebGUI::VersionTag->create($session, {});
WebGUI::Test->tagsToRollback($versionTag6);
$versionTag6->set( { name => 'move commit of child to uncommitted parent on requestAutoCommit tests vt2' } ); $versionTag6->set( { name => 'move commit of child to uncommitted parent on requestAutoCommit tests vt2' } );
$versionTag6->setWorking; $versionTag6->setWorking;
@ -871,13 +877,6 @@ is($testVersionTag->get('isCommitted'),1,'parent asset is now committed');
$childVersionTag = WebGUI::VersionTag->new($session, $childAsset->get('tagId')); $childVersionTag = WebGUI::VersionTag->new($session, $childAsset->get('tagId'));
is($childVersionTag->get('isCommitted'),1,'child asset is now committed'); is($childVersionTag->get('isCommitted'),1,'child asset is now committed');
END {
foreach my $vTag ($versionTag, $versionTag2, $versionTag3, $versionTag4, $versionTag5, $versionTag6, ) {
$vTag->rollback;
}
}
##Return an array of hashrefs. Each hashref describes a test ##Return an array of hashrefs. Each hashref describes a test
##for the fixId method. ##for the fixId method.