X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-TextView-HelperAndDebug.cpp;h=f5e39e6ee5017036b55dd8ab8017550d66a385f6;hp=dd0855a1eade873f1610318b6dbc04d68aa0994a;hb=49499a0b6e23d98f681f7aefe6b18c5dad55f8b3;hpb=64485a966f60d59a33610e3439703dc7e7c19c32 diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-HelperAndDebug.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-HelperAndDebug.cpp index dd0855a..f5e39e6 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-HelperAndDebug.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-HelperAndDebug.cpp @@ -55,21 +55,21 @@ struct GetIndicesFromGlobalCharacterIndexTest std::string description; std::string input; std::size_t position; - std::size_t lineIndex; + std::size_t paragraphIndex; std::size_t wordIndex; std::size_t characterIndex; }; /** - * Gets the line, word, and character indices for a given text and a given position and checks the results with the given indices. + * Gets the paragraph, word, and character indices for a given text and a given position and checks the results with the given indices. * * If the test fails it prints a short description and the line where this function was called. * * @param description Short description of the experiment. * @param input The input text. * @param position Global position of the character. i.e in a text with with 1000 characters, position could be any value from 0 to 1000. - * @param resultLineIndex Index to the line where the character is located. - * @param resultWordIndex Index to the word within the line where the character is located. + * @param resultParagraphIndex Index to the paragraph where the character is located. + * @param resultWordIndex Index to the word within the paragraph where the character is located. * @param resultCharacterIndex Index to the character within the word where the character is located. * @param location Where this function has been called. * @@ -78,7 +78,7 @@ struct GetIndicesFromGlobalCharacterIndexTest bool TestGetIndicesFromGlobalCharacterIndex( const std::string& description, const std::string& input, const std::size_t position, - const std::size_t resultLineIndex, + const std::size_t resultParagraphIndex, const std::size_t resultWordIndex, const std::size_t resultCharacterIndex, const char* location ) @@ -101,9 +101,9 @@ bool TestGetIndicesFromGlobalCharacterIndex( const std::string& description, inputLayout, indices ); - if( indices.mLineIndex != resultLineIndex ) + if( indices.mParagraphIndex != resultParagraphIndex ) { - tet_printf( "Fail. different line index. %s", location ); + tet_printf( "Fail. different paragraph index. %s", location ); return false; } if( indices.mWordIndex != resultWordIndex ) @@ -187,7 +187,7 @@ int UtcDaliTextViewGetIndicesFromGlobalCharacterIndex(void) 3 }, { - std::string( "Test position 33. (end of the second word of the second line)" ), + std::string( "Test position 33. (end of the second word of the second paragraph)" ), std::string( "text text text text text\n" "text text טקסט טקסט text\n" "text text text text text\n" @@ -215,7 +215,7 @@ int UtcDaliTextViewGetIndicesFromGlobalCharacterIndex(void) { const GetIndicesFromGlobalCharacterIndexTest& test = getIndicesFromGlobalCharacterIndexTests[index]; - if( !TestGetIndicesFromGlobalCharacterIndex( test.description, test.input, test.position, test.lineIndex, test.wordIndex, test.characterIndex, TEST_LOCATION ) ) + if( !TestGetIndicesFromGlobalCharacterIndex( test.description, test.input, test.position, test.paragraphIndex, test.wordIndex, test.characterIndex, TEST_LOCATION ) ) { tet_result( TET_FAIL ); }