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-ConfirmationPopup.cpp;h=8bdddfe2270437bc83a391f5828c3f828d224df9;hp=887b6b9c9e6923c1f3d05bf749cdbcf9c17eab70;hb=6b38c6c213808ada74270118045e7e23d8b4910d;hpb=0dd0a126f9fbf78fb20239425b78ffd609ddfec0

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp
index 887b6b9..8bdddfe 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.
@@ -108,7 +108,7 @@ int UtcDaliConfirmationPopupNewP( void )
   DALI_TEST_CHECK( popup2 == popup );
 
   // 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;
@@ -161,35 +161,35 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void)
   Actor footerActor = Actor::New();
 
   // The confirmation popup can use any control type for the ok or cancel buttons.
-  // It requires that the name is "control-ok" to provide the "control-signal-ok" signal.
+  // It requires that the name is "controlOk" to provide the "controlSignalOk" signal.
   PushButton buttonOK = PushButton::New();
-  buttonOK.SetName( "control-ok" );
+  buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOk" );
   footerActor.Add( buttonOK );
 
   PushButton buttonCancel = PushButton::New();
-  buttonCancel.SetName( "control-cancel" );
+  buttonCancel.SetProperty( Dali::Actor::Property::NAME, "controlCancel" );
   footerActor.Add( buttonCancel );
 
   popup.SetFooter( footerActor );
 
-  // Tell the confirmation popup to connect to the signal in our button called "on-stage".
-  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "on-stage" );
+  // Tell the confirmation popup to connect to the signal in our button called "onScene".
+  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene" );
   std::string resultProperty;
   DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED ).Get( resultProperty ) );
-  DALI_TEST_EQUALS( resultProperty, "on-stage", TEST_LOCATION );
+  DALI_TEST_EQUALS( resultProperty, "onScene",  TEST_LOCATION );
 
   // Connect to the confirmation popup's OK signal. This signal is dynamically created upon connection.
   gSignalReceivedOK = false;
   gSignalReceivedCancel = false;
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
-  popup.ConnectSignal( testTracker, "control-signal-ok", ConfirmationPopupOKTestFunctor() );
+  popup.ConnectSignal( testTracker, "controlSignalOk",   ConfirmationPopupOKTestFunctor() );
 
   // Check no signal has occurred yet.
   DALI_TEST_CHECK( !gSignalReceivedOK );
   DALI_TEST_CHECK( !gSignalReceivedCancel );
 
   // Provoke the signal.
-  Stage::GetCurrent().Add( popup );
+  application.GetScene().Add( popup );
 
   // Check the signal has occurred.
   DALI_TEST_CHECK( gSignalReceivedOK );
@@ -197,18 +197,18 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void)
 
   // Remove the popup from the stage, and connect the cancel signal.
   popup.Unparent();
-  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "on-stage" );
+  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "onScene" );
   DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED ).Get( resultProperty ) );
-  DALI_TEST_EQUALS( resultProperty, "on-stage", TEST_LOCATION );
+  DALI_TEST_EQUALS( resultProperty, "onScene",  TEST_LOCATION );
 
-  popup.ConnectSignal( testTracker, "control-signal-cancel", ConfirmationPopupCancelTestFunctor() );
+  popup.ConnectSignal( testTracker, "controlSignalCancel",   ConfirmationPopupCancelTestFunctor() );
 
   // Check the cancel signal has not occurred yet.
   DALI_TEST_CHECK( gSignalReceivedOK );
   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,24 +233,24 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationN(void)
    Actor footerActor = Actor::New();
 
    PushButton buttonOK = PushButton::New();
-   buttonOK.SetName( "control-ok-misnamed" );
+   buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOkMisnamed" );
    popup.SetFooter( buttonOK );
 
-   // Tell the confirmation popup to connect to the signal in our button called "on-stage".
-   popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "on-stage" );
+   // Tell the confirmation popup to connect to the signal in our button called "onScene".
+   popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene" );
 
    // Connect to the confirmation popup's OK signal.
    gSignalReceivedOK = false;
 
-   // The connection will fail at this point as no actor with the name "control-ok" will be located.
+   // The connection will fail at this point as no actor with the name "controlOk" will be located.
    TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
-   popup.ConnectSignal( testTracker, "control-signal-ok", ConfirmationPopupOKTestFunctor() );
+   popup.ConnectSignal( testTracker, "controlSignalOk",   ConfirmationPopupOKTestFunctor() );
 
    // Check no signal has occurred yet.
    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();