ICU-511.34.tar.gz

[apple/icu.git] / icuSources / test / intltest / transapi.cpp

diff --git a/icuSources/test/intltest/transapi.cpp b/icuSources/test/intltest/transapi.cpp
index 5146784c22c3dffdb5cff614639629f69f96ef47..24317ca8adfbda76b504cf4ef1588df15843713f 100644 (file)
--- a/icuSources/test/intltest/transapi.cpp
+++ b/icuSources/test/intltest/transapi.cpp
@@ -1,8 +1,8 @@
-/********************************************************************
+/************************************************************************

  * COPYRIGHT: 
  * COPYRIGHT: 

- * Copyright (c) 2000-2003, International Business Machines Corporation and
- * others. All Rights Reserved.
- ********************************************************************/
+ * Copyright (c) 2000-2009, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ ************************************************************************/

 /************************************************************************
 *   Date        Name        Description
 *   1/03/2000   Madhu        Creation.
 /************************************************************************
 *   Date        Name        Description
 *   1/03/2000   Madhu        Creation.


@@ -16,15 +16,14 @@
 #include "transapi.h"
 #include "unicode/utypes.h"
 #include "unicode/translit.h"
 #include "transapi.h"
 #include "unicode/utypes.h"
 #include "unicode/translit.h"

-#include "rbt.h"

 #include "unicode/unifilt.h"
 #include "cpdtrans.h"
 #include "unicode/unifilt.h"
 #include "cpdtrans.h"

-#include "nultrans.h"

 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "unicode/rep.h"
 #include "unicode/locid.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "unicode/rep.h"
 #include "unicode/locid.h"

+#include "unicode/uniset.h"

 
 int32_t getInt(UnicodeString str)
 {
 
 int32_t getInt(UnicodeString str)
 {


@@ -60,6 +59,7 @@ TransliteratorAPITest::runIndexedTest(int32_t index, UBool exec,
         TESTCASE(11,TestClone);
         TESTCASE(12,TestNullTransliterator);
         TESTCASE(13,TestRegisterUnregister);
         TESTCASE(11,TestClone);
         TESTCASE(12,TestNullTransliterator);
         TESTCASE(13,TestRegisterUnregister);

+        TESTCASE(14,TestUnicodeFunctor);

         default: name = ""; break;
     }
 }
         default: name = ""; break;
     }
 }


@@ -72,7 +72,7 @@ void TransliteratorAPITest::TestgetID() {
     UErrorCode status = U_ZERO_ERROR;
     Transliterator* t= Transliterator::createInstance(trans, UTRANS_FORWARD, parseError, status);
     if(t==0 || U_FAILURE(status)){
     UErrorCode status = U_ZERO_ERROR;
     Transliterator* t= Transliterator::createInstance(trans, UTRANS_FORWARD, parseError, status);
     if(t==0 || U_FAILURE(status)){

-        errln("FAIL: construction of Latin-Greek");
+        dataerrln("FAIL: construction of Latin-Greek -  %s",u_errorName(status));

         return;
     }else{
         ID= t->getID();
         return;
     }else{
         ID= t->getID();


@@ -84,6 +84,9 @@ void TransliteratorAPITest::TestgetID() {
     for (i=0; i<Transliterator::countAvailableIDs(); i++){
         status = U_ZERO_ERROR;
         ID = (UnicodeString) Transliterator::getAvailableID(i);
     for (i=0; i<Transliterator::countAvailableIDs(); i++){
         status = U_ZERO_ERROR;
         ID = (UnicodeString) Transliterator::getAvailableID(i);

+        if(ID.indexOf("Thai")>-1){
+            continue;
+        }   

         t = Transliterator::createInstance(ID, UTRANS_FORWARD, parseError, status);
         if(t == 0){
             errln("FAIL: " + ID);
         t = Transliterator::createInstance(ID, UTRANS_FORWARD, parseError, status);
         if(t == 0){
             errln("FAIL: " + ID);


@@ -116,7 +119,7 @@ void TransliteratorAPITest::TestgetID() {
     Transliterator* t5=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
     if(t5 == 0)
         errln("FAIL: construction");
     Transliterator* t5=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
     if(t5 == 0)
         errln("FAIL: construction");

-    if(t1->getID() != t5->getID() || t5->getID() != t3->getID() || t1->getID() != t3->getID())
+    else if(t1->getID() != t5->getID() || t5->getID() != t3->getID() || t1->getID() != t3->getID())

         errln("FAIL: getID or clone failed");
 
 
         errln("FAIL: getID or clone failed");
 
 


@@ -135,7 +138,7 @@ void TransliteratorAPITest::TestgetInverse() {
      Transliterator* t2    = Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
      Transliterator* invt2 = Transliterator::createInstance("Devanagari-Latin", UTRANS_FORWARD, parseError, status);
      if(t1 == 0 || invt1 == 0 || t2 == 0 || invt2 == 0) {
      Transliterator* t2    = Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
      Transliterator* invt2 = Transliterator::createInstance("Devanagari-Latin", UTRANS_FORWARD, parseError, status);
      if(t1 == 0 || invt1 == 0 || t2 == 0 || invt2 == 0) {

-         errln("FAIL: in instantiation");
+         dataerrln("FAIL: in instantiation - %s", u_errorName(status));

          return;
      }
 
          return;
      }
 


@@ -191,7 +194,7 @@ void TransliteratorAPITest::TestClone(){
     t1=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
     t2=Transliterator::createInstance("Latin-Greek", UTRANS_FORWARD, parseError, status);
     if(t1 == 0 || t2 == 0){
     t1=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
     t2=Transliterator::createInstance("Latin-Greek", UTRANS_FORWARD, parseError, status);
     if(t1 == 0 || t2 == 0){

-        errln("FAIL: construction");
+        dataerrln("FAIL: construction - %s", u_errorName(status));

         return;
     }
     t3=t1->clone();
         return;
     }
     t3=t1->clone();


@@ -240,7 +243,7 @@ void TransliteratorAPITest::TestGetDisplayName() {
     for (uint32_t i=0; i<sizeof(dispNames)/sizeof(dispNames[0]); i=i+2 ) {
         t = Transliterator::createInstance(dispNames[i+0], UTRANS_FORWARD, parseError, status);
         if(t==0){
     for (uint32_t i=0; i<sizeof(dispNames)/sizeof(dispNames[0]); i=i+2 ) {
         t = Transliterator::createInstance(dispNames[i+0], UTRANS_FORWARD, parseError, status);
         if(t==0){

-             errln("FAIL: construction: " + dispNames[i+0]);
+             dataerrln("FAIL: construction: " + dispNames[i+0] + " - " + u_errorName(status));

              status = U_ZERO_ERROR;
              continue;
         }
              status = U_ZERO_ERROR;
              continue;
         }


@@ -271,7 +274,7 @@ void TransliteratorAPITest::TestTransliterate1(){
          "Latin-Devanagari",CharsToUnicodeString("bha\\u0304rata"), CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924") ,
          "Latin-Devanagari",UnicodeString("kra ksha khra gra cra dya dhya",""), CharsToUnicodeString("\\u0915\\u094D\\u0930 \\u0915\\u094D\\u0936 \\u0916\\u094D\\u0930 \\u0917\\u094D\\u0930 \\u091a\\u094D\\u0930 \\u0926\\u094D\\u092F \\u0927\\u094D\\u092F") ,
 
          "Latin-Devanagari",CharsToUnicodeString("bha\\u0304rata"), CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924") ,
          "Latin-Devanagari",UnicodeString("kra ksha khra gra cra dya dhya",""), CharsToUnicodeString("\\u0915\\u094D\\u0930 \\u0915\\u094D\\u0936 \\u0916\\u094D\\u0930 \\u0917\\u094D\\u0930 \\u091a\\u094D\\u0930 \\u0926\\u094D\\u092F \\u0927\\u094D\\u092F") ,
 

-         "Devanagari-Latin",    CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"),        UnicodeString("bh\\u0101rata"),
+         "Devanagari-Latin",    CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"),        CharsToUnicodeString("bh\\u0101rata"),

      //  "Contracted-Expanded", CharsToUnicodeString("\\u00C0\\u00C1\\u0042"),               CharsToUnicodeString("\\u0041\\u0300\\u0041\\u0301\\u0042") ,
      //  "Expanded-Contracted", CharsToUnicodeString("\\u0041\\u0300\\u0041\\u0301\\u0042"), CharsToUnicodeString("\\u00C0\\u00C1\\u0042") ,
          //"Latin-Arabic",        "aap",                                 CharsToUnicodeString("\\u0627\\u06A4")     ,
      //  "Contracted-Expanded", CharsToUnicodeString("\\u00C0\\u00C1\\u0042"),               CharsToUnicodeString("\\u0041\\u0300\\u0041\\u0301\\u0042") ,
      //  "Expanded-Contracted", CharsToUnicodeString("\\u0041\\u0300\\u0041\\u0301\\u0042"), CharsToUnicodeString("\\u00C0\\u00C1\\u0042") ,
          //"Latin-Arabic",        "aap",                                 CharsToUnicodeString("\\u0627\\u06A4")     ,


@@ -289,8 +292,8 @@ void TransliteratorAPITest::TestTransliterate1(){
     for(uint32_t i=0;i<sizeof(Data)/sizeof(Data[0]); i=i+3){
         t=Transliterator::createInstance(Data[i+0], UTRANS_FORWARD, parseError, status);
         if(t==0){
     for(uint32_t i=0;i<sizeof(Data)/sizeof(Data[0]); i=i+3){
         t=Transliterator::createInstance(Data[i+0], UTRANS_FORWARD, parseError, status);
         if(t==0){

-            errln("FAIL: construction: " + Data[i+0] + " Error: "  + u_errorName(status));
-            errln("PreContext: " + prettify(parseError.preContext) + " PostContext: " + prettify( parseError.postContext) );
+            dataerrln("FAIL: construction: " + Data[i+0] + " Error: "  + u_errorName(status));
+            dataerrln("PreContext: " + prettify(parseError.preContext) + " PostContext: " + prettify( parseError.postContext) );

             status = U_ZERO_ERROR;
             continue;
         }
             status = U_ZERO_ERROR;
             continue;
         }


@@ -308,6 +311,7 @@ void TransliteratorAPITest::TestTransliterate1(){
         message.append(Data[i][1]);
         doTest(message, temp, Data[i+2]);
 
         message.append(Data[i][1]);
         doTest(message, temp, Data[i+2]);
 

+        callEverything(t, __LINE__);

         delete t;
     }
 }
         delete t;
     }
 }


@@ -321,7 +325,7 @@ void TransliteratorAPITest::TestTransliterate2(){
          "Hex-Any",         CharsToUnicodeString("\\u0068\\u0065\\u006C\\u006C\\u006F\\u0021\\u0020"), "0", "5",  "hello", "hello! "  ,
        //  "Contracted-Expanded", CharsToUnicodeString("\\u00C0\\u00C1\\u0042"),        "1", "2",  CharsToUnicodeString("\\u0041\\u0301"), CharsToUnicodeString("\\u00C0\\u0041\\u0301\\u0042") ,
          "Devanagari-Latin",    CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "0", "1",  "bha", CharsToUnicodeString("bha\\u093E\\u0930\\u0924") ,
          "Hex-Any",         CharsToUnicodeString("\\u0068\\u0065\\u006C\\u006C\\u006F\\u0021\\u0020"), "0", "5",  "hello", "hello! "  ,
        //  "Contracted-Expanded", CharsToUnicodeString("\\u00C0\\u00C1\\u0042"),        "1", "2",  CharsToUnicodeString("\\u0041\\u0301"), CharsToUnicodeString("\\u00C0\\u0041\\u0301\\u0042") ,
          "Devanagari-Latin",    CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "0", "1",  "bha", CharsToUnicodeString("bha\\u093E\\u0930\\u0924") ,

-         "Devanagari-Latin",    CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "1", "2",  "\\u0314\\u0101", CharsToUnicodeString("\\u092D\\u0314\\u0101\\u0930\\u0924")  
+         "Devanagari-Latin",    CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "1", "2",  CharsToUnicodeString("\\u0314\\u0101"), CharsToUnicodeString("\\u092D\\u0314\\u0101\\u0930\\u0924")  

 
     };
     logln("\n   Testing transliterate(String, int, int, StringBuffer)");
 
     };
     logln("\n   Testing transliterate(String, int, int, StringBuffer)");


@@ -335,7 +339,7 @@ void TransliteratorAPITest::TestTransliterate2(){
     for(uint32_t i=0; i<sizeof(Data2)/sizeof(Data2[0]); i=i+6){
         t=Transliterator::createInstance(Data2[i+0], UTRANS_FORWARD, parseError, status);
         if(t==0){
     for(uint32_t i=0; i<sizeof(Data2)/sizeof(Data2[0]); i=i+6){
         t=Transliterator::createInstance(Data2[i+0], UTRANS_FORWARD, parseError, status);
         if(t==0){

-            errln("FAIL: construction: " + prettify(Data2[i+0]));
+            dataerrln("FAIL: construction: " + prettify(Data2[i+0]) + " - " + u_errorName(status));

             continue;
         }
         start=getInt(Data2[i+2]);
             continue;
         }
         start=getInt(Data2[i+2]);


@@ -349,6 +353,7 @@ void TransliteratorAPITest::TestTransliterate2(){
         t->transliterate(temp, start, limit);
         doTest(t->getID() + ".transliterate(Replaceable, int32_t, int32_t, ):(" + start + "," + limit + ")  for \n\t source: " + prettify(Data2[i+1]), temp, Data2[i+5]);
         status = U_ZERO_ERROR;
         t->transliterate(temp, start, limit);
         doTest(t->getID() + ".transliterate(Replaceable, int32_t, int32_t, ):(" + start + "," + limit + ")  for \n\t source: " + prettify(Data2[i+1]), temp, Data2[i+5]);
         status = U_ZERO_ERROR;

+        callEverything(t, __LINE__);

         delete t;
         t = NULL;
     }
         delete t;
         t = NULL;
     }


@@ -363,11 +368,13 @@ void TransliteratorAPITest::TestTransliterate2(){
     }
     gotResBuf = temp = "try start greater than limit";
     t->transliterate(gotResBuf, 10, 5);
     }
     gotResBuf = temp = "try start greater than limit";
     t->transliterate(gotResBuf, 10, 5);

-    if(gotResBuf == temp)
+    if(gotResBuf == temp) {

         logln("OK: start greater than limit value handled correctly");
         logln("OK: start greater than limit value handled correctly");

-    else
+    } else {

         errln("FAIL: start greater than limit value returned" + gotResBuf);
         errln("FAIL: start greater than limit value returned" + gotResBuf);

+    }

 
 

+    callEverything(t, __LINE__);

     delete t;
 
 }
     delete t;
 
 }


@@ -408,12 +415,16 @@ void TransliteratorAPITest::TestSimpleKeyboardTransliterator(){
     UParseError parseError;
     Transliterator* t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
     if(t == 0) {
     UParseError parseError;
     Transliterator* t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
     if(t == 0) {

+        UnicodeString context;
+
+        if (parseError.preContext[0]) {
+            context += (UnicodeString)" at " + parseError.preContext;
+        }
+        if (parseError.postContext[0]) {
+            context += (UnicodeString)" | " + parseError.postContext;
+        }

         errln((UnicodeString)"FAIL: can't create Any-Hex, " +
         errln((UnicodeString)"FAIL: can't create Any-Hex, " +

-              (UnicodeString)u_errorName(status) +
-              (parseError.preContext[0] ?
-               ((UnicodeString)" at " + parseError.preContext +
-                (parseError.postContext[0] ?
-                 ((UnicodeString)" | " + parseError.postContext) : (UnicodeString)"")) : (UnicodeString)""));
+              (UnicodeString)u_errorName(status) + context);

         return;
     }
     UTransPosition index={19,20,20,20};
         return;
     }
     UTransPosition index={19,20,20,20};


@@ -543,7 +554,7 @@ void TransliteratorAPITest::TestKeyboardTransliterator2(){
     rs="Initial String: add--";
     t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
     if(t == 0)
     rs="Initial String: add--";
     t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
     if(t == 0)

-        errln("FAIL : construction");
+        dataerrln("FAIL : construction - %s", u_errorName(status));

     else {
         keyboardAux(t, Data, rs, 0, 20);
         delete t;
     else {
         keyboardAux(t, Data, rs, 0, 20);
         delete t;


@@ -552,7 +563,7 @@ void TransliteratorAPITest::TestKeyboardTransliterator2(){
     rs="Hindi --";
     t=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
     if(t == 0)
     rs="Hindi --";
     t=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
     if(t == 0)

-        errln("FAIL : construction");
+        dataerrln("FAIL : construction - %s", u_errorName(status));

     else
         keyboardAux(t, Data, rs, 20, 40);
 
     else
         keyboardAux(t, Data, rs, 20, 40);
 


@@ -578,13 +589,11 @@ void TransliteratorAPITest::TestKeyboardTransliterator3(){
     UTransPosition index={0, 0, 0, 0};
     logln("Testing transliterate(Replaceable, int32_t, UErrorCode)");
     Transliterator *t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
     UTransPosition index={0, 0, 0, 0};
     logln("Testing transliterate(Replaceable, int32_t, UErrorCode)");
     Transliterator *t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);

-    if(U_FAILURE(status)) {
+    if(t == 0 || U_FAILURE(status)) {

       errln("Error creating transliterator %s", u_errorName(status));
       delete t;
       return;
     }
       errln("Error creating transliterator %s", u_errorName(status));
       delete t;
       return;
     }

-    if(t == 0)
-        errln("FAIL : construction");

     for(uint32_t i=0; i<sizeof(Data)/sizeof(Data[0]); i=i+4){
         UnicodeString log;
         index.contextStart=getInt(Data[i+0]);
     for(uint32_t i=0; i<sizeof(Data)/sizeof(Data[0]); i=i+4){
         UnicodeString log;
         index.contextStart=getInt(Data[i+0]);


@@ -604,8 +613,9 @@ void TransliteratorAPITest::TestKeyboardTransliterator3(){
     delete t;
 }
 void TransliteratorAPITest::TestNullTransliterator(){
     delete t;
 }
 void TransliteratorAPITest::TestNullTransliterator(){

+    UErrorCode status=U_ZERO_ERROR;

     UnicodeString s("Transliterate using null transliterator");
     UnicodeString s("Transliterate using null transliterator");

-    NullTransliterator *nullTrans=new NullTransliterator();
+    Transliterator *nullTrans=Transliterator::createInstance("Any-Null", UTRANS_FORWARD, status);

     int32_t transLimit;
     int32_t start=0;
     int32_t limit=s.length();
     int32_t transLimit;
     int32_t start=0;
     int32_t limit=s.length();


@@ -622,11 +632,12 @@ void TransliteratorAPITest::TestNullTransliterator(){
     index.contextLimit = limit;
     index.start = 0;
     index.limit = limit;
     index.contextLimit = limit;
     index.start = 0;
     index.limit = limit;

-    nullTrans->handleTransliterate(replaceable, index, TRUE);
+    nullTrans->finishTransliteration(replaceable, index);

     if(index.start != limit){
         errln("ERROR: NullTransliterator->handleTransliterate() failed");
     }
     doTest((UnicodeString)"NullTransliterator->handleTransliterate", replaceable, s);
     if(index.start != limit){
         errln("ERROR: NullTransliterator->handleTransliterate() failed");
     }
     doTest((UnicodeString)"NullTransliterator->handleTransliterate", replaceable, s);

+    callEverything(nullTrans, __LINE__);

     delete nullTrans;
 
     
     delete nullTrans;
 
     


@@ -634,9 +645,8 @@ void TransliteratorAPITest::TestNullTransliterator(){
 void TransliteratorAPITest::TestRegisterUnregister(){
    
    UErrorCode status=U_ZERO_ERROR;
 void TransliteratorAPITest::TestRegisterUnregister(){
    
    UErrorCode status=U_ZERO_ERROR;

-   UParseError parseError;

     /* Make sure it doesn't exist */
     /* Make sure it doesn't exist */

