X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-FlexContainer.cpp;h=a698b3cdf330500e233fe19d128c8c970cb88bb6;hb=26a3b93400d9b9de81db36cbe4cea39f51940d10;hp=3ae109cf417bcb9a03e201522b3fc91fd2aa26e7;hpb=fca202af829a0657805e44461f08f284cdbf0bbb;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp old mode 100755 new mode 100644 index 3ae109c..a698b3c --- a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.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. @@ -149,7 +149,7 @@ int UtcDaliToolkitFlexContainerSetPropertyP(void) DALI_TEST_CHECK( flexContainer ); // Add flex container to the stage - Stage::GetCurrent().Add( flexContainer ); + application.GetScene().Add( flexContainer ); // Create two actors and add them to the container Actor actor1 = Actor::New(); @@ -196,7 +196,7 @@ int UtcDaliToolkitFlexContainerSetPropertyEnumP(void) DALI_TEST_CHECK( flexContainer ); // Add flex container to the stage - Stage::GetCurrent().Add( flexContainer ); + application.GetScene().Add( flexContainer ); // Create two actors and add them to the container Actor actor1 = Actor::New(); @@ -242,7 +242,7 @@ int UtcDaliToolkitFlexContainerSetChildPropertyP(void) DALI_TEST_CHECK( flexContainer ); // Add flex container to the stage - Stage::GetCurrent().Add( flexContainer ); + application.GetScene().Add( flexContainer ); // Create an actor and add it to the container Actor actor = Actor::New(); @@ -310,7 +310,7 @@ int UtcDaliToolkitFlexContainerRemoveChildP(void) DALI_TEST_CHECK( flexContainer ); // Add flex container to the stage - Stage::GetCurrent().Add( flexContainer ); + application.GetScene().Add( flexContainer ); RelayoutSignalHandler relayoutSignal(flexContainer); flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback ); @@ -436,8 +436,8 @@ int UtcDaliToolkitFlexContainerMoveFocus(void) flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW ); // Add flex container to the stage - Stage::GetCurrent().Add( flexContainer ); - Size stageSize = Stage::GetCurrent().GetSize(); + application.GetScene().Add( flexContainer ); + Size stageSize = application.GetScene().GetSize(); RelayoutSignalHandler relayoutSignal(flexContainer); flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback ); @@ -505,7 +505,7 @@ int UtcDaliToolkitFlexContainerRTLSupportP(void) Actor actor0 = Actor::New(); - Stage::GetCurrent().Add( actor0 ); + application.GetScene().Add( actor0 ); actor0.Add( flexContainer ); // Create two actors and add them to the container