X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-CheckBoxButton.cpp;h=f60ab87baf511eca8b6d31dc3d199c81426eab3a;hp=07b810f59a8e5e8af6bdb7bb3ec090f85377523f;hb=863244a09761c6e22a224299b6155a285e21d6ec;hpb=2bb866335dd821778de0b7245b6d04c814f82efc diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp index 07b810f..f60ab87 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp @@ -20,6 +20,10 @@ #include #include +#include +#include + + using namespace Dali; using namespace Toolkit; @@ -155,11 +159,14 @@ int UtcDaliCheckBoxSetLabelP(void) CheckBoxButton checkBox = CheckBoxButton::New(); Property::Map propertyMap; - propertyMap.Insert("text", "activate"); + + propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::TEXT, "activate" ) + .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ); + checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap ); DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GerProperty once that code is implemented - END_TEST; } @@ -177,13 +184,16 @@ int UtcDaliCheckBoxSetLabelDisabledP(void) application.Render(); Property::Map propertyMap; - propertyMap.Insert("text", "activate"); - checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true); + propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::TEXT, "activate" ) + .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ); + + checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true); checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap ); DALI_TEST_CHECK( checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")) ); - DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GerProperty once that code is implemented + DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GetProperty once that code is implemented END_TEST; }