Merge "Return target size and position while retrieving default actor property value...

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-BaseHandle.cpp

diff --git a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
index b0fb0c0..9e3da41 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
+++ b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
@@ -315,7 +315,7 @@ int UtcDaliBaseHandleDoAction(void)
   DALI_TEST_CHECK(actorObject);
 
   // Check that an invalid command is not performed
-  std::vector<Property::Value> attributes;
+  Property::Map attributes;
   DALI_TEST_CHECK(actorObject.DoAction("invalidCommand", attributes) == false);
 
   // Check that the actor is visible
@@ -360,7 +360,7 @@ int UtcDaliBaseHandleDoAction(void)
   // Set the new duration to be 2 seconds
   float newDurationSeconds(2.0f);
   Property::Value newDurationSecondsValue = Property::Value( newDurationSeconds );
-  attributes.push_back(newDurationSecondsValue);
+  attributes["duration"] = newDurationSecondsValue;
 
   // Check the animation performed an action to play itself with the specified duration of 2 seconds
   animationObject.DoAction("play", attributes);
@@ -456,7 +456,7 @@ int UtcDaliBaseHandleGetTypeNameN(void)
   FakeObject object;
   std::string typeName = object.GetTypeName();
 
-  DALI_TEST_CHECK( typeName == Dali::String::EMPTY );
+  DALI_TEST_CHECK( typeName.empty() );
   END_TEST;
 }
 
@@ -522,3 +522,14 @@ int UtcDaliBaseHandleBooleanCast(void)
   DALI_TEST_CHECK( static_cast<BaseHandle::BooleanType>( handle ) );
   END_TEST;
 }
+
+int UtcDaliBaseHandleCompareOperatorN(void)
+{
+  TestApplication application;
+  BaseHandle handle1 = Actor::New();
+  BaseHandle handle2 = handle1;
+
+  DALI_TEST_CHECK( (handle1 < handle2) == false );
+
+  END_TEST;
+}