AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-12153 uspoof_setRestrictionLevel also must enable restriction level checking.

Browse Source 
X-SVN-Rev: 38805
This commit is contained in:
Andy Heninger 2016-06-07 17:40:12 +00:00
parent aa0e0a8a9d
commit b8aabec51f
2 changed files with 36 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
icu4c/source/test/intltest/itspoof.cpp
View File

@ -69,72 +69,22 @@
void IntlTestSpoof::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
{
if (exec) logln("TestSuite spoof: ");
switch (index) {
case 0:
name = "TestSpoofAPI";
if (exec) {
testSpoofAPI();
}
break;
case 1:
name = "TestSkeleton";
if (exec) {
testSkeleton();
}
break;
case 2:
name = "TestAreConfusable";
if (exec) {
testAreConfusable();
}
break;
case 3:
name = "TestInvisible";
if (exec) {
testInvisible();
}
break;
case 4:
name = "testConfData";
if (exec) {
testConfData();
}
break;
case 5:
name = "testBug8654";
if (exec) {
testBug8654();
}
break;
case 6:
name = "testIdentifierInfo";
if (exec) {
testIdentifierInfo();
}
break;
case 7:
name = "testScriptSet";
if (exec) {
testScriptSet();
}
break;
case 8:
name = "testRestrictionLevel";
if (exec) {
testRestrictionLevel();
}
break;
case 9:
name = "testMixedNumbers";
if (exec) {
testMixedNumbers();
}
break;
default: name=""; break;
if (exec) {
logln("TestSuite spoof: ");
}
TESTCASE_AUTO_BEGIN;
TESTCASE_AUTO(testSpoofAPI);
TESTCASE_AUTO(testSkeleton);
TESTCASE_AUTO(testAreConfusable);
TESTCASE_AUTO(testInvisible);
TESTCASE_AUTO(testConfData);
TESTCASE_AUTO(testBug8654);
TESTCASE_AUTO(testIdentifierInfo);
TESTCASE_AUTO(testScriptSet);
TESTCASE_AUTO(testRestrictionLevel);
TESTCASE_AUTO(testMixedNumbers);
TESTCASE_AUTO(testBug12153);
TESTCASE_AUTO_END;
}
void IntlTestSpoof::testSpoofAPI() {
@ -768,4 +718,23 @@ void IntlTestSpoof::testMixedNumbers() {
}
}
// Bug #12153 - uspoof_setRestrictionLevel() should enable restriction level testing.
//
void IntlTestSpoof::testBug12153() {
UErrorCode status = U_ZERO_ERROR;
LocalUSpoofCheckerPointer sc(uspoof_open(&status));
TEST_ASSERT_SUCCESS(status);
int32_t checks = uspoof_getChecks(sc.getAlias(), &status);
TEST_ASSERT((checks & USPOOF_RESTRICTION_LEVEL) != 0);
checks &= ~USPOOF_RESTRICTION_LEVEL;
uspoof_setChecks(sc.getAlias(), checks, &status);
checks = uspoof_getChecks(sc.getAlias(), &status);
TEST_ASSERT((checks & USPOOF_RESTRICTION_LEVEL) == 0);
uspoof_setRestrictionLevel(sc.getAlias(), USPOOF_MODERATELY_RESTRICTIVE);
checks = uspoof_getChecks(sc.getAlias(), &status);
TEST_ASSERT((checks & USPOOF_RESTRICTION_LEVEL) != 0);
TEST_ASSERT_SUCCESS(status);
}
#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_NORMALIZATION && !UCONFIG_NO_FILE_IO */

2
icu4c/source/test/intltest/itspoof.h
View File

@ -44,6 +44,8 @@ public:
void testMixedNumbers();
void testBug12153();
// Internal function to run a single skeleton test case.
void checkSkeleton(const USpoofChecker *sc, uint32_t flags,
const char *input, const char *expected, int32_t lineNum);