From b7616ee3f152dbba4f6895f4ba63dfbe8d6bc76b Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 20 Jun 2016 16:13:52 +0100 Subject: [PATCH] [UTC][dali-core][ACR-687][Fix Test Case Execution & added test cases for new APIs in Property::Map] All pass in mobile profile Change-Id: Ifff77de9e93bbe4899f5a30ed102a6f9b39256e7 Signed-off-by: Adeel Kazmi --- .../property-map/utc-dali-property-map.cpp | 353 ++++++++++++++++++++- src/utc/dali-core/tct-dali-core-core.cpp | 10 +- src/utc/dali-core/tct-dali-core-core_common_iot.h | 16 + src/utc/dali-core/tct-dali-core-core_mobile.h | 16 + src/utc/dali-core/tct-dali-core-core_tv.h | 16 + src/utc/dali-core/tct-dali-core-core_wearable.h | 16 + 6 files changed, 424 insertions(+), 3 deletions(-) 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 8e22288..f4a0a3a 100755 --- a/src/utc/dali-core/property-map/utc-dali-property-map.cpp +++ b/src/utc/dali-core/property-map/utc-dali-property-map.cpp @@ -33,17 +33,25 @@ void PropertyMapCount(); void PropertyMapEmpty(); void PropertyMapInsert(); void PropertyMapInsertP2(); +void PropertyMapInsertP3(); +void PropertyMapInsertP4(); void PropertyMapGetValue(); void PropertyMapGetKey(); void PropertyMapGetKeyValuePair(); void PropertyMapFind(); void PropertyMapFindP2(); void PropertyMapFindP3(); +void PropertyMapFindP4(); +void PropertyMapFindP5(); +void PropertyMapFindN(); void PropertyMapClear(); void PropertyMapMerge(); void PropertyMapOperatorAssignment(); void PropertyMapOperatorAssignmentP2(); void PropertyMapOperatorAssignmentP3(); +void PropertyMapSquareOperatorP(); +void PropertyMapConstSquareOperatorP(); +void PropertyMapConstSquareOperatorN(); namespace { enum TEST_CASES_LIST_PROPERTY_MAP @@ -54,17 +62,25 @@ namespace PROPERTY_MAP_EMPTY, PROPERTY_MAP_INSERT, PROPERTY_MAP_INSERT_P2, + PROPERTY_MAP_INSERT_P3, + PROPERTY_MAP_INSERT_P4, PROPERTY_MAP_GET_KEY, PROPERTY_MAP_GET_VALUE, PROPERTY_MAP_GET_KEY_VALUE_PAIR, PROPERTY_MAP_FIND, PROPERTY_MAP_FIND_P2, PROPERTY_MAP_FIND_P3, + PROPERTY_MAP_FIND_P4, + PROPERTY_MAP_FIND_P5, + PROPERTY_MAP_FIND_N, PROPERTY_MAP_MERGE, PROPERTY_MAP_CLEAR, PROPERTY_MAP_ASSIGNMENT_OPERATOR, PROPERTY_MAP_ASSIGNMENT_OPERATOR_P2, - PROPERTY_MAP_ASSIGNMENT_OPERATOR_P3 + PROPERTY_MAP_ASSIGNMENT_OPERATOR_P3, + PROPERTY_MAP_SQUARE_OPERATOR_P, + PROPERTY_MAP_CONST_SQUARE_OPERATOR_P, + PROPERTY_MAP_CONST_SQUARE_OPERATOR_N }; struct Property_Map_TestApp : public ConnectionTracker @@ -119,6 +135,14 @@ namespace PropertyMapInsertP2(); break; + case PROPERTY_MAP_INSERT_P3: + PropertyMapInsertP3(); + break; + + case PROPERTY_MAP_INSERT_P4: + PropertyMapInsertP4(); + break; + case PROPERTY_MAP_FIND: PropertyMapFind(); break; @@ -131,6 +155,18 @@ namespace PropertyMapFindP3(); break; + case PROPERTY_MAP_FIND_P4: + PropertyMapFindP4(); + break; + + case PROPERTY_MAP_FIND_P5: + PropertyMapFindP5(); + break; + + case PROPERTY_MAP_FIND_N: + PropertyMapFindN(); + break; + case PROPERTY_MAP_CLEAR: PropertyMapClear(); break; @@ -162,6 +198,18 @@ namespace case PROPERTY_MAP_ASSIGNMENT_OPERATOR_P3: PropertyMapOperatorAssignmentP3(); break; + + case PROPERTY_MAP_SQUARE_OPERATOR_P: + PropertyMapSquareOperatorP(); + break; + + case PROPERTY_MAP_CONST_SQUARE_OPERATOR_P: + PropertyMapConstSquareOperatorP(); + break; + + case PROPERTY_MAP_CONST_SQUARE_OPERATOR_N: + PropertyMapConstSquareOperatorN(); + break; } } // Data @@ -355,6 +403,50 @@ void PropertyMapInsertP2() DaliLog::PrintPass(); } +void PropertyMapInsertP3() +{ + const Property::Index indexMapFirst = 10; + const Property::Index indexMapTwo = 20; + const Property::Index indexMapThree = 30; + + const int nSetValueOne = 1 ,nSetValueTwo = 2 , nSetValueThree = 3 ; + + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + propMap.Insert(indexMapFirst, nSetValueOne); + Property::Value* valueGet = propMap.Find( indexMapFirst ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueOne ," Find is not working properly while returning reference of the key"); + + propMap.Insert(indexMapTwo, nSetValueTwo); + valueGet = propMap.Find( indexMapTwo ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueTwo ," Find is not working properly while returning reference of the key"); + + propMap.Insert(indexMapThree, nSetValueThree); + valueGet = propMap.Find( indexMapThree ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueThree ," Find is not working properly while returning reference of the key"); + + DaliLog::PrintPass(); +} +void PropertyMapInsertP4() +{ + const Property::Index indexMapFirst = 10; + const Property::Index indexMapTwo = 11; + const int nSetValueOne = 1 ,nSetValueTwo = 2; + + Property::Map propMap; + + propMap.Insert(indexMapFirst, nSetValueOne); + DALI_CHECK_FAIL( 1 != propMap.Count() ," Only one item should be in Map"); + + propMap.Insert(indexMapTwo, nSetValueTwo); + DALI_CHECK_FAIL( 2 != propMap.Count() ," Only two items should be in Map"); + + DaliLog::PrintPass(); +} void PropertyMapGetKey() { const string strMapFirst = "hello"; @@ -512,6 +604,77 @@ void PropertyMapFindP3() DALI_CHECK_FAIL( valueGet->Get() != nSetValueThree ," Find is not working properly while returning reference of the key"); DaliLog::PrintPass(); +} +void PropertyMapFindP4() +{ + const Property::Index indexMapFirst = 10; + const Property::Index indexMapTwo = 20; + const Property::Index indexMapThree = 30; + + const int nSetValueOne = 1 ,nSetValueTwo = 2 , nSetValueThree = 3 ; + + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + propMap.Insert(indexMapFirst, nSetValueOne); + Property::Value* valueGet = propMap.Find( indexMapFirst ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueOne ," Find is not working properly while returning reference of the key"); + + propMap.Insert(indexMapTwo, nSetValueTwo); + valueGet = propMap.Find( indexMapTwo ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueTwo ," Find is not working properly while returning reference of the key"); + + propMap.Insert(indexMapThree, nSetValueThree); + valueGet = propMap.Find( indexMapThree ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueThree ," Find is not working properly while returning reference of the key"); + + DaliLog::PrintPass(); +} +void PropertyMapFindP5() +{ + const Property::Index indexMapFirst = 10; + const Property::Index indexMapTwo = 20; + const Property::Index indexMapThree = 30; + + const int nSetValueOne = 1 ,nSetValueTwo = 2 , nSetValueThree = 3 ; + + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + propMap.Insert(indexMapFirst, nSetValueOne); + Property::Value* valueGet = propMap.Find( indexMapFirst, Property::INTEGER ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueOne ," Find is not working properly while returning reference of the key"); + + propMap.Insert(indexMapTwo, nSetValueTwo); + valueGet = propMap.Find( indexMapTwo, Property::INTEGER ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueTwo ," Find is not working properly while returning reference of the key"); + + propMap.Insert(indexMapThree, nSetValueThree); + valueGet = propMap.Find( indexMapThree, Property::INTEGER ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueThree ," Find is not working properly while returning reference of the key"); + + DaliLog::PrintPass(); +} +void PropertyMapFindN() +{ + const Property::Index indexMapFirst = 10; + const int nSetValueOne = 1; + + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + propMap.Insert(indexMapFirst, nSetValueOne); + Property::Value* valueGet = propMap.Find( indexMapFirst, Property::MAP ); + DALI_CHECK_FAIL( valueGet," Find should not return a valid value if the property type we pass in is wrong"); DaliLog::PrintPass(); } @@ -684,6 +847,75 @@ void PropertyMapOperatorAssignmentP3() DaliLog::PrintPass(); } +void PropertyMapSquareOperatorP() +{ + const Property::Index indexMapFirst = 10; + const Property::Index indexMapTwo = 20; + const Property::Index indexMapThree = 30; + + const int nSetValueOne = 1 ,nSetValueTwo = 2 , nSetValueThree = 3 ; + + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + propMap[indexMapFirst] = nSetValueOne; + Property::Value* valueGet = propMap.Find( indexMapFirst ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueOne ," Square operator is setting the wrong value"); + + propMap[indexMapTwo] = nSetValueTwo; + valueGet = propMap.Find( indexMapTwo ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueTwo ," Square operator is setting the wrong value"); + + propMap[indexMapThree] = nSetValueThree; + valueGet = propMap.Find( indexMapThree ); + DALI_CHECK_FAIL( valueGet->Get() != nSetValueThree ," Square operator is setting the wrong value"); + + DaliLog::PrintPass(); +} +void PropertyMapConstSquareOperatorP() +{ + const Property::Index indexMapFirst = 10; + const int nSetValueOne = 1; + + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + propMap[indexMapFirst] = nSetValueOne; + Property::Value* valueGet = propMap.Find( indexMapFirst ); + + const Property::Map& constPropMap = propMap; + DALI_CHECK_FAIL( constPropMap[indexMapFirst].Get() != nSetValueOne, "Square operator is retrieving the wrong value" ); + + DaliLog::PrintPass(); +} +void PropertyMapConstSquareOperatorN() +{ + Property::Map propMap; + DALI_CHECK_FAIL(!propMap.Empty(), "property is not empty which is not expected"); + + unsigned int uCountReal = propMap.Count(); + DALI_CHECK_FAIL( uCountReal != 0 , "property count should be 0 but it is not match with expected"); //Should only have zero items !! + + const Property::Map& constPropMap = propMap; + try + { + Property::Value value = constPropMap[200]; + } + catch (Dali::DaliException& e) + { + LOG_E("Cannot create a new value on a constant Property::Map so exception should be thrown"); + test_return_value=TC_FAIL; + return; + } + + DaliLog::PrintPass(); +} /** * End of TC Logic Implementation Area. @@ -787,6 +1019,36 @@ int UtcDaliPropertyMapInsertP2(void) } /** + * @testcase UtcDaliPropertyMapInsertP3 + * @since_tizen 3.0 + * @description Check if we can insert an index-value pair to a property-map + */ +int UtcDaliPropertyMapInsertP3(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_INSERT_P3); + application.MainLoop(); + return test_return_value; +} + +/** + * @testcase UtcDaliPropertyMapInsertP4 + * @since_tizen 3.0 + * @description Check if we can insert an index-value pair to a property-map + */ +int UtcDaliPropertyMapInsertP4(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_INSERT_P4); + application.MainLoop(); + return test_return_value; +} + +/** * @testcase UtcDaliPropertyMapGetValueP * @since_tizen 2.4 * @description Check if Getpair,GetValue,GetKey Api working properly or not @@ -877,6 +1139,51 @@ int UtcDaliPropertyMapFindP3(void) } /** + * @testcase UtcDaliPropertyMapFindP4 + * @since_tizen 2.4 + * @description Check Find with an index param + */ +int UtcDaliPropertyMapFindP4(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_FIND_P4); + application.MainLoop(); + return test_return_value; +} + +/** + * @testcase UtcDaliPropertyMapFindP5 + * @since_tizen 2.4 + * @description Check Find with an index param and a property type param + */ +int UtcDaliPropertyMapFindP5(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_FIND_P5); + application.MainLoop(); + return test_return_value; +} + +/** + * @testcase UtcDaliPropertyMapFindN + * @since_tizen 2.4 + * @description Check Find with an index param and a mismatching property type + */ +int UtcDaliPropertyMapFindN(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_FIND_N); + application.MainLoop(); + return test_return_value; +} + +/** * @testcase UtcDaliPropertyMapClearP * @since_tizen 2.4 * @description Check if Getpair,GetValue,GetKey Api working properly or not @@ -951,3 +1258,47 @@ int UtcDaliPropertyMapOperatorAssignmentP3(void) return test_return_value; } +/** + * @testcase UtcDaliPropertyMapSquareOperatorP + * @since_tizen 2.4 + * @description Check if the square operator works + */ +int UtcDaliPropertyMapSquareOperatorP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_SQUARE_OPERATOR_P); + application.MainLoop(); + return test_return_value; +} + +/** + * @testcase UtcDaliPropertyMapConstSquareOperatorP + * @since_tizen 2.4 + * @description Check if the const square operator works + */ +int UtcDaliPropertyMapConstSquareOperatorP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_CONST_SQUARE_OPERATOR_P); + application.MainLoop(); + return test_return_value; +} + +/** + * @testcase UtcDaliPropertyMapConstSquareOperatorN + * @since_tizen 2.4 + * @description Check if the square operator works + */ +int UtcDaliPropertyMapConstSquareOperatorN(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + Property_Map_TestApp testApp( application, PROPERTY_MAP_CONST_SQUARE_OPERATOR_N); + application.MainLoop(); + return test_return_value; +} diff --git a/src/utc/dali-core/tct-dali-core-core.cpp b/src/utc/dali-core/tct-dali-core-core.cpp index 10da659..994c1d7 100755 --- a/src/utc/dali-core/tct-dali-core-core.cpp +++ b/src/utc/dali-core/tct-dali-core-core.cpp @@ -105,7 +105,10 @@ int main(int argc, const char *argv[]) tc_array[i].cleanup(); } - free(func_name); + if(smack_mode) { + free(func_name); + } + return result; } } @@ -113,6 +116,9 @@ int main(int argc, const char *argv[]) dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); dlog_print(DLOG_ERROR,"Unknown testcase name: \"%s\"\n", func_name); - free(func_name); + if(smack_mode) { + free(func_name); + } + return 2; } diff --git a/src/utc/dali-core/tct-dali-core-core_common_iot.h b/src/utc/dali-core/tct-dali-core-core_common_iot.h index ab2925a..c8078f6 100755 --- a/src/utc/dali-core/tct-dali-core-core_common_iot.h +++ b/src/utc/dali-core/tct-dali-core-core_common_iot.h @@ -159,17 +159,25 @@ extern int UtcDaliPropertyMapCountP(void); extern int UtcDaliPropertyMapEmptyP(void); extern int UtcDaliPropertyMapInsertP(void); extern int UtcDaliPropertyMapInsertP2(void); +extern int UtcDaliPropertyMapInsertP3(void); +extern int UtcDaliPropertyMapInsertP4(void); extern int UtcDaliPropertyMapGetValueP(void); extern int UtcDaliPropertyMapGetKeyP(void); extern int UtcDaliPropertyMapGetPairP(void); extern int UtcDaliPropertyMapFindP(void); extern int UtcDaliPropertyMapFindP2(void); extern int UtcDaliPropertyMapFindP3(void); +extern int UtcDaliPropertyMapFindP4(void); +extern int UtcDaliPropertyMapFindP5(void); +extern int UtcDaliPropertyMapFindN(void); extern int UtcDaliPropertyMapClearP(void); extern int UtcDaliPropertyMapMergeP(void); extern int UtcDaliPropertyMapOperatorAssignmentP(void); extern int UtcDaliPropertyMapOperatorAssignmentP2(void); extern int UtcDaliPropertyMapOperatorAssignmentP3(void); +extern int UtcDaliPropertyMapSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorN(void); //property-array extern int UtcDaliPropertyArrayConstructorP(void); @@ -1646,17 +1654,25 @@ testcase tc_array[] = { {"UtcDaliPropertyMapEmptyP", UtcDaliPropertyMapEmptyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapInsertP", UtcDaliPropertyMapInsertP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, {"UtcDaliPropertyMapGetValueP", UtcDaliPropertyMapGetValueP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetKeyP", UtcDaliPropertyMapGetKeyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetPairP", UtcDaliPropertyMapGetPairP, 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}, + {"UtcDaliPropertyMapFindP4", UtcDaliPropertyMapFindP4, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindP5", UtcDaliPropertyMapFindP5, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindN", UtcDaliPropertyMapFindN, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapClearP", UtcDaliPropertyMapClearP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapMergeP", UtcDaliPropertyMapMergeP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP", UtcDaliPropertyMapOperatorAssignmentP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP2", UtcDaliPropertyMapOperatorAssignmentP2, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, + {"UtcDaliPropertyMapConstSquareOperatorN", UtcDaliPropertyMapConstSquareOperatorN, 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}, 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 ab2925a..c8078f6 100755 --- a/src/utc/dali-core/tct-dali-core-core_mobile.h +++ b/src/utc/dali-core/tct-dali-core-core_mobile.h @@ -159,17 +159,25 @@ extern int UtcDaliPropertyMapCountP(void); extern int UtcDaliPropertyMapEmptyP(void); extern int UtcDaliPropertyMapInsertP(void); extern int UtcDaliPropertyMapInsertP2(void); +extern int UtcDaliPropertyMapInsertP3(void); +extern int UtcDaliPropertyMapInsertP4(void); extern int UtcDaliPropertyMapGetValueP(void); extern int UtcDaliPropertyMapGetKeyP(void); extern int UtcDaliPropertyMapGetPairP(void); extern int UtcDaliPropertyMapFindP(void); extern int UtcDaliPropertyMapFindP2(void); extern int UtcDaliPropertyMapFindP3(void); +extern int UtcDaliPropertyMapFindP4(void); +extern int UtcDaliPropertyMapFindP5(void); +extern int UtcDaliPropertyMapFindN(void); extern int UtcDaliPropertyMapClearP(void); extern int UtcDaliPropertyMapMergeP(void); extern int UtcDaliPropertyMapOperatorAssignmentP(void); extern int UtcDaliPropertyMapOperatorAssignmentP2(void); extern int UtcDaliPropertyMapOperatorAssignmentP3(void); +extern int UtcDaliPropertyMapSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorN(void); //property-array extern int UtcDaliPropertyArrayConstructorP(void); @@ -1646,17 +1654,25 @@ testcase tc_array[] = { {"UtcDaliPropertyMapEmptyP", UtcDaliPropertyMapEmptyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapInsertP", UtcDaliPropertyMapInsertP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, {"UtcDaliPropertyMapGetValueP", UtcDaliPropertyMapGetValueP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetKeyP", UtcDaliPropertyMapGetKeyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetPairP", UtcDaliPropertyMapGetPairP, 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}, + {"UtcDaliPropertyMapFindP4", UtcDaliPropertyMapFindP4, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindP5", UtcDaliPropertyMapFindP5, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindN", UtcDaliPropertyMapFindN, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapClearP", UtcDaliPropertyMapClearP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapMergeP", UtcDaliPropertyMapMergeP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP", UtcDaliPropertyMapOperatorAssignmentP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP2", UtcDaliPropertyMapOperatorAssignmentP2, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, + {"UtcDaliPropertyMapConstSquareOperatorN", UtcDaliPropertyMapConstSquareOperatorN, 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}, diff --git a/src/utc/dali-core/tct-dali-core-core_tv.h b/src/utc/dali-core/tct-dali-core-core_tv.h index ab2925a..c8078f6 100755 --- a/src/utc/dali-core/tct-dali-core-core_tv.h +++ b/src/utc/dali-core/tct-dali-core-core_tv.h @@ -159,17 +159,25 @@ extern int UtcDaliPropertyMapCountP(void); extern int UtcDaliPropertyMapEmptyP(void); extern int UtcDaliPropertyMapInsertP(void); extern int UtcDaliPropertyMapInsertP2(void); +extern int UtcDaliPropertyMapInsertP3(void); +extern int UtcDaliPropertyMapInsertP4(void); extern int UtcDaliPropertyMapGetValueP(void); extern int UtcDaliPropertyMapGetKeyP(void); extern int UtcDaliPropertyMapGetPairP(void); extern int UtcDaliPropertyMapFindP(void); extern int UtcDaliPropertyMapFindP2(void); extern int UtcDaliPropertyMapFindP3(void); +extern int UtcDaliPropertyMapFindP4(void); +extern int UtcDaliPropertyMapFindP5(void); +extern int UtcDaliPropertyMapFindN(void); extern int UtcDaliPropertyMapClearP(void); extern int UtcDaliPropertyMapMergeP(void); extern int UtcDaliPropertyMapOperatorAssignmentP(void); extern int UtcDaliPropertyMapOperatorAssignmentP2(void); extern int UtcDaliPropertyMapOperatorAssignmentP3(void); +extern int UtcDaliPropertyMapSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorN(void); //property-array extern int UtcDaliPropertyArrayConstructorP(void); @@ -1646,17 +1654,25 @@ testcase tc_array[] = { {"UtcDaliPropertyMapEmptyP", UtcDaliPropertyMapEmptyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapInsertP", UtcDaliPropertyMapInsertP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, {"UtcDaliPropertyMapGetValueP", UtcDaliPropertyMapGetValueP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetKeyP", UtcDaliPropertyMapGetKeyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetPairP", UtcDaliPropertyMapGetPairP, 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}, + {"UtcDaliPropertyMapFindP4", UtcDaliPropertyMapFindP4, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindP5", UtcDaliPropertyMapFindP5, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindN", UtcDaliPropertyMapFindN, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapClearP", UtcDaliPropertyMapClearP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapMergeP", UtcDaliPropertyMapMergeP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP", UtcDaliPropertyMapOperatorAssignmentP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP2", UtcDaliPropertyMapOperatorAssignmentP2, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, + {"UtcDaliPropertyMapConstSquareOperatorN", UtcDaliPropertyMapConstSquareOperatorN, 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}, 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 ab2925a..c8078f6 100755 --- a/src/utc/dali-core/tct-dali-core-core_wearable.h +++ b/src/utc/dali-core/tct-dali-core-core_wearable.h @@ -159,17 +159,25 @@ extern int UtcDaliPropertyMapCountP(void); extern int UtcDaliPropertyMapEmptyP(void); extern int UtcDaliPropertyMapInsertP(void); extern int UtcDaliPropertyMapInsertP2(void); +extern int UtcDaliPropertyMapInsertP3(void); +extern int UtcDaliPropertyMapInsertP4(void); extern int UtcDaliPropertyMapGetValueP(void); extern int UtcDaliPropertyMapGetKeyP(void); extern int UtcDaliPropertyMapGetPairP(void); extern int UtcDaliPropertyMapFindP(void); extern int UtcDaliPropertyMapFindP2(void); extern int UtcDaliPropertyMapFindP3(void); +extern int UtcDaliPropertyMapFindP4(void); +extern int UtcDaliPropertyMapFindP5(void); +extern int UtcDaliPropertyMapFindN(void); extern int UtcDaliPropertyMapClearP(void); extern int UtcDaliPropertyMapMergeP(void); extern int UtcDaliPropertyMapOperatorAssignmentP(void); extern int UtcDaliPropertyMapOperatorAssignmentP2(void); extern int UtcDaliPropertyMapOperatorAssignmentP3(void); +extern int UtcDaliPropertyMapSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorP(void); +extern int UtcDaliPropertyMapConstSquareOperatorN(void); //property-array extern int UtcDaliPropertyArrayConstructorP(void); @@ -1646,17 +1654,25 @@ testcase tc_array[] = { {"UtcDaliPropertyMapEmptyP", UtcDaliPropertyMapEmptyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapInsertP", UtcDaliPropertyMapInsertP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, {"UtcDaliPropertyMapGetValueP", UtcDaliPropertyMapGetValueP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetKeyP", UtcDaliPropertyMapGetKeyP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapGetPairP", UtcDaliPropertyMapGetPairP, 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}, + {"UtcDaliPropertyMapFindP4", UtcDaliPropertyMapFindP4, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindP5", UtcDaliPropertyMapFindP5, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, + {"UtcDaliPropertyMapFindN", UtcDaliPropertyMapFindN, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapClearP", UtcDaliPropertyMapClearP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapMergeP", UtcDaliPropertyMapMergeP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP", UtcDaliPropertyMapOperatorAssignmentP, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"UtcDaliPropertyMapOperatorAssignmentP2", UtcDaliPropertyMapOperatorAssignmentP2, utc_Dali_PropertyMap_startup, utc_Dali_PropertyMap_cleanup}, {"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}, + {"UtcDaliPropertyMapConstSquareOperatorN", UtcDaliPropertyMapConstSquareOperatorN, 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}, -- 2.7.4