X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Cursor.cpp;h=768e58becfc2612a322126a50e08287fabfba191;hb=4800a84a19c2fd33aea3174eae8e55297ee3a9af;hp=2ab84e71784ebfd56e712a32c62f2f7ab654fa2c;hpb=6514e0ed28d783353baecc8d0d613eea4193e2bc;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp index 2ab84e7..768e58b 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -111,7 +111,10 @@ bool GetClosestLineTest( const GetClosestLineData& data ) layoutSize, textModel, metrics, - false ); + false, + LineWrap::WORD, + false, + Toolkit::DevelText::EllipsisPosition::END ); LogicalModelPtr logicalModel = textModel->mLogicalModel; VisualModelPtr visualModel = textModel->mVisualModel; @@ -157,7 +160,10 @@ bool GetClosestCursorIndexTest( const GetClosestCursorIndexData& data ) layoutSize, textModel, metrics, - false ); + false, + LineWrap::WORD, + false, + Toolkit::DevelText::EllipsisPosition::END ); LogicalModelPtr logicalModel = textModel->mLogicalModel; VisualModelPtr visualModel = textModel->mVisualModel; @@ -207,7 +213,10 @@ bool GetCursorPositionTest( const GetCursorPositionData& data ) layoutSize, textModel, metrics, - false ); + false, + LineWrap::WORD, + false, + Toolkit::DevelText::EllipsisPosition::END ); LogicalModelPtr logicalModel = textModel->mLogicalModel; VisualModelPtr visualModel = textModel->mVisualModel; @@ -260,7 +269,10 @@ bool FindSelectionIndicesTest( const FindSelectionIndicesData& data ) layoutSize, textModel, metrics, - false ); + false, + LineWrap::WORD, + false, + Toolkit::DevelText::EllipsisPosition::END ); LogicalModelPtr logicalModel = textModel->mLogicalModel; VisualModelPtr visualModel = textModel->mVisualModel; @@ -414,7 +426,7 @@ int UtcDaliGetClosestCursorIndex(void) CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP }; CharacterIndex logicalIndex04[] = { 0, 5u, 6u, 11u, 11u, 12u, 16u, 17u, 21u, 21u, - 22u, 25u, 31u, 32u, 35u, 34u, 40u, + 22u, 25u, 30u, 32u, 35u, 34u, 40u, 41u }; bool isCharacterHit04[] = { false, true, true, true, false, false, true, true, true, false, @@ -452,11 +464,11 @@ int UtcDaliGetClosestCursorIndex(void) CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP }; CharacterIndex logicalIndex05[] = { 0, 10u, 19u, 28u, 39u, 44u, - 45u, 49u, 59u, 66u, 78u, 87u, + 45u, 48u, 59u, 66u, 78u, 87u, 89u, 96u, 106u, 115u, 124u, 133u, 134u, 145u, 154u, 162u, 171u, 179u, 180u, 184u, 191u, 203u, 212u, - 221u, 222u, 233u, 240u, 251u, 265u }; + 221u, 222u, 233u, 241u, 251u, 265u }; bool isCharacterHit05[] = { false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, @@ -495,7 +507,7 @@ int UtcDaliGetClosestCursorIndex(void) CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP }; - CharacterIndex logicalIndex06[] = { 0, 10u, 19u, 28u, 39u, 44u, + CharacterIndex logicalIndex06[] = { 0, 11u, 19u, 28u, 39u, 44u, 45u, 48u, 57u, 65u, 78u, 87u, 89u, 96u, 107u, 114u, 124u, 133u, 134u, 144u, 154u, 162u, 171u, 178u, @@ -517,7 +529,7 @@ int UtcDaliGetClosestCursorIndex(void) float visualX08[] = { 7.f }; float visualY08[] = { 12.f }; CharacterHitTest::Mode mode08[] = { CharacterHitTest::TAP }; - CharacterIndex logicalIndex08[] = { 2u }; + CharacterIndex logicalIndex08[] = { 1u }; bool isCharacterHit08[] = { true }; struct GetClosestCursorIndexData data[] = @@ -634,7 +646,7 @@ int UtcDaliGetCursorPosition(void) { tet_infoline(" UtcDaliGetCursorPosition"); - float visualX08[] = { 4.f }; + float visualX08[] = { 5.f }; float visualY08[] = { 0.f }; CharacterIndex logicalIndex08[] = { 1u };