[UTC][dali-core][ACR-951] Add new TCs of dali-core PropertyMap and PropertyArray

Change-Id: Ic847d50cd860a5afbdada3c1e37dd08daf5401ca

diff --git a/src/utc/dali-core/property-array/utc-dali-property-array.cpp b/src/utc/dali-core/property-array/utc-dali-property-array.cpp
index 226ee792f167cb821b7613c0227e461f2dfc102c..bc30b76d2eb3cf70c488a5731f1c06462ea0868e 100755 (executable)
--- a/src/utc/dali-core/property-array/utc-dali-property-array.cpp
+++ b/src/utc/dali-core/property-array/utc-dali-property-array.cpp
@@ -1,4 +1,5 @@
 #include "utc-dali-property-array-common.h"
+#include <dlog.h>
 
 extern int gArgc;
 extern char ** gArgv;
@@ -26,6 +27,11 @@ void utc_Dali_PropertyArray_cleanup(void)
 
 }
 
+bool FloatCompare(float value1, float value2, float epsilon)
+{
+       return fabsf(value1 - value2)<epsilon;
+}
+
 
 void PropertyArrayConstructor();
 void PropertyArrayCopyConstructor();
@@ -35,6 +41,7 @@ void PropertyArrayEmpty();
 void PropertyArrayClear();
 void PropertyArrayReserve();
 void PropertyArrayResize();
+void PropertyArrayAddP();
 void PropertyArrayCapacity();
 void PropertyArrayPushBack();
 void PropertyArrayGetElementAt();
@@ -51,6 +58,7 @@ namespace
     PROPERTY_ARRAY_COUNT,
     PROPERTY_ARRAY_EMPTY,
     PROPERTY_ARRAY_CLEAR,
+    PROPERTY_ARRAY_ADD,
     PROPERTY_ARRAY_RESERVE,
     PROPERTY_ARRAY_RESIZE,
     PROPERTY_ARRAY_CAPACITY,
@@ -117,6 +125,10 @@ namespace
           PropertyArrayReserve();
           break;
 
+        case PROPERTY_ARRAY_ADD:
+          PropertyArrayAddP();
+          break;
+
         case PROPERTY_ARRAY_RESIZE:
           PropertyArrayResize();
           break;
@@ -283,6 +295,27 @@ void PropertyArrayResize()
 
   DaliLog::PrintPass();
 }
+void PropertyArrayAddP()
+{
+  Property::Array propArray;
+  DALI_CHECK_FAIL(!propArray.Empty(), "property is not empty which is not expected ");
+
+  propArray.Add( 1 );
+
+  DALI_CHECK_FAIL( 1 != propArray.Size(), " property array count value is not which is not expected");
+  DALI_CHECK_FAIL( propArray[0].Get<int>() != 1, " property array element value is not matched ");
+
+  propArray.Add( 2 )
+       .Add( 3 )
+       .Add( 4.f );
+
+  DALI_CHECK_FAIL( 4 != propArray.Size(), " property array count value is not which is not expected");
+
+  DALI_CHECK_FAIL( propArray[1].Get<int>()   != 2,   " property array element value is not matched ");
+  DALI_CHECK_FAIL( propArray[2].Get<int>()   != 3,   " property array element value is not matched ");
+  DALI_CHECK_FAIL( !FloatCompare(propArray[3].Get<float>(),4.f, Math::MACHINE_EPSILON_1), " property array element value is not matched ");
+  DaliLog::PrintPass();;
+}
 void PropertyArrayCapacity()
 {
   Property::Array propArray;
@@ -485,6 +518,21 @@ int UtcDaliPropertyArrayResizeP(void)
   return test_return_value;
 }
 
