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

ICU-1053 fix API test that is calling handleTransliterate - should call transliterate or finishTransliteration

Browse Source 
X-SVN-Rev: 5260
This commit is contained in:
Alan Liu 2001-07-17 23:39:00 +00:00
parent 953c8621af
commit 5ded1a9c58
3 changed files with 76 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
icu4c/source/test/intltest/hajatrts.cpp
View File

@ -52,6 +52,22 @@ void HangToJamoTransliteratorTest::runIndexedTest( int32_t index, UBool exec, co
default: name = ""; break; /*needed to end loop*/
}
}
// This test used to call handleTransliterate. That is a protected
// method that isn't supposed to be called externally. This method is
// a workaround to make it call the correct method.
static void pseudoHandleTransliterate(const Transliterator* t,
Replaceable& text,
UTransPosition& index,
UBool incremental) {
if (incremental) {
UErrorCode status = U_ZERO_ERROR;
t->transliterate(text, index, status);
} else {
t->finishTransliteration(text, index);
}
}
/**
* Used by TestConstruction() and TestTransliterate.
*/
@ -254,7 +270,7 @@ void HangToJamoTransliteratorTest::expectTranslit(const HangulJamoTransliterator
index.start = cursor;
index.limit = limit;
UnicodeString rsource(source);
t.handleTransliterate(rsource, index, FALSE);
pseudoHandleTransliterate(&t, rsource, index, FALSE);
expectAux(t.getID() + ":handleTransliterator(increment=FALSE) " + message, source + "-->" + rsource, rsource==expectedResult, expectedResult);
UnicodeString rsource2(source);
@ -264,7 +280,7 @@ void HangToJamoTransliteratorTest::expectTranslit(const HangulJamoTransliterator
_index.start = cursor;
_index.limit = limit;
uprv_memcpy(&index, &_index, sizeof(index));
t.handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(&t, rsource2, index, TRUE);
expectAux(t.getID() + ":handleTransliterator(increment=TRUE) " + message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
/*ceates a copy constructor and checks the transliteration*/
@ -272,13 +288,13 @@ void HangToJamoTransliteratorTest::expectTranslit(const HangulJamoTransliterator
rsource2.remove();
rsource2.append(source);
uprv_memcpy(&index, &_index, sizeof(index));
copy->handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(copy, rsource2, index, FALSE);
expectAux(t.getID() + "COPY:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
uprv_memcpy(&index, &_index, sizeof(index));
copy->handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(copy, rsource2, index, TRUE);
expectAux(t.getID() + "COPY:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
delete copy;
@ -287,13 +303,13 @@ void HangToJamoTransliteratorTest::expectTranslit(const HangulJamoTransliterator
rsource2.remove();
rsource2.append(source);
uprv_memcpy(&index, &_index, sizeof(index));
clone->handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(clone, rsource2, index, FALSE);
expectAux(t.getID() + "CLONE:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
uprv_memcpy(&index, &_index, sizeof(index));
clone->handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(clone, rsource2, index, TRUE);
expectAux(t.getID() + "CLONE:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
/*Uses the assignment operator to create a transliterator and tests transliteration*/
@ -301,13 +317,13 @@ void HangToJamoTransliteratorTest::expectTranslit(const HangulJamoTransliterator
rsource2.remove();
rsource2.append(source);
uprv_memcpy(&index, &_index, sizeof(index));
equal.handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(&equal, rsource2, index, FALSE);
expectAux(t.getID() + "=OPERATOR:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
uprv_memcpy(&index, &_index, sizeof(index));
equal.handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(&equal, rsource2, index, TRUE);
expectAux(t.getID() + "=OPERATOR:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
delete clone;
@ -329,7 +345,7 @@ void HangToJamoTransliteratorTest::expect(const HangulJamoTransliterator& t,
index.contextLimit=source.length();
index.start=0;
index.limit=source.length();
t.handleTransliterate(rsource, index, TRUE);
pseudoHandleTransliterate(&t, rsource, index, TRUE);
expectAux(t.getID() + ":handleTransliterate " + message, source + "->" + rsource, rsource==expectedResult, expectedResult);
}

34
icu4c/source/test/intltest/jahatrts.cpp
View File

@ -50,6 +50,22 @@ void JamoToHangTransliteratorTest::runIndexedTest( int32_t index, UBool exec, co
default: name = ""; break; /*needed to end loop*/
}
}
// This test used to call handleTransliterate. That is a protected
// method that isn't supposed to be called externally. This method is
// a workaround to make it call the correct method.
static void pseudoHandleTransliterate(const Transliterator* t,
Replaceable& text,
UTransPosition& index,
UBool incremental) {
if (incremental) {
UErrorCode status = U_ZERO_ERROR;
t->transliterate(text, index, status);
} else {
t->finishTransliteration(text, index);
}
}
/**
* Used by TestConstruction() and TestTransliterate.
*/
@ -249,12 +265,12 @@ void JamoToHangTransliteratorTest::expectTranslit(const JamoHangulTransliterator
UTransPosition index;
index = _index;
UnicodeString rsource(source);
t.handleTransliterate(rsource, index, FALSE);
pseudoHandleTransliterate(&t, rsource, index, FALSE);
expectAux(t.getID() + ":handleTransliterator(increment=FALSE) " + message, source + "-->" + rsource, rsource==expectedResult, expectedResult);
UnicodeString rsource2(source);
index=_index;
t.handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(&t, rsource2, index, TRUE);
expectAux(t.getID() + ":handleTransliterator(increment=TRUE) " + message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
/*ceates a copy constructor and checks the transliteration*/
@ -262,13 +278,13 @@ void JamoToHangTransliteratorTest::expectTranslit(const JamoHangulTransliterator
rsource2.remove();
rsource2.append(source);
index=_index;
copy->handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(copy, rsource2, index, FALSE);
expectAux(t.getID() + "COPY:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
index=_index;
copy->handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(copy, rsource2, index, TRUE);
expectAux(t.getID() + "COPY:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
delete copy;
@ -277,13 +293,13 @@ void JamoToHangTransliteratorTest::expectTranslit(const JamoHangulTransliterator
rsource2.remove();
rsource2.append(source);
index=_index;
clone->handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(clone, rsource2, index, FALSE);
expectAux(t.getID() + "CLONE:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
index=_index;
clone->handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(clone, rsource2, index, TRUE);
expectAux(t.getID() + "CLONE:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
/*Uses the assignment operator to create a transliterator and tests transliteration*/
@ -291,13 +307,13 @@ void JamoToHangTransliteratorTest::expectTranslit(const JamoHangulTransliterator
rsource2.remove();
rsource2.append(source);
index=_index;
equal.handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(&equal, rsource2, index, FALSE);
expectAux(t.getID() + "=OPERATOR:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
index=_index;
equal.handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(&equal, rsource2, index, TRUE);
expectAux(t.getID() + "=OPERATOR:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
delete clone;
@ -321,7 +337,7 @@ void JamoToHangTransliteratorTest::expect(const JamoHangulTransliterator& t,
index.contextLimit=source.length();
index.start=0;
index.limit=source.length();
t.handleTransliterate(rsource, index, TRUE);
pseudoHandleTransliterate(&t, rsource, index, TRUE);
expectAux(t.getID() + ":handleTransliterate " + message, source + "->" + rsource, rsource==expectedResult, expectedResult);
}

36
icu4c/source/test/intltest/unhxtrts.cpp
View File

@ -48,6 +48,22 @@ void UniToHexTransliteratorTest::runIndexedTest( int32_t index, UBool exec, cons
default: name = ""; break; /*needed to end loop*/
}
}
// This test used to call handleTransliterate. That is a protected
// method that isn't supposed to be called externally. This method is
// a workaround to make it call the correct method.
static void pseudoHandleTransliterate(const Transliterator* t,
Replaceable& text,
UTransPosition& index,
UBool incremental) {
if (incremental) {
UErrorCode status = U_ZERO_ERROR;
t->transliterate(text, index, status);
} else {
t->finishTransliteration(text, index);
}
}
/**
* Used by TestConstruction() and TestTransliterate.
*/
@ -298,7 +314,7 @@ void UniToHexTransliteratorTest::TestSimpleTransliterate(){
UnicodeString source("Hello");
UnicodeString rsource(source);
UnicodeString expected("He\\U+006C\\U+006C\\U+006F", "");
trans1->handleTransliterate(rsource, index, FALSE);
pseudoHandleTransliterate(trans1, rsource, index, FALSE);
expectAux(trans1->getID() + ":handleTransliterator ", source + "-->" + rsource, rsource==expected, expected);
delete trans1;
}
@ -358,12 +374,12 @@ void UniToHexTransliteratorTest::expectTranslit(const UnicodeToHexTransliterator
_index.limit = limit;
UTransPosition index = _index;
UnicodeString rsource(source);
t.handleTransliterate(rsource, index, FALSE);
pseudoHandleTransliterate(&t, rsource, index, FALSE);
expectAux(t.getID() + ":handleTransliterator(increment=FALSE) " + message, source + "-->" + rsource, rsource==expectedResult, expectedResult);
UnicodeString rsource2(source);
index=_index;
t.handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(&t, rsource2, index, TRUE);
expectAux(t.getID() + ":handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
/*ceates a copy constructor and checks the transliteration*/
@ -371,13 +387,13 @@ void UniToHexTransliteratorTest::expectTranslit(const UnicodeToHexTransliterator
rsource2.remove();
rsource2.append(source);
index=_index;
copy->handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(copy, rsource2, index, FALSE);
expectAux(t.getID() + "COPY:handleTransliterator(increment=FALSE) " + message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
index=_index;
copy->handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(copy, rsource2, index, TRUE);
expectAux(t.getID() + "COPY:handleTransliterator(increment=TRUE) " + message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
delete copy;
@ -386,13 +402,13 @@ void UniToHexTransliteratorTest::expectTranslit(const UnicodeToHexTransliterator
rsource2.remove();
rsource2.append(source);
index=_index;
clone->handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(clone, rsource2, index, FALSE);
expectAux(t.getID() + "CLONE:handleTransliterator(increment=FALSE) "+ message,source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
index=_index;
clone->handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(clone, rsource2, index, TRUE);
expectAux(t.getID() + "CLONE:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
/*Uses the assignment operator to create a transliterator and tests transliteration*/
@ -400,13 +416,13 @@ void UniToHexTransliteratorTest::expectTranslit(const UnicodeToHexTransliterator
rsource2.remove();
rsource2.append(source);
index=_index;
equal.handleTransliterate(rsource2, index, FALSE);
pseudoHandleTransliterate(&equal, rsource2, index, FALSE);
expectAux(t.getID() + "=OPERATOR:handleTransliterator(increment=FALSE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
rsource2.remove();
rsource2.append(source);
index=_index;
equal.handleTransliterate(rsource2, index, TRUE);
pseudoHandleTransliterate(&equal, rsource2, index, TRUE);
expectAux(t.getID() + "=OPERATOR:handleTransliterator(increment=TRUE) "+ message, source + "-->" + rsource2, rsource2==expectedResult, expectedResult);
@ -461,7 +477,7 @@ void UniToHexTransliteratorTest::expect(const UnicodeToHexTransliterator& t,
index.contextLimit = source.length();
index.start =0;
index.limit=source.length();
t.handleTransliterate(rsource, index, TRUE);
pseudoHandleTransliterate(&t, rsource, index, TRUE);
expectAux(t.getID() + ":handleTransliterate " + message, source + "->" + rsource, rsource==expectedResult, expectedResult);
}