ICU-531.31.tar.gz

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

diff --git a/icuSources/test/intltest/ssearch.cpp b/icuSources/test/intltest/ssearch.cpp
index 39bd6152b90a8dcb8f43e0854499fd32bc859845..1c78370bb275e4322c924ef1414961bf5039eb31 100644 (file)
--- a/icuSources/test/intltest/ssearch.cpp
+++ b/icuSources/test/intltest/ssearch.cpp
@@ -1,6 +1,6 @@
 /*
  **********************************************************************
- *   Copyright (C) 2005-2013, International Business Machines
+ *   Copyright (C) 2005-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
@@ -11,7 +11,7 @@
 
 #include "cmemory.h"
 #include "cstring.h"
-#include "ucol_imp.h"
+#include "usrchimp.h"
 
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
@@ -629,9 +629,6 @@ void SSearchTest::offsetTest()
     col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
 
     for(int32_t i = 0; i < testCount; i += 1) {
-        if (!isICUVersionAtLeast(52, 0, 1) && i>=4 && i<=6) {
-            continue; // timebomb until ticket #9156 (was #8081) is resolved
-        }
         UnicodeString ts = CharsToUnicodeString(test[i]);
         CollationElementIterator *iter = col->createCollationElementIterator(ts);
         OrderList forwardList;
@@ -953,6 +950,7 @@ const char *cPattern = "maketh houndes ete hem";
     //   to get runtimes of at least several seconds.
     for (i=0; i<10000; i++) {
         found = usearch_search(uss.getAlias(), 0, &icuMatchPos, &icuMatchEnd, &status);
+        (void)found;   // Suppress set but not used warning.
         //TEST_ASSERT_SUCCESS(status);
         //TEST_ASSERT(found);
 
@@ -1448,7 +1446,7 @@ void SSearchTest::monkeyTest(char *params)
         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;