+/**
+ * @testcase             UtcDaliPropertyArrayAddP
+ * @since_tizen          4.0
+ * @description          To Check propertyarray add is working properly or not
+ */
+int UtcDaliPropertyArrayAddP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Array_TestApp testApp( application, PROPERTY_ARRAY_ADD);
+  application.MainLoop();
+  return test_return_value;
+} 
+
 /**
  * @testcase             UtcDaliPropertyArrayCapacityP
  * @since_tizen          2.4

diff --git a/src/utc/dali-core/property-map/utc-dali-property-map.cpp b/src/utc/dali-core/property-map/utc-dali-property-map.cpp
index e41b86091013c68e8e704d634aaff037349c069c..57850762c359f0bf2c9829d01d5f420d0b7ee298 100755 (executable)
--- a/src/utc/dali-core/property-map/utc-dali-property-map.cpp
+++ b/src/utc/dali-core/property-map/utc-dali-property-map.cpp
@@ -35,9 +35,14 @@ void PropertyMapInsert();
 void PropertyMapInsertP2();
 void PropertyMapInsertP3();
 void PropertyMapInsertP4();
+void PropertyMapAdd();
+void PropertyMapAddChain();
+void PropertyMapAnonymousAddChain();
 void PropertyMapGetValue();
 void PropertyMapGetKey();
+void PropertyMapGetKeyAt();
 void PropertyMapGetKeyValuePair();
+void PropertyMapGetKeyValue();
 void PropertyMapFind();
 void PropertyMapFindP2();
 void PropertyMapFindP3();
@@ -52,6 +57,10 @@ void PropertyMapOperatorAssignmentP2();
 void PropertyMapOperatorAssignmentP3();
 void PropertyMapSquareOperatorP();
 void PropertyMapConstSquareOperatorP();
+void PropertyKeyConstructorP();
+void PropertyKeyEqualityOperatorP();
+void PropertyKeyInequalityOperatorP();
+void PropertyKeyOutputStream();
 namespace
 {
   enum TEST_CASES_LIST_PROPERTY_MAP
@@ -64,9 +73,14 @@ namespace
     PROPERTY_MAP_INSERT_P2,
     PROPERTY_MAP_INSERT_P3,
     PROPERTY_MAP_INSERT_P4,
+    PROPERTY_MAP_ADD,
+    PROPERTY_MAP_ADD_CHAIN,
+    PROPERTY_MAP_ANONYMOUS_ADD_CHAIN,
     PROPERTY_MAP_GET_KEY,
+    PROPERTY_MAP_GET_KEY_AT,
     PROPERTY_MAP_GET_VALUE,
     PROPERTY_MAP_GET_KEY_VALUE_PAIR,
+    PROPERTY_MAP_GET_KEY_VALUE,
     PROPERTY_MAP_FIND,
     PROPERTY_MAP_FIND_P2,
     PROPERTY_MAP_FIND_P3,
@@ -80,7 +94,11 @@ namespace
     PROPERTY_MAP_ASSIGNMENT_OPERATOR_P2,
     PROPERTY_MAP_ASSIGNMENT_OPERATOR_P3,
     PROPERTY_MAP_SQUARE_OPERATOR_P,
-    PROPERTY_MAP_CONST_SQUARE_OPERATOR_P
+    PROPERTY_MAP_CONST_SQUARE_OPERATOR_P,
+    PROPERTY_KEY_CONSTRUCTOR_P,
+    PROPERTY_KEY_EQUALITY_OPERATOR_P,
+    PROPERTY_KEY_INEQUALITY_OPERATOR_P,
+    PROPERTY_KEY_OUTPUT_STREAM
   };
 
   struct Property_Map_TestApp : public ConnectionTracker
@@ -143,6 +161,18 @@ namespace
           PropertyMapInsertP4();
           break;
 
+        case PROPERTY_MAP_ADD:
+          PropertyMapAdd();
+          break;
+
+        case PROPERTY_MAP_ADD_CHAIN:
+          PropertyMapAddChain();
+          break;
+
+        case PROPERTY_MAP_ANONYMOUS_ADD_CHAIN:
+          PropertyMapAnonymousAddChain();
+          break;
+
         case PROPERTY_MAP_FIND:
           PropertyMapFind();
           break;
@@ -187,10 +217,18 @@ namespace
           PropertyMapGetKey();
           break;
 
+        case PROPERTY_MAP_GET_KEY_AT:
+          PropertyMapGetKeyAt();
+          break;
+
         case PROPERTY_MAP_GET_KEY_VALUE_PAIR:
           PropertyMapGetKeyValuePair();
           break;
 
+        case PROPERTY_MAP_GET_KEY_VALUE:
+          PropertyMapGetKeyValue();
+          break;
+
         case PROPERTY_MAP_ASSIGNMENT_OPERATOR:
           PropertyMapOperatorAssignment();
           break;
@@ -210,6 +248,22 @@ namespace
         case PROPERTY_MAP_CONST_SQUARE_OPERATOR_P:
           PropertyMapConstSquareOperatorP();
           break;
+
+        case PROPERTY_KEY_CONSTRUCTOR_P:
+          PropertyKeyConstructorP();
+          break;
+
+        case PROPERTY_KEY_EQUALITY_OPERATOR_P:
+          PropertyKeyEqualityOperatorP();
+          break;
+
+        case PROPERTY_KEY_INEQUALITY_OPERATOR_P:
+          PropertyKeyInequalityOperatorP();
+          break;
+
+        case PROPERTY_KEY_OUTPUT_STREAM:
+          PropertyKeyOutputStream();
+          break;
       }
     }
     // Data
@@ -447,12 +501,113 @@ void PropertyMapInsertP4()
 
   DaliLog::PrintPass();
 }
+void PropertyMapAdd()
+{ 
+  const std::string strValue1 = "bar";
+  const std::string strValue2 = "testing";
+  const std::string strValue3 = "DALi";
+  const int intValue = 9;
+
+  Property::Map map;
+  DALI_CHECK_FAIL( 0 != map.Count() ," Property is not empty which is not expected");
+
+  map.Add( "foo", strValue1);
+  DALI_CHECK_FAIL( 1 != map.Count() ," Only one item should be in Map");
+
+  Property::Value* value = map.Find( "foo" );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue1 ), " Find is not working properly while returning reference of the key" );
+
+  map.Add( std::string("foo2"), strValue2 );
+  DALI_CHECK_FAIL( 2 != map.Count() ," Only two items should be in Map");
+  value = map.Find( "foo2" );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue2 ), " Find is not working properly while returning reference of the key" );
+
+  map.Add( 10, strValue3 );
+  DALI_CHECK_FAIL( 3 != map.Count() ," Only three items should be in Map");
+  value = map.Find( 10 );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue3 ), " Find is not working properly while returning reference of the key" );
+
+  map.Add( 100, intValue );
+  DALI_CHECK_FAIL( 4 != map.Count() ," Only four items should be in Map");
+  value = map.Find( 100 );
+  DALI_CHECK_FAIL( value->Get<int>() != intValue , " Find is not working properly while returning reference of the key" );
+
+  DaliLog::PrintPass();
+}
+void PropertyMapAddChain()
+{ 
+  const std::string strValue1 = "bar";
+  const std::string strValue2 = "testing";
+  const std::string strValue3 = "DALi";
+  const int intValue = 9;
+
+  Property::Map map;
+  DALI_CHECK_FAIL( 0 != map.Count() ," Property is not empty which is not expected");
+  map
+    .Add( "foo", strValue1)
+    .Add( std::string("foo2"), strValue2 )
+    .Add( 10, strValue3 )
+    .Add( 100, intValue );
+
+  DALI_CHECK_FAIL( 4 != map.Count() ," 4 items should be in Map");
+
+  Property::Value* value = map.Find( "foo" );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue1 ), " Find is not working properly while returning reference of the key" );
+
+  value = map.Find( "foo2" );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue2 ), " Find is not working properly while returning reference of the key" );
+
+  value = map.Find( 10 );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue3 ), " Find is not working properly while returning reference of the key" );
+
+  value = map.Find( 100 );
+  DALI_CHECK_FAIL( value->Get<int>() != intValue, " Find is not working properly while returning reference of the key" );
+
+  DaliLog::PrintPass();
+}
+void PropertyMapAnonymousAddChain(void)
+{
+  const std::string strValue1 = "bar";
+  const std::string strValue2 = "testing";
+  const std::string strValue3 = "DALi";
+  const int intValue = 9;
+
+  class TestMap
+  {
+  public:
+    TestMap(Property::Map map)
+    : mMap(map)
+    {
+    }
+    Property::Map mMap;
+  };
+
+  TestMap mapTest( Property::Map().Add( "foo", "bar")
+                                  .Add( std::string("foo2"), "testing" )
+                                  .Add( 10, "DALi" )
+                                  .Add( 100, 9 ));
+
+
+  Property::Value* value = mapTest.mMap.Find( "foo" );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue1 ), " Find is not working properly while returning reference of the key" );
+
+  value = mapTest.mMap.Find( "foo2" );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue2 ), " Find is not working properly while returning reference of the key" );
+
+  value = mapTest.mMap.Find( 10 );
+  DALI_CHECK_FAIL( ! ( value->Get<std::string>() == strValue3 ), " Find is not working properly while returning reference of the key" );
+
+  value = mapTest.mMap.Find( 100 );
+  DALI_CHECK_FAIL( value->Get<int>() != intValue , " Find is not working properly while returning reference of the key" );
+
+  DaliLog::PrintPass();;
+}
 void PropertyMapGetKey()
 {
   const string strMapFirst = "hello";
   const string strMapTwo = "world";
   const string strMapThree = "Tizen";
-
+ 
   const int nSetValueOne = 1 ,nSetValueTwo = 2  , nSetValueThree = 3 ;
 
   Property::Map propMap;
@@ -473,18 +628,45 @@ void PropertyMapGetKey()
 
   DaliLog::PrintPass();
 }
+
+void PropertyMapGetKeyAt()
+{
+  const string strMapFirst = "hello";
+  const string strMapTwo = "world";
+  const Dali::Property::Index idxMapThree = Actor::Property::COLOR;
+
+  const int nSetValueOne = 1 ,nSetValueTwo = 2 ;
+  const Vector4 nSetValueThree = Color::MAGENTA;
+
+  Property::Map propMap;
+  DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected");
+
+  propMap[ strMapFirst]   =  nSetValueOne ;
+  propMap[ strMapTwo  ]   =  nSetValueTwo;
+  propMap[ idxMapThree ]  =  nSetValueThree;
+
+  DALI_CHECK_FAIL(propMap.GetKeyAt( 0 ) != strMapFirst ," GetKeyAt is not working properly while returning the key");
+
+  DALI_CHECK_FAIL(propMap.GetKeyAt( 1 ) != strMapTwo ," GetKeyAt is not working properly while returning the key");
+  
+  DALI_CHECK_FAIL(propMap.GetKeyAt( 2 ) != idxMapThree ," GetKeyAt is not working properly while returning the key");
+  DaliLog::PrintPass();
+}
 void PropertyMapGetValue()
 {
   const string strMapFirst = "hello";
   const string strMapTwo = "world";
+  const Dali::Property::Index idxMapThree = Actor::Property::COLOR;
 
   const int nSetValueOne = 1 ,nSetValueTwo = 2;
+  const Vector4 nSetValueThree = Color::MAGENTA;
 
   Property::Map propMap;
   DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected");
 
   propMap[ strMapFirst]   =  nSetValueOne;
   propMap[ strMapTwo  ]   =  nSetValueTwo;
+  propMap[ idxMapThree ]  =  nSetValueThree;
 
   Property::Value& value = propMap.GetValue( 0 );
   DALI_CHECK_FAIL( value.Get<int>() != nSetValueOne ," getvalue is not working properly while returning reference");
@@ -492,6 +674,12 @@ void PropertyMapGetValue()
   value = propMap.GetValue( 1 );
   DALI_CHECK_FAIL( value.Get<int>() != nSetValueTwo ," getvalue is not working properly while returning reference");
 
+  value = propMap.GetValue( 2 );
+  DALI_CHECK_FAIL( value.Get<Vector4>() != nSetValueThree ," getvalue is not working properly while returning reference");
+
+  value = Color::CYAN;
+  DALI_CHECK_FAIL( value.Get<Vector4>() != Color::CYAN ," value changing is not working properly while returning reference");
+
   DaliLog::PrintPass();
 }
 void PropertyMapGetKeyValuePair()
@@ -525,6 +713,40 @@ void PropertyMapGetKeyValuePair()
 
   DaliLog::PrintPass();
 }
+void PropertyMapGetKeyValue()
+{
+  const string strMapFirst = "hello";
+  const string strMapTwo = "world";
+  const string strMapThree = "Tizen";
+  const Dali::Property::Index idxMapFour = Actor::Property::COLOR;
+
+  const int nSetValueOne = 1 ,nSetValueTwo = 2  , nSetValueThree = 3 ;
+  const Vector4 nSetValueFour = Color::MAGENTA;
+
+
+  
+
+  Property::Map propMap;
+  DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected");
+
+  propMap[ strMapFirst]   =  nSetValueOne ;
+  propMap[ strMapTwo  ]   =  nSetValueTwo;
+  propMap[ strMapThree]   =  nSetValueThree;
+  propMap[ idxMapFour  ]  =  nSetValueFour;
+
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 0 ).first != strMapFirst,                " GetPair is not working properly while returning the pair key");
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 0 ).second.Get< int >() != nSetValueOne, " getvalue is not working properly while returning reference");
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 1 ).first != strMapTwo,                  " GetPair is not working properly while returning the pair key");
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 1 ).second.Get< int >() != nSetValueTwo, " getvalue is not working properly while returning reference");
+
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 2 ).first != strMapThree,                  " GetPair is not working properly while returning the pair key");
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 2 ).second.Get< int >() != nSetValueThree, " getvalue is not working properly while returning reference");
+
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 3 ).first != idxMapFour,                      " GetPair is not working properly while returning the pair key");
+  DALI_CHECK_FAIL( propMap.GetKeyValue( 3 ).second.Get< Vector4 >() != nSetValueFour, " getvalue is not working properly while returning reference");
+
+  DaliLog::PrintPass();
+}
 void PropertyMapFind()
 {
   const string strMapFirst = "hello";
@@ -931,6 +1153,76 @@ void PropertyMapConstSquareOperatorP()
 
   DaliLog::PrintPass();
 }
+void PropertyKeyConstructorP()
+{
+  Property::Key key1( "aKey" );
+  DALI_CHECK_FAIL( key1.type != Property::Key::STRING, " Property::Key type is not matched");
+  DALI_CHECK_FAIL( key1.stringKey != "aKey", " Property::Key stringkey is not matched");
+  DALI_CHECK_FAIL( key1.indexKey != Property::INVALID_INDEX, " Property::Key indexkey is not matched");
+
+  Property::Key key2( Actor::Property::COLOR );
+  DALI_CHECK_FAIL( key2.type != Property::Key::INDEX, " Property::Key type is not matched");
+  DALI_CHECK_FAIL( key2.indexKey != (Dali::Property::Index)Actor::Property::COLOR, " Property::Key indexkey is not matched");
+
+  DaliLog::PrintPass();
+  
+}
+
+void PropertyKeyEqualityOperatorP()
+{
+  Property::Key key1( "aKey" );
+  Property::Key key2( 113 );
+
+  DALI_CHECK_FAIL( !(key1 == "aKey")    , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( key1 == "notTheKey" , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( key1 == 1            , " Property::Key EqualityOperator test failed");
+
+  DALI_CHECK_FAIL( !(key2 == 113)                     , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( key2 == 0                          , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( key2 == "One hundred and thirteen" , " Property::Key EqualityOperator test failed");
+
+  DALI_CHECK_FAIL( key1 == key2    , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( !(key1 != key2) , " Property::Key EqualityOperator test failed");
+
+  Property::Key key1B( "aKey" );
+  Property::Key key2B( 113 );
+
+  DALI_CHECK_FAIL( !(key1 == key1B) , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( !(key2 == key2B) , " Property::Key EqualityOperator test failed");
+
+  DaliLog::PrintPass();;
+}
+void PropertyKeyInequalityOperatorP()
+{
+  Property::Key key1( "aKey" );
+  Property::Key key2( 113 );
+
+  DALI_CHECK_FAIL( !(key1 != "notTheKey") , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( !(key1 != 1)           , " Property::Key EqualityOperator test failed");
+
+  DALI_CHECK_FAIL( !(key2 != 0)                         , " Property::Key EqualityOperator test failed");
+  DALI_CHECK_FAIL( !(key2 != "One hundred and thirteen"), " Property::Key EqualityOperator test failed");
+
+  DALI_CHECK_FAIL( !(key1 != key2)                      , " Property::Key EqualityOperator test failed");
+
+  DaliLog::PrintPass();
+}
+
+void PropertyKeyOutputStream()
+{
+  Property::Key key1( "aKey" );
+  Property::Key key2( 113 );
+
+  std::ostringstream oss;
+  oss << key1;
+  DALI_CHECK_FAIL( oss.str() != "aKey", " PropertyKey output stream test failed");
+
+  std::ostringstream oss2;
+  oss2 << key2;
+  DALI_CHECK_FAIL( oss2.str() != "113", " PropertyKey output stream test failed");
+
+  DaliLog::PrintPass();
+}
 
 /**
  * End of TC Logic Implementation Area.
@@ -1063,6 +1355,51 @@ int UtcDaliPropertyMapInsertP4(void)
   return test_return_value;
 }
 
+/**
+ * @testcase         UtcDaliPropertyMapAddP
+ * @since_tizen      4.0
+ * @description      Check if we can add an index-value pair to a property-map
+ */
+int UtcDaliPropertyMapAddP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_MAP_ADD);
+  application.MainLoop();
+  return test_return_value;
+}
+
+/**
+ * @testcase         UtcDaliPropertyMapAddChainP
+ * @since_tizen      4.0
+ * @description      Check if we can add an index-value pair to a property-map
+ */
+int UtcDaliPropertyMapAddChainP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_MAP_ADD_CHAIN);
+  application.MainLoop();
+  return test_return_value;
+}
+
+/**
+ * @testcase         UtcDaliPropertyMapAnonymousAddChainP
+ * @since_tizen      4.0
+ * @description      Check if we can add an index-value pair to a property-map
+ */
+int UtcDaliPropertyMapAnonymousAddChainP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_MAP_ANONYMOUS_ADD_CHAIN);
+  application.MainLoop();
+  return test_return_value;
+}
+
 /**
  * @testcase         UtcDaliPropertyMapGetValueP
  * @since_tizen      2.4
@@ -1093,6 +1430,21 @@ int UtcDaliPropertyMapGetKeyP(void)
   return test_return_value;
 }
 
+/**
+ * @testcase         UtcDaliPropertyMapGetKeyAtP
+ * @since_tizen      4.0
+ * @description      Check if Getpair,GetValue,GetKey Api working properly or not
+ */
+int UtcDaliPropertyMapGetKeyAtP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_MAP_GET_KEY_AT);
+  application.MainLoop();
+  return test_return_value;
+}
+
 /**
  * @testcase         UtcDaliPropertyMapGetPairP
  * @since_tizen      2.4
@@ -1108,6 +1460,21 @@ int UtcDaliPropertyMapGetPairP(void)
   return test_return_value;
 }
 
+/**
+ * @testcase         UtcDaliPropertyMapGetKeyValueP
+ * @since_tizen      4.0
+ * @description      Check if Getpair,GetValue,GetKey Api working properly or not
+ */
+int UtcDaliPropertyMapGetKeyValueP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_MAP_GET_KEY_VALUE);
+  application.MainLoop();
+  return test_return_value;
+}
+
 /**
  * @testcase         UtcDaliPropertyMapFindP
  * @since_tizen      2.4
@@ -1317,3 +1684,63 @@ int UtcDaliPropertyMapConstSquareOperatorP(void)
   application.MainLoop();
   return test_return_value;
 }
+
+/**
+ * @testcase         UtcDaliPropertyKeyConstructorP
+ * @since_tizen      4.0
+ * @description      Check if property key constructor works fine
+ */
+int UtcDaliPropertyKeyConstructorP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_KEY_CONSTRUCTOR_P);
+  application.MainLoop();
+  return test_return_value;
+}
+
+/**
+ * @testcase         UtcDaliPropertyKeyEqualityOperatorP
+ * @since_tizen      4.0
+ * @description      Check if property key equality operation works
+ */
+int UtcDaliPropertyKeyEqualityOperatorP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_KEY_EQUALITY_OPERATOR_P);
+  application.MainLoop();
+  return test_return_value;
+}
+
+/**
+ * @testcase         UtcDaliPropertyKeyInequalityOperatorP
+ * @since_tizen      4.0
+ * @description      Check if property key inequality operation works
+ */
+int UtcDaliPropertyKeyInequalityOperatorP(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_KEY_INEQUALITY_OPERATOR_P);
+  application.MainLoop();
+  return test_return_value;
+}
+
+/**
+ * @testcase         UtcDaliPropertyKeyOutputStream
+ * @since_tizen      4.0
+ * @description      Check if property key output stream works
+ */
+int UtcDaliPropertyKeyOutputStream(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Property_Map_TestApp testApp( application, PROPERTY_KEY_OUTPUT_STREAM);
+  application.MainLoop();
+  return test_return_value;
+}
\ No newline at end of file

diff --git a/src/utc/dali-core/tct-dali-core-core_mobile.h b/src/utc/dali-core/tct-dali-core-core_mobile.h
index e39f48d98e519c9765339025a546f0fb4f56ce83..d221a0a8679d14654309ffe9a355072f5aa72487 100755 (executable)
--- a/src/utc/dali-core/tct-dali-core-core_mobile.h
+++ b/src/utc/dali-core/tct-dali-core-core_mobile.h
@@ -550,9 +550,14 @@ extern int UtcDaliPropertyMapInsertP(void);
 extern int UtcDaliPropertyMapInsertP2(void);
 extern int UtcDaliPropertyMapInsertP3(void);
 extern int UtcDaliPropertyMapInsertP4(void);
+extern int UtcDaliPropertyMapAddP(void);
+extern int UtcDaliPropertyMapAddChainP(void);
+extern int UtcDaliPropertyMapAnonymousAddChainP(void);
 extern int UtcDaliPropertyMapGetValueP(void);
 extern int UtcDaliPropertyMapGetKeyP(void);
+extern int UtcDaliPropertyMapGetKeyAtP(void);
 extern int UtcDaliPropertyMapGetPairP(void);
+extern int UtcDaliPropertyMapGetKeyValueP(void);
 extern int UtcDaliPropertyMapFindP(void);
 extern int UtcDaliPropertyMapFindP2(void);
 extern int UtcDaliPropertyMapFindP3(void);
