icu: Merge http://bugs.icu-project.org/trac/changeset/36672

source/test/intltest/rbbiapts.cpp

 /********************************************************************
  * Copyright (c) 1999-2014, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *   Date        Name        Description
  *   12/14/99    Madhu        Creation.
  *   01/12/2000  Madhu        updated for changed API
  ********************************************************************/
 
 #include "unicode/utypes.h"
@@ skipping 1208 matching lines @@
   delete [] pos;
 }
 #endif
 
 void RBBIAPITest::TestFilteredBreakIteratorBuilder() {
 #if !UCONFIG_NO_BREAK_ITERATION && U_HAVE_STD_STRING && !UCONFIG_NO_FILTERED_BREAK_ITERATION
   UErrorCode status = U_ZERO_ERROR;
   LocalPointer<FilteredBreakIteratorBuilder> builder;
   LocalPointer<BreakIterator> baseBI;
   LocalPointer<BreakIterator> filteredBI;
+  LocalPointer<BreakIterator> frenchBI;
 
   const UnicodeString text("In the meantime Mr. Weston arrived with his small ship, which he had now recovered. Capt. Gorges, who informed the Sgt. here that one purpose of his going east was to meet with Mr. Weston, took this opportunity to call him to account for some abuses he had to lay to his charge."); // (William Bradford, public domain. http://catalog.hathitrust.org/Record/008651224 ) - edited.
   const UnicodeString ABBR_MR("Mr.");
   const UnicodeString ABBR_CAPT("Capt.");
 
   {
     logln("Constructing empty builder\n");
     builder.adoptInstead(FilteredBreakIteratorBuilder::createInstance(status));
     TEST_ASSERT_SUCCESS(status);
 
     logln("Constructing base BI\n");
     baseBI.adoptInstead(BreakIterator::createSentenceInstance(Locale::getEnglish(), status));
     TEST_ASSERT_SUCCESS(status);
 
-    logln("Building new BI\n");
+        logln("Building new BI\n");
     filteredBI.adoptInstead(builder->build(baseBI.orphan(), status));
     TEST_ASSERT_SUCCESS(status);
 
-    if (U_SUCCESS(status)) {
+        if (U_SUCCESS(status)) {
         logln("Testing:");
         filteredBI->setText(text);
         TEST_ASSERT(20 == filteredBI->next()); // Mr.
         TEST_ASSERT(84 == filteredBI->next()); // recovered.
         TEST_ASSERT(90 == filteredBI->next()); // Capt.
         TEST_ASSERT(181 == filteredBI->next()); // Mr.
         TEST_ASSERT(278 == filteredBI->next()); // charge.
         filteredBI->first();
         prtbrks(filteredBI.getAlias(), text, *this);
     }
@@ skipping 109 matching lines @@
           logln("Testing:");
           filteredBI->setText(text);
           TEST_ASSERT(84 == filteredBI->next());
           TEST_ASSERT(278 == filteredBI->next());
           filteredBI->first();
           prtbrks(filteredBI.getAlias(), text, *this);
         }
     }
   }
 
-#if 0
   // reenable once french is in
   {
     logln("Constructing French builder");
     builder.adoptInstead(FilteredBreakIteratorBuilder::createInstance(Locale::getFrench(), status));
     TEST_ASSERT_SUCCESS(status);
 
     logln("Constructing base BI\n");
     baseBI.adoptInstead(BreakIterator::createSentenceInstance(Locale::getFrench(), status));
     TEST_ASSERT_SUCCESS(status);
 
     logln("Building new BI\n");
-    filteredBI.adoptInstead(builder->build(baseBI.orphan(), status));
+    frenchBI.adoptInstead(builder->build(baseBI.orphan(), status));
     TEST_ASSERT_SUCCESS(status);
 
-    if(filteredBI.isValid()) {
+    if(frenchBI.isValid()) {
       logln("Testing:");
-      filteredBI->setText(text);
-      TEST_ASSERT(20 == filteredBI->next());
-      TEST_ASSERT(84 == filteredBI->next());
+      UnicodeString frText("C'est MM. Duval.");
+      frenchBI->setText(frText);
+      TEST_ASSERT(16 == frenchBI->next());
+      TEST_ASSERT(BreakIterator::DONE == frenchBI->next());
+      frenchBI->first();
+      prtbrks(frenchBI.getAlias(), frText, *this);
+      logln("Testing against English:");
+      filteredBI->setText(frText);
+      TEST_ASSERT(10 == filteredBI->next()); // wrong for french, but filterBI is english.
+      TEST_ASSERT(16 == filteredBI->next());
+      TEST_ASSERT(BreakIterator::DONE == filteredBI->next());
       filteredBI->first();
-      prtbrks(filteredBI.getAlias(), text, *this);
-    }
+      prtbrks(filteredBI.getAlias(), frText, *this);
+
+      // Verify ==
+      TEST_ASSERT_TRUE(*frenchBI   == *frenchBI);
+      TEST_ASSERT_TRUE(*filteredBI != *frenchBI);
+      TEST_ASSERT_TRUE(*frenchBI   != *filteredBI);
+    } else {
+      dataerrln("French BI: not valid.");
+        }
   }
-#endif
 
 #else
   logln("Skipped- not: !UCONFIG_NO_BREAK_ITERATION && U_HAVE_STD_STRING && !UCONFIG_NO_FILTERED_BREAK_ITERATION");
 #endif
 }
 
 //---------------------------------------------
 // runIndexedTest
 //---------------------------------------------
 
@@ skipping 84 matching lines @@
     : RuleBasedBreakIterator(data, status)
 {
 }
 
 RBBIWithProtectedFunctions::RBBIWithProtectedFunctions(const RBBIDataHeader* data, enum EDontAdopt, UErrorCode &status)
     : RuleBasedBreakIterator(data, RuleBasedBreakIterator::kDontAdopt, status)
 {
 }
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */