gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-29 16:01:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for bug #34815

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35272 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-07-09 05:22:03 +00:00
parent 99b20009a9
commit 2b30f01d2d
5 changed files with 170 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/base/NSBundle/Resources/GNUmakefile
View file

@ -5,7 +5,7 @@ BUNDLE_NAME = TestBundle
TestBundle_OBJC_FILES = TestBundle.m
TestBundle_RESOURCE_FILES = NonLocalRes.txt
TestBundle_LANGUAGES = English French
TestBundle_LANGUAGES = English French de
TestBundle_LOCALIZED_RESOURCE_FILES = TextRes.txt
TestBundle_NEEDS_GUI = NO

1
Tests/base/NSBundle/Resources/de.lproj/TextRes.txt Normal file
View file

@ -0,0 +1 @@
Deutsche Ressource

64
Tests/base/NSBundle/resources2.m
View file

@ -20,23 +20,63 @@ int main()
/* --- [NSBundle -pathsForResourcesOfType:inDirectory:] --- */
bundle = [NSBundle bundleWithPath: path];
arr = [bundle pathsForResourcesOfType:@"txt" inDirectory: nil];
PASS((arr && [arr count]), "-pathsForResourcesOfType:inDirectory: returns an array");
localPath = [path stringByAppendingPathComponent: @"Resources/NonLocalRes.txt"];
PASS([arr containsObject: localPath], "Returned array contains non-localized resource");
localPath = [path stringByAppendingPathComponent: @"Resources/English.lproj/TextRes.txt"];
PASS([arr containsObject: localPath], "Returned array contains localized resource");
PASS((arr && [arr count]),
"-pathsForResourcesOfType:inDirectory: returns an array");
localPath = [path stringByAppendingPathComponent:
@"Resources/NonLocalRes.txt"];
PASS([arr containsObject: localPath],
"Returned array contains non-localized resource");
localPath = [path stringByAppendingPathComponent:
@"Resources/English.lproj/TextRes.txt"];
PASS([arr containsObject: localPath],
"Returned array contains localized resource");
/* --- [NSBundle +pathsForResourcesOfType:inDirectory:] --- */
carr = [NSBundle pathsForResourcesOfType:@"txt" inDirectory: path];
PASS([arr isEqual: carr], "+pathsForResourcesOfType:inDirectory: returns same array");
PASS([arr isEqual: carr],
"+pathsForResourcesOfType:inDirectory: returns same array");
/* --- [NSBundle -pathsForResourcesOfType:inDirectory:forLocalization:] --- */
arr = [bundle pathsForResourcesOfType:@"txt" inDirectory: nil forLocalization: @"English"];
PASS((arr && [arr count]), "-pathsForResourcesOfType:inDirectory:forLocalization returns an array");
localPath = [path stringByAppendingPathComponent: @"Resources/NonLocalRes.txt"];
PASS([arr containsObject: localPath], "Returned array contains non-localized resource");
localPath = [path stringByAppendingPathComponent: @"Resources/English.lproj/TextRes.txt"];
PASS([arr containsObject: localPath], "Returned array contains localized resource");
arr = [bundle pathsForResourcesOfType:@"txt" inDirectory: nil
forLocalization: @"English"];
PASS((arr && [arr count]),
"-pathsForResourcesOfType:inDirectory:forLocalization returns an array");
localPath = [path stringByAppendingPathComponent:
@"Resources/NonLocalRes.txt"];
PASS([arr containsObject: localPath],
"Returned array contains non-localized resource");
localPath = [path stringByAppendingPathComponent:
@"Resources/English.lproj/TextRes.txt"];
PASS([arr containsObject: localPath],
"Returned array contains localized resource");
/* --- [NSBundle -pathsForResourcesOfType:inDirectory:forLocalization:] --- */
arr = [bundle pathsForResourcesOfType:@"txt" inDirectory: nil
forLocalization: @"en"];
PASS((arr && [arr count]),
"-pathsForResources... returns an array for 'en'");
localPath = [path stringByAppendingPathComponent:
@"Resources/NonLocalRes.txt"];
PASS([arr containsObject: localPath],
"Returned array for 'en' contains non-localized resource");
localPath = [path stringByAppendingPathComponent:
@"Resources/English.lproj/TextRes.txt"];
PASS([arr containsObject: localPath],
"Returned array for 'en' contains localized resource");
/* --- [NSBundle -pathsForResourcesOfType:inDirectory:forLocalization:] --- */
arr = [bundle pathsForResourcesOfType:@"txt" inDirectory: nil
forLocalization: @"German"];
PASS((arr && [arr count]),
"-pathsForResources... returns an array for 'German'");
localPath = [path stringByAppendingPathComponent:
@"Resources/NonLocalRes.txt"];
PASS([arr containsObject: localPath],
"Returned array for 'German' contains non-localized resource");
localPath = [path stringByAppendingPathComponent:
@"Resources/de.lproj/TextRes.txt"];
PASS([arr containsObject: localPath],
"Returned array for 'German' contains localized resource");
[arp release]; arp = nil;
return 0;