projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Property enum name changes in dali-core: Core changes
[platform/core/uifw/dali-core.git]
/
automated-tests
/
src
/
dali
/
utc-Dali-ImageActor.cpp
diff --git
a/automated-tests/src/dali/utc-Dali-ImageActor.cpp
b/automated-tests/src/dali/utc-Dali-ImageActor.cpp
index
5df2c0c
..
45a53b5
100644
(file)
--- a/
automated-tests/src/dali/utc-Dali-ImageActor.cpp
+++ b/
automated-tests/src/dali/utc-Dali-ImageActor.cpp
@@
-658,10
+658,10
@@
int UtcDaliImageActorDefaultProperties(void)
ImageActor actor = ImageActor::New( img );
std::vector<Property::Index> indices;
ImageActor actor = ImageActor::New( img );
std::vector<Property::Index> indices;
- indices.push_back(ImageActor::Property::P
ixelArea
);
- indices.push_back(ImageActor::Property::S
tyle
);
- indices.push_back(ImageActor::Property::B
order
);
- indices.push_back(ImageActor::Property::I
mage
);
+ indices.push_back(ImageActor::Property::P
IXEL_AREA
);
+ indices.push_back(ImageActor::Property::S
TYLE
);
+ indices.push_back(ImageActor::Property::B
ORDER
);
+ indices.push_back(ImageActor::Property::I
MAGE
);
DALI_TEST_CHECK(actor.GetPropertyCount() == ( Actor::New().GetPropertyCount() + indices.size() ) );
DALI_TEST_CHECK(actor.GetPropertyCount() == ( Actor::New().GetPropertyCount() + indices.size() ) );
@@
-677,11
+677,11
@@
int UtcDaliImageActorDefaultProperties(void)
actor.SetPixelArea(ImageActor::PixelArea( 0, 0, 0, 0 ));
ImageActor::PixelArea area( 1, 2, 3, 4 );
actor.SetPixelArea(ImageActor::PixelArea( 0, 0, 0, 0 ));
ImageActor::PixelArea area( 1, 2, 3, 4 );
- actor.SetProperty(ImageActor::Property::P
ixelArea
, Property::Value(Rect<int>(area)));
+ actor.SetProperty(ImageActor::Property::P
IXEL_AREA
, Property::Value(Rect<int>(area)));
- DALI_TEST_CHECK(Property::RECTANGLE == actor.GetPropertyType(ImageActor::Property::P
ixelArea
));
+ DALI_TEST_CHECK(Property::RECTANGLE == actor.GetPropertyType(ImageActor::Property::P
IXEL_AREA
));
- Property::Value v = actor.GetProperty(ImageActor::Property::P
ixelArea
);
+ Property::Value v = actor.GetProperty(ImageActor::Property::P
IXEL_AREA
);
DALI_TEST_CHECK(v.Get<Rect<int> >() == area);
DALI_TEST_CHECK(v.Get<Rect<int> >() == area);
@@
-924,7
+924,7
@@
int UtcDaliImageActorImageProperty(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- Property::Value imageMap = imageActor.GetProperty( ImageActor::Property::I
mage
);
+ Property::Value imageMap = imageActor.GetProperty( ImageActor::Property::I
MAGE
);
DALI_TEST_CHECK( imageMap.HasKey( "filename" ) );
DALI_TEST_EQUALS( imageMap.GetValue( "filename" ).Get< std::string >(), "MY_PATH", TEST_LOCATION );
END_TEST;
DALI_TEST_CHECK( imageMap.HasKey( "filename" ) );
DALI_TEST_EQUALS( imageMap.GetValue( "filename" ).Get< std::string >(), "MY_PATH", TEST_LOCATION );
END_TEST;