wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 587550 - Fix UnicharSelfTest.cpp, which was busted by deCOMtamination in bug 575043 (rev e0fa43b96c03). r=khuey, a=test-only

Browse Source 
--HG--
extra : rebase_source : 915555760cfc005a3a8186c5a8850cfb0052de08
This commit is contained in:
Justin Lebar 2010-08-16 14:35:39 -07:00
parent b0a14967ee
commit 7dc2e2a15d
2 changed files with 53 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intl/unicharutil/tests/Makefile.in
View File

@ -54,6 +54,7 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

145
intl/unicharutil/tests/UnicharSelfTest.cpp
View File

@ -52,8 +52,8 @@
#include "nsCOMPtr.h"
#include "nsIUnicodeNormalizer.h"
#include "nsStringAPI.h"
#include "nsUnicharUtils.h"
NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID);
NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID);
NS_DEFINE_CID(kUnicodeNormalizerCID, NS_UNICODE_NORMALIZER_CID);
@ -284,104 +284,63 @@ static PRUnichar t4result[T4LEN+2] = {
void TestCaseConversion()
{
printf("==============================\n");
printf("Start nsICaseConversion Test \n");
printf("==============================\n");
nsICaseConversion *t = NULL;
nsresult res;
res = CallGetService(kUnicharUtilCID, &t);
printf("Test 1 - GetService():\n");
if(NS_FAILED(res) || ( t == NULL ) ) {
printf("\t1st GetService failed\n");
} else {
NS_RELEASE(t);
}
printf("==========================\n");
printf("Start case conversion test\n");
printf("==========================\n");
res = CallGetService(kUnicharUtilCID, &t);
if(NS_FAILED(res) || ( t == NULL ) ) {
printf("\t2nd GetService failed\n");
} else {
int i;
PRUnichar ch;
PRUnichar buf[256];
int i;
PRUnichar buf[256];
printf("Test 2 - ToUpper(PRUnichar, PRUnichar*):\n");
for(i=0;i < T2LEN ; i++)
{
res = t->ToUpper(t2data[i], &ch);
if(NS_FAILED(res)) {
printf("\tFailed!! return value != NS_OK\n");
break;
}
if(ch != t2result[i])
printf("\tFailed!! result unexpected %d\n", i);
printf("Test 2 - ToUpper(PRUnichar, PRUnichar*):\n");
for(i=0;i < T2LEN ; i++)
{
PRUnichar ch = ToUpperCase(t2data[i]);
if(ch != t2result[i])
printf("\tFailed!! result unexpected %d\n", i);
}
printf("Test 3 - ToLower(PRUnichar, PRUnichar*):\n");
for(i=0;i < T3LEN; i++)
{
PRUnichar ch = ToLowerCase(t3data[i]);
if(ch != t3result[i])
printf("\tFailed!! result unexpected %d\n", i);
}
printf("Test 4 - ToTitle(PRUnichar, PRUnichar*):\n");
for(i=0;i < T4LEN; i++)
{
PRUnichar ch = ToTitleCase(t4data[i]);
if(ch != t4result[i])
printf("\tFailed!! result unexpected %d\n", i);
}
printf("Test 5 - ToUpper(PRUnichar*, PRUnichar*, PRUint32):\n");
ToUpperCase(t2data, buf, T2LEN);
for(i = 0; i < T2LEN; i++)
{
if(buf[i] != t2result[i])
{
printf("\tFailed!! result unexpected %d\n", i);
break;
}
}
printf("Test 3 - ToLower(PRUnichar, PRUnichar*):\n");
for(i=0;i < T3LEN; i++)
{
res = t->ToLower(t3data[i], &ch);
if(NS_FAILED(res)) {
printf("\tFailed!! return value != NS_OK\n");
break;
}
if(ch != t3result[i])
printf("\tFailed!! result unexpected %d\n", i);
printf("Test 6 - ToLower(PRUnichar*, PRUnichar*, PRUint32):\n");
ToLowerCase(t3data, buf, T3LEN);
for(i = 0; i < T3LEN; i++)
{
if(buf[i] != t3result[i])
{
printf("\tFailed!! result unexpected %d\n", i);
break;
}
}
printf("Test 4 - ToTitle(PRUnichar, PRUnichar*):\n");
for(i=0;i < T4LEN; i++)
{
res = t->ToTitle(t4data[i], &ch);
if(NS_FAILED(res)) {
printf("\tFailed!! return value != NS_OK\n");
break;
}
if(ch != t4result[i])
printf("\tFailed!! result unexpected %d\n", i);
}
printf("Test 5 - ToUpper(PRUnichar*, PRUnichar*, PRUint32):\n");
res = t->ToUpper(t2data, buf, T2LEN);
if(NS_FAILED(res)) {
printf("\tFailed!! return value != NS_OK\n");
} else {
for(i = 0; i < T2LEN; i++)
{
if(buf[i] != t2result[i])
{
printf("\tFailed!! result unexpected %d\n", i);
break;
}
}
}
printf("Test 6 - ToLower(PRUnichar*, PRUnichar*, PRUint32):\n");
res = t->ToLower(t3data, buf, T3LEN);
if(NS_FAILED(res)) {
printf("\tFailed!! return value != NS_OK\n");
} else {
for(i = 0; i < T3LEN; i++)
{
if(buf[i] != t3result[i])
{
printf("\tFailed!! result unexpected %d\n", i);
break;
}
}
}
NS_RELEASE(t);
}
printf("==============================\n");
printf("Finish nsICaseConversion Test \n");
printf("==============================\n");
printf("===========================\n");
printf("Finish case conversion test\n");
printf("===========================\n");
}
static void TestEntityConversion(PRUint32 version)