@@ -567,6 +572,10 @@ extern int UtcDaliPropertyMapOperatorAssignmentP2(void);
 extern int UtcDaliPropertyMapOperatorAssignmentP3(void);
 extern int UtcDaliPropertyMapSquareOperatorP(void);
 extern int UtcDaliPropertyMapConstSquareOperatorP(void);
+extern int UtcDaliPropertyKeyConstructorP(void);
+extern int UtcDaliPropertyKeyEqualityOperatorP(void);
+extern int UtcDaliPropertyKeyInequalityOperatorP(void);
+extern int UtcDaliPropertyKeyOutputStream(void);
 extern int UtcDaliPropertyArrayConstructorP(void);
 extern int UtcDaliPropertyArrayCopyConstructorP(void);
 extern int UtcDaliPropertyArraySizeP(void);
@@ -575,6 +584,7 @@ extern int UtcDaliPropertyArrayEmptyP(void);
 extern int UtcDaliPropertyArrayClearP(void);
 extern int UtcDaliPropertyArrayReserveP(void);
 extern int UtcDaliPropertyArrayResizeP(void);
+extern int UtcDaliPropertyArrayAddP(void);
 extern int UtcDaliPropertyArrayCapacityP(void);
 extern int UtcDaliPropertyArrayPushBackP(void);
 extern int UtcDaliPropertyArrayGetElementAtP(void);
