From 689e645e510d5179c5560ccacb580b72bcd919fc Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 25 May 2009 04:42:40 +0000
Subject: [PATCH] Forward porting tests with better cleanups.

---
 t/Asset/Wobject/Article.t           | 2 +-
 t/Asset/Wobject/DataForm/DataForm.t | 2 ++
 t/Macro/FileUrl.t                   | 7 ++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/t/Asset/Wobject/Article.t b/t/Asset/Wobject/Article.t
index 324ae507c..99de19a94 100644
--- a/t/Asset/Wobject/Article.t
+++ b/t/Asset/Wobject/Article.t
@@ -40,6 +40,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Article Test"});
+WebGUI::Test->tagsToRollback($versionTag);
 my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
 
 # Test for a sane object type
@@ -138,6 +139,5 @@ TODO: {
 
 END {
 	# Clean up after thy self
-	$versionTag->rollback();
 }
 
diff --git a/t/Asset/Wobject/DataForm/DataForm.t b/t/Asset/Wobject/DataForm/DataForm.t
index a69090a14..9a47aac18 100644
--- a/t/Asset/Wobject/DataForm/DataForm.t
+++ b/t/Asset/Wobject/DataForm/DataForm.t
@@ -40,6 +40,7 @@ my $node = WebGUI::Asset->getImportNode($session);
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Article Test"});
+WebGUI::Test->tagsToRollback($versionTag);
 my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
 
 # Test for a sane object type
@@ -99,6 +100,7 @@ $duplicateArticle->purge();
 
 # The get method will create the directory if it doesnt exist... very strange.
 $duplicateStorage = WebGUI::Storage->get($session,$duplicateStorageId);
+WebGUI::Test->storagesToDelete($duplicateStorage);
 
 # so lets check for the file instead
 $duplicateFilename = $duplicateStorage->getFiles->[0];
diff --git a/t/Macro/FileUrl.t b/t/Macro/FileUrl.t
index 8795a8d9b..6cc0963fe 100644
--- a/t/Macro/FileUrl.t
+++ b/t/Macro/FileUrl.t
@@ -93,15 +93,13 @@ 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);
 
-($versionTag, @testSets) = setupTest($session, $homeAsset, @testSets);
+my ($versionTag, @testSets) = setupTest($session, $homeAsset, @testSets);
 
 foreach my $testSet (@testSets) {
 	my $output = WebGUI::Macro::FileUrl::process($session, $testSet->{url});
@@ -147,10 +145,9 @@ sub setupTest {
 		++$testNum;
 	}
 	$versionTag->commit;
+    WebGUI::Test->tagsToRollback($versionTag);
 	return $versionTag, @testSets;
 }
 
 END { ##Clean-up after yourself, always
-	use Data::Dumper;
-	$versionTag->rollback;
 }