ICU-400.38.tar.gz

[apple/icu.git] / icuSources / test / cintltst / spreptst.c

diff --git a/icuSources/test/cintltst/spreptst.c b/icuSources/test/cintltst/spreptst.c
index b68bc47cf69df9ef4d824c449e5ac86f538b85c9..8a2fa96805bc509a2908282ccac9b19bb33e2286 100644 (file)
--- a/icuSources/test/cintltst/spreptst.c
+++ b/icuSources/test/cintltst/spreptst.c
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
  *
 /*
  *******************************************************************************
  *

- *   Copyright (C) 2003-2006, International Business Machines
+ *   Copyright (C) 2003-2008, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************


@@ -56,6 +56,12 @@ addUStringPrepTest(TestNode** root)
 static void 
 Test_nfs4_cs_prep_data(void){
     UErrorCode errorCode = U_ZERO_ERROR;
 static void 
 Test_nfs4_cs_prep_data(void){
     UErrorCode errorCode = U_ZERO_ERROR;

+    loadTestData(&errorCode);
+    if(U_FAILURE(errorCode)) {
+        log_data_err("Could not load testdata.dat, status = %s\n", u_errorName(errorCode));
+        return;
+    }
+

     log_verbose("Testing nfs4_cs_prep_ci.txt\n");
     doStringPrepTest("nfscsi","nfs4_cs_prep_ci.txt", USPREP_DEFAULT, &errorCode);
 
     log_verbose("Testing nfs4_cs_prep_ci.txt\n");
     doStringPrepTest("nfscsi","nfs4_cs_prep_ci.txt", USPREP_DEFAULT, &errorCode);
 


@@ -74,6 +80,12 @@ Test_nfs4_cis_prep_data(void){
 static void 
 Test_nfs4_mixed_prep_data(void){
     UErrorCode errorCode = U_ZERO_ERROR;
 static void 
 Test_nfs4_mixed_prep_data(void){
     UErrorCode errorCode = U_ZERO_ERROR;

+    loadTestData(&errorCode);
+    if(U_FAILURE(errorCode)) {
+        log_data_err("Could not load testdata.dat, status = %s\n", u_errorName(errorCode));
+        return;
+    }
+

     log_verbose("Testing nfs4_mixed_prep_s.txt\n");
     doStringPrepTest("nfsmxs","nfs4_mixed_prep_s.txt", USPREP_DEFAULT, &errorCode);
 
     log_verbose("Testing nfs4_mixed_prep_s.txt\n");
     doStringPrepTest("nfsmxs","nfs4_mixed_prep_s.txt", USPREP_DEFAULT, &errorCode);
 


@@ -83,7 +95,7 @@ Test_nfs4_mixed_prep_data(void){
 
 }
 
 
 }
 

-static struct ConformanceTestCases
+static const struct ConformanceTestCases

    {
      const char *comment;
      const char *in;
    {
      const char *comment;
      const char *in;


@@ -297,7 +309,7 @@ static void Test_nfs4_cis_prep(void){
     UErrorCode loadStatus = U_ZERO_ERROR;
     loadTestData(&loadStatus);
     if (U_FAILURE(loadStatus)) {
     UErrorCode loadStatus = U_ZERO_ERROR;
     loadTestData(&loadStatus);
     if (U_FAILURE(loadStatus)) {

-        log_err("Test could not initialize. Got %s\n", u_errorName(loadStatus));
+        log_data_err("Test could not initialize. Got %s\n", u_errorName(loadStatus));

         return;
     }
 
         return;
     }
 


@@ -416,7 +428,7 @@ Test_nfs4_mixed_prep(void){
     UErrorCode loadStatus = U_ZERO_ERROR;
     loadTestData(&loadStatus);
     if (U_FAILURE(loadStatus)) {
     UErrorCode loadStatus = U_ZERO_ERROR;
     loadTestData(&loadStatus);
     if (U_FAILURE(loadStatus)) {

-        log_err("Test could not initialize. Got %s\n", u_errorName(loadStatus));
+        log_data_err("Test could not initialize. Got %s\n", u_errorName(loadStatus));

         return;
     }
 
         return;
     }
 


@@ -470,6 +482,13 @@ Test_nfs4_mixed_prep(void){
 
 static void 
 Test_nfs4_cs_prep(void){
 
 static void 
 Test_nfs4_cs_prep(void){

+    UErrorCode errorCode = U_ZERO_ERROR;
+    loadTestData(&errorCode);
+    if(U_FAILURE(errorCode)) {
+        log_data_err("Could not load testdata.dat, status = %s\n", u_errorName(errorCode));
+        return;
+    }
+

     {
         /* BiDi checking is turned off */
         const char *source = "\\uC138\\uACC4\\uC758\\uBAA8\\uB4E0\\uC0AC\\uB78C\\uB4E4\\uC774\\u0644\\u064A\\u0647\\uD55C\\uAD6D\\uC5B4\\uB97C\\uC774\\uD574\\uD55C\\uB2E4\\uBA74";
     {
         /* BiDi checking is turned off */
         const char *source = "\\uC138\\uACC4\\uC758\\uBAA8\\uB4E0\\uC0AC\\uB78C\\uB4E4\\uC774\\u0644\\u064A\\u0647\\uD55C\\uAD6D\\uC5B4\\uB97C\\uC774\\uD574\\uD55C\\uB2E4\\uBA74";


@@ -577,6 +596,10 @@ static void TestBEAMWarning(){
     const char *testdatapath = NULL;
     UChar src =0x0000;
     testdatapath = loadTestData(&status);
     const char *testdatapath = NULL;
     UChar src =0x0000;
     testdatapath = loadTestData(&status);

+    if(U_FAILURE(status)) {
+        log_data_err("Could not load testdata.dat, status = %s\n", u_errorName(status));
+        return;
+    }

     /* open the profile */
     profile = usprep_open(testdatapath, "nfscis",  &status);
     usprep_prepare(profile,&src , 0, NULL, 0, USPREP_DEFAULT, &parseError, &status);
     /* open the profile */
     profile = usprep_open(testdatapath, "nfscis",  &status);
     usprep_prepare(profile,&src , 0, NULL, 0, USPREP_DEFAULT, &parseError, &status);