X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.cpp;h=56b3b5e480ac9a191951db550ed656984216f413;hb=0dcf9f8788fc4b48e4b127edcb4a00990e5ff512;hp=a7ccfbaa37a7ac439aea057615b71ab5c00c52ce;hpb=01777a3489f027123010b281e58efbc9f0a93db7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index a7ccfba..56b3b5e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -174,7 +174,7 @@ void DummyControlImpl::SetProperty( BaseObject* object, Dali::Property::Index in
     case Toolkit::DummyControl::Property::FOCUS_VISUAL:
     case Toolkit::DummyControl::Property::LABEL_VISUAL:
     {
-      Property::Map* map = value.GetMap();
+      const Property::Map* map = value.GetMap();
       if( map != NULL )
       {
         VisualFactory visualFactory = VisualFactory::Get();
@@ -268,8 +268,20 @@ void Impl::DummyControl::OnChildRemove(Actor& child) { childRemoveCalled = true;
 void Impl::DummyControl::OnSizeSet(const Vector3& targetSize) { Control::OnSizeSet( targetSize ); sizeSetCalled = true; }
 void Impl::DummyControl::OnSizeAnimation(Animation& animation, const Vector3& targetSize) { Control::OnSizeAnimation( animation, targetSize ); sizeAnimationCalled = true; }
 bool Impl::DummyControl::OnKeyEvent(const KeyEvent& event) { keyEventCalled = true; return false;}
-void Impl::DummyControl::OnKeyInputFocusGained() { keyInputFocusGained = true; }
-void Impl::DummyControl::OnKeyInputFocusLost() { keyInputFocusLost = true; }
+void Impl::DummyControl::OnKeyInputFocusGained()
+{
+  if(this->HasKeyInputFocus())
+  {
+    keyInputFocusGained = true;
+  }
+}
+void Impl::DummyControl::OnKeyInputFocusLost()
+{
+  if(!this->HasKeyInputFocus())
+  {
+    keyInputFocusLost = true;
+  }
+}
 
 void Impl::DummyControl::SetLayout( Property::Index visualIndex, Property::Map& map )
 {