X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Slider.cpp;h=ccec03e276ff061885b64962633cafa52673928b;hb=e9e0a004027846f001ca87c1db13c811177c8f70;hp=9cd92ca697e21e22c43a157f51dbf016adfeb35f;hpb=11ed6421771d05113ae1a6510167d8c2557ac20e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp index 9cd92ca..ccec03e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -20,7 +20,6 @@ #include #include #include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -66,7 +65,7 @@ int UtcDaliSliderNew(void) DALI_TEST_CHECK( slider2 == slider ); //Additional check to ensure object is created by checking if it's registered - ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry(); + ObjectRegistry registry = application.GetCore().GetObjectRegistry(); DALI_TEST_CHECK( registry ); gObjectCreatedCallBackCalled = false; @@ -129,11 +128,11 @@ int UtcDaliSliderSignals1(void) // Create the Popup actor Slider slider = Slider::New(); - Stage::GetCurrent().Add( slider ); - slider.SetParentOrigin(ParentOrigin::TOP_LEFT); - slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); - slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); - slider.SetPosition( 0.0f, 0.0f ); + application.GetScene().Add( slider ); + slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); + slider.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); const float MIN_BOUND = 0.0f; const float MAX_BOUND = 1.0f; @@ -226,11 +225,11 @@ int UtcDaliSliderSignals2(void) // Create the Popup actor Slider slider = Slider::New(); - Stage::GetCurrent().Add( slider ); - slider.SetParentOrigin(ParentOrigin::TOP_LEFT); - slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); - slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); - slider.SetPosition( 0.0f, 0.0f ); + application.GetScene().Add( slider ); + slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); + slider.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); const float MIN_BOUND = 0.0f; const float MAX_BOUND = 1.0f; @@ -290,12 +289,12 @@ int UtcDaliSetPropertyP(void) tet_infoline( "UtcDaliSetPropertyP" ); Slider slider = Slider::New(); - slider.SetParentOrigin(ParentOrigin::TOP_LEFT); - slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); - slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); - slider.SetPosition( 0.0f, 0.0f ); + slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); + slider.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); - Stage::GetCurrent().Add(slider); + application.GetScene().Add(slider); application.SendNotification(); application.Render();