organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-11406 RBBITest/TestUnicodeFiles, improve known issue detection.

Browse source 
X-SVN-Rev: 36804
This commit is contained in:
Andy Heninger 2014-12-03 23:43:47 +00:00
parent a2581f458c
commit 8e27cbf59d
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
icu4c/source/test/intltest/rbbitst.cpp
View file

@ -38,6 +38,7 @@
#include <stdlib.h>
#include "unicode/numfmt.h"
#include "unicode/uscript.h"
#include "cmemory.h"
#define TEST_ASSERT(x) {if (!(x)) { \
errln("Failure in file %s, line %d", __FILE__, __LINE__);}}
@ -1724,6 +1725,32 @@ void RBBITest::TestUnicodeFiles() {
}
// Check for test cases from the Unicode test data files that are known to fail
// and should be skipped because ICU is not yet able to fully implement the spec.
// See ticket #7270.
UBool RBBITest::testCaseIsKnownIssue(const UnicodeString &testCase, const char *fileName) {
static const UChar badTestCases[][4] { // Line Numbers from Unicode 7.0.0 file.
{(UChar)0x200B, (UChar)0x0020, (UChar)0x007D, (UChar)0x0000}, // Line 5198
{(UChar)0x200B, (UChar)0x0020, (UChar)0x0029, (UChar)0x0000}, // Line 5202
{(UChar)0x200B, (UChar)0x0020, (UChar)0x0021, (UChar)0x0000}, // Line 5214
{(UChar)0x200B, (UChar)0x0020, (UChar)0x002c, (UChar)0x0000}, // Line 5246
{(UChar)0x200B, (UChar)0x0020, (UChar)0x002f, (UChar)0x0000}, // Line 5298
{(UChar)0x200B, (UChar)0x0020, (UChar)0x2060, (UChar)0x0000} // Line 5302
};
if (strcmp(fileName, "LineBreakTest.txt") != 0) {
return FALSE;
}
for (int i=0; i<UPRV_LENGTHOF(badTestCases); i++) {
if (testCase == UnicodeString(badTestCases[i])) {
return logKnownIssue("7270");
}
}
return FALSE;
}
//--------------------------------------------------------------------------------------------
//
// Run tests from one of the boundary test data files distributed by the Unicode Consortium
@ -1731,9 +1758,6 @@ void RBBITest::TestUnicodeFiles() {
//-------------------------------------------------------------------------------------------
void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) {
#if !UCONFIG_NO_REGULAR_EXPRESSIONS
// TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb. Ticket #7270
UBool isTicket7270Fixed = !logKnownIssue("7270");
UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
UErrorCode status = U_ZERO_ERROR;
//
@ -1825,20 +1849,8 @@ void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *
else if (tokenMatcher.start(4, status) >= 0) {
// Scanned to end of a line, possibly skipping over a comment in the process.
// If the line from the file contained test data, run the test now.
//
if (testString.length() > 0) {
// TODO(andy): Remove this time bomb code. Note: Failing line numbers may change when updating to new Unicode data.
// Rule 8
// ZW SP* <break>
// is not yet implemented.
if (!(isLineBreak && !isTicket7270Fixed && (5198 == lineNumber ||
5202 == lineNumber ||
5214 == lineNumber ||
5246 == lineNumber ||
5298 == lineNumber ||
5302 == lineNumber ))) {
if (testString.length() > 0 && !testCaseIsKnownIssue(testString, fileName)) {
checkUnicodeTestCase(fileName, lineNumber, testString, &breakPositions, bi);
}
}
// Clear out this test case.

9
icu4c/source/test/intltest/rbbitst.h
View file

@ -131,6 +131,15 @@ private:
// Run the actual tests for TestTailoredBreaks()
void TBTest(BreakIterator* brkitr, int type, const char *locale, const char* escapedText,
const int32_t *expectOffsets, int32_t expectOffsetsCount);
/** Filter for test cases from the Unicode test data files.
* Some need to be skipped because ICU is unable to fully implement the
* Unicode boundary specifications.
* @param testCase the test data string.
* @param fileName the Unicode test data file name.
* @return FALSE if the test case should be run, TRUE if it should be skipped.
*/
UBool testCaseIsKnownIssue(const UnicodeString &testCase, const char *fileName);
};
#endif /* #if !UCONFIG_NO_BREAK_ITERATION */