X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Control.cpp;h=c58bb83862c4abe0b10a4cb6ca9236612b1d1927;hb=4f47cceb532287509dc8b0f410e8922ce05e0324;hp=5cc1e0e790dea3f1bb4eb2a4ae59414f3d2e49f5;hpb=a36bb59e13fb8f984d0aad09bad0dca259aeff4c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index 5cc1e0e..c58bb83 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp @@ -414,7 +414,7 @@ int UtcDaliControlBackgroundProperties(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().empty() ); + DALI_TEST_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().Empty() ); control.SetProperty( Control::PROPERTY_BACKGROUND_COLOR, Color::RED ); DALI_TEST_CHECK( control.GetBackgroundActor() ); @@ -422,9 +422,9 @@ int UtcDaliControlBackgroundProperties(void) DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::RED, TEST_LOCATION ); Property::Map imageMap; - imageMap.push_back( Property::StringValuePair( "filename", "TestImage" ) ); + imageMap[ "filename" ] = "TestImage"; Property::Map map; - map.push_back( Property::StringValuePair( "image", imageMap ) ); + map[ "image" ] = imageMap; control.SetProperty( Control::PROPERTY_BACKGROUND, map ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::RED, TEST_LOCATION ); @@ -440,7 +440,7 @@ int UtcDaliControlBackgroundProperties(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().empty() ); + DALI_TEST_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().Empty() ); END_TEST; }