Update ICU to 54.1 step 1

source/test/intltest/ssearch.cpp

 /*
  **********************************************************************
- *   Copyright (C) 2005-2013, International Business Machines
+ *   Copyright (C) 2005-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_COLLATION
 
 #include "cmemory.h"
 #include "cstring.h"
-#include "ucol_imp.h"
+#include "usrchimp.h"
 
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
 #include "unicode/usearch.h"
 #include "unicode/uset.h"
 #include "unicode/ustring.h"
 
 #include "unicode/coleitr.h"
 #include "unicode/regex.h"        // TODO: make conditional on regexp being built.
 
@@ skipping 597 matching lines @@
         errcheckln(status, "Failed to create collator in offsetTest! - %s", u_errorName(status));
         return;
     }
     char buffer[4096];  // A bit of a hack... just happens to be long enough for all the test cases...
                         // We could allocate one that's the right size by (CE_count * 10) + 2
                         // 10 chars is enough room for 8 hex digits plus ", ". 2 extra chars for "[" and "]"
 
     col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
 
     for(int32_t i = 0; i < testCount; i += 1) {
-      if (i>=4 && i<=6 && logKnownIssue("9156", "was 8081")) {
-            continue; // timebomb until ticket #9156 (was #8081) is resolved
-        }
         UnicodeString ts = CharsToUnicodeString(test[i]);
         CollationElementIterator *iter = col->createCollationElementIterator(ts);
         OrderList forwardList;
         OrderList backwardList;
         int32_t order, low, high;
 
         do {
             low   = iter->getOffset();
             order = iter->next(status);
             high  = iter->getOffset();
@@ skipping 797 matching lines @@
 #endif
     }
 
     for(int32_t s = firstStrength; s <= lastStrength; s += 1) {
         int32_t notFoundCount = 0;
 
         logln("Setting strength to %s.", strengthNames[s]);
         ucol_setStrength(coll, strengths[s]);
 
         // TODO: try alternate prefix and suffix too?
-        // TODO: alterntaes are only equal at primary strength. Is this OK?
+        // TODO: alternates are only equal at primary strength. Is this OK?
         for(int32_t t = 0; t < loopCount; t += 1) {
             uint32_t seed = m_seed;
             // int32_t  nmc = 0;
 
             generateTestCase(coll, monkeys, monkeyCount, pattern, altPattern);
             generateTestCase(coll, monkeys, monkeyCount, prefix,  altPrefix);
             generateTestCase(coll, monkeys, monkeyCount, suffix,  altSuffix);
 
             // pattern
             notFoundCount += monkeyTestCase(coll, pattern, pattern, altPattern, "pattern", strengthNames[s], seed);
@@ skipping 25 matching lines @@
     uset_close(expansions);
     uset_close(letters);
     delete monkeyData;
 
     ucol_close(coll);
 }
 
 #endif
 
 #endif