X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-PushButton.cpp;h=ccfb8637bdf09711cc698eb341300b0c33b63bc5;hb=b05f1616f050416fb9537db0c0f3ea78e0b30b1f;hp=c88aa9249af68ef2c73b3c97767d154cf05d149a;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp index c88aa92..ccfb863 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp @@ -679,7 +679,7 @@ int UtcDaliPushButtonProperties(void) DALI_TEST_EQUALS( "IMAGE_PATH_1", button.GetProperty( PushButton::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; - map.push_back( Property::StringValuePair( "type", "ImageActor" ) ); + map[ "type" ] = "ImageActor"; button.SetProperty( PushButton::PROPERTY_NORMAL_STATE_ACTOR, map ); DALI_TEST_EQUALS( "ImageActor", button.GetProperty( PushButton::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION ); @@ -691,7 +691,7 @@ int UtcDaliPushButtonProperties(void) DALI_TEST_EQUALS( "IMAGE_PATH_2", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; - map.push_back( Property::StringValuePair( "type", "Actor" ) ); + map[ "type" ] = "Actor"; button.SetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR, map ); DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION ); @@ -704,7 +704,7 @@ int UtcDaliPushButtonProperties(void) DALI_TEST_EQUALS( "IMAGE_PATH_3", button.GetProperty( PushButton::PROPERTY_DIMMED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; - map.push_back( Property::StringValuePair( "type", "Actor" ) ); + map[ "type" ] = "Actor"; button.SetProperty( PushButton::PROPERTY_DIMMED_STATE_ACTOR, map ); DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_DIMMED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION ); @@ -716,7 +716,7 @@ int UtcDaliPushButtonProperties(void) DALI_TEST_EQUALS( "TextView", button.GetProperty( PushButton::PROPERTY_LABEL_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; - map.push_back( Property::StringValuePair( "type", "Actor" ) ); + map[ "type" ] = "Actor"; button.SetProperty( PushButton::PROPERTY_LABEL_ACTOR, map ); DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_LABEL_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );