From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 22 Apr 2015 12:07:05 +0000 (-0700)
Subject: Merge "Fix to default Shadow Color setting" into tizen
X-Git-Tag: dali_1.0.39~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e4e5db1d2d7997e7bf803a531048d8dcb959083b

Merge "Fix to default Shadow Color setting" into tizen
---

e4e5db1d2d7997e7bf803a531048d8dcb959083b
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index f38404e,ee9787b..498c40e
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@@ -180,45 -103,8 +180,45 @@@ int UtcDaliToolkitTextLabelGetPropertyP
    DALI_TEST_EQUALS( label.GetProperty<int>( TextLabel::Property::RENDERING_BACKEND ), Text::RENDERING_SHARED_ATLAS, TEST_LOCATION );
    DALI_TEST_EQUALS( label.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ), Color::WHITE, TEST_LOCATION );
    DALI_TEST_EQUALS( label.GetProperty<Vector2>( TextLabel::Property::SHADOW_OFFSET ), Vector2::ZERO, TEST_LOCATION );
-   DALI_TEST_EQUALS( label.GetProperty<Vector4>( TextLabel::Property::SHADOW_COLOR ), Vector4::ZERO, TEST_LOCATION );
+   DALI_TEST_EQUALS( label.GetProperty<Vector4>( TextLabel::Property::SHADOW_COLOR ), Color::BLACK, TEST_LOCATION );
    DALI_TEST_EQUALS( label.GetProperty<bool>( TextLabel::Property::UNDERLINE_ENABLED ), false, TEST_LOCATION );
 +  DALI_TEST_EQUALS( label.GetProperty<float>( TextLabel::Property::UNDERLINE_HEIGHT ), 0.0f, TEST_LOCATION );
 +  END_TEST;
 +}
 +
 +int UtcDaliToolkitTextLabelSetPropertyN(void)
 +{
 +  ToolkitTestApplication application;
 +  tet_infoline(" UtcDaliToolkitTextLabelSetPropertyN");
 +  TextLabel label = TextLabel::New("Test Text");
 +  DALI_TEST_CHECK( label );
 +
 +  bool assert = false;
 +  try
 +  {
 +    label.SetProperty( 0, true );
 +  }
 +  catch ( ... )
 +  {
 +    assert = true;
 +  }
 +  if ( assert )
 +  {
 +    tet_result(TET_PASS);
 +  }
 +  else
 +  {
 +    tet_result(TET_FAIL);
 +  }
 +  END_TEST;
 +}
 +
 +int UtcDaliToolkitTextLabelSetPropertyP(void)
 +{
 +  ToolkitTestApplication application;
 +  tet_infoline(" UtcDaliToolkitTextLabelSetPropertyP");
 +  TextLabel label = TextLabel::New("Test Text");
 +  DALI_TEST_CHECK( label );
  
    // Check that text can be correctly reset
    label.SetProperty( TextLabel::Property::TEXT, "Setting Text" );