take more advantage of getTestCollateralPath file concat

This commit is contained in:
Colin Kuskie 2008-02-09 04:44:15 +00:00
parent 92813f394d
commit 04da356822
4 changed files with 5 additions and 5 deletions

View file

@ -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);

View file

@ -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/)
);
}

View file

@ -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/)
);
}

View file

@ -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(