i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

localeTest: fix build.

Browse Source
This commit is contained in:
Adrien Destugues
2014-09-29 18:37:47 +02:00
parent 9ddea57b38
commit 9d1cbc67a6
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/locale/localeTest.cpp
+19 -13
View File
@@ -1,9 +1,10 @@
#include <UnicodeChar.h>
#include <Collator.h> #include <Collator.h>
#include <Language.h> #include <Language.h>
#include <Locale.h> #include <Locale.h>
#include <LocaleRoster.h>
#include <String.h> #include <String.h>
#include <UnicodeChar.h>
#include <stdio.h> #include <stdio.h>
@@ -46,7 +47,8 @@ main()
} }
const char *utf8chars[] = {"à", "ß", "ñ", "é", "ç", "ä", NULL}; const char *utf8chars[] = {"à", "ß", "ñ", "é", "ç", "ä", NULL};
for (int32 j = 0, i; (i = BUnicodeChar::FromUTF8(utf8chars[j])) != 0; j++) { for (int32 j = 0; utf8chars[j] != 0; j++) {
int32 i = BUnicodeChar::FromUTF8(utf8chars[j]);
unicode_char_to_string(i, text); unicode_char_to_string(i, text);
printf("%s: alpha == %d, alNum == %d, lower == %d, upper == %d, defined == %d, charType == %d\n", printf("%s: alpha == %d, alNum == %d, lower == %d, upper == %d, defined == %d, charType == %d\n",
text, text,
@@ -62,20 +64,21 @@ main()
// Test BCollator class // Test BCollator class
BCollator *collator = be_locale->Collator(); BCollator collator;
BLocaleRoster::Default()->GetDefaultLocale()->GetCollator(&collator);
const char *strings[] = {"gehen", "géhen", "aus", "äUß", "auss", "äUß", "WO", const char *strings[] = {"gehen", "géhen", "aus", "äUß", "auss", "äUß", "WO",
"wÖ", "SO", "so", "açñ", "acn", NULL}; "wÖ", "SO", "so", "açñ", "acn", NULL};
const char *strengths[] = {"primary: ", "secondary:", "tertiary: "}; const char *strengths[] = {"primary: ", "secondary:", "tertiary: "};
for (int32 i = 0; strings[i]; i += 2) { for (int32 i = 0; strings[i]; i += 2) {
for (int32 strength = B_COLLATE_PRIMARY; strength < 4; strength++) { for (int32 strength = B_COLLATE_PRIMARY; strength < 4; strength++) {
BString a, b; BString a, b;
collator->GetSortKey(strings[i], &a, strength); collator.GetSortKey(strings[i], &a, strength);
collator->GetSortKey(strings[i + 1], &b, strength); collator.GetSortKey(strings[i + 1], &b, strength);
printf("%s sort keys: \"%s\" -> \"%s\", \"%s\" -> \"%s\"\n", printf("%s sort keys: \"%s\" -> \"%s\", \"%s\" -> \"%s\"\n",
strengths[strength-1], strings[i], a.String(), strings[i+1], b.String()); strengths[strength-1], strings[i], a.String(), strings[i+1], b.String());
printf("\tcmp = %d (key compare = %d)\n", printf("\tcmp = %d (key compare = %d)\n",
collator->Compare(strings[i], strings[i + 1], -1, strength), collator.Compare(strings[i], strings[i + 1], strength),
strcmp(a.String(), b.String())); strcmp(a.String(), b.String()));
} }
putchar('\n'); putchar('\n');
@@ -83,12 +86,15 @@ main()
// Tests the BLanguage class // Tests the BLanguage class
BLanguage *language = be_locale->Language(); BLanguage language;
printf("Language name = \"%s\", code = \"%s\", family = \"%s\"\n", language->Name(), BLocaleRoster::Default()->GetDefaultLocale()->GetLanguage(&language);
language->Code(), language->Family()); BString name;
language.GetName(name);
printf("Language name = \"%s\", code = \"%s\"\n", name.String(),
language.Code());
printf("\tdirection = %s\n", printf("\tdirection = %s\n",
language->Direction() == B_LEFT_TO_RIGHT ? "left-to-right" : language.Direction() == B_LEFT_TO_RIGHT ? "left-to-right" :
language->Direction() == B_RIGHT_TO_LEFT ? "right-to-left" : language.Direction() == B_RIGHT_TO_LEFT ? "right-to-left" :
"top-to-bottom"); "top-to-bottom");
//for (int32 i = 0; i < 200; i++) { //for (int32 i = 0; i < 200; i++) {
@@ -98,7 +104,7 @@ main()
//} //}
printf("First month = %s (%s)\n", printf("First month = %s (%s)\n",
language->GetString(B_MON_1), language.GetString(B_MON_1),
language->GetString(B_AB_MON_1)); language.GetString(B_AB_MON_1));
} }