X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-TypeRegistry.cpp;h=41ba9b95665c38587186d8c26bdf3183a2b9c523;hb=ab7b2c898458ad779321c0cbc0a79387ca6d318c;hp=f3d2cb4235aa5537bced6cbca01fadcfcd4193fb;hpb=e7267cff159c0ea2f919cbbe8c809f22226148d9;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp b/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp index f3d2cb4..41ba9b9 100644 --- a/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp +++ b/automated-tests/src/dali/utc-Dali-TypeRegistry.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,11 @@ #include #include +#include #include +#include #include +#include #include #include #include @@ -202,7 +205,7 @@ struct MyTestCustomActor : public CustomActorImpl } // From CustomActorImpl - virtual void OnStageConnection() + virtual void OnStageConnection( int depth ) { } virtual void OnStageDisconnection() @@ -228,7 +231,7 @@ struct MyTestCustomActor : public CustomActorImpl { return true; } - virtual bool OnMouseWheelEvent(const MouseWheelEvent& event) + virtual bool OnWheelEvent(const WheelEvent& event) { return true; } @@ -355,6 +358,16 @@ class MyTestCustomActor2 : public CustomActor { public: + struct Property + { + enum + { + P1=Dali::PROPERTY_REGISTRATION_START_INDEX, + P2 + }; + }; + + MyTestCustomActor2() { } @@ -403,6 +416,60 @@ private: static TypeRegistration customTypeInit( typeid(MyTestCustomActor2), typeid(Dali::CustomActor), CreateCustomInit, true ); +PropertyRegistration P1( customTypeInit, "propertyOne", MyTestCustomActor2::Property::P1, Property::INTEGER, &SetProperty, &GetProperty ); +PropertyRegistration P2( customTypeInit, "propertyTwo", MyTestCustomActor2::Property::P2, Property::STRING, &SetProperty, &GetProperty ); + + +class MyTestCustomActor3 : public CustomActor +{ +public: + MyTestCustomActor3() + { + } + + static MyTestCustomActor3 New() + { + return MyTestCustomActor3(); // takes ownership + } + + virtual ~MyTestCustomActor3() + { + } + + static MyTestCustomActor3 DownCast( BaseHandle handle ) + { + MyTestCustomActor3 result; + + CustomActor custom = Dali::CustomActor::DownCast( handle ); + if ( custom ) + { + CustomActorImpl& customImpl = custom.GetImplementation(); + + Impl::MyTestCustomActor* impl = dynamic_cast(&customImpl); + + if (impl) + { + result = MyTestCustomActor3(customImpl.GetOwner()); + } + } + + return result; + } + +private: + + MyTestCustomActor3(Internal::CustomActor* internal) + : CustomActor(internal) + { + } + + MyTestCustomActor3( Impl::MyTestCustomActor& impl ) + : CustomActor( impl ) + { + } +}; + +static TypeRegistration customTypeBadInit( typeid(MyTestCustomActor3), typeid(Dali::CustomActor), NULL, false ); BaseHandle CreateCustom(void) { @@ -481,7 +548,7 @@ static void ResetFunctorCounts() } static std::string lastActionCustom; -bool DoActionCustom(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool DoActionCustom(BaseObject* object, const std::string& actionName, const Property::Map& /*attributes*/) { lastActionCustom = actionName; return true; @@ -516,7 +583,7 @@ BaseHandle CreateNamedActorType() } TypeRegistration namedActorType( "MyNamedActor", typeid(Dali::Actor), CreateNamedActorType ); -PropertyRegistration namedActorPropertyOne( namedActorType, "prop-name", PROPERTY_REGISTRATION_START_INDEX, Property::BOOLEAN, &SetProperty, &GetProperty ); +PropertyRegistration namedActorPropertyOne( namedActorType, "propName", PROPERTY_REGISTRATION_START_INDEX, Property::BOOLEAN, &SetProperty, &GetProperty ); } // Anonymous namespace @@ -574,6 +641,20 @@ int UtcDaliTypeRegistryAssignmentOperatorP(void) END_TEST; } +int UtcDaliTypeRegistryAssignP(void) +{ + TestApplication application; + + TypeRegistry registry = TypeRegistry::Get(); + TypeRegistry registry2; + registry2 = registry; + DALI_TEST_CHECK( registry2 ); + + DALI_TEST_CHECK( registry2.GetTypeInfo( "Actor" ).GetName() == registry2.GetTypeInfo( "Actor" ).GetName() ); + + END_TEST; +} + int UtcDaliTypeRegistryGetTypeInfoFromTypeNameP(void) { TestApplication application; @@ -582,16 +663,6 @@ int UtcDaliTypeRegistryGetTypeInfoFromTypeNameP(void) TypeInfo type; - // image actor - type = registry.GetTypeInfo( "ImageActor" ); - DALI_TEST_CHECK( type ); - DALI_TEST_CHECK( type.GetCreator() ); - DALI_TEST_CHECK( ImageActor::DownCast( type.GetCreator()() ) ); - ImageActor ia = ImageActor::DownCast(type.CreateInstance()); - DALI_TEST_CHECK( ia ); - Stage::GetCurrent().Add( ia ); - application.Render(); - // camera actor type = registry.GetTypeInfo( "CameraActor" ); DALI_TEST_CHECK( type ); @@ -608,13 +679,6 @@ int UtcDaliTypeRegistryGetTypeInfoFromTypeNameP(void) an.Play(); application.Render(); - // shader effect - type = registry.GetTypeInfo( "ShaderEffect" ); - DALI_TEST_CHECK( type ); - ShaderEffect ef = ShaderEffect::DownCast(type.CreateInstance()); - DALI_TEST_CHECK( ef ); - application.Render(); - END_TEST; } @@ -634,8 +698,8 @@ int UtcDaliTypeRegistryGetTypeInfoFromTypeNameN(void) int UtcDaliTypeRegistryGetTypeInfoFromTypeIdP(void) { - TypeInfo named_type = TypeRegistry::Get().GetTypeInfo( "ImageActor" ); - TypeInfo typeinfo_type = TypeRegistry::Get().GetTypeInfo( typeid(Dali::ImageActor) ); + TypeInfo named_type = TypeRegistry::Get().GetTypeInfo( "CameraActor" ); + TypeInfo typeinfo_type = TypeRegistry::Get().GetTypeInfo( typeid(Dali::CameraActor) ); DALI_TEST_CHECK( named_type ); DALI_TEST_CHECK( typeinfo_type ); @@ -660,42 +724,38 @@ int UtcDaliTypeRegistryGetTypeInfoFromTypeIdN(void) END_TEST; } -int UtcDaliTypeRegistryGetTypeNamesP(void) +int UtcDaliTypeRegistryGetTypeNameCountP(void) { TestApplication application; - + TypeRegistry typeRegistry = TypeRegistry::Get(); TypeInfo type; - TypeRegistry::NameContainer names = TypeRegistry::Get().GetTypeNames(); - - for(TypeRegistry::NameContainer::iterator iter = names.begin(); - iter != names.end(); ++iter) + for(size_t i = 0; i < typeRegistry.GetTypeNameCount(); i++) { - type = TypeRegistry::Get().GetTypeInfo( *iter ); + type = typeRegistry.GetTypeInfo( typeRegistry.GetTypeName(i) ); DALI_TEST_CHECK( type ); } END_TEST; } -int UtcDaliTypeRegistryGetTypeNamesN(void) + +int UtcDaliTypeRegistryGetTypeNamesP(void) { TestApplication application; - + TypeRegistry typeRegistry = TypeRegistry::Get(); TypeInfo type; - TypeRegistry::NameContainer names = TypeRegistry::Get().GetTypeNames(); - - for(TypeRegistry::NameContainer::iterator iter = names.begin(); - iter != names.end(); ++iter) + for(size_t i = 0; i < typeRegistry.GetTypeNameCount(); i++) { - type = TypeRegistry::Get().GetTypeInfo( *iter ); - DALI_TEST_CHECK( type.GetName() != "MyDummyActor" ); + type = typeRegistry.GetTypeInfo( typeRegistry.GetTypeName(i) ); + DALI_TEST_CHECK( type ); } END_TEST; } + // Note: No negative test case for UtcDaliTypeRegistryTypeRegistration can be implemented. int UtcDaliTypeRegistryTypeRegistrationNotCallingCreateOnInitP(void) { @@ -715,19 +775,9 @@ int UtcDaliTypeRegistryTypeRegistrationNotCallingCreateOnInitP(void) MyTestCustomActor customHandle = MyTestCustomActor::DownCast( handle ); DALI_TEST_CHECK( customHandle ); - TypeInfo::NameContainer names; - type.GetActions(names); - TypeInfo::NameContainer baseNames; - baseType.GetActions(baseNames); - DALI_TEST_EQUALS( names.size(), TEST_ACTION_COUNT + baseNames.size(), TEST_LOCATION ); - - names.clear(); - type.GetSignals(names); + DALI_TEST_EQUALS( type.GetActionCount(), TEST_ACTION_COUNT + baseType.GetActionCount(), TEST_LOCATION ); - baseNames.clear(); - baseType.GetSignals(baseNames); - - DALI_TEST_EQUALS( names.size(), TEST_SIGNAL_COUNT + baseNames.size(), TEST_LOCATION ); + DALI_TEST_EQUALS( type.GetSignalCount(), TEST_SIGNAL_COUNT + baseType.GetSignalCount(), TEST_LOCATION ); { TestConnectionTracker tracker; @@ -755,7 +805,7 @@ int UtcDaliTypeRegistryTypeRegistrationNotCallingCreateOnInitP(void) DALI_TEST_EQUALS( CustomTestFunctor::mTotalInstanceCount, 2/*temporary copy + FunctorDelegate copy*/, TEST_LOCATION ); DALI_TEST_EQUALS( CustomTestFunctor::mCurrentInstanceCount, 0, TEST_LOCATION ); - std::vector attributes; + Property::Map attributes; handle.DoAction("act1", attributes); DALI_TEST_CHECK( lastActionCustom == "act1" ); END_TEST; @@ -795,7 +845,6 @@ int UtcDaliTypeRegistryTypeRegistrationForNamedTypeP(void) END_TEST; } -// Note: No negative test case for UtcDaliTypeRegistryRegisteredName can be implemented. int UtcDaliTypeRegistryRegisteredNameP(void) { TestApplication application; @@ -813,6 +862,32 @@ int UtcDaliTypeRegistryRegisteredNameP(void) END_TEST; } + +int UtcDaliTypeRegistryRegisteredNameN(void) +{ + TestApplication application; + + DALI_TEST_CHECK( scriptedName == scriptedType.RegisteredName() ); + + TypeInfo baseType = TypeRegistry::Get().GetTypeInfo( scriptedName ); + DALI_TEST_CHECK( baseType ); + + // should cause an assert because we're registering same type twice + // once statically at the start of this file, then again now + try + { + TypeRegistration scriptedType( scriptedName, typeid(Dali::CustomActor), CreateCustomNamedInit ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "Duplicate type name for Type Registation", TEST_LOCATION ); + } + + END_TEST; +} + + int UtcDaliTypeRegistrySignalConnectorTypeP(void) { ResetFunctorCounts(); @@ -877,21 +952,9 @@ int UtcDaliTypeRegistrySignalConnectorTypeN(void) MyTestCustomActor customHandle = MyTestCustomActor::DownCast( handle ); DALI_TEST_CHECK( customHandle ); - TypeInfo::NameContainer names; - TypeInfo::NameContainer baseNames; - - type.GetActions(names); - baseType.GetActions(baseNames); - - DALI_TEST_EQUALS( names.size(), TEST_ACTION_COUNT + baseNames.size(), TEST_LOCATION ); + DALI_TEST_EQUALS( type.GetActionCount(), TEST_ACTION_COUNT + baseType.GetActionCount(), TEST_LOCATION ); - names.clear(); - baseNames.clear(); - - type.GetSignals(names); - baseType.GetSignals(baseNames); - - DALI_TEST_EQUALS( names.size(), TEST_SIGNAL_COUNT + baseNames.size(), TEST_LOCATION ); + DALI_TEST_EQUALS( type.GetSignalCount(), TEST_SIGNAL_COUNT + baseType.GetSignalCount(), TEST_LOCATION ); { TestConnectionTracker tracker; @@ -928,7 +991,7 @@ int UtcDaliTypeRegistryTypeActionP(void) BaseHandle handle = type.CreateInstance(); DALI_TEST_CHECK( handle ); - std::vector attributes; + Property::Map attributes; DALI_TEST_CHECK( handle.DoAction("act1", attributes) ); DALI_TEST_CHECK( lastActionCustom == "act1" ); @@ -947,8 +1010,8 @@ int UtcDaliTypeRegistryTypeActionN(void) BaseHandle handle = type.CreateInstance(); DALI_TEST_CHECK( handle ); - std::vector attributes; - DALI_TEST_CHECK( !handle.DoAction( "unknown-action", attributes ) ); + Property::Map attributes; + DALI_TEST_CHECK( !handle.DoAction( "unknownAction", attributes ) ); END_TEST; } @@ -967,7 +1030,7 @@ int UtcDaliTypeRegistryPropertyRegistrationP(void) DALI_TEST_CHECK( customActor ); unsigned int initialPropertyCount( customActor.GetPropertyCount() ); - std::string propertyName( "prop-1" ); + std::string propertyName( "prop1" ); int propertyIndex( PROPERTY_REGISTRATION_START_INDEX ); Property::Type propertyType( Property::BOOLEAN ); PropertyRegistration property1( customType1, propertyName, propertyIndex, propertyType, &SetProperty, &GetProperty ); @@ -977,7 +1040,7 @@ int UtcDaliTypeRegistryPropertyRegistrationP(void) DALI_TEST_EQUALS( initialPropertyCount + 1u, postRegistrationPropertyCount, TEST_LOCATION ); // Add custom property and check property count - customActor.RegisterProperty( "custom-prop-1", true ); + customActor.RegisterProperty( "customProp1", true ); unsigned int customPropertyCount( customActor.GetPropertyCount() ); DALI_TEST_EQUALS( postRegistrationPropertyCount + 1u, customPropertyCount, TEST_LOCATION ); @@ -991,6 +1054,12 @@ int UtcDaliTypeRegistryPropertyRegistrationP(void) (void)customActor.GetProperty< bool >( propertyIndex ); DALI_TEST_CHECK( getPropertyCalled ); + // Get the property using DevelHandle::GetCurrentProperty and ensure GetProperty is called + getPropertyCalled = false; + DALI_TEST_CHECK( !getPropertyCalled ); + (void)DevelHandle::GetCurrentProperty< bool >( customActor, propertyIndex ); + DALI_TEST_CHECK( getPropertyCalled ); + // Check the property name DALI_TEST_EQUALS( customActor.GetPropertyName( propertyIndex ), propertyName, TEST_LOCATION ); DALI_TEST_EQUALS( typeInfo.GetPropertyName( propertyIndex ), propertyName, TEST_LOCATION ); @@ -1004,14 +1073,17 @@ int UtcDaliTypeRegistryPropertyRegistrationP(void) // Check property count of type-info is 1 Property::IndexContainer indices; typeInfo.GetPropertyIndices( indices ); - DALI_TEST_EQUALS( indices.size(), 1u, TEST_LOCATION ); + + size_t typePropertyCount = typeInfo.GetPropertyCount(); + DALI_TEST_EQUALS( indices.Size(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( indices.Size(), typePropertyCount, TEST_LOCATION ); // Ensure indices returned from actor and customActor differ by two Actor actor = Actor::New(); actor.GetPropertyIndices( indices ); - unsigned int actorIndices = indices.size(); + unsigned int actorIndices = indices.Size(); customActor.GetPropertyIndices( indices ); - unsigned int customActorIndices = indices.size(); + unsigned int customActorIndices = indices.Size(); DALI_TEST_EQUALS( actorIndices + 2u, customActorIndices, TEST_LOCATION ); // Custom property + registered property END_TEST; } @@ -1024,7 +1096,7 @@ int UtcDaliTypeRegistryPropertyRegistrationN(void) // Attempt to register a property type out-of-bounds index (less than) try { - PropertyRegistration property1( customType1, "prop-name", PROPERTY_REGISTRATION_START_INDEX - 1, Property::BOOLEAN, &SetProperty, &GetProperty ); + PropertyRegistration property1( customType1, "propName", PROPERTY_REGISTRATION_START_INDEX - 1, Property::BOOLEAN, &SetProperty, &GetProperty ); tet_result( TET_FAIL ); } catch ( DaliException& e ) @@ -1035,7 +1107,7 @@ int UtcDaliTypeRegistryPropertyRegistrationN(void) // Attempt to register a property type out-of-bounds index (greater than) try { - PropertyRegistration property1( customType1, "prop-name", PROPERTY_REGISTRATION_MAX_INDEX + 1, Property::BOOLEAN, &SetProperty, &GetProperty ); + PropertyRegistration property1( customType1, "propName", PROPERTY_REGISTRATION_MAX_INDEX + 1, Property::BOOLEAN, &SetProperty, &GetProperty ); tet_result( TET_FAIL ); } catch ( DaliException& e ) @@ -1058,14 +1130,15 @@ int UtcDaliTypeRegistryAnimatablePropertyRegistrationP(void) DALI_TEST_CHECK( handle ); Actor customActor = Actor::DownCast( handle ); DALI_TEST_CHECK( customActor ); + Stage::GetCurrent().Add(customActor); unsigned int customPropertyCount( customActor.GetPropertyCount() ); // Register animatable property - std::string animatablePropertyName( "animatable-prop-1" ); + std::string animatablePropertyName( "animatableProp1" ); int animatablePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); Property::Type animatablePropertyType( Property::FLOAT ); - AnimatablePropertyRegistration animatableProperty1( customType1, animatablePropertyName, animatablePropertyIndex, animatablePropertyType ); + AnimatablePropertyRegistration animatableProperty( customType1, animatablePropertyName, animatablePropertyIndex, animatablePropertyType ); // Check property count after registration DALI_TEST_EQUALS( customPropertyCount + 1u, customActor.GetPropertyCount(), TEST_LOCATION ); @@ -1078,11 +1151,10 @@ int UtcDaliTypeRegistryAnimatablePropertyRegistrationP(void) application.Render(); // Check the animatable property value - DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 25.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 25.f, TEST_LOCATION ); // Check the animatable property name DALI_TEST_EQUALS( customActor.GetPropertyName( animatablePropertyIndex ), animatablePropertyName, TEST_LOCATION ); -// DALI_TEST_EQUALS( typeInfo.GetPropertyName( animatablePropertyIndex ), animatablePropertyName, TEST_LOCATION ); // Check the animatable property index DALI_TEST_EQUALS( customActor.GetPropertyIndex( animatablePropertyName ), animatablePropertyIndex, TEST_LOCATION ); @@ -1093,16 +1165,36 @@ int UtcDaliTypeRegistryAnimatablePropertyRegistrationP(void) // Check property count of type-info is 1 Property::IndexContainer indices; typeInfo.GetPropertyIndices( indices ); - DALI_TEST_EQUALS( indices.size(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( indices.Size(), 1u, TEST_LOCATION ); - // Ensure indices returned from actor and customActor differ by three + // Ensure indices returned from actor and customActor differ by one Actor actor = Actor::New(); actor.GetPropertyIndices( indices ); - unsigned int actorIndices = indices.size(); + unsigned int actorIndices = indices.Size(); customActor.GetPropertyIndices( indices ); - unsigned int customActorIndices = indices.size(); + unsigned int customActorIndices = indices.Size(); DALI_TEST_EQUALS( actorIndices + 1u, customActorIndices, TEST_LOCATION ); // Custom property + registered property + // check that the property is animatable + Animation animation = Animation::New(0.2f); + animation.AnimateTo( Property( customActor, animatablePropertyIndex ), 15.f, AlphaFunction::LINEAR ); + animation.Play(); + + // Target value should change straight away + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 15.0f, TEST_LOCATION ); + + // Render and notify, animation play for 0.05 seconds + application.SendNotification(); + application.Render(50); + DALI_TEST_EQUALS( 0.25f, animation.GetCurrentProgress(), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyIndex ), 22.5f, TEST_LOCATION ); + + // Render and notify, animation play for another 0.1 seconds + application.SendNotification(); + application.Render(100); + DALI_TEST_EQUALS( 0.75f, animation.GetCurrentProgress(), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyIndex ), 17.5f, TEST_LOCATION ); + END_TEST; } @@ -1114,7 +1206,7 @@ int UtcDaliTypeRegistryAnimatablePropertyRegistrationN(void) // Attempt to register an animatable property type out-of-bounds index (less than) try { - AnimatablePropertyRegistration property1( customType1, "anim-prop-name", ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX - 1, Property::BOOLEAN ); + AnimatablePropertyRegistration property1( customType1, "animPropName", ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX - 1, Property::BOOLEAN ); tet_result( TET_FAIL ); } catch ( DaliException& e ) @@ -1125,7 +1217,7 @@ int UtcDaliTypeRegistryAnimatablePropertyRegistrationN(void) // Attempt to register an animatable property type out-of-bounds index (greater than) try { - AnimatablePropertyRegistration property1( customType1, "anim-prop-name", ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX + 1, Property::BOOLEAN ); + AnimatablePropertyRegistration property1( customType1, "animPropName", ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX + 1, Property::BOOLEAN ); tet_result( TET_FAIL ); } catch ( DaliException& e ) @@ -1136,160 +1228,692 @@ int UtcDaliTypeRegistryAnimatablePropertyRegistrationN(void) END_TEST; } - -/******************************************************************************* - * - * Action through the base handle - * - ******************************************************************************/ -int UtcDaliTypeRegistryActionViaBaseHandle(void) +int UtcDaliTypeRegistryAnimatablePropertyRegistrationWithDefaultP(void) { TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); - TypeInfo type; - - type = TypeRegistry::Get().GetTypeInfo( "Actor" ); - DALI_TEST_CHECK( type ); + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + Stage::GetCurrent().Add(customActor); - BaseHandle hdl = type.CreateInstance(); - DALI_TEST_CHECK( hdl ); + unsigned int customPropertyCount( customActor.GetPropertyCount() ); - Actor a = Actor::DownCast(hdl); - DALI_TEST_CHECK( a ); + // Register animatable property + std::string animatablePropertyName( "animatableProp1" ); + int animatablePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + AnimatablePropertyRegistration animatableProperty1( customType1, animatablePropertyName, animatablePropertyIndex, 10.f ); - a.SetVisible(false); + // Check property count after registration + DALI_TEST_EQUALS( customPropertyCount + 1u, customActor.GetPropertyCount(), TEST_LOCATION ); + // Render and notify application.SendNotification(); - application.Render(0); - DALI_TEST_CHECK(!a.IsVisible()); + application.Render(); - std::vector attributes; + // Check the animatable property value + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 10.f, TEST_LOCATION ); - DALI_TEST_CHECK(hdl.DoAction("show", attributes)); + // Check the animatable property name + DALI_TEST_EQUALS( customActor.GetPropertyName( animatablePropertyIndex ), animatablePropertyName, TEST_LOCATION ); - application.SendNotification(); - application.Render(0); - DALI_TEST_CHECK(a.IsVisible()); + // Check the animatable property index + DALI_TEST_EQUALS( customActor.GetPropertyIndex( animatablePropertyName ), animatablePropertyIndex, TEST_LOCATION ); - DALI_TEST_CHECK(!hdl.DoAction("unknown-action", attributes)); - END_TEST; -} + // Check the animatable property type + DALI_TEST_EQUALS( customActor.GetPropertyType( animatablePropertyIndex ), Property::FLOAT, TEST_LOCATION ); -int UtcDaliPropertyRegistrationFunctions(void) -{ - TestApplication application; - int propertyIndex = PROPERTY_REGISTRATION_START_INDEX + 10; + // Check property count of type-info is 1 + Property::IndexContainer indices; + typeInfo.GetPropertyIndices( indices ); + DALI_TEST_EQUALS( indices.Size(), 1u, TEST_LOCATION ); - // Attempt to register a property without a setter - try - { - PropertyRegistration property1( customType1, "prop-name", propertyIndex++, Property::BOOLEAN, NULL, &GetProperty ); - tet_result( TET_PASS ); - } - catch ( DaliException& e ) - { - tet_result( TET_FAIL ); - } + // Ensure indices returned from actor and customActor differ by one + Actor actor = Actor::New(); + actor.GetPropertyIndices( indices ); + unsigned int actorIndices = indices.Size(); + customActor.GetPropertyIndices( indices ); + unsigned int customActorIndices = indices.Size(); + DALI_TEST_EQUALS( actorIndices + 1u, customActorIndices, TEST_LOCATION ); // Custom property + registered property + + // check that the property is animatable + Animation animation = Animation::New(0.2f); + animation.AnimateTo( Property( customActor, animatablePropertyIndex ), 20.f, AlphaFunction::LINEAR ); + animation.Play(); + + // Target value should change straight away + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 20.0f, TEST_LOCATION ); + + // Render and notify, animation play for 0.05 seconds + application.SendNotification(); + application.Render(50); + DALI_TEST_EQUALS( 0.25f, animation.GetCurrentProgress(), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyIndex ), 12.5f, TEST_LOCATION ); + + // Render and notify, animation play for another 0.1 seconds + application.SendNotification(); + application.Render(100); + DALI_TEST_EQUALS( 0.75f, animation.GetCurrentProgress(), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyIndex ), 17.5f, TEST_LOCATION ); - // Attempt to register a property without a getter - try - { - PropertyRegistration property1( customType1, "prop-name", propertyIndex++, Property::BOOLEAN, NULL, NULL ); - tet_result( TET_FAIL ); - } - catch ( DaliException& e ) - { - DALI_TEST_ASSERT( e, "! \"GetProperty", TEST_LOCATION ); - } END_TEST; } -int UtcDaliPropertyRegistrationAddSameIndex(void) +int UtcDaliTypeRegistryAnimatablePropertyRegistrationWithDefaultN(void) { TestApplication application; - int propertyIndex = PROPERTY_REGISTRATION_START_INDEX + 100; - - // Add one property with a valid property index - PropertyRegistration property1( customType1, "prop-name", propertyIndex, Property::BOOLEAN, &SetProperty, &GetProperty ); + TypeRegistry typeRegistry = TypeRegistry::Get(); - // Attempt to add another property with the same index + // Attempt to register an animatable property type out-of-bounds index (less than) try { - PropertyRegistration property2( customType1, "prop-name-2", propertyIndex, Property::BOOLEAN, &SetProperty, &GetProperty ); + AnimatablePropertyRegistration property1( customType1, "animPropName", ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX - 1, false ); + tet_result( TET_FAIL ); } catch ( DaliException& e ) { - DALI_TEST_ASSERT( e, "! \"Property index already added", TEST_LOCATION ); + DALI_TEST_ASSERT( e, "( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX )", TEST_LOCATION ); } - int animatablePropertyIndex = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 100; - - // Add one property with a valid property index - AnimatablePropertyRegistration property3( customType1, "anim-prop-name", animatablePropertyIndex, Property::BOOLEAN ); - - // Attempt to add another property with the same index + // Attempt to register an animatable property type out-of-bounds index (greater than) try { - AnimatablePropertyRegistration property4( customType1, "anim-prop-name-2", animatablePropertyIndex, Property::BOOLEAN ); + AnimatablePropertyRegistration property1( customType1, "animPropName", ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX + 1, true ); + tet_result( TET_FAIL ); } catch ( DaliException& e ) { - DALI_TEST_ASSERT( e, "! \"Property index already added", TEST_LOCATION ); + DALI_TEST_ASSERT( e, "( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX )", TEST_LOCATION ); } + END_TEST; } -int UtcDaliPropertyRegistrationPropertyWritable(void) +int UtcDaliTypeRegistryAnimatablePropertyComponentRegistrationP(void) { TestApplication application; - int propertyIndex1 = PROPERTY_REGISTRATION_START_INDEX + 200; - int propertyIndex2 = PROPERTY_REGISTRATION_START_INDEX + 201; - - // Add two properties, one with SetProperty, one without - PropertyRegistration property1( customType1, "prop-name-readwrite", propertyIndex1, Property::BOOLEAN, &SetProperty, &GetProperty ); - PropertyRegistration property2( customType1, "prop-name-readonly", propertyIndex2, Property::BOOLEAN, NULL, &GetProperty ); + TypeRegistry typeRegistry = TypeRegistry::Get(); - // Create custom-actor - TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(MyTestCustomActor) ); + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); DALI_TEST_CHECK( typeInfo ); BaseHandle handle = typeInfo.CreateInstance(); DALI_TEST_CHECK( handle ); Actor customActor = Actor::DownCast( handle ); DALI_TEST_CHECK( customActor ); - // Check whether properties are writable - DALI_TEST_CHECK( customActor.IsPropertyWritable( propertyIndex1 ) ); - DALI_TEST_CHECK( ! customActor.IsPropertyWritable( propertyIndex2 ) ); - END_TEST; -} + unsigned int customPropertyCount( customActor.GetPropertyCount() ); -int UtcDaliPropertyRegistrationPropertyAnimatable(void) -{ - TestApplication application; - int propertyIndex = PROPERTY_REGISTRATION_START_INDEX + 400; - int animatablePropertyIndex = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 400; + // Register animatable property + std::string animatablePropertyName( "animatableProp1" ); + int animatablePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + Property::Type animatablePropertyType( Property::VECTOR2 ); + AnimatablePropertyRegistration animatableProperty1( customType1, animatablePropertyName, animatablePropertyIndex, animatablePropertyType ); - // These properties are not animatable - PropertyRegistration property1( customType1, "prop-name", propertyIndex, Property::BOOLEAN, &SetProperty, &GetProperty ); + // Check property count after registration + DALI_TEST_EQUALS( customPropertyCount + 1u, customActor.GetPropertyCount(), TEST_LOCATION ); - // These properties are animatable - AnimatablePropertyRegistration property2( customType1, "anim-prop-name", animatablePropertyIndex, Property::BOOLEAN ); + // Set the animatable property value + customActor.SetProperty( animatablePropertyIndex, Vector2(25.0f, 50.0f) ); - // Create custom-actor - TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(MyTestCustomActor) ); - DALI_TEST_CHECK( typeInfo ); - BaseHandle handle = typeInfo.CreateInstance(); - DALI_TEST_CHECK( handle ); - Actor customActor = Actor::DownCast( handle ); - DALI_TEST_CHECK( customActor ); + // Render and notify + application.SendNotification(); + application.Render(); - // Check if animatable - DALI_TEST_CHECK( ! customActor.IsPropertyAnimatable( propertyIndex ) ); - DALI_TEST_CHECK( customActor.IsPropertyAnimatable( animatablePropertyIndex ) ); + // Check the animatable property value + DALI_TEST_EQUALS( customActor.GetProperty< Vector2 >( animatablePropertyIndex ), Vector2(25.0f, 50.0f), TEST_LOCATION ); - // Create another instance of custom-actor - BaseHandle handle2 = typeInfo.CreateInstance(); - DALI_TEST_CHECK( handle2 ); + // Check the animatable property name + DALI_TEST_EQUALS( customActor.GetPropertyName( animatablePropertyIndex ), animatablePropertyName, TEST_LOCATION ); + + // Check the animatable property index + DALI_TEST_EQUALS( customActor.GetPropertyIndex( animatablePropertyName ), animatablePropertyIndex, TEST_LOCATION ); + + // Check the animatable property type + DALI_TEST_EQUALS( customActor.GetPropertyType( animatablePropertyIndex ), animatablePropertyType, TEST_LOCATION ); + + // Check property count of type-info is 1 + Property::IndexContainer indices; + typeInfo.GetPropertyIndices( indices ); + DALI_TEST_EQUALS( indices.Size(), 1u, TEST_LOCATION ); + + // Register animatable property components + std::string animatablePropertyComponentName1( "animatableProp1X" ); + int animatablePropertyComponentIndex1( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1 ); + AnimatablePropertyComponentRegistration animatablePropertyComponent1( customType1, animatablePropertyComponentName1, animatablePropertyComponentIndex1, animatablePropertyIndex, 0 ); + + std::string animatablePropertyComponentName2( "animatableProp1Y" ); + int animatablePropertyComponentIndex2( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 2 ); + AnimatablePropertyComponentRegistration animatablePropertyComponent2( customType1, animatablePropertyComponentName2, animatablePropertyComponentIndex2, animatablePropertyIndex, 1 ); + + // Check property count after registration + DALI_TEST_EQUALS( customPropertyCount + 3u, customActor.GetPropertyCount(), TEST_LOCATION ); + + // Check the animatable property component value + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyComponentIndex1 ), 25.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyComponentIndex2 ), 50.0f, TEST_LOCATION ); + + // Set the animatable property component value + customActor.SetProperty( animatablePropertyComponentIndex1, 150.0f ); + + // Render and notify + application.SendNotification(); + application.Render(); + + // Check the animatable property value + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector2 >( customActor, animatablePropertyIndex ), Vector2(150.0f, 50.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyComponentIndex1 ), 150.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyComponentIndex2 ), 50.0f, TEST_LOCATION ); + + // Set the animatable property component value + customActor.SetProperty( animatablePropertyComponentIndex2, 225.0f ); + + // Render and notify + application.SendNotification(); + application.Render(); + + // Check the animatable property value + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector2 >( customActor, animatablePropertyIndex ), Vector2(150.0f, 225.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyComponentIndex1 ), 150.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyComponentIndex2 ), 225.0f, TEST_LOCATION ); + + // Ensure indices returned from actor and customActor differ by three + Actor actor = Actor::New(); + actor.GetPropertyIndices( indices ); + unsigned int actorIndices = indices.Size(); + customActor.GetPropertyIndices( indices ); + unsigned int customActorIndices = indices.Size(); + DALI_TEST_EQUALS( actorIndices + 3u, customActorIndices, TEST_LOCATION ); // Custom property + registered property + + END_TEST; +} + +int UtcDaliTypeRegistryAnimatablePropertyComponentRegistrationN(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + // Register animatable property with the type of Vector2 + int animatablePropertyIndex1( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + AnimatablePropertyRegistration animatableProperty1( customType1, "animatableProp1", animatablePropertyIndex1, Property::VECTOR2 ); + + // Attempt to register an animatable property component out-of-bounds index (less than) + try + { + AnimatablePropertyComponentRegistration propertyComponent1( customType1, "animatableProp1X", ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX - 1, animatablePropertyIndex1, 0 ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX )", TEST_LOCATION ); + } + + // Attempt to register an animatable property component out-of-bounds index (greater than) + try + { + AnimatablePropertyComponentRegistration propertyComponent1( customType1, "animatableProp1X", ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX + 1, animatablePropertyIndex1, 0 ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX )", TEST_LOCATION ); + } + + // Register an animatable property component + AnimatablePropertyComponentRegistration propertyComponent1( customType1, "animatableProp1X", ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1, animatablePropertyIndex1, 0 ); + + // Attempt to register another animatable property component with the same component index + try + { + AnimatablePropertyComponentRegistration propertyComponent2( customType1, "animatableProp1Y", ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 2, animatablePropertyIndex1, 0 ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "Property component already registered", TEST_LOCATION ); + } + + // Register animatable property with the type of boolean + int animatablePropertyIndex2( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 2 ); + AnimatablePropertyRegistration animatableProperty2( customType1, "animatableProp2", animatablePropertyIndex2, Property::BOOLEAN ); + + // Attempt to register an animatable property component for the above property with boolean type + try + { + AnimatablePropertyComponentRegistration propertyComponent1( customType1, "animatableProp2X", animatablePropertyIndex2 + 1, animatablePropertyIndex2, 0 ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "Base property does not support component", TEST_LOCATION ); + } + + END_TEST; +} + +int UtcDaliTypeRegistryChildPropertyRegistrationP(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + unsigned int initialPropertyCount( customActor.GetPropertyCount() ); + + // Register child properties to the parent + std::string propertyName( "childProp1" ); + int propertyIndex( CHILD_PROPERTY_REGISTRATION_START_INDEX ); + Property::Type propertyType( Property::BOOLEAN ); + ChildPropertyRegistration childProperty1( customType1, propertyName, propertyIndex, propertyType ); + + std::string propertyName2( "childProp2" ); + int propertyIndex2( CHILD_PROPERTY_REGISTRATION_START_INDEX + 1 ); + Property::Type propertyType2( Property::INTEGER ); + ChildPropertyRegistration childProperty2( customType1, propertyName2, propertyIndex2, propertyType2 ); + + std::string propertyName3( "childProp3" ); + int propertyIndex3( CHILD_PROPERTY_REGISTRATION_START_INDEX + 2 ); + Property::Type propertyType3( Property::FLOAT ); + ChildPropertyRegistration childProperty3( customType1, propertyName3, propertyIndex3, propertyType3 ); + + std::string propertyName4( "childProp4" ); + int propertyIndex4( CHILD_PROPERTY_REGISTRATION_START_INDEX + 3 ); + Property::Type propertyType4( Property::INTEGER ); + ChildPropertyRegistration childProperty4( customType1, propertyName4, propertyIndex4, propertyType4 ); + + // Check property count are not changed because the child properties will not be created for the parent + DALI_TEST_EQUALS( initialPropertyCount, customActor.GetPropertyCount(), TEST_LOCATION ); + + // check the child property type + Internal::TypeInfo& typeInfoImpl = GetImplementation( typeInfo ); + Property::Type type = typeInfoImpl.GetChildPropertyType( typeInfoImpl.GetChildPropertyIndex("childProp4") ); + DALI_TEST_EQUALS( type, Property::INTEGER, TEST_LOCATION ); + + + // Create a child actor + Actor childActor = Actor::New(); + DALI_TEST_CHECK( childActor ); + unsigned int initialChildActorPropertyCount( childActor.GetPropertyCount() ); + + // The type of child properties should be Property::None as the child hasn't registered any child property yet. + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex ), Property::NONE, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex2 ), Property::NONE, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex3 ), Property::NONE, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex4 ), Property::NONE, TEST_LOCATION ); + + // Set the value for the first child property when the child actor doesn't have a parent yet + childActor.SetProperty(propertyIndex, true); + + // Check that the first child property is dynamically created + DALI_TEST_EQUALS( initialChildActorPropertyCount + 1u, childActor.GetPropertyCount(), TEST_LOCATION ); + + // Check the first child property value + DALI_TEST_EQUALS( childActor.GetProperty< bool >( propertyIndex ), true, TEST_LOCATION ); + + // Check the first child property type + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex ), propertyType, TEST_LOCATION ); + + // Check that the first child property have no name, as it doesn't have a parent yet. + DALI_TEST_EQUALS( childActor.GetPropertyName( propertyIndex ), "", TEST_LOCATION ); + + // Check that the first property can't be accessed through its name, as it doesn't have a parent yet. + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName ), Property::INVALID_INDEX, TEST_LOCATION ); + + // Create a custom property for the child with the same name as the second child property registered to the parent + Property::Index customPropertyIndex = childActor.RegisterProperty(propertyName2, 100, Property::READ_WRITE); + + // Check that the custom property is created + DALI_TEST_EQUALS( initialChildActorPropertyCount + 2u, childActor.GetPropertyCount(), TEST_LOCATION ); + + // Check the property value + DALI_TEST_EQUALS( childActor.GetProperty< int >( customPropertyIndex ), 100, TEST_LOCATION ); + + // Check the property index + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName2 ), customPropertyIndex, TEST_LOCATION ); + + // Check the property type + DALI_TEST_EQUALS( childActor.GetPropertyType( customPropertyIndex ), propertyType2, TEST_LOCATION ); + + // Check the property name + DALI_TEST_EQUALS( childActor.GetPropertyName( customPropertyIndex ), propertyName2, TEST_LOCATION ); + + // Now add the child actor to the parent + customActor.Add( childActor ); + + // Check that the first child property now has the correct name as previously registered to the parent + DALI_TEST_EQUALS( childActor.GetPropertyName( propertyIndex ), propertyName, TEST_LOCATION ); + + // Check that the child property index for the first child property can now be retrieved through its child property name + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName ), propertyIndex, TEST_LOCATION ); + + // Check that the second child property now has the correct index as previously registered to the parent + DALI_TEST_EQUALS( childActor.GetPropertyName( propertyIndex2 ), propertyName2, TEST_LOCATION ); + + // Check that the second child property can be accessed through both its custom property index and its child property index + DALI_TEST_EQUALS( childActor.GetProperty< int >( customPropertyIndex ), 100, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetProperty< int >( propertyIndex2 ), 100, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( customPropertyIndex ), propertyType2, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex2 ), propertyType2, TEST_LOCATION ); + + // Check that the child property index for the second child property can now be retrieved through its child property name + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName2 ), propertyIndex2, TEST_LOCATION ); + + // Set the value for the third child property when the child actor is already added to the parent + childActor.SetProperty(propertyIndex3, 0.15f); + + // Check that the third child property is dynamically created + DALI_TEST_EQUALS( initialChildActorPropertyCount + 3u, childActor.GetPropertyCount(), TEST_LOCATION ); + + // Check the third child property value + DALI_TEST_EQUALS( childActor.GetProperty< float >( propertyIndex3 ), 0.15f, TEST_LOCATION ); + + // Check the third child property type + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex3 ), propertyType3, TEST_LOCATION ); + + // Check the third child property name + DALI_TEST_EQUALS( childActor.GetPropertyName( propertyIndex3 ), propertyName3, TEST_LOCATION ); + + // Check the third child property index. + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName3 ), propertyIndex3, TEST_LOCATION ); + + // Create a custom property for the child with the same name as the fourth child property registered to the parent + Property::Index customPropertyIndex2 = childActor.RegisterProperty(propertyName4, 20, Property::READ_WRITE); + + // Check that the custom property is created + DALI_TEST_EQUALS( initialChildActorPropertyCount + 4u, childActor.GetPropertyCount(), TEST_LOCATION ); + + // Check the fourth child property value + DALI_TEST_EQUALS( childActor.GetProperty< int >( propertyIndex4 ), 20, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetProperty< int >( customPropertyIndex2 ), 20, TEST_LOCATION ); + + // Check the fourth child property type + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex4 ), propertyType4, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( customPropertyIndex2 ), propertyType4, TEST_LOCATION ); + + // Check the fourth child property name + DALI_TEST_EQUALS( childActor.GetPropertyName( propertyIndex4 ), propertyName4, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyName( customPropertyIndex2 ), propertyName4, TEST_LOCATION ); + + // Check the fourth child property index. + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName4 ), propertyIndex4, TEST_LOCATION ); + + // Now create another parent actor with different child properties registered + TypeInfo typeInfo2 = typeRegistry.GetTypeInfo( "MyNamedActor" ); + DALI_TEST_CHECK( typeInfo2 ); + BaseHandle handle2 = typeInfo2.CreateInstance(); + DALI_TEST_CHECK( handle2 ); + Actor customActor2 = Actor::DownCast( handle2 ); + DALI_TEST_CHECK( customActor2 ); + + // Register child properties to the new parent + std::string newPropertyName( "newChildProp" ); + int newPropertyIndex( CHILD_PROPERTY_REGISTRATION_START_INDEX ); // The same index as the first child property "childProp1" in the old parent + Property::Type newPropertyType( Property::VECTOR2 ); + ChildPropertyRegistration newChildProperty( namedActorType, newPropertyName, newPropertyIndex, newPropertyType ); + + std::string newPropertyName2( "childProp3" ); // The same name as the third child property in the old parent + int newPropertyIndex2( CHILD_PROPERTY_REGISTRATION_START_INDEX + 1 ); // The same index as the second child property "childProp2" in the old parent + Property::Type newPropertyType2( Property::FLOAT ); // The same type as the third child property in the old parent + ChildPropertyRegistration newChildProperty2( namedActorType, newPropertyName2, newPropertyIndex2, newPropertyType2 ); + + // Now move the child actor to the new parent + customActor2.Add( childActor ); + + // "childProp1" is not a valid child property supported by the new parent, so nothing changed + DALI_TEST_EQUALS( childActor.GetPropertyType( propertyIndex ), propertyType, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyName( propertyIndex ), propertyName, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyIndex( propertyName ), propertyIndex, TEST_LOCATION ); + + // "childProp3" is a valid child property supported by the new parent + // So it should get its new child property index and should just work + DALI_TEST_EQUALS( childActor.GetPropertyType( newPropertyIndex2 ), newPropertyType2, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyName( newPropertyIndex2 ), newPropertyName2, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyIndex( newPropertyName2 ), newPropertyIndex2, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetProperty< float >( newPropertyIndex2 ), 0.15f, TEST_LOCATION ); + + // Now register a custom property called "newChildProp" + Property::Index customPropertyIndex3 = childActor.RegisterProperty("newChildProp", Vector2( 10.0f, 10.0f ), Property::READ_WRITE); + + // Check that the custom property is created + DALI_TEST_EQUALS( initialChildActorPropertyCount + 5u, childActor.GetPropertyCount(), TEST_LOCATION ); + + // This is a valid child property registered to the new parent + // So should be able to access it through both its custom property index and its registered child property index + DALI_TEST_EQUALS( childActor.GetPropertyType( newPropertyIndex ), newPropertyType, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyType( customPropertyIndex3 ), newPropertyType, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetPropertyName( newPropertyIndex ), newPropertyName, TEST_LOCATION ); // This should return the new name, although the child property index remains the same + DALI_TEST_EQUALS( childActor.GetPropertyName( customPropertyIndex3 ), newPropertyName, TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetProperty< Vector2 >( newPropertyIndex ), Vector2( 10.0f, 10.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( childActor.GetProperty< Vector2 >( customPropertyIndex3 ), Vector2( 10.0f, 10.0f ), TEST_LOCATION ); + + // Should return the child property index by given its name + DALI_TEST_EQUALS( childActor.GetPropertyIndex( newPropertyName ), newPropertyIndex, TEST_LOCATION ); + + + END_TEST; +} + +int UtcDaliTypeRegistryChildPropertyRegistrationN(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + // Attempt to register a child property type out-of-bounds index (less than) + try + { + ChildPropertyRegistration property1( customType1, "propName", CHILD_PROPERTY_REGISTRATION_START_INDEX - 1, Property::BOOLEAN ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "( index >= CHILD_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= CHILD_PROPERTY_REGISTRATION_MAX_INDEX )", TEST_LOCATION ); + } + + // Attempt to register a child property type out-of-bounds index (greater than) + try + { + ChildPropertyRegistration property1( customType1, "propName", CHILD_PROPERTY_REGISTRATION_MAX_INDEX + 1, Property::BOOLEAN ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "( index >= CHILD_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= CHILD_PROPERTY_REGISTRATION_MAX_INDEX )", TEST_LOCATION ); + } + + END_TEST; +} + + +/******************************************************************************* + * + * Action through the base handle + * + ******************************************************************************/ +int UtcDaliTypeRegistryActionViaBaseHandle(void) +{ + TestApplication application; + + TypeInfo type; + + type = TypeRegistry::Get().GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( type ); + + BaseHandle hdl = type.CreateInstance(); + DALI_TEST_CHECK( hdl ); + + Actor a = Actor::DownCast(hdl); + DALI_TEST_CHECK( a ); + + a.SetVisible(false); + + application.SendNotification(); + application.Render(0); + DALI_TEST_CHECK(!a.IsVisible()); + + Property::Map attributes; + + DALI_TEST_CHECK(hdl.DoAction("show", attributes)); + + application.SendNotification(); + application.Render(0); + DALI_TEST_CHECK(a.IsVisible()); + + DALI_TEST_CHECK(!hdl.DoAction("unknownAction", attributes)); + END_TEST; +} + +int UtcDaliPropertyRegistrationFunctions(void) +{ + TestApplication application; + int propertyIndex = PROPERTY_REGISTRATION_START_INDEX + 10; + + // Attempt to register a property without a setter + try + { + PropertyRegistration property1( customType1, "propName", propertyIndex++, Property::BOOLEAN, NULL, &GetProperty ); + tet_result( TET_PASS ); + } + catch ( DaliException& e ) + { + tet_result( TET_FAIL ); + } + + // Attempt to register a property without a getter + try + { + PropertyRegistration property1( customType1, "propName", propertyIndex++, Property::BOOLEAN, NULL, NULL ); + tet_result( TET_FAIL ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "! \"GetProperty", TEST_LOCATION ); + } + END_TEST; +} + +int UtcDaliPropertyRegistrationAddSameIndex(void) +{ + TestApplication application; + int propertyIndex = PROPERTY_REGISTRATION_START_INDEX + 100; + + // Add one property with a valid property index + PropertyRegistration property1( customType1, "propName", propertyIndex, Property::BOOLEAN, &SetProperty, &GetProperty ); + + // Attempt to add another property with the same index + try + { + PropertyRegistration property2( customType1, "propName2", propertyIndex, Property::BOOLEAN, &SetProperty, &GetProperty ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "! \"Property index already added", TEST_LOCATION ); + } + + int animatablePropertyIndex = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 100; + + // Add one property with a valid property index + AnimatablePropertyRegistration property3( customType1, "animPropName", animatablePropertyIndex, Property::BOOLEAN ); + + // Attempt to add another property with the same index + try + { + AnimatablePropertyRegistration property4( customType1, "animPropName2", animatablePropertyIndex, Property::BOOLEAN ); + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "! \"Property index already added", TEST_LOCATION ); + } + END_TEST; +} + +int UtcDaliPropertyRegistrationPropertyWritableP(void) +{ + TestApplication application; + int propertyIndex1 = PROPERTY_REGISTRATION_START_INDEX + 200; + int propertyIndex2 = PROPERTY_REGISTRATION_START_INDEX + 201; + + // Add two properties, one with SetProperty, one without + PropertyRegistration property1( customType1, "propNameReadwrite", propertyIndex1, Property::BOOLEAN, &SetProperty, &GetProperty ); + PropertyRegistration property2( customType1, "propNameReadonly", propertyIndex2, Property::BOOLEAN, NULL, &GetProperty ); + + // Create custom-actor + TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + + // Check whether properties are writable + DALI_TEST_CHECK( customActor.IsPropertyWritable( propertyIndex1 ) ); + DALI_TEST_CHECK( ! customActor.IsPropertyWritable( propertyIndex2 ) ); + + + // Check the property is writable in the type registry + Internal::TypeInfo& typeInfoImpl = GetImplementation( typeInfo ); + + DALI_TEST_EQUALS( typeInfoImpl.IsPropertyWritable( propertyIndex1 ), true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliPropertyRegistrationPropertyWritableN(void) +{ + // Currently Actors don't register properties with the type registry + + TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(MyTestCustomActor) ); + Internal::TypeInfo& typeInfoImpl = GetImplementation( typeInfo ); + + try + { + typeInfoImpl.IsPropertyWritable( Actor::Property::COLOR); + tet_result( TET_FAIL ); + + } + catch ( DaliException& e ) + { + DALI_TEST_ASSERT( e, "Cannot find property index", TEST_LOCATION ); + } + END_TEST; + +} +int UtcDaliPropertyRegistrationPropertyAnimatable(void) +{ + TestApplication application; + int propertyIndex = PROPERTY_REGISTRATION_START_INDEX + 400; + int animatablePropertyIndex = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 400; + + // These properties are not animatable + PropertyRegistration property1( customType1, "propName", propertyIndex, Property::BOOLEAN, &SetProperty, &GetProperty ); + + // These properties are animatable + AnimatablePropertyRegistration property2( customType1, "animPropName", animatablePropertyIndex, Property::BOOLEAN ); + + // Create custom-actor + TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + + // Check if animatable + DALI_TEST_CHECK( ! customActor.IsPropertyAnimatable( propertyIndex ) ); + DALI_TEST_CHECK( customActor.IsPropertyAnimatable( animatablePropertyIndex ) ); + + // Create another instance of custom-actor + BaseHandle handle2 = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle2 ); Actor customActor2 = Actor::DownCast( handle2 ); DALI_TEST_CHECK( customActor2 ); @@ -1382,7 +2006,7 @@ int UtcDaliLongPressGestureDetectorTypeRegistry(void) detector.Attach(actor); // Connect to signal through type - handle.ConnectSignal( &application, "long-press-detected", functor ); + handle.ConnectSignal( &application, "longPressDetected", functor ); // Render and notify application.SendNotification(); @@ -1420,7 +2044,7 @@ int UtcDaliPanGestureDetectorTypeRegistry(void) detector.Attach(actor); // Connect to signal through type - handle.ConnectSignal( &application, "pan-detected", functor ); + handle.ConnectSignal( &application, "panDetected", functor ); // Render and notify application.SendNotification(); @@ -1458,7 +2082,7 @@ int UtcDaliPinchGestureDetectorTypeRegistry(void) detector.Attach(actor); // Connect to signal through type - handle.ConnectSignal( &application, "pinch-detected", functor ); + handle.ConnectSignal( &application, "pinchDetected", functor ); // Render and notify application.SendNotification(); @@ -1494,7 +2118,7 @@ int UtcDaliTapGestureDetectorTypeRegistry(void) detector.Attach(actor); // Connect to signal through type - handle.ConnectSignal( &application, "tap-detected", functor ); + handle.ConnectSignal( &application, "tapDetected", functor ); // Render and notify application.SendNotification(); @@ -1529,3 +2153,440 @@ int UtcDaliTypeRegistryNamedType(void) DALI_TEST_CHECK( namedActorPropertyCount > actorPropertyCount ); END_TEST; } + +int UtcDaliTypeInfoGetActionNameP(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( typeInfo ); + + DALI_TEST_CHECK( 0 != typeInfo.GetActionCount() ); + + std::string name = typeInfo.GetActionName(0); + + DALI_TEST_EQUALS( name, "show", TEST_LOCATION ); + + + TypeInfo typeInfo2 = typeRegistry.GetTypeInfo( "MyTestCustomActor" ); + + // search for show action in base class, given a derived class + bool foundChildAction = false; + for( std::size_t i = 0; i < typeInfo2.GetActionCount(); i++ ) + { + + std::string name = typeInfo2.GetActionName( i ); + if( name == "show") + { + foundChildAction = true; + } + + } + + DALI_TEST_EQUALS( foundChildAction, true, TEST_LOCATION ); + + + END_TEST; +} + +int UtcDaliTypeInfoGetActionNameN(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( typeInfo ); + + DALI_TEST_CHECK( 0 != typeInfo.GetActionCount() ); + + std::string name = typeInfo.GetActionName(std::numeric_limits::max()); + + DALI_TEST_EQUALS( 0u, name.size(), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliTypeInfoGetSignalNameP(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( typeInfo ); + + DALI_TEST_CHECK( 0 != typeInfo.GetSignalCount() ); + + std::string name = typeInfo.GetSignalName(0); + + DALI_TEST_EQUALS( name, "touched", TEST_LOCATION ); + + TypeInfo typeInfo2 = typeRegistry.GetTypeInfo( "MyTestCustomActor" ); + + // search for signal in base class, given a derived class + bool foundSignal = false; + for( std::size_t i = 0; i < typeInfo2.GetSignalCount(); i++ ) + { + + std::string name = typeInfo2.GetSignalName( i ); + if( name == "touched") + { + foundSignal = true; + } + + } + + DALI_TEST_EQUALS( foundSignal, true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliTypeInfoGetSignalNameN(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( typeInfo ); + + DALI_TEST_CHECK( 0 != typeInfo.GetSignalCount() ); + + std::string name = typeInfo.GetSignalName(std::numeric_limits::max()); + + DALI_TEST_EQUALS( 0u, name.size(), TEST_LOCATION ); + + END_TEST; +} + + +int UtcDaliTypeInfoGetCreatorP(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( typeInfo ); + + TypeInfo::CreateFunction createFn = typeInfo.GetCreator(); + DALI_TEST_EQUALS( createFn != NULL, true, TEST_LOCATION ); + if( createFn ) + { + // try calling it: + BaseHandle handle = createFn(); + DALI_TEST_EQUALS( (bool)handle, true, TEST_LOCATION ); + } + + END_TEST; +} + +int UtcDaliTypeInfoGetCreatorN(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "MyTestCustomActor3" ); + DALI_TEST_CHECK( typeInfo ); + + TypeInfo::CreateFunction createFn = typeInfo.GetCreator(); + DALI_TEST_EQUALS( createFn == NULL, true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliTypeInfoGetPropertyCountP1(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" ); + DALI_TEST_CHECK( typeInfo ); + size_t actorPropertyCount = typeInfo.GetPropertyCount(); + + DALI_TEST_EQUALS( actorPropertyCount == 0 , true, TEST_LOCATION ); // No event only props + END_TEST; +} + +int UtcDaliTypeInfoGetPropertyCountP2(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + TypeInfo typeInfo = typeRegistry.GetTypeInfo( "MyTestCustomActor2" ); + DALI_TEST_CHECK( typeInfo ); + size_t propertyCount = typeInfo.GetPropertyCount(); + Property::IndexContainer indices; + typeInfo.GetPropertyIndices( indices ); + + DALI_TEST_EQUALS( propertyCount > 0 && propertyCount <= indices.Size(), true, TEST_LOCATION ); + DALI_TEST_EQUALS( propertyCount == 2, true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliPropertyRegistrationPropertyAnimatableSynchronousSetGet01(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + tet_infoline( "Register a type registered animatable property and ensure set/get behaviour works synchronously" ); + + // Register animatable property + const int animatablePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + AnimatablePropertyRegistration animatableProperty( customType1, "animatableProp1", animatablePropertyIndex, Property::FLOAT ); + + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + Stage::GetCurrent().Add(customActor); + + tet_infoline( "Set the value and ensure it changes straight away" ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 0.0f, TEST_LOCATION ); + customActor.SetProperty( animatablePropertyIndex, 25.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 25.0f, TEST_LOCATION ); + + tet_infoline( "Check latest scene-graph value is unchanged" ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyIndex ), 0.0f, TEST_LOCATION ); + + // Render and notify + application.SendNotification(); + application.Render(); + + tet_infoline( "Check values after rendering and both retrieval methods should return the latest" ); + + DALI_TEST_EQUALS( customActor.GetProperty< float >( animatablePropertyIndex ), 25.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, animatablePropertyIndex ), 25.0f, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliPropertyRegistrationPropertyAnimatableSynchronousSetGetWithComponentsVector2(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + tet_infoline( "Register a type registered animatable property that has component indices and ensure set/get behaviour works synchronously and is the same regardless of how the property is set" ); + + // Register the animatable propeties + const int basePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + const int componentZeroPropertyIndex( basePropertyIndex + 1 ); + const int componentOnePropertyIndex( componentZeroPropertyIndex + 1 ); + AnimatablePropertyRegistration baseAnimatableProperty( customType1, "baseProp", basePropertyIndex, Vector2( 13.0f, 24.0f ) ); + AnimatablePropertyComponentRegistration componentZeroAnimatableProperty( customType1, "componentZeroProp", componentZeroPropertyIndex, basePropertyIndex, 0 ); + AnimatablePropertyComponentRegistration componentOneAnimatableProperty( customType1, "componentOneProp", componentOnePropertyIndex, basePropertyIndex, 1 ); + + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + Stage::GetCurrent().Add(customActor); + + tet_infoline( "Get the component values, they should be the default value of the base-property" ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 13.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 24.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector2 >( basePropertyIndex ), Vector2( 13.0f, 24.0f ), TEST_LOCATION ); + + tet_infoline( "Set a component value and ensure it changes for the base property as well" ); + customActor.SetProperty( componentZeroPropertyIndex, 125.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector2 >( basePropertyIndex ), Vector2( 125.0f, 24.0f ), TEST_LOCATION ); + + customActor.SetProperty( componentOnePropertyIndex, 225.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector2 >( basePropertyIndex ), Vector2( 125.0f, 225.0f ), TEST_LOCATION ); + + tet_infoline( "Check latest scene-graph value is unchanged" ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector2 >( customActor, basePropertyIndex ), Vector2( 13.0f, 24.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentZeroPropertyIndex ), 13.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentOnePropertyIndex ), 24.0f, TEST_LOCATION ); + + // Render and notify + application.SendNotification(); + application.Render(); + + tet_infoline( "Check values after rendering and both retrieval methods should return the latest" ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector2 >( basePropertyIndex ), Vector2( 125.0f, 225.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector2 >( customActor, basePropertyIndex ), Vector2( 125.0f, 225.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + + tet_infoline( "Set the base property value and ensure the component values reflect the change" ); + customActor.SetProperty( basePropertyIndex, Vector2( 1.0f, 2.0f ) ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 2.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector2 >( basePropertyIndex ), Vector2( 1.0f, 2.0f ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliPropertyRegistrationPropertyAnimatableSynchronousSetGetWithComponentsVector3(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + tet_infoline( "Register a type registered animatable property that has component indices and ensure set/get behaviour works synchronously and is the same regardless of how the property is set" ); + + // Register the animatable propeties + const int basePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + const int componentZeroPropertyIndex( basePropertyIndex + 1 ); + const int componentOnePropertyIndex( componentZeroPropertyIndex + 1 ); + const int componentTwoPropertyIndex( componentOnePropertyIndex + 1 ); + AnimatablePropertyRegistration baseAnimatableProperty( customType1, "baseProp", basePropertyIndex, Vector3( 13.0f, 24.0f, 35.0 ) ); + AnimatablePropertyComponentRegistration componentZeroAnimatableProperty( customType1, "componentZeroProp", componentZeroPropertyIndex, basePropertyIndex, 0 ); + AnimatablePropertyComponentRegistration componentOneAnimatableProperty( customType1, "componentOneProp", componentOnePropertyIndex, basePropertyIndex, 1 ); + AnimatablePropertyComponentRegistration componentTwoAnimatableProperty( customType1, "componentTwoProp", componentTwoPropertyIndex, basePropertyIndex, 2 ); + + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + Stage::GetCurrent().Add(customActor); + + tet_infoline( "Get the component values, they should be the default value of the base-property" ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 13.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 24.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 35.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector3 >( basePropertyIndex ), Vector3( 13.0f, 24.0f, 35.0f ), TEST_LOCATION ); + + tet_infoline( "Set a component value and ensure it changes for the base property as well" ); + customActor.SetProperty( componentZeroPropertyIndex, 125.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector3 >( basePropertyIndex ), Vector3( 125.0f, 24.0f, 35.0f ), TEST_LOCATION ); + + customActor.SetProperty( componentOnePropertyIndex, 225.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector3 >( basePropertyIndex ), Vector3( 125.0f, 225.0f, 35.0f ), TEST_LOCATION ); + + customActor.SetProperty( componentTwoPropertyIndex, 325.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 325.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector3 >( basePropertyIndex ), Vector3( 125.0f, 225.0f, 325.0f ), TEST_LOCATION ); + + tet_infoline( "Check latest scene-graph value is unchanged" ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector3 >( customActor, basePropertyIndex ), Vector3( 13.0f, 24.0f, 35.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentZeroPropertyIndex ), 13.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentOnePropertyIndex ), 24.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentTwoPropertyIndex ), 35.0f, TEST_LOCATION ); + + // Render and notify + application.SendNotification(); + application.Render(); + + tet_infoline( "Check values after rendering and both retrieval methods should return the latest" ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector3 >( basePropertyIndex ), Vector3( 125.0f, 225.0f, 325.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 325.0f, TEST_LOCATION ); + + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector3 >( customActor, basePropertyIndex ), Vector3( 125.0f, 225.0f, 325.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentTwoPropertyIndex ), 325.0f, TEST_LOCATION ); + + tet_infoline( "Set the base property value and ensure the component values reflect the change" ); + customActor.SetProperty( basePropertyIndex, Vector3( 1.0f, 2.0f, 3.0f ) ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 2.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 3.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector3 >( basePropertyIndex ), Vector3( 1.0f, 2.0f, 3.0f ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliPropertyRegistrationPropertyAnimatableSynchronousSetGetWithComponentsVector4(void) +{ + TestApplication application; + TypeRegistry typeRegistry = TypeRegistry::Get(); + + tet_infoline( "Register a type registered animatable property that has component indices and ensure set/get behaviour works synchronously and is the same regardless of how the property is set" ); + + // Register the animatable propeties + const int basePropertyIndex( ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ); + const int componentZeroPropertyIndex( basePropertyIndex + 1 ); + const int componentOnePropertyIndex( componentZeroPropertyIndex + 1 ); + const int componentTwoPropertyIndex( componentOnePropertyIndex + 1 ); + const int componentThreePropertyIndex( componentTwoPropertyIndex + 1 ); + AnimatablePropertyRegistration baseAnimatableProperty( customType1, "baseProp", basePropertyIndex, Vector4( 13.0f, 24.0f, 35.0, 47.0f ) ); + AnimatablePropertyComponentRegistration componentZeroAnimatableProperty( customType1, "componentZeroProp", componentZeroPropertyIndex, basePropertyIndex, 0 ); + AnimatablePropertyComponentRegistration componentOneAnimatableProperty( customType1, "componentOneProp", componentOnePropertyIndex, basePropertyIndex, 1 ); + AnimatablePropertyComponentRegistration componentTwoAnimatableProperty( customType1, "componentTwoProp", componentTwoPropertyIndex, basePropertyIndex, 2 ); + AnimatablePropertyComponentRegistration componentThreeAnimatableProperty( customType1, "componentThreeProp", componentThreePropertyIndex, basePropertyIndex, 3 ); + + // Check property count before property registration + TypeInfo typeInfo = typeRegistry.GetTypeInfo( typeid(MyTestCustomActor) ); + DALI_TEST_CHECK( typeInfo ); + BaseHandle handle = typeInfo.CreateInstance(); + DALI_TEST_CHECK( handle ); + Actor customActor = Actor::DownCast( handle ); + DALI_TEST_CHECK( customActor ); + Stage::GetCurrent().Add(customActor); + + tet_infoline( "Get the component values, they should be the default value of the base-property" ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 13.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 24.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 35.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentThreePropertyIndex ), 47.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 13.0f, 24.0f, 35.0f, 47.0f ), TEST_LOCATION ); + + tet_infoline( "Set a component value and ensure it changes for the base property as well" ); + customActor.SetProperty( componentZeroPropertyIndex, 125.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 125.0f, 24.0f, 35.0f, 47.0f ), TEST_LOCATION ); + + customActor.SetProperty( componentOnePropertyIndex, 225.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 125.0f, 225.0f, 35.0f, 47.0f ), TEST_LOCATION ); + + customActor.SetProperty( componentTwoPropertyIndex, 325.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 325.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 125.0f, 225.0f, 325.0f, 47.0f ), TEST_LOCATION ); + + customActor.SetProperty( componentThreePropertyIndex, 435.0f ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentThreePropertyIndex ), 435.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 125.0f, 225.0f, 325.0f, 435.0f ), TEST_LOCATION ); + + tet_infoline( "Check latest scene-graph value is unchanged" ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( customActor, basePropertyIndex ), Vector4( 13.0f, 24.0f, 35.0f, 47.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentZeroPropertyIndex ), 13.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentOnePropertyIndex ), 24.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentTwoPropertyIndex ), 35.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentThreePropertyIndex ), 47.0f, TEST_LOCATION ); + + // Render and notify + application.SendNotification(); + application.Render(); + + tet_infoline( "Check values after rendering and both retrieval methods should return the latest" ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 125.0f, 225.0f, 325.0f, 435.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 325.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentThreePropertyIndex ), 435.0f, TEST_LOCATION ); + + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( customActor, basePropertyIndex ), Vector4( 125.0f, 225.0f, 325.0f, 435.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentZeroPropertyIndex ), 125.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentOnePropertyIndex ), 225.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentTwoPropertyIndex ), 325.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< float >( customActor, componentThreePropertyIndex ), 435.0f, TEST_LOCATION ); + + tet_infoline( "Set the base property value and ensure the component values reflect the change" ); + customActor.SetProperty( basePropertyIndex, Vector4( 1.0f, 2.0f, 3.0f, 4.0f ) ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentZeroPropertyIndex ), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentOnePropertyIndex ), 2.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentTwoPropertyIndex ), 3.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< float >( componentThreePropertyIndex ), 4.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( customActor.GetProperty< Vector4 >( basePropertyIndex ), Vector4( 1.0f, 2.0f, 3.0f, 4.0f ), TEST_LOCATION ); + + END_TEST; +}