Skip to content

Commit

Permalink
Item9103: revert the use of ${slash} so we can solve it a better way …
Browse files Browse the repository at this point in the history 
…- we're going back to defining that foswiki _always_ uses '/' - until we intentionally support yet another OS....

git-svn-id: http://svn.foswiki.org/trunk@7626 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
SvenDowideit authored and SvenDowideit committed Jun 4, 2010
1 parent 7b0472e commit 533ba72
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 30 deletions.
46 changes: 21 additions & 25 deletions UnitTestContrib/test/unit/ConfigureTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,23 +369,19 @@ sub test_Util_mapTarget {

$Foswiki::cfg{TrashWebName} = $this->{trash_web};

#oh crumbs. windows
my $slash = '/';
$slash = '\\' if ($^O eq 'MSWin32');

# Remap system web

$Foswiki::cfg{SystemWebName} = 'Fizbin';
my $file = 'pub/System/System/MyAtt.gif';
my $results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "$this->{rootdir}pub${slash}Fizbin${slash}System${slash}MyAtt.gif",
$this->assert_str_equals( "$this->{rootdir}pub/Fizbin/System/MyAtt.gif",
$results );

$file = 'data/System/System.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "$this->{rootdir}data${slash}Fizbin${slash}System.txt",
$this->assert_str_equals( "$this->{rootdir}data/Fizbin/System.txt",
$results );

# Remap data and pub directory names
Expand All @@ -398,14 +394,14 @@ sub test_Util_mapTarget {
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}public${slash}$this->{trash_web}${slash}Fizbin${slash}Data.attachment",
"/var/www/foswiki/public/$this->{trash_web}/Fizbin/Data.attachment",
$results );

$file = 'data/Trash/Fizbin.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}storage${slash}$this->{trash_web}${slash}Fizbin.txt", $results );
"/var/www/foswiki/storage/$this->{trash_web}/Fizbin.txt", $results );

# Verify default Users and Main web names

Expand All @@ -415,13 +411,13 @@ sub test_Util_mapTarget {
$file = 'pub/Users/Fizbin/asdf.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}public${slash}Main${slash}Fizbin${slash}asdf.txt",
$this->assert_str_equals( "/var/www/foswiki/public/Main/Fizbin/asdf.txt",
$results );

$file = 'data/Users/Fizbin.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}storage${slash}Main${slash}Fizbin.txt",
$this->assert_str_equals( "/var/www/foswiki/storage/Main/Fizbin.txt",
$results );

# Remap the UsersWebName
Expand All @@ -431,13 +427,13 @@ sub test_Util_mapTarget {
$file = 'pub/Main/Fizbin/Blah.gif';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}public${slash}Blah${slash}Fizbin${slash}Blah.gif",
$this->assert_str_equals( "/var/www/foswiki/public/Blah/Fizbin/Blah.gif",
$results );

$file = 'data/Main/Fizbin.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}storage${slash}Blah${slash}Fizbin.txt",
$this->assert_str_equals( "/var/www/foswiki/storage/Blah/Fizbin.txt",
$results );

# Remap the SandboxWebName
Expand All @@ -448,12 +444,12 @@ sub test_Util_mapTarget {
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}public${slash}Litterbox${slash}Fizbin${slash}Blah.gif", $results );
"/var/www/foswiki/public/Litterbox/Fizbin/Blah.gif", $results );

$file = 'data/Sandbox/Fizbin.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}storage${slash}Litterbox${slash}Fizbin.txt",
$this->assert_str_equals( "/var/www/foswiki/storage/Litterbox/Fizbin.txt",
$results );

$Foswiki::cfg{SandboxWebName} = $saveSandbox;
Expand All @@ -466,13 +462,13 @@ sub test_Util_mapTarget {
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}public${slash}Litterbox${slash}Beta${slash}Fizbin${slash}Blah.gif", $results );
"/var/www/foswiki/public/Litterbox/Beta/Fizbin/Blah.gif", $results );

$file = 'data/Sandbox/Beta/Fizbin.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}storage${slash}Litterbox${slash}Beta${slash}Fizbin.txt", $results );
"/var/www/foswiki/storage/Litterbox/Beta/Fizbin.txt", $results );

