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=99cd40e6e98fa4bb6b942c3740d372591af6dea7;hp=fec79487a437a3ebf8a21401653c81c08bfa9278;hb=5e351965bad7e1de2e94027548b022bac692603c;hpb=6084b902e588a8ed1b8ec0dd7aacae8775006ef6 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp index fec7948..99cd40e 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) 2017 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,7 +21,8 @@ #include #include #include -#include +#include +#include "dummy-control.h" using namespace Dali; using namespace Toolkit; @@ -37,11 +38,15 @@ static void TestCallback(BaseHandle handle) Actor CreateColorActor( const Vector4& color ) { - Actor solidColorActor = Actor::New(); - - RendererFactory factory = RendererFactory::Get(); - ControlRenderer colorRenderer = factory.GetControlRenderer( color ); - colorRenderer.SetOnStage( solidColorActor ); + 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; }