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-ToolBar.cpp;h=c4777bc9f29a09cc0263a06e991ec34c85ded557;hp=36e8f8c4d87b01fca8fd988b119f692a571e5f95;hb=e0c063be9e7ecde0e5665079289489d456828abf;hpb=70fc28a8c9ad04e29cb4a69c856bac3e96e2301d diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp index 36e8f8c..c4777bc 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -21,6 +21,8 @@ #include #include #include +#include +#include "dummy-control.h" using namespace Dali; using namespace Toolkit; @@ -33,6 +35,22 @@ static void TestCallback(BaseHandle handle) { gObjectCreatedCallBackCalled = true; } + +Actor CreateColorActor( const Vector4& color ) +{ + DummyControl solidColorActor = DummyControl::New(); + DummyControlImpl& dummyImpl = static_cast(solidColorActor.GetImplementation()); + + VisualFactory factory = VisualFactory::Get(); + Dali::Property::Map map; + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR; + map[ ColorVisual::Property::MIX_COLOR ] = color; + Visual::Base colorVisual = factory.CreateVisual( map ); + dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, colorVisual ); + + return solidColorActor; +} + } // namespace void dali_toolbar_startup(void) @@ -64,7 +82,7 @@ int UtcDaliToolBarNew(void) DALI_TEST_CHECK( toolbar2 == toolbar ); //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; @@ -75,7 +93,7 @@ int UtcDaliToolBarNew(void) DALI_TEST_CHECK( gObjectCreatedCallBackCalled ); Actor actor = toolbar; - toolbar == ToolBar::DownCast( actor ); + toolbar = ToolBar::DownCast( actor ); DALI_TEST_CHECK( toolbar ); END_TEST; @@ -88,19 +106,19 @@ int UtcDaliToolBarAddControl01(void) try { - ImageActor control1 = CreateSolidColorActor( Color::RED ); - control1.SetSize( Vector2( 100.f, 100.f ) ); - ImageActor control2 = CreateSolidColorActor( Color::RED ); - control2.SetSize( Vector2( 100.f, 100.f ) ); - ImageActor control3 = CreateSolidColorActor( Color::RED ); - control3.SetSize( Vector2( 100.f, 100.f ) ); - ImageActor control4 = CreateSolidColorActor( Color::RED ); - control4.SetSize( Vector2( 100.f, 100.f ) ); - ImageActor control5 = CreateSolidColorActor( Color::RED ); - control5.SetSize( Vector2( 100.f, 100.f ) ); + Actor control1 = CreateColorActor( Color::RED ); + control1.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + Actor control2 = CreateColorActor( Color::RED ); + control2.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + Actor control3 = CreateColorActor( Color::RED ); + control3.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + Actor control4 = CreateColorActor( Color::RED ); + control4.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + Actor control5 = CreateColorActor( Color::RED ); + control5.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); ToolBar toolbar = ToolBar::New(); - toolbar.SetSize( Vector2( 600.f, 100.f ) ); + toolbar.SetProperty( Actor::Property::SIZE, Vector2( 600.f, 100.f ) ); application.Render(); application.SendNotification(); @@ -108,26 +126,26 @@ int UtcDaliToolBarAddControl01(void) application.SendNotification(); toolbar.Add( control1 ); - toolbar.AddControl( control2, 0.1f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control3, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control4, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control5, 0.1f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - - ImageActor control6 = CreateSolidColorActor( Color::RED ); - control6.SetSize( Vector2( 100.f, 100.f ) ); - ImageActor control7 = CreateSolidColorActor( Color::RED ); - control7.SetSize( Vector2( 100.f, 100.f ) ); - ImageActor control8 = CreateSolidColorActor( Color::RED ); - control8.SetSize( Vector2( 100.f, 100.f ) ); + toolbar.AddControl( control2, 0.1f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control3, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control4, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control5, 0.1f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + + Actor control6 = CreateColorActor( Color::RED ); + control6.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + Actor control7 = CreateColorActor( Color::RED ); + control7.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + Actor control8 = CreateColorActor( Color::RED ); + control8.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); application.Render(); application.SendNotification(); application.Render(); application.SendNotification(); - toolbar.AddControl( control6, 0.4f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control7, 0.2f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control8, 0.2f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control6, 0.4f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control7, 0.2f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control8, 0.2f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); } catch( ... ) { @@ -147,7 +165,7 @@ int UtcDaliToolBarAddControl02(void) try { - ImageActor control = CreateSolidColorActor( Color::RED ); + Actor control = CreateColorActor( Color::RED ); ToolBar toolbar = ToolBar::New(); @@ -177,10 +195,10 @@ int UtcDaliToolBarRemoveControl01(void) try { - ImageActor control = CreateSolidColorActor( Color::RED ); + Actor control = CreateColorActor( Color::RED ); ToolBar toolbar = ToolBar::New(); - toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft ); + toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT ); toolbar.RemoveControl( control ); } @@ -200,13 +218,13 @@ int UtcDaliToolBarRemoveControl02(void) try { - ImageActor control01 = CreateSolidColorActor( Color::RED ); - ImageActor control02 = CreateSolidColorActor( Color::RED ); + Actor control01 = CreateColorActor( Color::RED ); + Actor control02 = CreateColorActor( Color::RED ); ToolBar toolbar01 = ToolBar::New(); ToolBar toolbar02 = ToolBar::New(); - toolbar01.AddControl( control01, 0.1f, Alignment::HorizontalLeft ); - toolbar02.AddControl( control02, 0.1f, Alignment::HorizontalLeft ); + toolbar01.AddControl( control01, 0.1f, Alignment::HORIZONTAL_LEFT ); + toolbar02.AddControl( control02, 0.1f, Alignment::HORIZONTAL_LEFT ); toolbar02.RemoveControl( control01 ); } @@ -222,10 +240,10 @@ int UtcDaliToolBarRemoveControl02(void) try { - ImageActor control = CreateSolidColorActor( Color::RED ); + Actor control = CreateColorActor( Color::RED ); ToolBar toolbar = ToolBar::New(); - toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft ); + toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT ); toolbar.RemoveControl( control ); toolbar.RemoveControl( control );