X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Shaping.cpp;h=2bdd21767053c905abd9d189dd1841a32e10a6a5;hb=746c9a68c411a98ba9e853609775a1519ae5bcd9;hp=9a7bf3fcd68a91ae8072d5c4dc3ee582488844b1;hpb=87a9019904ab49c42f1e32e7ebb6a1512b0dc28c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp index 9a7bf3f..2bdd217 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp @@ -123,8 +123,7 @@ struct ShapeInfoData bool ShapeInfoTest( const ShapeInfoData& data ) { // 1) Create the model. - LogicalModelPtr logicalModel; - VisualModelPtr visualModel; + ModelPtr textModel; MetricsPtr metrics; Size textArea(100.f, 60.f); Size layoutSize; @@ -136,11 +135,13 @@ bool ShapeInfoTest( const ShapeInfoData& data ) data.fontDescriptions, options, layoutSize, - logicalModel, - visualModel, + textModel, metrics, false ); + LogicalModelPtr logicalModel = textModel->mLogicalModel; + VisualModelPtr visualModel = textModel->mVisualModel; + // 2) Clear the model. Vector& glyphs = visualModel->mGlyphs; @@ -552,13 +553,13 @@ int UtcDaliTextSoftwareStyling(void) struct GlyphInfoData glyphs01[] = { { 2u, 21154u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, - { 2u, 12298, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, + { 2u, 12298u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, { 2u, 17828u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, }; struct GlyphInfoData glyphs02[] = { { 2u, 21154u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, false }, - { 2u, 12298, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, true }, + { 2u, 12298u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, true }, { 2u, 17828u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, false }, };