[ITC][dali-core][Non-ACR][Fixed testcase execution timeout issue]

Change-Id: I922ce5896f980086125f169cc09c0c3b87594d35

diff --git a/src/itc/dali-core/CMakeLists.txt b/src/itc/dali-core/CMakeLists.txt
index 0153346..cd496ca 100755 (executable)
--- a/src/itc/dali-core/CMakeLists.txt
+++ b/src/itc/dali-core/CMakeLists.txt
@@ -146,8 +146,8 @@ type-info/ITs-type-info.cpp
 type-info/ITs-type-info-common.cpp
 type-registration/ITs-type-registration.cpp
 type-registration/ITs-type-registration-common.cpp
-##type-registry/ITs-type-registry.cpp
-##type-registry/ITs-type-registry-common.cpp
+type-registry/ITs-type-registry.cpp
+type-registry/ITs-type-registry-common.cpp
 unit16-pair/ITs-unit16-pair.cpp
 unit16-pair/ITs-unit16-pair-common.cpp
 value/ITs-value.cpp

diff --git a/src/itc/dali-core/tct-dali-core-native_mobile.h b/src/itc/dali-core/tct-dali-core-native_mobile.h
index 09d4df4..2a98322 100755 (executable)
--- a/src/itc/dali-core/tct-dali-core-native_mobile.h
+++ b/src/itc/dali-core/tct-dali-core-native_mobile.h
@@ -161,8 +161,8 @@ extern void ITs_TypeInfo_startup(void);
 extern void ITs_TypeInfo_cleanup(void);
 extern void ITs_typeregistration_startup(void);
 extern void ITs_typeregistration_cleanup(void);
-//extern void ITs_typeRegistry_startup(void);
-//extern void ITs_typeRegistry_cleanup(void);
+extern void ITs_typeRegistry_startup(void);
+extern void ITs_typeRegistry_cleanup(void);
 extern void ITs_unit16_pair_startup(void);
 extern void ITs_unit16_pair_cleanup(void);
 extern void ITs_value_startup(void);
@@ -873,9 +873,9 @@ extern int ITcTypeInfoCreateInstanceGetCreator(void);
 extern int ITcTypeInfoGetPropertyIndices(void);
 extern int ITcTypeInfogetActionCountGetSignalCount(void);
 extern int ITcTypeRegistrationRegisteredName(void);
-//extern int ITcTypeRegistryGetTypeNames(void);
-//extern int ITcTypeRegistryCopyAssign(void);
-//extern int ITcTypeRegistryChildPropertyRegistration(void);
+extern int ITcTypeRegistryGetTypeNames(void);
+extern int ITcTypeRegistryCopyAssign(void);
+extern int ITcTypeRegistryChildPropertyRegistration(void);
 extern int ITcUint16PairFromFloatVec2(void);
 extern int ITcUint16PairFromFloatArray(void);
 extern int ITcUint16PairGetHeightWidth(void);
