X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Tooltip.cpp;h=3d68d5a0a0043d7e8f1d56515a15172f295a6ece;hb=ec1db95268e1cf8e8bd893027d45a19c64b32848;hp=573ffaceb52ab9258286e6972b46ad5ca131b897;hpb=8c98262c52c72d5767c4552bb3c294a1565aefaa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp index 573ffac..3d68d5a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.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. @@ -50,7 +50,7 @@ void utc_dali_toolkit_tooltip_cleanup(void) namespace { -Integration::HoverEvent GenerateSingleHover( TouchPoint::State state, const Vector2& screenPosition ) +Integration::HoverEvent GenerateSingleHover( PointState::Type state, const Vector2& screenPosition ) { Integration::HoverEvent hoverEvent; Integration::Point point; @@ -272,7 +272,7 @@ int UtcDaliTooltipCreateWithArray(void) tet_infoline( "Ensure first value is a map and contains the right item" ); const Property::Value mapValue1 = contentArray->GetElementAt( 0 ); - Property::Map* map1 = mapValue1.GetMap(); + const Property::Map* map1 = mapValue1.GetMap(); DALI_TEST_CHECK( map1 ); Property::Value* urlValue = map1->Find( ImageVisual::Property::URL ); DALI_TEST_CHECK( urlValue ); @@ -280,7 +280,7 @@ int UtcDaliTooltipCreateWithArray(void) tet_infoline( "Ensure second value is a map and contains the right item" ); const Property::Value mapValue2 = contentArray->GetElementAt( 1 ); - Property::Map* map2 = mapValue2.GetMap(); + const Property::Map* map2 = mapValue2.GetMap(); DALI_TEST_CHECK( map2 ); Property::Value* textValue = map2->Find( TextVisual::Property::TEXT ); DALI_TEST_CHECK( textValue ); @@ -510,9 +510,9 @@ int UtcDaliTooltipDisplay(void) control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -520,8 +520,8 @@ int UtcDaliTooltipDisplay(void) int rootChildCount = rootActor.GetChildCount(); - Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + Vector2 centerPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -533,7 +533,7 @@ int UtcDaliTooltipDisplay(void) ++rootChildCount; DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION ); - application.ProcessEvent( GenerateSingleHover( TouchPoint::Stationary, centerPoint ) ); // Emit for code coverage, will have no effect + application.ProcessEvent( GenerateSingleHover( PointState::STATIONARY, centerPoint ) ); // Emit for code coverage, will have no effect END_TEST; } @@ -545,7 +545,7 @@ int UtcDaliTooltipDisplayWithTail(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::TAIL, @@ -554,7 +554,7 @@ int UtcDaliTooltipDisplayWithTail(void) .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" )) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -562,8 +562,8 @@ int UtcDaliTooltipDisplayWithTail(void) int rootChildCount = rootActor.GetChildCount(); - Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + Vector2 centerPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -585,7 +585,7 @@ int UtcDaliTooltipDisplayWithContentArray(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE ) @@ -598,7 +598,7 @@ int UtcDaliTooltipDisplayWithContentArray(void) .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" )) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -606,8 +606,8 @@ int UtcDaliTooltipDisplayWithContentArray(void) int rootChildCount = rootActor.GetChildCount(); - Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + Vector2 centerPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -629,20 +629,20 @@ int UtcDaliTooltipDisplayBelow(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); application.Render(); - Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + Vector2 centerPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -665,20 +665,20 @@ int UtcDaliTooltipDisplayAbove(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::POSITION, Tooltip::Position::ABOVE ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); application.Render(); - Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + Vector2 centerPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -701,23 +701,23 @@ int UtcDaliTooltipDisplayAtHoverPoint(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::POSITION, Tooltip::Position::HOVER_POINT ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); application.Render(); - const Vector2 stageSize = Stage::GetCurrent().GetSize(); + const Vector2 stageSize = application.GetScene().GetSize(); Vector2 hoverPoint = stageSize * 0.5f; hoverPoint.x -= 10.0f; hoverPoint.y -= 10.0f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -741,13 +741,13 @@ int UtcDaliTooltipExceedThreshold(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 5 ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -756,15 +756,15 @@ int UtcDaliTooltipExceedThreshold(void) int rootChildCount = rootActor.GetChildCount(); tet_infoline( "Start hover" ); - Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) ); + Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) ); application.SendNotification(); application.Render(); tet_infoline( "Emit a value which exceeds threshold, timer should start again" ); hoverPoint.x += 10.0f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) ); application.SendNotification(); application.Render(); @@ -790,10 +790,10 @@ int UtcDaliTooltipGoOutOfBounds(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -802,15 +802,15 @@ int UtcDaliTooltipGoOutOfBounds(void) int rootChildCount = rootActor.GetChildCount(); tet_infoline( "Start hover" ); - Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) ); + Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) ); application.SendNotification(); application.Render(); tet_infoline( "Emit a value which goes out of bounds" ); hoverPoint.x += 100.0f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) ); application.SendNotification(); application.Render(); @@ -836,9 +836,9 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void) control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -846,8 +846,8 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void) int rootChildCount = rootActor.GetChildCount(); - Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) ); + Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -860,7 +860,7 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void) DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION ); hoverPoint.x += 100.0f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) ); application.SendNotification(); application.Render(); @@ -879,14 +879,14 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void) Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::DISAPPEAR_ON_MOVEMENT, true ) .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 5 ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -894,8 +894,8 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void) int rootChildCount = rootActor.GetChildCount(); - Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) ); + Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -908,7 +908,7 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void) DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION ); hoverPoint.x += 10.0f; // Stay within bounds but exceed threshold - application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) ); application.SendNotification(); application.Render(); @@ -928,9 +928,9 @@ int UtcDaliTooltipChangeContent(void) control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - control.SetSize( 100.0f, 100.0f ); + control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -938,8 +938,8 @@ int UtcDaliTooltipChangeContent(void) int rootChildCount = rootActor.GetChildCount(); - Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + Vector2 centerPoint = application.GetScene().GetSize() * 0.5f; + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); tet_infoline( "Change content while timer is running and ensure it matches the new value" ); control.SetProperty( DevelControl::Property::TOOLTIP, "Second Value" ); @@ -967,7 +967,7 @@ int UtcDaliTooltipChangeContent(void) DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION ); tet_infoline( "More movement at same point, and emit signal, we should get the tooltip" ); - application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, centerPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::MOTION, centerPoint ) ); timer.MockEmitSignal(); application.SendNotification(); @@ -1009,13 +1009,13 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void) { ToolkitTestApplication application; // Exceptions require ToolkitTestApplication - Vector2 stageSize = Stage::GetCurrent().GetSize(); + Vector2 stageSize = application.GetScene().GetSize(); tet_infoline( "Create a control and place it at the bottom of the screen, setting the tooltip to appear below" ); Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); - control.SetSize( stageSize ); + control.SetProperty( Actor::Property::SIZE, stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::TAIL, @@ -1025,14 +1025,14 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void) .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); application.Render(); Vector2 centerPoint = stageSize * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -1051,13 +1051,13 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void) { ToolkitTestApplication application; // Exceptions require ToolkitTestApplication - Vector2 stageSize = Stage::GetCurrent().GetSize(); + Vector2 stageSize = application.GetScene().GetSize(); tet_infoline( "Create a control and place it at the top of the screen, setting the tooltip to appear above" ); Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); - control.SetSize( stageSize ); + control.SetProperty( Actor::Property::SIZE, stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::TAIL, @@ -1067,14 +1067,14 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void) .Add( Tooltip::Property::POSITION, Tooltip::Position::ABOVE ) ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); application.Render(); Vector2 centerPoint = stageSize * 0.5f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -1093,14 +1093,14 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void) { ToolkitTestApplication application; // Exceptions require ToolkitTestApplication - Vector2 stageSize = Stage::GetCurrent().GetSize(); + Vector2 stageSize = application.GetScene().GetSize(); Vector2 centerPoint = stageSize * 0.5f; tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the left of the screen" ); Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); - control.SetSize( stageSize ); + control.SetProperty( Actor::Property::SIZE, stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::TAIL, @@ -1109,9 +1109,9 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void) .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) ) .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW ) ); - control.SetX( -centerPoint.x ); + control.SetProperty( Actor::Property::POSITION_X, -centerPoint.x ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -1119,7 +1119,7 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void) Vector2 hoverPoint( centerPoint ); hoverPoint.x = 1.0f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal(); @@ -1138,14 +1138,14 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void) { ToolkitTestApplication application; // Exceptions require ToolkitTestApplication - Vector2 stageSize = Stage::GetCurrent().GetSize(); + Vector2 stageSize = application.GetScene().GetSize(); Vector2 centerPoint = stageSize * 0.5f; tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the right of the screen" ); Control control = Control::New(); control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); - control.SetSize( stageSize ); + control.SetProperty( Actor::Property::SIZE, stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) .Add( Tooltip::Property::TAIL, @@ -1154,9 +1154,9 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void) .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) ) .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW ) ); - control.SetX( centerPoint.x ); + control.SetProperty( Actor::Property::POSITION_X, centerPoint.x ); - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor = application.GetScene().GetRootLayer(); rootActor.Add( control ); application.SendNotification(); @@ -1164,7 +1164,7 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void) Vector2 hoverPoint( centerPoint ); hoverPoint.x = 1.0f; - application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) ); + application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) ); Dali::Timer timer = Timer::New( 1u ); timer.MockEmitSignal();