-   if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, parseError, status) != NULL) {
+   if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, status) != NULL) {

       errln("FAIL: TestA-TestB already registered\n");
       return;
    }
       errln("FAIL: TestA-TestB already registered\n");
       return;
    }


@@ -650,18 +660,22 @@ void TransliteratorAPITest::TestRegisterUnregister(){
    status =U_ZERO_ERROR;
 
    /* Create it */
    status =U_ZERO_ERROR;
 
    /* Create it */

-   Transliterator *t = new RuleBasedTransliterator("TestA-TestB",
+   UParseError parseError;
+   Transliterator *t = Transliterator::createFromRules("TestA-TestB",

                                                    "a<>b",
                                                    "a<>b",

+                                                   UTRANS_FORWARD, parseError,

                                                    status);
    /* Register it */
    Transliterator::registerInstance(t);
 
    /* Now check again -- should exist now*/
                                                    status);
    /* Register it */
    Transliterator::registerInstance(t);
 
    /* Now check again -- should exist now*/

-   Transliterator *s = Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, parseError, status);
+   Transliterator *s = Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, status);

    if (s == NULL) {
       errln("FAIL: TestA-TestB not registered\n");
       return;
    }
    if (s == NULL) {
       errln("FAIL: TestA-TestB not registered\n");
       return;
    }

