Update ICU to 54.1 step 1

source/tools/ctestfw/unicode/uperf.h

 /*
 **********************************************************************
-* Copyright (c) 2002-2011, International Business Machines
+* Copyright (c) 2002-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 #ifndef _UPERF_H
 #define _UPERF_H
 
 #include "unicode/utypes.h"
 #include "unicode/unistr.h"
 #include "unicode/ustring.h"
 
 #include "unicode/testtype.h"
 #include "unicode/utimer.h"
 #include "ucbuf.h"
 
 // Forward declarations from uoptions.h.
 struct UOption;
 typedef struct UOption UOption;
 
 #if !UCONFIG_NO_CONVERSION
 
 U_NAMESPACE_USE
-// Use the TESTCASE macro in subclasses of IntlTest.  Define the
+// Use the TESTCASE macro in subclasses of UPerfTest. Define the
 // runIndexedTest method in this fashion:
 //
 //| void MyTest::runIndexedTest(int32_t index, UBool exec,
 //|                             const char* &name, char* /*par*/) {
 //|     switch (index) {
 //|         TESTCASE(0,TestSomething);
 //|         TESTCASE(1,TestSomethingElse);
 //|         TESTCASE(2,TestAnotherThing);
 //|         default: 
-//|             name = ""; 
-//|             return NULL;
+//|             name = "";
+//|             break;
 //|     }
+//|     return NULL;
 //| }
-#if 0
-#define TESTCASE(id,test)                       \
-    case id:                                    \
-        name = #test;                           \
-        if (exec) {                             \
-            fprintf(stdout,#test "---");        \
-            fprintf(stdout,"\n");               \
-            return test();                      \
-        }                                       \
-        break
-
-#endif
 #define TESTCASE(id,test)                       \
     case id:                                    \
         name = #test;                           \
         if (exec) {                             \
             return test();                      \
         }                                       \
         break
 
+// More convenient macros. These allow easy reordering of the test cases.
+// Copied from intltest.h, and adjusted to not logln() but return a UPerfFunction.
+//
+//| void MyTest::runIndexedTest(int32_t index, UBool exec,
+//|                             const char* &name, char* /*par*/) {
+//|     TESTCASE_AUTO_BEGIN;
+//|     TESTCASE_AUTO(TestSomething);
+//|     TESTCASE_AUTO(TestSomethingElse);
+//|     TESTCASE_AUTO(TestAnotherThing);
+//|     TESTCASE_AUTO_END;
+//|     return NULL;
+//| }
+#define TESTCASE_AUTO_BEGIN \
+    for(;;) { \
+        int32_t testCaseAutoNumber = 0
+
+#define TESTCASE_AUTO(test) \
+        if (index == testCaseAutoNumber++) { \
+            name = #test; \
+            if (exec) { \
+                return test(); \
+            } \
+            break; \
+        }
+
+#define TESTCASE_AUTO_END \
+        name = ""; \
+        break; \
+    }
+
 /**
  * Subclasses of PerfTest will need to create subclasses of
  * Function that define a call() method which contains the code to
  * be timed.  They then call setTestFunction() in their "Test..."
  * method to establish this as the current test functor.
  */
 class T_CTEST_EXPORT_API UPerfFunction {
 public:
     /**
      * destructor
@@ skipping 101 matching lines @@
 
 // static members
 public:
     static UPerfTest* gTest;
     static const char gUsageString[];
 };
 
 #endif
 #endif