ICU-62107.0.1.tar.gz

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

diff --git a/icuSources/test/intltest/reptest.cpp b/icuSources/test/intltest/reptest.cpp
index c7fae4833fa8dee8532c1cf1b997c5c6e981b5e2..35a3f5dcf5e40b6a32a425a55ebbd70153f316a1 100644 (file)
--- a/icuSources/test/intltest/reptest.cpp
+++ b/icuSources/test/intltest/reptest.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 2001-2003, International Business Machines Corporation and
+ * Copyright (c) 2001-2010, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /************************************************************************
@@ -92,18 +94,18 @@ public:
     }
 
     /**
-     * ICU "poor man's RTTI", returns a UClassID for the actual class.
+     * ICU "poor man's RTTI", returns a UClassID for this class.
      *
      * @draft ICU 2.2
      */
-    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
+    static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
 
     /**
-     * ICU "poor man's RTTI", returns a UClassID for this class.
+     * ICU "poor man's RTTI", returns a UClassID for the actual class.
      *
      * @draft ICU 2.2
      */
-    static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
+    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
 
 protected:
     virtual int32_t getLength() const {
@@ -118,15 +120,6 @@ protected:
         return chars.char32At(offset);
     }
 
-    virtual void handleReplaceBetween(int32_t start, int32_t limit, const UnicodeString& text) {
-        UnicodeString s;
-        this->extractBetween(start, limit, s);
-        if (s == text) return; // NO ACTION!
-        this->chars.replaceBetween(start, limit, text);
-        fixStyles(start, limit, text.length());
-    }
-    
-
     void fixStyles(int32_t start, int32_t limit, int32_t newLen) {
         UChar newStyle = NO_STYLE;
         if (start != limit && styles.charAt(start) != NO_STYLE) {
@@ -151,6 +144,15 @@ protected:
         styles.replaceBetween(start, limit, s);
     }
 
+    virtual void handleReplaceBetween(int32_t start, int32_t limit, const UnicodeString& text) {
+        UnicodeString s;
+        this->extractBetween(start, limit, s);
+        if (s == text) return; // NO ACTION!
+        this->chars.replaceBetween(start, limit, text);
+        fixStyles(start, limit, text.length());
+    }
+    
+
     virtual void copy(int32_t start, int32_t limit, int32_t dest) {
         chars.copy(start, limit, dest);
         styles.copy(start, limit, dest);
@@ -201,8 +203,8 @@ public:
         /* do nothing */
     }
 
-    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
     static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
+    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
 
 private:
     static const char fgClassID;
@@ -296,9 +298,7 @@ void ReplaceableTest::check(const UnicodeString& transliteratorName,
         t = Transliterator::createInstance(transliteratorName, UTRANS_FORWARD, status);
     }
     if (U_FAILURE(status)) {
-        log("FAIL: failed to create the ");
-        log(transliteratorName);
-        errln(" transliterator.");
+        dataerrln("FAIL: failed to create the " + transliteratorName + " transliterator");
         delete tr;
         return;
     }