@@ -1675,9 +1685,14 @@ testcase tc_array[] = {
        {"UtcDaliPropertyMapInsertP2",UtcDaliPropertyMapInsertP2,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapInsertP3",UtcDaliPropertyMapInsertP3,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapInsertP4",UtcDaliPropertyMapInsertP4,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapAddP",UtcDaliPropertyMapAddP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapAddChainP",UtcDaliPropertyMapAddChainP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapAnonymousAddChainP",UtcDaliPropertyMapAnonymousAddChainP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapGetValueP",UtcDaliPropertyMapGetValueP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapGetKeyP",UtcDaliPropertyMapGetKeyP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapGetKeyAtP",UtcDaliPropertyMapGetKeyAtP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapGetPairP",UtcDaliPropertyMapGetPairP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapGetKeyValueP",UtcDaliPropertyMapGetKeyValueP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapFindP",UtcDaliPropertyMapFindP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapFindP2",UtcDaliPropertyMapFindP2,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapFindP3",UtcDaliPropertyMapFindP3,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
@@ -1692,6 +1707,10 @@ testcase tc_array[] = {
        {"UtcDaliPropertyMapOperatorAssignmentP3",UtcDaliPropertyMapOperatorAssignmentP3,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapSquareOperatorP",UtcDaliPropertyMapSquareOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapConstSquareOperatorP",UtcDaliPropertyMapConstSquareOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyConstructorP",UtcDaliPropertyKeyConstructorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyEqualityOperatorP",UtcDaliPropertyKeyEqualityOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyInequalityOperatorP",UtcDaliPropertyKeyInequalityOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyOutputStream",UtcDaliPropertyKeyOutputStream,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyArrayConstructorP",UtcDaliPropertyArrayConstructorP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayCopyConstructorP",UtcDaliPropertyArrayCopyConstructorP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArraySizeP",UtcDaliPropertyArraySizeP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
@@ -1700,6 +1719,7 @@ testcase tc_array[] = {
        {"UtcDaliPropertyArrayClearP",UtcDaliPropertyArrayClearP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayReserveP",UtcDaliPropertyArrayReserveP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayResizeP",UtcDaliPropertyArrayResizeP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
+       {"UtcDaliPropertyArrayAddP",UtcDaliPropertyArrayAddP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayCapacityP",UtcDaliPropertyArrayCapacityP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayPushBackP",UtcDaliPropertyArrayPushBackP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayGetElementAtP",UtcDaliPropertyArrayGetElementAtP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},

diff --git a/src/utc/dali-core/tct-dali-core-core_wearable.h b/src/utc/dali-core/tct-dali-core-core_wearable.h
index e39f48d98e519c9765339025a546f0fb4f56ce83..d221a0a8679d14654309ffe9a355072f5aa72487 100755 (executable)
--- a/src/utc/dali-core/tct-dali-core-core_wearable.h
+++ b/src/utc/dali-core/tct-dali-core-core_wearable.h
@@ -550,9 +550,14 @@ extern int UtcDaliPropertyMapInsertP(void);
 extern int UtcDaliPropertyMapInsertP2(void);
 extern int UtcDaliPropertyMapInsertP3(void);
 extern int UtcDaliPropertyMapInsertP4(void);
+extern int UtcDaliPropertyMapAddP(void);
+extern int UtcDaliPropertyMapAddChainP(void);
+extern int UtcDaliPropertyMapAnonymousAddChainP(void);
 extern int UtcDaliPropertyMapGetValueP(void);
 extern int UtcDaliPropertyMapGetKeyP(void);
+extern int UtcDaliPropertyMapGetKeyAtP(void);
 extern int UtcDaliPropertyMapGetPairP(void);
+extern int UtcDaliPropertyMapGetKeyValueP(void);
 extern int UtcDaliPropertyMapFindP(void);
 extern int UtcDaliPropertyMapFindP2(void);
 extern int UtcDaliPropertyMapFindP3(void);
@@ -567,6 +572,10 @@ extern int UtcDaliPropertyMapOperatorAssignmentP2(void);
 extern int UtcDaliPropertyMapOperatorAssignmentP3(void);
 extern int UtcDaliPropertyMapSquareOperatorP(void);
 extern int UtcDaliPropertyMapConstSquareOperatorP(void);
+extern int UtcDaliPropertyKeyConstructorP(void);
+extern int UtcDaliPropertyKeyEqualityOperatorP(void);
+extern int UtcDaliPropertyKeyInequalityOperatorP(void);
+extern int UtcDaliPropertyKeyOutputStream(void);
 extern int UtcDaliPropertyArrayConstructorP(void);
 extern int UtcDaliPropertyArrayCopyConstructorP(void);
 extern int UtcDaliPropertyArraySizeP(void);
@@ -575,6 +584,7 @@ extern int UtcDaliPropertyArrayEmptyP(void);
 extern int UtcDaliPropertyArrayClearP(void);
 extern int UtcDaliPropertyArrayReserveP(void);
 extern int UtcDaliPropertyArrayResizeP(void);
+extern int UtcDaliPropertyArrayAddP(void);
 extern int UtcDaliPropertyArrayCapacityP(void);
 extern int UtcDaliPropertyArrayPushBackP(void);
 extern int UtcDaliPropertyArrayGetElementAtP(void);
@@ -1675,9 +1685,14 @@ testcase tc_array[] = {
        {"UtcDaliPropertyMapInsertP2",UtcDaliPropertyMapInsertP2,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapInsertP3",UtcDaliPropertyMapInsertP3,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapInsertP4",UtcDaliPropertyMapInsertP4,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapAddP",UtcDaliPropertyMapAddP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapAddChainP",UtcDaliPropertyMapAddChainP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapAnonymousAddChainP",UtcDaliPropertyMapAnonymousAddChainP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapGetValueP",UtcDaliPropertyMapGetValueP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapGetKeyP",UtcDaliPropertyMapGetKeyP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapGetKeyAtP",UtcDaliPropertyMapGetKeyAtP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapGetPairP",UtcDaliPropertyMapGetPairP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyMapGetKeyValueP",UtcDaliPropertyMapGetKeyValueP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapFindP",UtcDaliPropertyMapFindP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapFindP2",UtcDaliPropertyMapFindP2,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapFindP3",UtcDaliPropertyMapFindP3,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
@@ -1692,6 +1707,10 @@ testcase tc_array[] = {
        {"UtcDaliPropertyMapOperatorAssignmentP3",UtcDaliPropertyMapOperatorAssignmentP3,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapSquareOperatorP",UtcDaliPropertyMapSquareOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyMapConstSquareOperatorP",UtcDaliPropertyMapConstSquareOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyConstructorP",UtcDaliPropertyKeyConstructorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyEqualityOperatorP",UtcDaliPropertyKeyEqualityOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyInequalityOperatorP",UtcDaliPropertyKeyInequalityOperatorP,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
+       {"UtcDaliPropertyKeyOutputStream",UtcDaliPropertyKeyOutputStream,utc_Dali_PropertyMap_startup,utc_Dali_PropertyMap_cleanup},
        {"UtcDaliPropertyArrayConstructorP",UtcDaliPropertyArrayConstructorP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayCopyConstructorP",UtcDaliPropertyArrayCopyConstructorP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArraySizeP",UtcDaliPropertyArraySizeP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
@@ -1700,6 +1719,7 @@ testcase tc_array[] = {
        {"UtcDaliPropertyArrayClearP",UtcDaliPropertyArrayClearP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayReserveP",UtcDaliPropertyArrayReserveP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayResizeP",UtcDaliPropertyArrayResizeP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
+       {"UtcDaliPropertyArrayAddP",UtcDaliPropertyArrayAddP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayCapacityP",UtcDaliPropertyArrayCapacityP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayPushBackP",UtcDaliPropertyArrayPushBackP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},
        {"UtcDaliPropertyArrayGetElementAtP",UtcDaliPropertyArrayGetElementAtP,utc_Dali_PropertyArray_startup,utc_Dali_PropertyArray_cleanup},