mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 476336 - Remove check for InfoText from readstrings.cpp. r=ted.mielczarek

This commit is contained in:
Robert Strong 2009-03-11 19:10:56 -07:00
Родитель 3be199254c
Коммит b62c370af6
7 изменённых файлов: 19 добавлений и 156 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
toolkit/mozapps/update/src/updater/readstrings.cpp
Просмотреть файл

@ -190,7 +190,7 @@ ReadStrings(const NS_tchar *path, StringTable *results)
results->title[MAX_TEXT_LEN - 1] = 0;
read |= Title;
}
else if (strcmp(key, "Info") == 0 || strcmp(key, "InfoText") == 0) {
else if (strcmp(key, "Info") == 0) {
strncpy(results->info, token, MAX_TEXT_LEN - 1);
results->info[MAX_TEXT_LEN - 1] = 0;
read |= Info;

1
toolkit/mozapps/update/test/Makefile.in
Просмотреть файл

@ -60,7 +60,6 @@ INI_TEST_FILES = \
TestAUSReadStrings1.ini \
TestAUSReadStrings2.ini \
TestAUSReadStrings3.ini \
TestAUSReadStrings4.ini \
$(NULL)
LOCAL_INCLUDES += \

61
toolkit/mozapps/update/test/TestAUSReadStrings.cpp
Просмотреть файл

@ -101,43 +101,10 @@ int NS_main(int argc, NS_tchar **argv)
}
*(++slash) = '\0';
// Test success when the ini file exists with both Title and InfoText in the
// Strings section and test values for Title and InfoText.
// Test success when the ini file exists with both Title and Info in the
// Strings section and the values for Title and Info.
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStrings1.ini"), argv[0]);
retval = ReadStrings(inifile, &testStrings);
if (retval == OK) {
if (strcmp(testStrings.title, "Title Test - \xE6\xB5\x8B\xE8\xAF\x95 " \
"\xE6\xB8\xAC\xE8\xA9\xA6 " \
"\xCE\x94\xCE\xBF\xCE\xBA\xCE\xB9\xCE\xBC\xCE\xAE " \
"\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88 " \
"\xD0\x98\xD1\x81\xD0\xBF\xD1\x8B\xD1\x82\xD0" \
"\xB0\xD0\xBD\xD0\xB8\xD0\xB5") != 0) {
rv = 21;
printf("%s | %s Title ini value incorrect | Test 1\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME);
}
if (strcmp(testStrings.info, "InfoText Test - \xE6\xB5\x8B\xE8\xAF\x95 " \
"\xE6\xB8\xAC\xE8\xA9\xA6 " \
"\xCE\x94\xCE\xBF\xCE\xBA\xCE\xB9\xCE\xBC\xCE\xAE " \
"\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88 " \
"\xD0\x98\xD1\x81\xD0\xBF\xD1\x8B\xD1\x82\xD0\xB0" \
"\xD0\xBD\xD0\xB8\xD0\xB5\xE2\x80\xA6") != 0) {
rv = 22;
printf("%s | %s InfoText ini value incorrect | Test 1\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME);
}
}
else {
printf("%s | %s ReadStrings returned %i | Test 1\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME, retval);
rv = 23;
}
// Test success when the ini file exists with both Title and InfoText in the
// Strings section and test values for Title and InfoText.
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStrings2.ini"), argv[0]);
retval = ReadStrings(inifile, &testStrings);
if (retval == OK) {
if (strcmp(testStrings.title, "Title Test - \xD0\x98\xD1\x81\xD0\xBF\xD1\x8B" \
"\xD1\x82\xD0\xB0\xD0\xBD\xD0\xB8\xD0\xB5 " \
@ -145,7 +112,7 @@ int NS_main(int argc, NS_tchar **argv)
"\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88 " \
"\xE6\xB8\xAC\xE8\xA9\xA6 " \
"\xE6\xB5\x8B\xE8\xAF\x95") != 0) {
rv = 24;
rv = 21;
printf("%s | %s Title ini value incorrect | Test 2\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME);
}
@ -156,7 +123,7 @@ int NS_main(int argc, NS_tchar **argv)
"\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88 " \
"\xE6\xB8\xAC\xE8\xA9\xA6 " \
"\xE6\xB5\x8B\xE8\xAF\x95\xE2\x80\xA6") != 0) {
rv = 25;
rv = 22;
printf("%s | %s Info ini value incorrect | Test 2\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME);
}
@ -164,25 +131,25 @@ int NS_main(int argc, NS_tchar **argv)
else {
printf("%s | %s ReadStrings returned %i | Test 2\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME, retval);
rv = 26;
rv = 23;
}
// Test failure when the ini file exists without Title and with Info and
// InfoText in the Strings section.
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStrings3.ini"), argv[0]);
// Test failure when the ini file exists without Title and with Info in the
// Strings section.
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStrings2.ini"), argv[0]);
retval = ReadStrings(inifile, &testStrings);
if (retval != PARSE_ERROR) {
rv = 27;
rv = 24;
printf("%s | %s ReadStrings returned %i | Test 3\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME, retval);
}
// Test failure when the ini file exists with Title and without InfoText and
// Info in the Strings section.
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStrings4.ini"), argv[0]);
// Test failure when the ini file exists with Title and without Info in the
// Strings section.
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStrings3.ini"), argv[0]);
retval = ReadStrings(inifile, &testStrings);
if (retval != PARSE_ERROR) {
rv = 28;
rv = 25;
printf("%s | %s ReadStrings returned %i | Test 4\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME, retval);
}
@ -191,7 +158,7 @@ int NS_main(int argc, NS_tchar **argv)
NS_tsnprintf(inifile, sizeof(inifile), NS_T("%sTestAUSReadStringsBogus.ini"), argv[0]);
retval = ReadStrings(inifile, &testStrings);
if (retval != READ_ERROR) {
rv = 29;
rv = 26;
printf("%s | %s ini file doesn't exist | Test 5\n",
UNEXPECTED_FAIL_PREFIX, TEST_NAME);
}

20
toolkit/mozapps/update/test/TestAUSReadStrings1.ini
Просмотреть файл

@ -12,17 +12,13 @@ Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment
[Strings]
Bogus1=Bogus1
; Comment
Title=Title Test - 测试 測試 Δοκιμή テスト Испытание
Title=Title Test - Испытание Δοκιμή テスト 測試 测试
; Comment
@ -30,7 +26,7 @@ Bogus2=Bogus2
; Comment
Info=This should not be returned since it before InfoText
Info=Info Test - Испытание Δοκιμή テスト 測試 测试…
; Comment
@ -38,14 +34,6 @@ Bogus3=Bogus3
; Comment
InfoText=InfoText Test - 测试 測試 Δοκιμή テスト Испытание…
; Comment
Bogus4=Bogus4
; Comment
[BogusSection2]
; Comment
@ -57,7 +45,3 @@ Title=Bogus Title
Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment

26
toolkit/mozapps/update/test/TestAUSReadStrings2.ini
Просмотреть файл

@ -12,17 +12,13 @@ Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment
[Strings]
Bogus1=Bogus1
; Comment
Title=Title Test - Испытание Δοκιμή テスト 測試 测试
Info=Info
; Comment
@ -30,22 +26,6 @@ Bogus2=Bogus2
; Comment
InfoText=This should not be returned since it before Info
; Comment
Bogus3=Bogus3
; Comment
Info=Info Test - Испытание Δοκιμή テスト 測試 测试…
; Comment
Bogus4=Bogus4
; Comment
[BogusSection2]
; Comment
@ -57,7 +37,3 @@ Title=Bogus Title
Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment

18
toolkit/mozapps/update/test/TestAUSReadStrings3.ini
Просмотреть файл

@ -12,17 +12,13 @@ Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment
[Strings]
Bogus1=Bogus1
; Comment
Info=Info
Title=Title
; Comment
@ -30,14 +26,6 @@ Bogus2=Bogus2
; Comment
InfoText=InfoText
; Comment
Bogus3=Bogus3
; Comment
[BogusSection2]
; Comment
@ -49,7 +37,3 @@ Title=Bogus Title
Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment

47
toolkit/mozapps/update/test/TestAUSReadStrings4.ini
Просмотреть файл

@ -1,47 +0,0 @@
; This file is in the UTF-8 encoding
[BogusSection1]
; Comment
Title=Bogus Title
; Comment
Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment
[Strings]
Bogus1=Bogus1
; Comment
Title=Title
; Comment
Bogus2=Bogus2
; Comment
[BogusSection2]
; Comment
Title=Bogus Title
; Comment
Info=Bogus Info
; Comment
InfoText=Bogus InfoText
; Comment