From: Victor Cebollada <v.cebollada@samsung.com>
Date: Wed, 9 Apr 2014 12:34:41 +0000 (+0100)
Subject: Fix for TextView's broken TET cases.
X-Git-Tag: dali-2014-wk16-release~10
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=5f4593ad383c0fcc0a62bdfefae6e3e037e98ae7;ds=sidebyside

Fix for TextView's broken TET cases.

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] N/A

Change-Id: Ieff42ef89ce20291ded86595bdaf7dce73e7fa8c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
---

diff --git a/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView-Processor-Types.cpp b/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView-Processor-Types.cpp
index 3591c26..c44f441 100644
--- a/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView-Processor-Types.cpp
+++ b/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView-Processor-Types.cpp
@@ -93,7 +93,7 @@ static void UtcDaliTextViewDefaultConstructorDestructor()
   DALI_TEST_EQUALS( characterLayoutInfo.mAscender, 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo.mUnderlineThickness, 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo.mUnderlinePosition, 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_CHECK( !characterLayoutInfo.mTextActor );
+  DALI_TEST_CHECK( !characterLayoutInfo.mGlyphActor );
   DALI_TEST_CHECK( characterLayoutInfo.mStyledText.mText.IsEmpty() );
   DALI_TEST_EQUALS( characterLayoutInfo.mColorAlpha, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo.mGradientColor, Vector4::ZERO, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
@@ -152,7 +152,7 @@ static void UtcDaliTextViewCopyConstructorOperator()
   characterLayoutInfo.mUnderlineThickness = 1.f;
   characterLayoutInfo.mUnderlinePosition = 1.f;
 
-  characterLayoutInfo.mTextActor = TextActor::New( "Hello" );
+  characterLayoutInfo.mGlyphActor = TextActor::New( "Hello" );
   characterLayoutInfo.mStyledText.mText = Text( "Hello" );
 
   characterLayoutInfo.mColorAlpha = 0.f;
@@ -175,7 +175,7 @@ static void UtcDaliTextViewCopyConstructorOperator()
   DALI_TEST_EQUALS( characterLayoutInfo1.mAscender, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo1.mUnderlineThickness, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo1.mUnderlinePosition, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_CHECK( characterLayoutInfo1.mTextActor );
+  DALI_TEST_CHECK( characterLayoutInfo1.mGlyphActor );
   DALI_TEST_EQUALS( characterLayoutInfo1.mStyledText.mText.GetLength(), 5u, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo1.mColorAlpha, 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo1.mGradientColor, Vector4( 1.f, 1.f, 1.f, 1.f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
@@ -195,7 +195,7 @@ static void UtcDaliTextViewCopyConstructorOperator()
   DALI_TEST_EQUALS( characterLayoutInfo2.mAscender, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo2.mUnderlineThickness, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo2.mUnderlinePosition, 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_CHECK( characterLayoutInfo2.mTextActor );
+  DALI_TEST_CHECK( characterLayoutInfo2.mGlyphActor );
   DALI_TEST_EQUALS( characterLayoutInfo2.mStyledText.mText.GetLength(), 5u, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo2.mColorAlpha, 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( characterLayoutInfo2.mGradientColor, Vector4( 1.f, 1.f, 1.f, 1.f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
@@ -206,9 +206,9 @@ static void UtcDaliTextViewCopyConstructorOperator()
   DALI_TEST_CHECK( !characterLayoutInfo2.mSetStyle );
 
   // Increases coverage.
-  characterLayoutInfo2.mTextActor.Reset();
+  characterLayoutInfo2.mGlyphActor.Reset();
   characterLayoutInfo1 = characterLayoutInfo2;
-  DALI_TEST_CHECK( !characterLayoutInfo1.mTextActor );
+  DALI_TEST_CHECK( !characterLayoutInfo1.mGlyphActor );
 
   TextViewProcessor::WordLayoutInfo wordLayoutInfo;
   wordLayoutInfo.mSize = Vector2( 1.f, 1.f );
diff --git a/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView.cpp b/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView.cpp
index 6312da8..188377b 100644
--- a/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView.cpp
+++ b/automated-tests/dali-internal-test-suite/text-view/utc-Dali-TextView.cpp
@@ -157,9 +157,10 @@ void Print( const TextViewProcessor::CharacterLayoutInfo& character )
   std::cout << "              mSize : " << character.mSize << std::endl;
   std::cout << "          mAscender : " << character.mAscender << std::endl;
 
-  if( character.mTextActor )
+  TextActor textActor = TextActor::DownCast( character.mGlyphActor );
+  if( textActor )
   {
-    std::cout << "[" << character.mTextActor.GetText() << "]";
+    std::cout << "[" << textActor.GetText() << "]";
   }
   else
   {
@@ -286,12 +287,12 @@ bool TestEqual( const TextViewProcessor::CharacterLayoutInfo& character1,
     return false;
   }
 
-  if( character1.mTextActor && !character2.mTextActor )
+  if( character1.mGlyphActor && !character2.mGlyphActor )
   {
     return false;
   }
 
-  if( !character1.mTextActor && character2.mTextActor )
+  if( !character1.mGlyphActor && character2.mGlyphActor )
   {
     return false;
   }
@@ -301,13 +302,15 @@ bool TestEqual( const TextViewProcessor::CharacterLayoutInfo& character1,
   TextStyle style1;
   TextStyle style2;
 
-  if( character1.mTextActor )
+  TextActor textActor1 = TextActor::DownCast( character1.mGlyphActor );
+  TextActor textActor2 = TextActor::DownCast( character2.mGlyphActor );
+  if( textActor1 )
   {
-    text1 = character1.mTextActor.GetText();
-    style1 = character1.mTextActor.GetTextStyle();
+    text1 = textActor1.GetText();
+    style1 = textActor1.GetTextStyle();
 
-    text2 = character2.mTextActor.GetText();
-    style2 = character2.mTextActor.GetTextStyle();
+    text2 = textActor2.GetText();
+    style2 = textActor2.GetTextStyle();
   }
 
   if( text1 != text2 )