projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[dali-toolkit]: add texteditor scrolling functionality" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-LogicalModel.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
index
4fe4876
..
7cbbe90
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
@@
-104,8
+104,7
@@
struct GetLogicalCursorIndexData
bool CreateParagraphTest( const CreateParagraphData& data )
{
// 1) Create the model.
bool CreateParagraphTest( const CreateParagraphData& data )
{
// 1) Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
@@
-117,11
+116,13
@@
bool CreateParagraphTest( const CreateParagraphData& data )
fontDescriptionRuns,
options,
layoutSize,
fontDescriptionRuns,
options,
layoutSize,
- logicalModel,
- visualModel,
+ textModel,
metrics,
false );
metrics,
false );
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
+
// 2) Clear the paragraphs.
Vector<ParagraphRun>& paragraphs = logicalModel->mParagraphInfo;
ClearCharacterRuns( data.index,
// 2) Clear the paragraphs.
Vector<ParagraphRun>& paragraphs = logicalModel->mParagraphInfo;
ClearCharacterRuns( data.index,
@@
-165,8
+166,7
@@
bool CreateParagraphTest( const CreateParagraphData& data )
bool FindParagraphTest( const FindParagraphData& data )
{
// 1) Create the model.
bool FindParagraphTest( const FindParagraphData& data )
{
// 1) Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
@@
-178,11
+178,13
@@
bool FindParagraphTest( const FindParagraphData& data )
fontDescriptionRuns,
options,
layoutSize,
fontDescriptionRuns,
options,
layoutSize,
- logicalModel,
- visualModel,
+ textModel,
metrics,
false );
metrics,
false );
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
+
// 2) Find the paragraphs.
Vector<ParagraphRunIndex> paragraphs;
logicalModel->FindParagraphs( data.index, data.numberOfCharacters, paragraphs );
// 2) Find the paragraphs.
Vector<ParagraphRunIndex> paragraphs;
logicalModel->FindParagraphs( data.index, data.numberOfCharacters, paragraphs );
@@
-214,8
+216,7
@@
bool FetchBidirectionalLineInfoTest( const FetchBidirectionalLineInfoData& data
{
std::cout << " testing : " << data.description << std::endl;
// Create the model.
{
std::cout << " testing : " << data.description << std::endl;
// Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size textArea( 100.f, 300.f );
Size layoutSize;
MetricsPtr metrics;
Size textArea( 100.f, 300.f );
Size layoutSize;
@@
-228,11
+229,13
@@
bool FetchBidirectionalLineInfoTest( const FetchBidirectionalLineInfoData& data
fontDescriptions,
options,
layoutSize,
fontDescriptions,
options,
layoutSize,
- logicalModel,
- visualModel,
+ textModel,
metrics,
false );
metrics,
false );
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
+
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] );
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] );
@@
-260,8
+263,7
@@
bool GetLogicalCharacterIndexTest( const GetLogicalCharacterIndexData& data )
{
std::cout << " testing : " << data.description << std::endl;
// Create the model.
{
std::cout << " testing : " << data.description << std::endl;
// Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size layoutSize;
MetricsPtr metrics;
Size layoutSize;
@@
-273,11
+275,13
@@
bool GetLogicalCharacterIndexTest( const GetLogicalCharacterIndexData& data )
fontDescriptions,
options,
layoutSize,
fontDescriptions,
options,
layoutSize,
- logicalModel,
- visualModel,
+ textModel,
metrics,
false );
metrics,
false );
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
+
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
// Check the current cached bidi line index. (Check it before call the GetLogicalCharacterIndex() method )
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
// Check the current cached bidi line index. (Check it before call the GetLogicalCharacterIndex() method )
@@
-315,8
+319,7
@@
bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data )
fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" );
// Create the model.
fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" );
// Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size layoutSize;
MetricsPtr metrics;
Size layoutSize;
@@
-335,14
+338,17
@@
bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data )
fontDescriptionRuns,
options,
layoutSize,
fontDescriptionRuns,
options,
layoutSize,
- logicalModel,
- visualModel,
+ textModel,
metrics,
false );
metrics,
false );
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
+
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] );
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] );
+ tet_printf(" fetched %d, line index %d, expected line index %d\n", fetched, logicalModel->mBidirectionalLineIndex, data.cachedBidiLine[index] );
if( logicalModel->mBidirectionalLineIndex != data.cachedBidiLine[index] )
{
if( logicalModel->mBidirectionalLineIndex != data.cachedBidiLine[index] )
{
@@
-352,10
+358,11
@@
bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data )
const CharacterIndex visualCharacterIndex = data.visualCursorIndex[index];
const CharacterIndex logicalCursorIndex = fetched ? logicalModel->GetLogicalCursorIndex( visualCharacterIndex ) : visualCharacterIndex;
const CharacterIndex visualCharacterIndex = data.visualCursorIndex[index];
const CharacterIndex logicalCursorIndex = fetched ? logicalModel->GetLogicalCursorIndex( visualCharacterIndex ) : visualCharacterIndex;
+ tet_printf(" visual index %d, logical index %d\n", visualCharacterIndex, logicalCursorIndex);
if( logicalCursorIndex != data.logicalCursorIndex[index] )
{
if( logicalCursorIndex != data.logicalCursorIndex[index] )
{
- tet_printf( " test : %d, visual index : %d, different logical cursor index :%d, expected : %d", index, visualCharacterIndex, logicalCursorIndex, data.logicalCursorIndex[index] );
+ tet_printf( " test : %d, visual index : %d, different logical cursor index :%d, expected : %d
\n
", index, visualCharacterIndex, logicalCursorIndex, data.logicalCursorIndex[index] );
return false;
}
}
return false;
}
}
@@
-1053,18
+1060,19
@@
int UtcDaliGetLogicalCursorIndex(void)
unsigned int bidirectionalLineIndex05[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
0u, 0u, 0u, 0u };
unsigned int bidirectionalLineIndex05[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
0u, 0u, 0u, 0u };
-// LO ק ר א ט ו ן ם פ ש ד ג
-// 0 1 2 3 4 5 6 7 8 9 10 11
-// VO ג ד ש פ ם ן ו ט א ר ק
+// LO ק ר א ט ו ן ם פ ש ד ג כ
+// 0 1 2 3 4 5 6 7 8 9 10 11 12
+// VO כ ג ד ש פ ם ן ו ט א ר ק
+
+// LO ע י ח ל
+// 12 13 14 15 16
+// VO ל ח י ע
-// LO כ ע י ח ל
-// 11 12 13 14 15 16
-// VO ל ח י ע כ
// Set a known font description
FontDescriptionRun fontDescriptionRun0601;
fontDescriptionRun0601.characterRun.characterIndex = 0u;
// Set a known font description
FontDescriptionRun fontDescriptionRun0601;
fontDescriptionRun0601.characterRun.characterIndex = 0u;
- fontDescriptionRun0601.characterRun.numberOfCharacters = 1
4
u;
+ fontDescriptionRun0601.characterRun.numberOfCharacters = 1
6
u;
fontDescriptionRun0601.familyLength = fontFamilyHebrew.size();
fontDescriptionRun0601.familyName = new char[fontDescriptionRun0601.familyLength];
memcpy( fontDescriptionRun0601.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0601.familyLength );
fontDescriptionRun0601.familyLength = fontFamilyHebrew.size();
fontDescriptionRun0601.familyName = new char[fontDescriptionRun0601.familyLength];
memcpy( fontDescriptionRun0601.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0601.familyLength );
@@
-1077,17
+1085,17
@@
int UtcDaliGetLogicalCursorIndex(void)
Vector<FontDescriptionRun> fontDescriptionRuns06;
fontDescriptionRuns06.PushBack( fontDescriptionRun0601 );
Vector<FontDescriptionRun> fontDescriptionRuns06;
fontDescriptionRuns06.PushBack( fontDescriptionRun0601 );
- unsigned int visualIndex06[] = {
1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11
u,
- 1
1u, 1
2u, 13u, 14u, 15u, 16u };
+ unsigned int visualIndex06[] = {
0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12
u,
+ 12u, 13u, 14u, 15u, 16u };
- unsigned int characterIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
- 12u, 12u, 12u, 12u, 12u
, 12u
};
+ unsigned int characterIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
0u, 0u,
+ 12u, 12u, 12u, 12u, 12u };
- unsigned int logicalIndex06[] = { 1
1u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1
u,
- 1
3u, 1
6u, 15u, 14u, 13u, 12u };
+ unsigned int logicalIndex06[] = { 1
2u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0
u,
+ 16u, 15u, 14u, 13u, 12u };
- unsigned int bidirectionalLineIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
- 1u, 1u, 1u, 1u, 1u,
1u
};
+ unsigned int bidirectionalLineIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
0u, 0u,
+ 1u, 1u, 1u, 1u, 1u, };
struct GetLogicalCursorIndexData data[] =
{
struct GetLogicalCursorIndexData data[] =
{
@@
-1157,7
+1165,7
@@
int UtcDaliGetLogicalCursorIndex(void)
Size( 100.f, 300.f ),
1u,
fontDescriptionRuns06.Begin(),
Size( 100.f, 300.f ),
1u,
fontDescriptionRuns06.Begin(),
- 1
5
u,
+ 1
8
u,
visualIndex06,
characterIndex06,
logicalIndex06,
visualIndex06,
characterIndex06,
logicalIndex06,
@@
-1171,6
+1179,7
@@
int UtcDaliGetLogicalCursorIndex(void)
ToolkitTestApplication application;
if( !GetLogicalCursorIndexTest( data[index] ) )
{
ToolkitTestApplication application;
if( !GetLogicalCursorIndexTest( data[index] ) )
{
+ tet_printf("Test %d failed : [%s]\n", index, data[index].description.c_str());
tet_result(TET_FAIL);
}
}
tet_result(TET_FAIL);
}
}