X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ConfirmationPopup.cpp;h=8da9eae4dc574adf3eed758a572c2b2e5ecb166a;hb=6d4347e7eff8ab62127a60984af2f1cdf156716c;hp=9c3765d8a1edb2f8a9a6b0bd79f0e9d65cdd4c0b;hpb=0031ca8312dba666109e4f7fbb62a3a5e288b7c2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp index 9c3765d..8da9eae 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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. @@ -163,11 +163,11 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void) // The confirmation popup can use any control type for the ok or cancel buttons. // It requires that the name is "controlOk" to provide the "controlSignalOk" signal. PushButton buttonOK = PushButton::New(); - buttonOK.SetName( "controlOk" ); + buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOk" ); footerActor.Add( buttonOK ); PushButton buttonCancel = PushButton::New(); - buttonCancel.SetName( "controlCancel" ); + buttonCancel.SetProperty( Dali::Actor::Property::NAME, "controlCancel" ); footerActor.Add( buttonCancel ); popup.SetFooter( footerActor ); @@ -189,7 +189,7 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void) DALI_TEST_CHECK( !gSignalReceivedCancel ); // Provoke the signal. - Stage::GetCurrent().Add( popup ); + application.GetScene().Add( popup ); // Check the signal has occurred. DALI_TEST_CHECK( gSignalReceivedOK ); @@ -208,7 +208,7 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void) DALI_TEST_CHECK( !gSignalReceivedCancel ); // Provoke the signal. - Stage::GetCurrent().Add( popup ); + application.GetScene().Add( popup ); // Check the cancel signal has occurred. DALI_TEST_CHECK( gSignalReceivedOK ); @@ -233,7 +233,7 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationN(void) Actor footerActor = Actor::New(); PushButton buttonOK = PushButton::New(); - buttonOK.SetName( "controlOkMisnamed" ); + buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOkMisnamed" ); popup.SetFooter( buttonOK ); // Tell the confirmation popup to connect to the signal in our button called "onStage". @@ -250,7 +250,7 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationN(void) DALI_TEST_CHECK( !gSignalReceivedOK ); // Provoke the signal. - Stage::GetCurrent().Add( popup ); + application.GetScene().Add( popup ); // Check the signal has still not occurred, as our button was incorrectly named. DALI_TEST_CHECK( !gSignalReceivedOK ); @@ -272,7 +272,7 @@ int UtcDaliConfirmationPopupTypeRegistryCreation(void) Toolkit::Popup popup = Toolkit::Popup::DownCast( baseHandle ); popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f ); - Stage::GetCurrent().Add( popup ); + application.GetScene().Add( popup ); popup.SetDisplayState( Toolkit::Popup::SHOWN ); application.SendNotification();