ICU-64252.0.1.tar.gz

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

diff --git a/icuSources/test/intltest/transrt.cpp b/icuSources/test/intltest/transrt.cpp
index 66336ad754f164acc49877929ba00ff8c8a7da28..7517577ff555aad08c1dd4b804cec340c1c498f1 100644 (file)
--- a/icuSources/test/intltest/transrt.cpp
+++ b/icuSources/test/intltest/transrt.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-*   Copyright (C) 2000-2014, International Business Machines
+*   Copyright (C) 2000-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -31,6 +33,7 @@
 #include "cmemory.h"
 #include "transrt.h"
 #include "testutil.h"
+#include "uassert.h"
 #include <string.h>
 #include <stdio.h>
 
@@ -449,7 +452,8 @@ UBool RTTest::isCamel(const UnicodeString& a) {
             break;
         case U_TITLECASE_LETTER:
             if (haveLower) return TRUE;
-            // drop through, since second letter is lower.
+            // fall through, since second letter is lower.
+            U_FALLTHROUGH;
         case U_LOWERCASE_LETTER:
             haveLower = TRUE;
             break;
@@ -1044,6 +1048,7 @@ static void writeStringInU8(FILE *out, const UnicodeString &s) {
         UBool    isError = FALSE;
         int32_t  destIdx = 0;
         U8_APPEND(bufForOneChar, destIdx, (int32_t)sizeof(bufForOneChar), c, isError);
+        U_ASSERT(!isError);
         fwrite(bufForOneChar, 1, destIdx, out);
     }
 }
@@ -1619,7 +1624,7 @@ void TransliteratorRoundTripTest::TestDebug(const char* name,const char fromSet[
 
 void TransliteratorRoundTripTest::TestInterIndic() {
     //TestDebug("Latin-Gurmukhi", latinForIndic, "[:Gurmukhi:]","[\\u0965\\u0a02\\u0a72\\u0a73\\u0a74]",TRUE);
-    int32_t num = (int32_t)(sizeof(interIndicArray)/(INTER_INDIC_ARRAY_WIDTH*sizeof(char*)));
+    int32_t num = UPRV_LENGTHOF(interIndicArray)/INTER_INDIC_ARRAY_WIDTH;
     if(quick){
         logln("Testing only 5 of %i. Skipping rest (use -e for exhaustive)",num);
         num = 5;