+   callEverything(s, __LINE__);
+   callEverything(t, __LINE__);

    delete s;
    
    /* Check inverse too
    delete s;
    
    /* Check inverse too


@@ -677,7 +691,7 @@ void TransliteratorAPITest::TestRegisterUnregister(){
    /*unregister the instance*/
    Transliterator::unregister("TestA-TestB");
    /* now Make sure it doesn't exist */
    /*unregister the instance*/
    Transliterator::unregister("TestA-TestB");
    /* now Make sure it doesn't exist */

-   if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, parseError, status) != NULL) {
+   if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, status) != NULL) {

       errln("FAIL: TestA-TestB isn't unregistered\n");
       return;
    }
       errln("FAIL: TestA-TestB isn't unregistered\n");
       return;
    }


@@ -761,18 +775,18 @@ void TransliteratorAPITest::TestGetAdoptFilter(){
     UErrorCode status = U_ZERO_ERROR;
     UParseError parseError;
     Transliterator *t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
     UErrorCode status = U_ZERO_ERROR;
     UParseError parseError;
     Transliterator *t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);

-    if(U_FAILURE(status)) {
-      errln("Error creating transliterator %s", u_errorName(status));
-      delete t;
-      return;
+    if(t == 0 || U_FAILURE(status)) {
+        errln("Error creating transliterator %s", u_errorName(status));
+        delete t;
+        return;

     }
     }