@@ -1684,9 +1684,9 @@ testcase tc_array[] = {
        {"ITcTypeInfoGetPropertyIndices", ITcTypeInfoGetPropertyIndices, ITs_TypeInfo_startup, ITs_TypeInfo_cleanup},
        {"ITcTypeInfogetActionCountGetSignalCount", ITcTypeInfogetActionCountGetSignalCount, ITs_TypeInfo_startup, ITs_TypeInfo_cleanup},
        {"ITcTypeRegistrationRegisteredName", ITcTypeRegistrationRegisteredName, ITs_typeregistration_startup, ITs_typeregistration_cleanup},
-       //{"ITcTypeRegistryGetTypeNames", ITcTypeRegistryGetTypeNames, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
-       //{"ITcTypeRegistryCopyAssign", ITcTypeRegistryCopyAssign, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
-       //{"ITcTypeRegistryChildPropertyRegistration", ITcTypeRegistryChildPropertyRegistration, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},    
+       {"ITcTypeRegistryGetTypeNames", ITcTypeRegistryGetTypeNames, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
+       {"ITcTypeRegistryCopyAssign", ITcTypeRegistryCopyAssign, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
+       {"ITcTypeRegistryChildPropertyRegistration", ITcTypeRegistryChildPropertyRegistration, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},    
        {"ITcUint16PairFromFloatVec2", ITcUint16PairFromFloatVec2, ITs_unit16_pair_startup, ITs_unit16_pair_cleanup},
        {"ITcUint16PairFromFloatArray", ITcUint16PairFromFloatArray, ITs_unit16_pair_startup, ITs_unit16_pair_cleanup},
        {"ITcUint16PairGetHeightWidth", ITcUint16PairGetHeightWidth, ITs_unit16_pair_startup, ITs_unit16_pair_cleanup},

diff --git a/src/itc/dali-core/tct-dali-core-native_wearable.h b/src/itc/dali-core/tct-dali-core-native_wearable.h
index 09d4df4..2a98322 100755 (executable)
--- a/src/itc/dali-core/tct-dali-core-native_wearable.h
+++ b/src/itc/dali-core/tct-dali-core-native_wearable.h
@@ -161,8 +161,8 @@ extern void ITs_TypeInfo_startup(void);
 extern void ITs_TypeInfo_cleanup(void);
 extern void ITs_typeregistration_startup(void);
 extern void ITs_typeregistration_cleanup(void);
-//extern void ITs_typeRegistry_startup(void);
-//extern void ITs_typeRegistry_cleanup(void);
+extern void ITs_typeRegistry_startup(void);
+extern void ITs_typeRegistry_cleanup(void);
 extern void ITs_unit16_pair_startup(void);
 extern void ITs_unit16_pair_cleanup(void);
 extern void ITs_value_startup(void);
@@ -873,9 +873,9 @@ extern int ITcTypeInfoCreateInstanceGetCreator(void);
 extern int ITcTypeInfoGetPropertyIndices(void);
 extern int ITcTypeInfogetActionCountGetSignalCount(void);
 extern int ITcTypeRegistrationRegisteredName(void);
-//extern int ITcTypeRegistryGetTypeNames(void);
-//extern int ITcTypeRegistryCopyAssign(void);
-//extern int ITcTypeRegistryChildPropertyRegistration(void);
+extern int ITcTypeRegistryGetTypeNames(void);
+extern int ITcTypeRegistryCopyAssign(void);
+extern int ITcTypeRegistryChildPropertyRegistration(void);
 extern int ITcUint16PairFromFloatVec2(void);
 extern int ITcUint16PairFromFloatArray(void);
 extern int ITcUint16PairGetHeightWidth(void);
@@ -1684,9 +1684,9 @@ testcase tc_array[] = {
        {"ITcTypeInfoGetPropertyIndices", ITcTypeInfoGetPropertyIndices, ITs_TypeInfo_startup, ITs_TypeInfo_cleanup},
        {"ITcTypeInfogetActionCountGetSignalCount", ITcTypeInfogetActionCountGetSignalCount, ITs_TypeInfo_startup, ITs_TypeInfo_cleanup},
        {"ITcTypeRegistrationRegisteredName", ITcTypeRegistrationRegisteredName, ITs_typeregistration_startup, ITs_typeregistration_cleanup},
-       //{"ITcTypeRegistryGetTypeNames", ITcTypeRegistryGetTypeNames, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
-       //{"ITcTypeRegistryCopyAssign", ITcTypeRegistryCopyAssign, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
-       //{"ITcTypeRegistryChildPropertyRegistration", ITcTypeRegistryChildPropertyRegistration, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},    
+       {"ITcTypeRegistryGetTypeNames", ITcTypeRegistryGetTypeNames, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
+       {"ITcTypeRegistryCopyAssign", ITcTypeRegistryCopyAssign, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},
+       {"ITcTypeRegistryChildPropertyRegistration", ITcTypeRegistryChildPropertyRegistration, ITs_typeRegistry_startup, ITs_typeRegistry_cleanup},    
        {"ITcUint16PairFromFloatVec2", ITcUint16PairFromFloatVec2, ITs_unit16_pair_startup, ITs_unit16_pair_cleanup},
        {"ITcUint16PairFromFloatArray", ITcUint16PairFromFloatArray, ITs_unit16_pair_startup, ITs_unit16_pair_cleanup},
        {"ITcUint16PairGetHeightWidth", ITcUint16PairGetHeightWidth, ITs_unit16_pair_startup, ITs_unit16_pair_cleanup},

diff --git a/src/itc/dali-core/type-registry/ITs-type-registry.cpp b/src/itc/dali-core/type-registry/ITs-type-registry.cpp
index 8446112..ec9f84b 100755 (executable)
--- a/src/itc/dali-core/type-registry/ITs-type-registry.cpp
+++ b/src/itc/dali-core/type-registry/ITs-type-registry.cpp
@@ -194,15 +194,15 @@ Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex )
  ******************************************************************************/
 namespace Impl
 {
-struct MyTestCustomActor : public CustomActorImpl
+struct TestCustomActorForTypeRegistry : public CustomActorImpl
 {
   typedef Signal< void ()> SignalType;
   typedef Signal< void (float)> SignalTypeFloat;
 
-  MyTestCustomActor() : CustomActorImpl( ActorFlags( REQUIRES_TOUCH_EVENTS ) )
+  TestCustomActorForTypeRegistry() : CustomActorImpl( ActorFlags( REQUIRES_TOUCH_EVENTS ) )
   { }
 
-  virtual ~MyTestCustomActor()
+  virtual ~TestCustomActorForTypeRegistry()
   { }
 
   void ResetCallStack()
@@ -298,41 +298,41 @@ public:
 
 }; // namespace Impl
 
-class MyTestCustomActor : public CustomActor
+class TestCustomActorForTypeRegistry : public CustomActor
 {
 public:
 
   typedef Signal< void ()> SignalType;
   typedef Signal< void (float)> SignalTypeFloat;
 
-  MyTestCustomActor()
+  TestCustomActorForTypeRegistry()
   {
   }
 
-  static MyTestCustomActor New()
+  static TestCustomActorForTypeRegistry New()
   {
-    Impl::MyTestCustomActor* p = new Impl::MyTestCustomActor;
-    return MyTestCustomActor( *p ); // takes ownership
+    Impl::TestCustomActorForTypeRegistry* p = new Impl::TestCustomActorForTypeRegistry;
+    return TestCustomActorForTypeRegistry( *p ); // takes ownership
   }
 
-  virtual ~MyTestCustomActor()
+  virtual ~TestCustomActorForTypeRegistry()
   {
   }
 
-  static MyTestCustomActor DownCast( BaseHandle handle )
+  static TestCustomActorForTypeRegistry DownCast( BaseHandle handle )
   {
-    MyTestCustomActor result;
+    TestCustomActorForTypeRegistry result;
 
     CustomActor custom = Dali::CustomActor::DownCast( handle );
     if ( custom )
     {
       CustomActorImpl& customImpl = custom.GetImplementation();
 
-      Impl::MyTestCustomActor* impl = dynamic_cast<Impl::MyTestCustomActor*>(&customImpl);
+      Impl::TestCustomActorForTypeRegistry* impl = dynamic_cast<Impl::TestCustomActorForTypeRegistry*>(&customImpl);
 
       if (impl)
       {
-        result = MyTestCustomActor(customImpl.GetOwner());
+        result = TestCustomActorForTypeRegistry(customImpl.GetOwner());
       }
     }
 
@@ -342,54 +342,54 @@ public:
   SignalType& GetCustomSignal()
   {
     Dali::RefObject& obj = GetImplementation();
-    return static_cast<Impl::MyTestCustomActor&>( obj ).mSignal;
+    return static_cast<Impl::TestCustomActorForTypeRegistry&>( obj ).mSignal;
   }
 
 private:
 
-  MyTestCustomActor(Internal::CustomActor* internal)
+  TestCustomActorForTypeRegistry(Internal::CustomActor* internal)
   : CustomActor(internal)
   {
   }
 
-  MyTestCustomActor( Impl::MyTestCustomActor& impl )
+  TestCustomActorForTypeRegistry( Impl::TestCustomActorForTypeRegistry& impl )
   : CustomActor( impl )
   {
   }
 };
 
 
-class MyTestCustomActor2 : public CustomActor
+class TestCustomActorForTypeRegistry_2 : public CustomActor
 {
 public:
 
-  MyTestCustomActor2()
+  TestCustomActorForTypeRegistry_2()
   {
   }
 
-  static MyTestCustomActor2 New()
+  static TestCustomActorForTypeRegistry_2 New()
   {
-    return MyTestCustomActor2(); // takes ownership
+    return TestCustomActorForTypeRegistry_2(); // takes ownership
   }
 
-  virtual ~MyTestCustomActor2()
+  virtual ~TestCustomActorForTypeRegistry_2()
   {
   }
 
-  static MyTestCustomActor2 DownCast( BaseHandle handle )
+  static TestCustomActorForTypeRegistry_2 DownCast( BaseHandle handle )
   {
-    MyTestCustomActor2 result;
+    TestCustomActorForTypeRegistry_2 result;
 
     CustomActor custom = Dali::CustomActor::DownCast( handle );
     if ( custom )
     {
       CustomActorImpl& customImpl = custom.GetImplementation();
 
-      Impl::MyTestCustomActor* impl = dynamic_cast<Impl::MyTestCustomActor*>(&customImpl);
+      Impl::TestCustomActorForTypeRegistry* impl = dynamic_cast<Impl::TestCustomActorForTypeRegistry*>(&customImpl);
 
       if (impl)
       {
-        result = MyTestCustomActor2(customImpl.GetOwner());
+        result = TestCustomActorForTypeRegistry_2(customImpl.GetOwner());
       }
     }
 
@@ -398,23 +398,23 @@ public:
 
 private:
 
-  MyTestCustomActor2(Internal::CustomActor* internal)
+  TestCustomActorForTypeRegistry_2(Internal::CustomActor* internal)
   : CustomActor(internal)
   {
   }
 
-  MyTestCustomActor2( Impl::MyTestCustomActor& impl )
+  TestCustomActorForTypeRegistry_2( Impl::TestCustomActorForTypeRegistry& impl )
   : CustomActor( impl )
   {
   }
 };
 
-static TypeRegistration customTypeInit( typeid(MyTestCustomActor2), typeid(Dali::CustomActor), CreateCustomInit, true );
+static TypeRegistration customTypeInit( typeid(TestCustomActorForTypeRegistry_2), typeid(Dali::CustomActor), CreateCustomInit, true );
 
 
 BaseHandle CreateCustom(void)
 {
-  return MyTestCustomActor::New();
+  return TestCustomActorForTypeRegistry::New();
 }
 
 static std::string lastSignalConnectionCustom;
@@ -426,7 +426,7 @@ bool DoConnectSignalCustom( BaseObject* object, ConnectionTrackerInterface* trac
   bool connected( true );
 
   Dali::BaseHandle handle(object);
-  MyTestCustomActor customActor = MyTestCustomActor::DownCast(handle);
+  TestCustomActorForTypeRegistry customActor = TestCustomActorForTypeRegistry::DownCast(handle);
 
   if( "sig1" == signalName )
   {
@@ -496,7 +496,7 @@ bool DoActionCustom(BaseObject* object, const std::string& actionName, const Pro
 }
 
 // Custom type registration
-static TypeRegistration customType1( typeid(MyTestCustomActor), typeid(Dali::CustomActor), CreateCustom );
+static TypeRegistration customType1( typeid(TestCustomActorForTypeRegistry), typeid(Dali::CustomActor), CreateCustom );
 
 // Custom signals
 static SignalConnectorType customSignalConnector1( customType1, "sig1", DoConnectSignalCustom );
@@ -632,9 +632,10 @@ void TypeRegistryCopyAssign()
 
 void TypeRegistryChildPropertyRegistration()
 {
+       OPEN_GL_FREATURE_CHECK(SUITE_NAME,__LINE__)
        TypeRegistry typeRegistry = TypeRegistry::Get();
 
-       TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) );
+       TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(TestCustomActorForTypeRegistry) );
        DALI_CHECK_FAIL( !typeInfo ,"GetTypeInfo() is failed to get specified type");
        BaseHandle handle = typeInfo.CreateInstance();
        DALI_CHECK_FAIL( !handle ,"CreateInstance() is failed to create instance");