[dali_1.3.25] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-HoverProcessing.cpp

diff --git a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp
index fd4a7e5..93630ed 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp
@@ -1264,6 +1264,13 @@ int UtcDaliHoverClippingActor(void)
   clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
   stage.Add( clippingActor );
 
+  // Add a child to the clipped region.
+  Actor clippingChild = Actor::New();
+  clippingChild.SetSize( 50.0f, 50.0f );
+  clippingChild.SetPosition( 25.0f, 25.0f );
+  clippingChild.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  clippingActor.Add( clippingChild );
+
   // Render and notify.
   application.SendNotification();
   application.Render();
@@ -1273,9 +1280,9 @@ int UtcDaliHoverClippingActor(void)
   HoverEventFunctor functor( data );
   actor.HoveredSignal().Connect( &application, functor );
 
-  // Emit an event within clipped area.
+  // Emit an event within clipped area - no hit.
   application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, Vector2( 10.0f, 10.0f ) ) );
-  DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+  DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Emit an event outside the clipped area but within the actor area, we should have a hit.
@@ -1283,5 +1290,12 @@ int UtcDaliHoverClippingActor(void)
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
+  clippingChild.HoveredSignal().Connect( &application, functor );
+
+  // Emit an event inside part of the child which is within the clipped area, we should have a hit.
+  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, Vector2( 30.0f, 30.0f ) ) );
+  DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+  data.Reset();
+
   END_TEST;
 }