$Foswiki::cfg{SandboxWebName} = $saveSandbox;

Expand All @@ -484,13 +480,13 @@ sub test_Util_mapTarget {
$file = 'data/Sandbox/WebNotify.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}storage${slash}Sandbox${slash}TellMe.txt",
$this->assert_str_equals( "/var/www/foswiki/storage/Sandbox/TellMe.txt",
$results );

$file = 'pub/Sandbox/WebNotify/Blah.gif';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}public${slash}Sandbox${slash}TellMe${slash}Blah.gif",
$this->assert_str_equals( "/var/www/foswiki/public/Sandbox/TellMe/Blah.gif",
$results );

$Foswiki::cfg{SandboxWebName} = $saveSandbox;
Expand All @@ -503,13 +499,13 @@ sub test_Util_mapTarget {
$file = 'data/Sandbox/WebHome.txt';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}storage${slash}Sandbox${slash}HomePage.txt",
$this->assert_str_equals( "/var/www/foswiki/storage/Sandbox/HomePage.txt",
$results );

$file = 'pub/Sandbox/WebNotify/Blah.gif';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}public${slash}Sandbox${slash}TellMe${slash}Blah.gif",
$this->assert_str_equals( "/var/www/foswiki/public/Sandbox/TellMe/Blah.gif",
$results );

$Foswiki::cfg{SandboxWebName} = $saveSandbox;
Expand All @@ -521,14 +517,14 @@ sub test_Util_mapTarget {
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}storage${slash}$this->{sandbox_web}${slash}Settings.txt",
"/var/www/foswiki/storage/$this->{sandbox_web}/Settings.txt",
$results );

$file = 'pub/Sandbox/WebPreferences/Logo.gif';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals(
"${slash}var${slash}www${slash}foswiki${slash}public${slash}$this->{sandbox_web}${slash}Settings${slash}Logo.gif",
"/var/www/foswiki/public/$this->{sandbox_web}/Settings/Logo.gif",
$results );

# Remap bin directory and script suffix - WebPrefsTopicName - default WebPreferences
Expand All @@ -537,22 +533,22 @@ sub test_Util_mapTarget {
$Foswiki::cfg{ScriptDir} = 'C:/asdf/bin/';
$file = 'bin/compare';
$results = Foswiki::Configure::Util::mapTarget( "C:/asdf/", "$file" );
$this->assert_str_equals( "C:${slash}asdf${slash}bin${slash}compare.pl", $results );
$this->assert_str_equals( "C:/asdf/bin/compare.pl", $results );

# Remap the data/mime.types file location

$Foswiki::cfg{MimeTypesFileName} = "$Foswiki::cfg{DataDir}/mymime.types";
$file = 'data/mime.types';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}storage${slash}mymime.types",
$this->assert_str_equals( "/var/www/foswiki/storage/mymime.types",
$results );

$Foswiki::cfg{ToolsDir} = '/var/www/foswiki/stuff';
$file = 'tools/testrun';
$results =
Foswiki::Configure::Util::mapTarget( "/var/www/foswiki/", "$file" );
$this->assert_str_equals( "${slash}var${slash}www${slash}foswiki${slash}stuff${slash}testrun", $results );
$this->assert_str_equals( "/var/www/foswiki/stuff/testrun", $results );

$Foswiki::cfg{PubDir} = $savePub;
$Foswiki::cfg{DataDir} = $saveData;
Expand Down
5 changes: 0 additions & 5 deletions core/lib/Foswiki/Configure/Util.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ sub mapTarget {
&& ( $file eq 'data/mime.types' ) )
{
$file =~ s#^data/mime\.types$#$Foswiki::cfg{MimeTypesFileName}#;
#force to windows paths
$file =~ s/\//\\/g if ($^O eq 'MSWin32');

return $file;
}

Expand Down Expand Up @@ -147,8 +144,6 @@ sub mapTarget {
else {
$file = File::Spec->catfile( $root, $file );
}
#force to windows paths
$file =~ s/\//\\/g if ($^O eq 'MSWin32');

return $file;
}
Expand Down

0 comments on commit 533ba72

Please sign in to comment.