X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-VisualModel.cpp;h=2453771afb4395c029826d049f719beed771292e;hb=311e5010e011ee0b93a4a7ee48a7ae150cdc0dbd;hp=c36fed6b10341942e9362cb7f7152ecb9a789424;hpb=6c02c77859dd2f4613080c4674e2c34e5f7420f1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp index c36fed6..2453771 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -65,8 +65,7 @@ struct SetCharacterToGlyphData bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data ) { // 1) Create the model. - LogicalModelPtr logicalModel; - VisualModelPtr visualModel; + ModelPtr textModel; MetricsPtr metrics; Size textArea(100.f, 60.f); Size layoutSize; @@ -78,10 +77,15 @@ bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data ) fontDescriptions, options, layoutSize, - logicalModel, - visualModel, + textModel, metrics, - false ); + false, + LineWrap::WORD, + false, + Toolkit::DevelText::EllipsisPosition::END ); + + LogicalModelPtr logicalModel = textModel->mLogicalModel; + VisualModelPtr visualModel = textModel->mVisualModel; Vector& charactersToGlyph = visualModel->mCharactersToGlyph; Vector& glyphsPerCharacter = visualModel->mGlyphsPerCharacter; @@ -148,8 +152,7 @@ bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data ) bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data ) { // 1) Create the model. - LogicalModelPtr logicalModel; - VisualModelPtr visualModel; + ModelPtr textModel; MetricsPtr metrics; Size textArea(100.f, 60.f); Size layoutSize; @@ -161,10 +164,15 @@ bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data ) fontDescriptions, options, layoutSize, - logicalModel, - visualModel, + textModel, metrics, - false ); + false, + LineWrap::WORD, + false, + Toolkit::DevelText::EllipsisPosition::END ); + + LogicalModelPtr logicalModel = textModel->mLogicalModel; + VisualModelPtr visualModel = textModel->mVisualModel; Vector& charactersToGlyph = visualModel->mCharactersToGlyph; Vector& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;