From 04da3568221f6c08dcfd08a8d977c301b9bb2e8e Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 9 Feb 2008 04:44:15 +0000
Subject: [PATCH] take more advantage of getTestCollateralPath file concat

---
 t/Asset/Wobject/Article.t | 2 +-
 t/International.t         | 4 ++--
 t/Session/DateTime.t      | 2 +-
 t/Storage.t               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/Asset/Wobject/Article.t b/t/Asset/Wobject/Article.t
index 0752e16db..3469804aa 100644
--- a/t/Asset/Wobject/Article.t
+++ b/t/Asset/Wobject/Article.t
@@ -66,7 +66,7 @@ foreach my $newSetting (keys %{$newArticleSettings}) {
 
 # Test the duplicate method... not for assets, just the extended duplicate functionality of the article wobject
 my $filename = "page_title.jpg";
-my $pathedFile = File::Spec->catfile(WebGUI::Test->getTestCollateralPath, $filename);
+my $pathedFile = WebGUI::Test->getTestCollateralPath($filename);
 
 # Use some test collateral to create a storage location and assign it to our article
 my $storage = WebGUI::Storage::Image->create($session);
diff --git a/t/International.t b/t/International.t
index 3538a8690..68c2514aa 100644
--- a/t/International.t
+++ b/t/International.t
@@ -78,11 +78,11 @@ isa_ok($i18n->getLanguage('English'), 'HASH', 'getLanguage, without a specific p
 sub installPigLatin {
 	mkdir File::Spec->catdir(WebGUI::Test->lib, 'WebGUI', 'i18n', 'PigLatin');
 	copy( 
-		File::Spec->catfile(WebGUI::Test->getTestCollateralPath, 'WebGUI.pm'),
+		WebGUI::Test->getTestCollateralPath('WebGUI.pm'),
 		File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin WebGUI.pm/)
 	);
 	copy(
-		File::Spec->catfile(WebGUI::Test->getTestCollateralPath, 'PigLatin.pm'),
+		WebGUI::Test->getTestCollateralPath('PigLatin.pm'),
 		File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin.pm/)
 	);
 }
diff --git a/t/Session/DateTime.t b/t/Session/DateTime.t
index 6b3de4497..fca1337f8 100644
--- a/t/Session/DateTime.t
+++ b/t/Session/DateTime.t
@@ -275,7 +275,7 @@ $session->user({userId => 1});
 
 sub installBadLocale {
 	copy(
-		File::Spec->catfile(WebGUI::Test->getTestCollateralPath, 'BadLocale.pm'),
+		WebGUI::Test->getTestCollateralPath('BadLocale.pm'),
 		File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n BadLocale.pm/)
 	);
 }
diff --git a/t/Storage.t b/t/Storage.t
index ad5266400..152adeb77 100644
--- a/t/Storage.t
+++ b/t/Storage.t
@@ -230,7 +230,7 @@ ok (!(-e $storage1->getPath("testfile-hash.file")), "rename file original file i
 ####################################################
 
 $storage1->addFileFromFilesystem(
-    File::Spec->catfile(WebGUI::Test->getTestCollateralPath, 'WebGUI.pm'),
+    WebGUI::Test->getTestCollateralPath('WebGUI.pm'),
 );
 
 ok(