ICU-511.32.tar.gz

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

diff --git a/icuSources/test/intltest/tstnrapi.cpp b/icuSources/test/intltest/tstnrapi.cpp
index 65a0ed2db53e8bc5d128d3e8f5f056c689f31454..110e206c2d4da28988fa6f9fd0113b3e9eb659aa 100644 (file)
--- a/icuSources/test/intltest/tstnrapi.cpp
+++ b/icuSources/test/intltest/tstnrapi.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2003, International Business Machines Corporation and
+ * Copyright (c) 1997-2010, International Business Machines Corporation and

  * others. All Rights Reserved.
  ********************************************************************/
 
  * others. All Rights Reserved.
  ********************************************************************/
 


@@ -25,13 +25,13 @@ BasicNormalizerTest::TestNormalizerAPI() {
     StringCharacterIterator iter(s);
     Normalizer norm(iter, UNORM_NFC);
     if(norm.next()!=0xe4) {
     StringCharacterIterator iter(s);
     Normalizer norm(iter, UNORM_NFC);
     if(norm.next()!=0xe4) {

-        errln("error in Normalizer(CharacterIterator).next()");
+        dataerrln("error in Normalizer(CharacterIterator).next()");

     }
 
     // test copy constructor
     Normalizer copy(norm);
     if(copy.next()!=0xac00) {
     }
 
     // test copy constructor
     Normalizer copy(norm);
     if(copy.next()!=0xac00) {

-        errln("error in Normalizer(Normalizer(CharacterIterator)).next()");
+        dataerrln("error in Normalizer(Normalizer(CharacterIterator)).next()");

     }
 
     // test clone(), ==, and hashCode()
     }
 
     // test clone(), ==, and hashCode()


@@ -44,7 +44,7 @@ BasicNormalizerTest::TestNormalizerAPI() {
         errln("error in Normalizer(Normalizer(CharacterIterator)).clone()->hashCode()!=copy.hashCode()");
     }
     if(clone->next()!=0x4e3d) {
         errln("error in Normalizer(Normalizer(CharacterIterator)).clone()->hashCode()!=copy.hashCode()");
     }
     if(clone->next()!=0x4e3d) {

-        errln("error in Normalizer(Normalizer(CharacterIterator)).clone()->next()");
+        dataerrln("error in Normalizer(Normalizer(CharacterIterator)).clone()->next()");

     }
     // position changed, must change hashCode()
     if(clone->hashCode()==copy.hashCode()) {
     }
     // position changed, must change hashCode()
     if(clone->hashCode()==copy.hashCode()) {


@@ -62,7 +62,7 @@ BasicNormalizerTest::TestNormalizerAPI() {
     Normalizer::compose(tel, TRUE, 0, nfkc, errorCode);
     Normalizer::decompose(tel, TRUE, 0, nfkd, errorCode);
     if(U_FAILURE(errorCode)) {
     Normalizer::compose(tel, TRUE, 0, nfkc, errorCode);
     Normalizer::decompose(tel, TRUE, 0, nfkd, errorCode);
     if(U_FAILURE(errorCode)) {

-        errln("error in Normalizer::(de)compose(): %s", u_errorName(errorCode));
+        dataerrln("error in Normalizer::(de)compose(): %s", u_errorName(errorCode));

     } else if(
         nfkc!=UnicodeString("TE\\u0139TELTELTELTELTELTELTELTELTEL", "").unescape() || 
         nfkd!=UnicodeString("TEL\\u0301TELTELTELTELTELTELTELTELTEL", "").unescape()
     } else if(
         nfkc!=UnicodeString("TE\\u0139TELTELTELTELTELTELTELTELTEL", "").unescape() || 
         nfkd!=UnicodeString("TEL\\u0301TELTELTELTELTELTELTELTELTEL", "").unescape()


@@ -73,7 +73,7 @@ BasicNormalizerTest::TestNormalizerAPI() {
     // test setIndex()
     norm.setIndexOnly(3);
     if(norm.current()!=0x4e3d) {
     // test setIndex()
     norm.setIndexOnly(3);
     if(norm.current()!=0x4e3d) {

-        errln("error in Normalizer(CharacterIterator).setIndex(3)");
+        dataerrln("error in Normalizer(CharacterIterator).setIndex(3)");

     }
 
     // test setText(CharacterIterator) and getText()
     }
 
     // test setText(CharacterIterator) and getText()


@@ -101,7 +101,7 @@ BasicNormalizerTest::TestNormalizerAPI() {
         errln("error in Normalizer::setMode() or Normalizer::getUMode()");
     }
     if(copy.next()!=0x308 || copy.next()!=0x1100) {
         errln("error in Normalizer::setMode() or Normalizer::getUMode()");
     }
     if(copy.next()!=0x308 || copy.next()!=0x1100) {

-        errln("error in Normalizer::setText(UChar *) or Normalizer::setMode()");
+        dataerrln("error in Normalizer::setText(UChar *) or Normalizer::setMode()");

     }
 
     // test setText(UChar *, length=-1)
     }
 
     // test setText(UChar *, length=-1)


@@ -144,23 +144,23 @@ BasicNormalizerTest::TestNormalizerAPI() {
     s.setTo((UChar)0xe4);
     Normalizer::normalize(s, UNORM_NFD, 0, s, status);
     if(s.charAt(1)!=0x308) {
     s.setTo((UChar)0xe4);
     Normalizer::normalize(s, UNORM_NFD, 0, s, status);
     if(s.charAt(1)!=0x308) {

-        errln("error in Normalizer::normalize(UNORM_NFD, self)");
+        dataerrln("error in Normalizer::normalize(UNORM_NFD, self)");

     }
     Normalizer::normalize(s, UNORM_NFC, 0, s, status);
     if(s.charAt(0)!=0xe4) {
     }
     Normalizer::normalize(s, UNORM_NFC, 0, s, status);
     if(s.charAt(0)!=0xe4) {

-        errln("error in Normalizer::normalize(UNORM_NFC, self)");
+        dataerrln("error in Normalizer::normalize(UNORM_NFC, self)");

     }
     Normalizer::decompose(s, FALSE, 0, s, status);
     if(s.charAt(1)!=0x308) {
     }
     Normalizer::decompose(s, FALSE, 0, s, status);
     if(s.charAt(1)!=0x308) {

-        errln("error in Normalizer::decompose(self)");
+        dataerrln("error in Normalizer::decompose(self)");

     }
     Normalizer::compose(s, FALSE, 0, s, status);
     if(s.charAt(0)!=0xe4) {
     }
     Normalizer::compose(s, FALSE, 0, s, status);
     if(s.charAt(0)!=0xe4) {

-        errln("error in Normalizer::compose(self)");
+        dataerrln("error in Normalizer::compose(self)");

     }
     Normalizer::concatenate(s, s, s, UNORM_NFC, 0, status);
     if(s.charAt(1)!=0xe4) {
     }
     Normalizer::concatenate(s, s, s, UNORM_NFC, 0, status);
     if(s.charAt(1)!=0xe4) {

-        errln("error in Normalizer::decompose(self)");
+        dataerrln("error in Normalizer::decompose(self)");

     }
 }
 
     }
 }