-    if(t == 0)
-        errln("FAIL : construction");

     const UnicodeFilter *u=t->getFilter();
     if(u != NULL){
     const UnicodeFilter *u=t->getFilter();
     if(u != NULL){

-      errln("FAIL: getFilter failed. Didn't return null when the transliterator used no filtering");
+        errln("FAIL: getFilter failed. Didn't return null when the transliterator used no filtering");
+        delete t;
+        return;

     }
     }

-          
+

     UnicodeString got, temp, message;
     UnicodeString data="ABCabcbbCBa";
     temp = data;
     UnicodeString got, temp, message;
     UnicodeString data="ABCabcbbCBa";
     temp = data;


@@ -801,6 +815,7 @@ void TransliteratorAPITest::TestGetAdoptFilter(){
     doTest("adoptFilter round trip", got, temp);
 
     t->adoptFilter(new TestFilter2);
     doTest("adoptFilter round trip", got, temp);
 
     t->adoptFilter(new TestFilter2);

+    callEverything(t, __LINE__);

     data="heelloe";
     exp=UnicodeString("\\u0068eell\\u006Fe", "");
     got = data;
     data="heelloe";
     exp=UnicodeString("\\u0068eell\\u006Fe", "");
     got = data;


@@ -887,7 +902,83 @@ void TransliteratorAPITest::doTest(const UnicodeString& message, const UnicodeSt
     if (prettify(result) == prettify(expected)) 
         logln((UnicodeString)"Ok: " + prettify(message) + " passed \"" + prettify(expected) + "\"");
     else 
     if (prettify(result) == prettify(expected)) 
         logln((UnicodeString)"Ok: " + prettify(message) + " passed \"" + prettify(expected) + "\"");
     else 

-        errln((UnicodeString)"FAIL:" + message + " failed  Got-->" + prettify(result)+ ", Expected--> " + prettify(expected) );
+        dataerrln((UnicodeString)"FAIL:" + message + " failed  Got-->" + prettify(result)+ ", Expected--> " + prettify(expected) );
+}
+
+
+//
+//  callEverything    call all of the const (non-destructive) methods on a
+//                    transliterator, just to verify that they don't fail in some
+//                    destructive way.
+//
+#define CEASSERT(a) {if (!(a)) { \
+errln("FAIL at line %d from line %d: %s", __LINE__, line, #a);  return; }}
+
+void TransliteratorAPITest::callEverything(const Transliterator *tr, int line) {
+    Transliterator *clonedTR = tr->clone();
+    CEASSERT(clonedTR != NULL);
+
+    int32_t  maxcl = tr->getMaximumContextLength();
+    CEASSERT(clonedTR->getMaximumContextLength() == maxcl);
+
+    UnicodeString id;
+    UnicodeString clonedId;
+    id = tr->getID();
+    clonedId = clonedTR->getID();
+    CEASSERT(id == clonedId);
+
+    const UnicodeFilter *filter = tr->getFilter();
+    const UnicodeFilter *clonedFilter = clonedTR->getFilter();
+    if (filter == NULL || clonedFilter == NULL) {
+        // If one filter is NULL they better both be NULL.
+        CEASSERT(filter == clonedFilter);
+    } else {
+        CEASSERT(filter != clonedFilter);
+    }
+
+    UnicodeString rules;
+    UnicodeString clonedRules;
+    rules = tr->toRules(rules, FALSE);
+    clonedRules = clonedTR->toRules(clonedRules, FALSE);
+    CEASSERT(rules == clonedRules);
+
+    UnicodeSet sourceSet;
+    UnicodeSet clonedSourceSet;
+    tr->getSourceSet(sourceSet);
+    clonedTR->getSourceSet(clonedSourceSet);
+    CEASSERT(clonedSourceSet == sourceSet);
+
+    UnicodeSet targetSet;
+    UnicodeSet clonedTargetSet;
+    tr->getTargetSet(targetSet);
+    clonedTR->getTargetSet(clonedTargetSet);
+    CEASSERT(targetSet == clonedTargetSet);
+
+    UClassID classID = tr->getDynamicClassID();
+    CEASSERT(classID == clonedTR->getDynamicClassID());
+    CEASSERT(classID != 0);
+
+    delete clonedTR;

 }
 
 }
 

+static const int MyUnicodeFunctorTestClassID = 0;
+class MyUnicodeFunctorTestClass : public UnicodeFunctor {
+public:
+    virtual UnicodeFunctor* clone() const {return NULL;}
+    static UClassID getStaticClassID(void) {return (UClassID)&MyUnicodeFunctorTestClassID;}
+    virtual UClassID getDynamicClassID(void) const {return getStaticClassID();};
+    virtual void setData(const TransliterationRuleData*) {}
+};
+
+void TransliteratorAPITest::TestUnicodeFunctor() {
+    MyUnicodeFunctorTestClass myClass;
+    if (myClass.toMatcher() != NULL) {
+        errln("FAIL: UnicodeFunctor::toMatcher did not return NULL");
+    }
+    if (myClass.toReplacer() != NULL) {
+        errln("FAIL: UnicodeFunctor::toReplacer did not return NULL");
+    }
+}
+
+

 #endif /* #if !UCONFIG_NO_TRANSLITERATION */
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */