X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-RadioButton.cpp;h=d56de3e835fa71965e47224e5f8e570127731a58;hb=77af66aef5b24b239f271ef76bd7f21ea103f91c;hp=85c791a498ff0542d5cd57e6ac375f4849043177;hpb=5e937a6322849b76d49d5b3f41cb5d91c94acd3e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp index 85c791a..d56de3e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -118,7 +118,7 @@ int UtcDaliRadioButtonNewP(void) DALI_TEST_CHECK( radioButton2 == radioButton ); //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; @@ -185,10 +185,10 @@ int UtcDaliRadioButtonSelectedProperty(void) // Create the RadioButton actor RadioButton radioButton = RadioButton::New(); - Stage::GetCurrent().Add( radioButton ); + application.GetScene().Add( radioButton ); radioButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); radioButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - radioButton.SetPosition( 0.0f, 0.0f ); + radioButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); // Default selected DALI_TEST_CHECK( radioButton.GetProperty( Button::Property::SELECTED ) == false ); @@ -209,19 +209,19 @@ int UtcDaliRadioButtonSelectedProperty(void) RadioButton radioButton2 = RadioButton::New( "label" ); radioButton2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); radioButton2.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - radioButton2.SetPosition( 0.0f, 0.0f ); + radioButton2.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); RadioButton radioButton3 = RadioButton::New( "label" ); radioButton3.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); radioButton3.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - radioButton3.SetPosition( 0.0f, 40.0f ); + radioButton3.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 40.0f )); Actor radioGroup = Actor::New(); - Stage::GetCurrent().Add( radioGroup ); + application.GetScene().Add( radioGroup ); radioGroup.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); radioGroup.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - radioGroup.SetPosition( 0.0f, 0.0f ); - radioGroup.SetSize( 400.0f, 400.0 ); + radioGroup.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); + radioGroup.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0 ) ); radioGroup.Add( radioButton2 ); radioGroup.Add( radioButton3 ); @@ -334,4 +334,4 @@ int UtcDaliRadioButtonSelectedProperty(void) } END_TEST; -} \ No newline at end of file +}