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-Alignment.cpp;h=6e262eb7f5ee11e99457d455f3a99b8b55505da5;hp=a4887badd7ac7cb6240c0a5d514bd6ada8ea741b;hb=ef15505c94dffeb0639c91d9d3cd374918c21c4f;hpb=14a22ca35c26d5fadeffa9f37ee58cc1d663aa11 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp index a4887ba..6e262eb 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.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. @@ -24,6 +24,7 @@ #include #include #include +#include #include using namespace Dali; @@ -39,9 +40,14 @@ void utc_dali_toolkit_alignment_cleanup(void) test_return_value = TET_PASS; } - namespace { +/// Compare an int (Or'd Alignment::Type) with an Alignment::Type value +void DALI_TEST_EQUALS( int value1, Alignment::Type value2, const char* location ) +{ + ::DALI_TEST_EQUALS< Alignment::Type >( static_cast< Alignment::Type >( value1 ), value2, location ); +} + static bool gObjectCreatedCallBackCalled; static void TestCallback(BaseHandle handle) @@ -98,8 +104,8 @@ int UtcDaliAlignmentConstructorRegister(void) { ToolkitTestApplication application; - //Te ensure the object is registered after creation - ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry(); + //To ensure the object is registered after creation + ObjectRegistry registry = application.GetCore().GetObjectRegistry(); DALI_TEST_CHECK( registry ); gObjectCreatedCallBackCalled = false; @@ -233,7 +239,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -244,7 +250,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -253,7 +259,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -264,7 +270,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -273,7 +279,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -284,7 +290,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -293,7 +299,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -304,7 +310,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -313,7 +319,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -324,7 +330,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -333,7 +339,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -344,7 +350,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -353,7 +359,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -364,7 +370,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -373,7 +379,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -384,7 +390,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -393,7 +399,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -404,7 +410,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -467,10 +473,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(); DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -480,10 +486,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalLeft); DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -493,10 +499,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalRight); DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -506,10 +512,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop); DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -519,10 +525,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop); DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -532,10 +538,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop); DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -545,10 +551,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom); DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -558,10 +564,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom); DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -571,10 +577,10 @@ int UtcDaliAlignmentGetAlignmentType(void) Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom); DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -589,7 +595,7 @@ int UtcDaliAlignmentSetScaling(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -613,7 +619,7 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -622,7 +628,7 @@ int UtcDaliAlignmentSetScaling(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -646,7 +652,7 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -655,7 +661,7 @@ int UtcDaliAlignmentSetScaling(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -679,7 +685,7 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -688,7 +694,7 @@ int UtcDaliAlignmentSetScaling(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -712,7 +718,7 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -721,7 +727,7 @@ int UtcDaliAlignmentSetScaling(void) { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -745,7 +751,7 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -900,7 +906,7 @@ int UtcDaliAlignmentChildAddAndRemove(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -920,7 +926,7 @@ int UtcDaliAlignmentChildAddAndRemove(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); END_TEST; } @@ -929,13 +935,13 @@ int UtcDaliAlignmentSizeSetP(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); Vector2 size( 100.0f, 200.0f ); - alignment.SetSize(size); + alignment.SetProperty( Actor::Property::SIZE, size); application.Render(); application.SendNotification(); @@ -944,12 +950,12 @@ int UtcDaliAlignmentSizeSetP(void) DALI_TEST_EQUALS(size, alignment.GetTargetSize().GetVectorXY(), TEST_LOCATION); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); END_TEST; } /////////////////////////////////////////////////////////////////////////////// -static bool TouchEventCallback(Actor actor, const TouchEvent& event) +static bool TouchCallback(Actor actor, const TouchEvent& event) { return false; } @@ -961,11 +967,11 @@ int UtcDaliAlignmentOnTouchEvent(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - alignment.SetSize(100.0f, 100.0f); - alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT); - Stage::GetCurrent().Add(alignment); + alignment.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + alignment.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + application.GetScene().Add(alignment); - alignment.TouchedSignal().Connect(&TouchEventCallback); + alignment.TouchSignal().Connect(&TouchCallback); application.Render(); application.SendNotification(); @@ -973,7 +979,10 @@ int UtcDaliAlignmentOnTouchEvent(void) application.SendNotification(); Integration::TouchEvent touchEvent(1); - TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f); + Integration::Point point; + point.SetDeviceId( 1 ); + point.SetState( PointState::DOWN); + point.SetScreenPosition( Vector2( 20.0f, 20.0f ) ); touchEvent.AddPoint(point); application.ProcessEvent(touchEvent); @@ -986,7 +995,7 @@ int UtcDaliAlignmentOnKeyEvent(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); alignment.SetKeyInputFocus(); @@ -1007,7 +1016,7 @@ int UtcDaliAlignmentOnSizeAnimation(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); Animation animation = Animation::New(100.0f); animation.AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );