X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Transition.cpp;h=332e7712ce647e1f94b1b70296914a36f4ec9dd1;hb=3e844ed708b1cbe03cd5bfe9ad202aad27bbe360;hp=0ead7104a8b9261a242cbb818de905d025917d2a;hpb=2a1d671b3526a30bfb8698a8bde4496b82be7f35;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp old mode 100755 new mode 100644 index 0ead710..332e771 --- a/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -15,23 +15,22 @@ * */ -#include -#include #include #include -#include #include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include using namespace Dali; using namespace Dali::Toolkit; namespace { - const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; } @@ -212,11 +211,11 @@ int UtcDaliTransitionBetweenControlPair(void) Vector3 destinationSize(120, 120, 0); Vector3 destinationScale(2, 1, 0); Vector4 destinationColor(1.0f, 0.5f, 1.0f, 0.8f); - float destinationOpacity(0.8f); - float destinationRadius(50.f); - float destinationBorderlineWidth(80.0f); + float destinationOpacity(0.8f); + float destinationRadius(50.f); + float destinationBorderlineWidth(80.0f); Vector4 destinationBorderlineColor(0.5f, 1.0f, 0.5f, 0.3f); - float destinationBorderlineOffset(-1.0f); + float destinationBorderlineOffset(-1.0f); Vector4 destinationRadiusV4 = Vector4(destinationRadius, destinationRadius, destinationRadius, destinationRadius); Control control1 = Control::New(); @@ -255,7 +254,7 @@ int UtcDaliTransitionBetweenControlPair(void) DALI_TEST_EQUALS(destinationPosition, control2.GetProperty(Actor::Property::POSITION), TEST_LOCATION); Property::Map backgroundMap = control2.GetProperty(Toolkit::Control::Property::BACKGROUND); - Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); + Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION); float borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get(); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); @@ -270,12 +269,12 @@ int UtcDaliTransitionBetweenControlPair(void) application.SendNotification(); application.Render(20); - Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); + Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); TransitionSet transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -288,17 +287,17 @@ int UtcDaliTransitionBetweenControlPair(void) DALI_TEST_NOT_EQUALS(destinationPosition, control2.GetCurrentProperty(Actor::Property::POSITION), 0.00001f, TEST_LOCATION); DALI_TEST_EQUALS(1, control2.GetRendererCount(), TEST_LOCATION); - Dali::Renderer renderer = control2.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); - cornerRadius = renderer.GetCurrentProperty(index); + Dali::Renderer renderer = control2.GetRendererAt(0); + Property::Index index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); + cornerRadius = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationRadiusV4, cornerRadius, 0.00001f, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); borderlineWidth = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationBorderlineWidth, borderlineWidth, 0.00001f, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); borderlineColor = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationBorderlineColor, borderlineColor, 0.00001f, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); borderlineOffset = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationBorderlineOffset, borderlineOffset, 0.00001f, TEST_LOCATION); @@ -318,17 +317,17 @@ int UtcDaliTransitionBetweenControlPair(void) DALI_TEST_EQUALS(destinationColor, control2.GetCurrentProperty(Actor::Property::COLOR), TEST_LOCATION); DALI_TEST_EQUALS(destinationOpacity, control2.GetCurrentProperty(Actor::Property::OPACITY), TEST_LOCATION); DALI_TEST_EQUALS(1, control2.GetRendererCount(), TEST_LOCATION); - renderer = control2.GetRendererAt(0); - index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); + renderer = control2.GetRendererAt(0); + index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); cornerRadius = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); borderlineWidth = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); borderlineColor = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationBorderlineColor, borderlineColor, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); borderlineOffset = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationBorderlineOffset, borderlineOffset, TEST_LOCATION); @@ -344,22 +343,22 @@ int UtcDaliTransitionBetweenControlPair2(void) Vector3 sourceSize(150, 150, 0); Vector3 sourceScale(1, 2, 0); Vector4 sourceColor(1.0f, 1.0f, 1.0f, 0.5f); - float sourceOpacity(0.5f); - float sourceRadius(30.f); - float sourceBorderlineWidth(60.0f); + float sourceOpacity(0.5f); + float sourceRadius(30.f); + float sourceBorderlineWidth(60.0f); Vector4 sourceBorderlineColor(1.0f, 0.0f, 0.0f, 1.0f); - float sourceBorderlineOffset(1.f); + float sourceBorderlineOffset(1.f); Vector4 sourceRadiusV4 = Vector4(sourceRadius, sourceRadius, sourceRadius, sourceRadius); Vector3 destinationPosition(50, 50, 0); Vector3 destinationSize(120, 120, 0); Vector3 destinationScale(2, 1, 0); Vector4 destinationColor(1.0f, 0.5f, 1.0f, 0.8f); - float destinationOpacity(0.8f); - float destinationRadius(50.f); - float destinationBorderlineWidth(80.0f); + float destinationOpacity(0.8f); + float destinationRadius(50.f); + float destinationBorderlineWidth(80.0f); Vector4 destinationBorderlineColor(0.5f, 1.0f, 0.5f, 0.3f); - float destinationBorderlineOffset(-1.0f); + float destinationBorderlineOffset(-1.0f); Vector4 destinationRadiusV4 = Vector4(destinationRadius, destinationRadius, destinationRadius, destinationRadius); Control control1 = Control::New(); @@ -398,7 +397,7 @@ int UtcDaliTransitionBetweenControlPair2(void) DALI_TEST_EQUALS(destinationPosition, control2.GetProperty(Actor::Property::POSITION), TEST_LOCATION); Property::Map backgroundMap = control2.GetProperty(Toolkit::Control::Property::BACKGROUND); - Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); + Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION); float borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get(); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); @@ -413,12 +412,12 @@ int UtcDaliTransitionBetweenControlPair2(void) application.SendNotification(); application.Render(20); - Transition transition = Transition::New(control1, control2, false, TimePeriod(0.5f)); + Transition transition = Transition::New(control1, control2, false, TimePeriod(0.5f)); TransitionSet transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -432,20 +431,20 @@ int UtcDaliTransitionBetweenControlPair2(void) DALI_TEST_NOT_EQUALS(destinationPosition, control1.GetCurrentProperty(Actor::Property::POSITION), 0.00001f, TEST_LOCATION); DALI_TEST_EQUALS(1, control1.GetRendererCount(), TEST_LOCATION); - Dali::Renderer renderer = control1.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); - cornerRadius = renderer.GetCurrentProperty(index); + Dali::Renderer renderer = control1.GetRendererAt(0); + Property::Index index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); + cornerRadius = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationRadiusV4, cornerRadius, 0.00001f, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); borderlineWidth = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationBorderlineWidth, borderlineWidth, 0.00001f, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); borderlineColor = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationBorderlineColor, borderlineColor, 0.00001f, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); borderlineOffset = renderer.GetCurrentProperty(index); DALI_TEST_NOT_EQUALS(destinationBorderlineOffset, borderlineOffset, 0.00001f, TEST_LOCATION); @@ -465,20 +464,20 @@ int UtcDaliTransitionBetweenControlPair2(void) DALI_TEST_EQUALS(destinationOpacity, control1.GetCurrentProperty(Actor::Property::OPACITY), TEST_LOCATION); DALI_TEST_EQUALS(1, control1.GetRendererCount(), TEST_LOCATION); - renderer = control1.GetRendererAt(0); - index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); + renderer = control1.GetRendererAt(0); + index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); cornerRadius = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); borderlineWidth = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); borderlineColor = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationBorderlineColor, borderlineColor, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); borderlineOffset = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(destinationBorderlineOffset, borderlineOffset, TEST_LOCATION); @@ -494,20 +493,20 @@ int UtcDaliTransitionBetweenControlPair2(void) // after next update, renderer properties are returned to the source properties. DALI_TEST_EQUALS(1, control1.GetRendererCount(), TEST_LOCATION); - renderer = control1.GetRendererAt(0); - index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); + renderer = control1.GetRendererAt(0); + index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS); cornerRadius = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(sourceRadiusV4, cornerRadius, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH); borderlineWidth = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(sourceBorderlineWidth, borderlineWidth, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR); borderlineColor = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(sourceBorderlineColor, borderlineColor, TEST_LOCATION); - index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); + index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET); borderlineOffset = renderer.GetCurrentProperty(index); DALI_TEST_EQUALS(sourceBorderlineOffset, borderlineOffset, TEST_LOCATION); @@ -543,7 +542,7 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void) control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2); Property::Map backgroundMap = control2.GetProperty(Toolkit::Control::Property::BACKGROUND); - Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); + Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION); float borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get(); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); @@ -558,12 +557,12 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void) application.SendNotification(); application.Render(20); - Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); + Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); TransitionSet transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -575,7 +574,7 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void) finishCheck.CheckSignalNotReceived(); backgroundMap = control2.GetProperty(Toolkit::Control::Property::BACKGROUND); - cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); + cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION); borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get(); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); @@ -595,7 +594,7 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void) application.Render(20); backgroundMap = control2.GetProperty(Toolkit::Control::Property::BACKGROUND); - cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); + cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get(); DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION); borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get(); DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION); @@ -652,15 +651,15 @@ int UtcDaliTransitionBetweenImageViewPair(void) application.SendNotification(); application.Render(20); - Vector3 startWorldPosition = control1.GetProperty(Actor::Property::WORLD_POSITION); + Vector3 startWorldPosition = control1.GetProperty(Actor::Property::WORLD_POSITION); Vector3 finishWorldPosition = control2.GetProperty(Actor::Property::WORLD_POSITION); - Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); + Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); TransitionSet transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -672,7 +671,7 @@ int UtcDaliTransitionBetweenImageViewPair(void) finishCheck.CheckSignalNotReceived(); // control2 moved about 80% - Vector3 currentPosition = control2.GetCurrentProperty(Actor::Property::POSITION); + Vector3 currentPosition = control2.GetCurrentProperty(Actor::Property::POSITION); Vector3 expectedPosition_0_7 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.7; Vector3 expectedPosition_0_9 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.9; DALI_TEST_CHECK(currentPosition.x <= expectedPosition_0_7.x && currentPosition.x >= expectedPosition_0_9.x); @@ -740,15 +739,15 @@ int UtcDaliTransitionBetweenImageViewPairWithDelay(void) application.SendNotification(); application.Render(20); - Vector3 startWorldPosition = control1.GetProperty(Actor::Property::WORLD_POSITION); + Vector3 startWorldPosition = control1.GetProperty(Actor::Property::WORLD_POSITION); Vector3 finishWorldPosition = control2.GetProperty(Actor::Property::WORLD_POSITION); - Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f, 0.5f)); + Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f, 0.5f)); TransitionSet transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -769,7 +768,7 @@ int UtcDaliTransitionBetweenImageViewPairWithDelay(void) finishCheck.CheckSignalNotReceived(); // control2 moved about 60% (800ms) - Vector3 currentPosition = control2.GetCurrentProperty(Actor::Property::POSITION); + Vector3 currentPosition = control2.GetCurrentProperty(Actor::Property::POSITION); Vector3 expectedPosition_0_5 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.5; Vector3 expectedPosition_0_7 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.7; DALI_TEST_CHECK(currentPosition.x <= expectedPosition_0_5.x && currentPosition.x >= expectedPosition_0_7.x); @@ -835,12 +834,12 @@ int UtcDaliTransitionBetweenControlPairWithTree(void) application.SendNotification(); application.Render(20); - Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); + Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f)); TransitionSet transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -908,7 +907,7 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithChild(void) transitionSet.AddTransition(transition); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck); @@ -972,9 +971,9 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutPositionInheritance(void) application.SendNotification(); application.Render(20); - Transition transition; - TransitionSet transitionSet; - bool signalReceived(false); + Transition transition; + TransitionSet transitionSet; + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); // not inherit Position. @@ -982,7 +981,7 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutPositionInheritance(void) control3.SetProperty(Actor::Property::INHERIT_ORIENTATION, true); control3.SetProperty(Actor::Property::INHERIT_SCALE, true); - transition = Transition::New(control1, control3, true, TimePeriod(0.5f)); + transition = Transition::New(control1, control3, true, TimePeriod(0.5f)); transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); @@ -1015,8 +1014,8 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(voi ToolkitTestApplication application; tet_infoline(" UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance"); - Radian sourceAngle(1.0f); - Radian destinationAngle(2.0f); + Radian sourceAngle(1.0f); + Radian destinationAngle(2.0f); Quaternion sourceOrientation(sourceAngle, Vector3::XAXIS); Quaternion destinationOrientation(destinationAngle, Vector3::XAXIS); @@ -1056,7 +1055,7 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(voi control3.SetProperty(Actor::Property::INHERIT_SCALE, true); Vector3 currentAxis; - Radian currentRadian; + Radian currentRadian; application.GetScene().Add(control1); application.GetScene().Add(control2); @@ -1068,12 +1067,12 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(voi Quaternion currentOrientation = control3.GetProperty(Actor::Property::WORLD_ORIENTATION); DALI_TEST_EQUALS(currentOrientation, destinationOrientation, 0.0001f, TEST_LOCATION); - Transition transition; - TransitionSet transitionSet; - bool signalReceived(false); + Transition transition; + TransitionSet transitionSet; + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); - transition = Transition::New(control1, control3, true, TimePeriod(0.5f)); + transition = Transition::New(control1, control3, true, TimePeriod(0.5f)); transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); @@ -1154,12 +1153,12 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutScaleInheritance(void) Vector3 currentScale = control3.GetProperty(Actor::Property::WORLD_SCALE); DALI_TEST_EQUALS(currentScale, destinationScale, 0.0001f, TEST_LOCATION); - Transition transition; - TransitionSet transitionSet; - bool signalReceived(false); + Transition transition; + TransitionSet transitionSet; + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); - transition = Transition::New(control1, control3, true, TimePeriod(0.5f)); + transition = Transition::New(control1, control3, true, TimePeriod(0.5f)); transitionSet = TransitionSet::New(); transitionSet.AddTransition(transition); transitionSet.Play(); @@ -1189,7 +1188,6 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutScaleInheritance(void) END_TEST; } - int UtcDaliMultipleTransitionAppearing(void) { ToolkitTestApplication application; @@ -1212,8 +1210,8 @@ int UtcDaliMultipleTransitionAppearing(void) DALI_TEST_EQUALS(1.0f, control.GetCurrentProperty(Actor::Property::OPACITY), TEST_LOCATION); - TransitionSet transitionSet = TransitionSet::New(); - FadeTransition fade = FadeTransition::New(control, 0.5, TimePeriod(1.0f, 1.0f)); + TransitionSet transitionSet = TransitionSet::New(); + FadeTransition fade = FadeTransition::New(control, 0.5, TimePeriod(1.0f, 1.0f)); fade.SetAppearingTransition(true); // set fade in transitionSet.AddTransition(fade); SlideTransition slide = SlideTransition::New(control, Dali::Toolkit::SlideTransitionDirection::BOTTOM, TimePeriod(0.5f, 1.0f)); @@ -1221,7 +1219,7 @@ int UtcDaliMultipleTransitionAppearing(void) transitionSet.AddTransition(slide); transitionSet.Play(); - bool signalReceived(false); + bool signalReceived(false); TransitionFinishCheck finishCheck(signalReceived); transitionSet.FinishedSignal().Connect(&application, finishCheck);