From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 13 Nov 2018 11:52:03 +0000 (+0900)
Subject: [UTC/ITC][dali-core][Non-ACR][Fix to compare the TypeInfo index correctly]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F197674%2F2;p=test%2Ftct%2Fnative%2Fapi.git

[UTC/ITC][dali-core][Non-ACR][Fix to compare the TypeInfo index correctly]

Change-Id: I21204327c271c5a1f1dd7a97af28891e8b71687f
---

diff --git a/src/itc/dali-core/property-registration/ITs-property-registration-impl.h b/src/itc/dali-core/property-registration/ITs-property-registration-impl.h
index 12bcc7cc0..63d9754dc 100755
--- a/src/itc/dali-core/property-registration/ITs-property-registration-impl.h
+++ b/src/itc/dali-core/property-registration/ITs-property-registration-impl.h
@@ -368,9 +368,9 @@ void VTPropertyRegistrationAnimatableWithComponents001()
 	DALI_CHECK_FAIL( getPropertyTypeAnimatable != propertyTypeAnimatable, "Set/ Get property types mismatch for registered animatable property.");
 	
 	g_typeInfo_pr.GetPropertyIndices( g_indices_pr );
-	DALI_CHECK_FAIL( g_indices_pr.Size() != (uPropertyCountAfterReg - uInitialAnimatableProperty), " AnimatablePropertyRegistration is failed." );
-	
-	
+	DALI_CHECK_FAIL( g_indices_pr.Size() != g_actorCustom_pr.GetPropertyCount(), " AnimatablePropertyRegistration is failed." );
+
+
 	//Registering animatable property components
 	AnimatablePropertyComponentRegistration animatablePropertyComponentX( typeRegistration, STR_ANIMATABLE_COMPONENT_X_NAME, nAnimatableComponentIndexX, nAnimatablePropertyIndex, uCompIndX );
 	AnimatablePropertyComponentRegistration animatablePropertyComponentY( typeRegistration, STR_ANIMATABLE_COMPONENT_Y_NAME, nAnimatableComponentIndexY, nAnimatablePropertyIndex, uCompIndY );
diff --git a/src/itc/dali-core/type-info/ITs-type-info.cpp b/src/itc/dali-core/type-info/ITs-type-info.cpp
index 71c5c727e..0e26ff20a 100755
--- a/src/itc/dali-core/type-info/ITs-type-info.cpp
+++ b/src/itc/dali-core/type-info/ITs-type-info.cpp
@@ -463,7 +463,7 @@ void TypeInfoGetPropertyIndices()
 	
 	Property::IndexContainer indices;
 	typeInfo.GetPropertyIndices( indices );
-	DALI_CHECK_FAIL(indices.Size() != 1u,  "GetPropertyIndices failed to retrive the size .");
+	DALI_CHECK_FAIL(indices.Size() != customActor.GetPropertyCount(),  "GetPropertyIndices failed to retrive the size .");
 	DaliLog::PrintPass();
 }
 
diff --git a/src/utc/dali-core/type-info/utc-dali-type-info.cpp b/src/utc/dali-core/type-info/utc-dali-type-info.cpp
index 1dc930812..bd34567ec 100755
--- a/src/utc/dali-core/type-info/utc-dali-type-info.cpp
+++ b/src/utc/dali-core/type-info/utc-dali-type-info.cpp
@@ -688,7 +688,7 @@ void TypeInfoGetPropertyCount()
 
   Property::IndexContainer indices;
   typeInfo.GetPropertyIndices( indices );
-  DALI_CHECK_FAIL(indices.Size() != 1u,  "GetPropertyIndices failed to retrive the size .");
+  DALI_CHECK_FAIL(indices.Size() != customActor.GetPropertyCount(),  "GetPropertyIndices failed to retrive the size .");
   DaliLog::PrintPass();
 }
 
@@ -709,7 +709,7 @@ void TypeInfoGetPropertyIndices()
 
   Property::IndexContainer indices;
   typeInfo.GetPropertyIndices( indices );
-  DALI_CHECK_FAIL(indices.Size() != 1u,  "GetPropertyIndices failed to retrive the size .");
+  DALI_CHECK_FAIL(indices.Size() != customActor.GetPropertyCount(),  "GetPropertyIndices failed to retrive the size .");
   DaliLog::PrintPass();
 }
 
@@ -730,7 +730,7 @@ void TypeInfoGetPropertyName()
 
   Property::IndexContainer indices;
   typeInfo.GetPropertyIndices( indices );
-  DALI_CHECK_FAIL(indices.Size() != 1u,  "GetPropertyIndices failed to retrive the size .");
+  DALI_CHECK_FAIL(indices.Size() != customActor.GetPropertyCount(),  "GetPropertyIndices failed to retrive the size .");
   DaliLog::PrintPass();
 }
 
diff --git a/src/utc/dali-core/type-registry/utc-dali-type-registry.cpp b/src/utc/dali-core/type-registry/utc-dali-type-registry.cpp
index 76656cd0a..3deae50b9 100755
--- a/src/utc/dali-core/type-registry/utc-dali-type-registry.cpp
+++ b/src/utc/dali-core/type-registry/utc-dali-type-registry.cpp
@@ -761,7 +761,7 @@ void TypeRegistryPropertyRegistrationP()
   // Check property count of type-info is 1
   Property::IndexContainer indices;
   typeInfo.GetPropertyIndices( indices );
-  DALI_CHECK_FAIL( indices.Size() != 1u, "GetPropertyIndices is failed" );
+  DALI_CHECK_FAIL( indices.Size() != typeInfo.GetPropertyCount(), "GetPropertyIndices is failed" );
 
   // Ensure indices returned from actor and customActor differ by two
   Actor actor = Actor::New();