X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ControlWrapper.cpp;h=e60505d9e79315d8acf7ac44df1d440ce919910d;hp=0921d6119c2657c721f05d87e6cc64a45bf0fba6;hb=98b0c47a996d12828edbda14a61b841a273d3439;hpb=87a9019904ab49c42f1e32e7ebb6a1512b0dc28c diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index 0921d61..e60505d 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -110,14 +110,14 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper virtual void OnInitialize( const char* name ) {} // From Toolkit::Internal::ControlWrapper - virtual void OnStageConnection( int depth ) + virtual void OnSceneConnection( int depth ) { mDepth = depth; - Control::OnStageConnection(depth); + Control::OnSceneConnection(depth); } - virtual void OnStageDisconnection() + virtual void OnSceneDisconnection() { - Control::OnStageDisconnection(); + Control::OnSceneDisconnection(); } virtual void OnChildAdd( Actor& child ) { @@ -127,7 +127,7 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper { Control::OnChildRemove(child); } - virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) + virtual void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) { Control::OnPropertySet(index, propertyValue); } @@ -141,10 +141,6 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper mTargetSize = targetSize; Control::OnSizeAnimation( animation, targetSize ); } - virtual bool OnTouchEvent( const TouchEvent& event ) - { - return true; - } virtual bool OnHoverEvent( const HoverEvent& event ) { return true; @@ -319,7 +315,7 @@ int UtcDaliControlWrapperRelayoutRequest(void) Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ); ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl ); - Stage::GetCurrent().Add( controlWrapper ); + application.GetScene().Add( controlWrapper ); application.SendNotification(); application.Render(); @@ -385,7 +381,7 @@ int UtcDaliControlWrapperCalculateChildSizeBase(void) Actor child = Actor::New(); child.SetResizePolicy( Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS ); - child.SetSize(150, 150); + child.SetProperty( Actor::Property::SIZE, Vector2(150, 150) ); application.SendNotification(); application.Render(); @@ -425,7 +421,7 @@ int UtcDaliControlWrapperRegisterVisualToSelf(void) { ToolkitTestApplication application; - Test::ObjectDestructionTracker objectDestructionTracker; + Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() ); { Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ); @@ -461,7 +457,7 @@ int UtcDaliControlWrapperRegisterVisualWithDepthIndexToSelf(void) { ToolkitTestApplication application; - Test::ObjectDestructionTracker objectDestructionTracker; + Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() ); { Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ); @@ -519,7 +515,7 @@ int UtcDaliControlWrapperRegisterDisabledVisual(void) DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( TEST_PROPERTY ), visual, TEST_LOCATION ); DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION ); - Stage::GetCurrent().Add( controlWrapper ); + application.GetScene().Add( controlWrapper ); // Render and notify application.SendNotification(); @@ -527,7 +523,7 @@ int UtcDaliControlWrapperRegisterDisabledVisual(void) DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION ); - DALI_TEST_EQUALS( controlWrapper.OnStage(), true, TEST_LOCATION ); + DALI_TEST_EQUALS( controlWrapper.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ), true, TEST_LOCATION ); controlWrapperImpl->EnableVisual( TEST_PROPERTY, true ); @@ -562,7 +558,7 @@ int UtcDaliControlWrapperRegisterDisabledVisualWithDepthIndex(void) DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION ); DALI_TEST_EQUALS( visual.GetDepthIndex(), 10, TEST_LOCATION ); - Stage::GetCurrent().Add( controlWrapper ); + application.GetScene().Add( controlWrapper ); // Render and notify application.SendNotification(); @@ -570,7 +566,7 @@ int UtcDaliControlWrapperRegisterDisabledVisualWithDepthIndex(void) DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION ); - DALI_TEST_EQUALS( controlWrapper.OnStage(), true, TEST_LOCATION ); + DALI_TEST_EQUALS( controlWrapper.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ), true, TEST_LOCATION ); controlWrapperImpl->EnableVisual( TEST_PROPERTY, true ); @@ -633,9 +629,9 @@ int UtcDaliControlWrapperTransitionDataMap1N(void) //DummyControl actor = DummyControl::New(); controlWrapper.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - controlWrapper.SetName("Actor1"); - controlWrapper.SetColor(Color::CYAN); - Stage::GetCurrent().Add(controlWrapper); + controlWrapper.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + controlWrapper.SetProperty( Actor::Property::COLOR,Color::CYAN); + application.GetScene().Add(controlWrapper); Animation anim = controlWrapperImpl->CreateTransition( transition ); DALI_TEST_CHECK( ! anim ); @@ -697,7 +693,7 @@ int UtcDaliControlWrapperTestControlProperties(void) Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ); ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl ); - Stage::GetCurrent().Add( controlWrapper ); + application.GetScene().Add( controlWrapper ); // "background" property Property::Map rendererMap; @@ -749,7 +745,7 @@ int UtcDaliControlWrapperAnimateVisual(void) tet_infoline("Test that the control wrapper's visuals can be animated by name when registered"); ToolkitTestApplication application; - Test::ObjectDestructionTracker objectDestructionTracker; + Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() ); { Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ); @@ -774,8 +770,8 @@ int UtcDaliControlWrapperAnimateVisual(void) // Register to self controlWrapperImpl->TestRegisterVisual( index, visual ); - Stage::GetCurrent().Add( controlWrapper ); - controlWrapper.SetSize( 100, 100 ); + application.GetScene().Add( controlWrapper ); + controlWrapper.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) ); application.SendNotification(); application.Render(0); // Trigger animation start @@ -812,7 +808,7 @@ int UtcDaliControlWrapperAnimateVisual(void) DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION ); // Control not destroyed yet DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( index ), visual, TEST_LOCATION ); - Stage::GetCurrent().Remove( controlWrapper ); + application.GetScene().Remove( controlWrapper ); } DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION ); // Should be destroyed @@ -838,4 +834,4 @@ int UtcDaliControlWrapperEmitKeyFocusSignal(void) DALI_TEST_CHECK( gKeyInputFocusCallBackCalled ); END_TEST; -} \ No newline at end of file +}