organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 22:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-829 Various porting changes

Browse source 
X-SVN-Rev: 3512
This commit is contained in:
George Rhoten 2001-01-31 22:42:21 +00:00
parent 784c953388
commit 26a05deb08
2 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
icu4c/source/test/cintltst/cucdtst.c
View file

@ -28,24 +28,7 @@
#include "cucdtst.h"
#include "uparse.h"
/* prototypes --------------------------------------------------------------- */
static void
TestCharNames();
static void
TestMirroring();
static void
TestUnescape();
static void
TestCaseMapping();
/* test data ---------------------------------------------------------------- */
#ifndef MIN
#define MIN(a,b) (a < b ? a : b)
#endif
UChar*** dataTable = NULL;
const UChar LAST_CHAR_CODE_IN_FILE = 0xFFFD;
@ -321,7 +304,7 @@ static void TestMisc()
/* Tests the ICU version #*/
u_getVersion(realVersion);
u_versionToString(realVersion, icuVersion);
if (strncmp(icuVersion, U_ICU_VERSION, MIN(strlen(icuVersion), strlen(U_ICU_VERSION))) != 0)
if (strncmp(icuVersion, U_ICU_VERSION, uprv_min(strlen(icuVersion), strlen(U_ICU_VERSION))) != 0)
{
log_err("ICU version test failed. Header says=%s, got=%s \n", U_ICU_VERSION, icuVersion);
}
@ -678,9 +661,9 @@ static void cleanUpDataTable()
static void TestStringFunctions()
{
int32_t i,j,k;
UChar temp[40];
char test[40];
char tempOut[40];
UChar temp[512];
char test[512];
char tempOut[512];
setUpDataTable();
@ -773,17 +756,17 @@ static void TestStringFunctions()
log_verbose("Testing u_strtok_r()");
{
const char string[] = " , 1 2 3 AHHHHH! 5.5 6 7 , 8\n";
const char tokString[] = " , 1 2 3 AHHHHH! 5.5 6 7 , 8\n";
const char *tokens[] = {",", "1", "2", "3", "AHHHHH!", "5.5", "6", "7", "8\n"};
const char *delim1 = " ";
const char *delim2 = " ,";
UChar delimBuf[sizeof(string)];
UChar currTokenBuf[sizeof(string)];
UChar delimBuf[sizeof(test)];
UChar currTokenBuf[sizeof(tokString)];
UChar *state;
uint32_t currToken = 0;
UChar *ptr;
u_uastrcpy(temp, string);
u_uastrcpy(temp, tokString);
u_uastrcpy(delimBuf, delim1);
ptr = u_strtok_r(temp, delimBuf, &state);

6
icu4c/source/test/cintltst/cucdtst.h
View file

@ -15,7 +15,7 @@
/* C API TEST For Unicode */
#ifndef _CUCDTST
#define _CUNDTST
#define _CUCDTST
static void setUpDataTable(void);
@ -30,6 +30,10 @@ static void TestUnicodeData(void);
static void TestStringCopy(void);
static void TestStringFunctions(void);
static void TestStringSearching(void);
static void TestCharNames(void);
static void TestMirroring(void);
static void TestUnescape(void);
static void TestCaseMapping(void);
/* internal methods used */
static int32_t MakeProp(char* str);