X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-TouchProcessing.cpp;h=82d514bf0befe76b21af9df0e29d24e05735f7e0;hb=de2ca7c4b8120766f23113ac6695c12066657006;hp=2fe2760aea660dfe7b9aee0923b2ab77125e634a;hpb=5bc264c723a4cce455771293a45092013a8fa3ae;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
index 2fe2760..82d514b 100644
--- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
@@ -117,10 +117,13 @@ struct RemoveActorFunctor : public TouchEventFunctor
   }
 };
 
-Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, Vector2 screenPosition )
+Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, const Vector2& screenPosition )
 {
   Integration::TouchEvent touchEvent;
-  touchEvent.points.push_back( TouchPoint ( 0, state, screenPosition.x, screenPosition.y ) );
+  Integration::Point point;
+  point.SetState( static_cast< PointState::Type >( state ) );
+  point.SetScreenPosition( screenPosition );
+  touchEvent.points.push_back( point );
   return touchEvent;
 }
 
@@ -176,12 +179,15 @@ int UtcDaliTouchNormalProcessing(void)
   screenCoordinates.x = screenCoordinates.y = 12.0f;
   actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y );
   application.ProcessEvent( GenerateSingleTouch( TouchPoint::Up, screenCoordinates ) );
-  const TouchPoint *point3 = &data.touchEvent.GetPoint(0);
+
+  const TouchPoint *point3ptr = &data.touchEvent.GetPoint(0);
+  TouchPoint point3( point3ptr->deviceId, point3ptr->state, point3ptr->screen.x, point3ptr->screen.y, point3ptr->local.x, point3ptr->local.y );
+
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( TouchPoint::Up, point3->state, TEST_LOCATION );
-  DALI_TEST_EQUALS( screenCoordinates, point3->screen, TEST_LOCATION );
-  DALI_TEST_EQUALS( localCoordinates, point3->local, 0.1f, TEST_LOCATION );
+  DALI_TEST_EQUALS( TouchPoint::Up, point3.state, TEST_LOCATION );
+  DALI_TEST_EQUALS( screenCoordinates, point3.screen, TEST_LOCATION );
+  DALI_TEST_EQUALS( localCoordinates, point3.local, 0.1f, TEST_LOCATION );
   data.Reset();
 
   // Emit a down signal where the actor is not present
@@ -956,12 +962,12 @@ int UtcDaliTouchOffscreenRenderTasks(void)
   // FrameBufferImage for offscreen RenderTask
   FrameBufferImage frameBufferImage( FrameBufferImage::New( stageSize.width, stageSize.height, Pixel::RGBA8888 ) );
 
-  // Create an image actor to display the FrameBufferImage
-  ImageActor imageActor ( ImageActor::New( frameBufferImage ) );
-  imageActor.SetParentOrigin(ParentOrigin::CENTER);
-  imageActor.SetSize( stageSize.x, stageSize.y );
-  imageActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
-  stage.Add( imageActor );
+  // Create a renderable actor to display the FrameBufferImage
+  Actor renderableActor = CreateRenderableActor( frameBufferImage );
+  renderableActor.SetParentOrigin(ParentOrigin::CENTER);
+  renderableActor.SetSize( stageSize.x, stageSize.y );
+  renderableActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
+  stage.Add( renderableActor );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1003,15 +1009,14 @@ int UtcDaliTouchMultipleRenderableActors(void)
   Stage stage ( Stage::GetCurrent() );
   Vector2 stageSize ( stage.GetSize() );
 
-  ImageActor parent = ImageActor::New();
+  Actor parent = CreateRenderableActor();
   parent.SetSize(100.0f, 100.0f);
   parent.SetAnchorPoint(AnchorPoint::TOP_LEFT);
   stage.Add(parent);
 
-  ImageActor actor = ImageActor::New();
+  Actor actor = CreateRenderableActor();
   actor.SetSize(100.0f, 100.0f);
   actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-  actor.SetSortModifier( 1.0f );
   parent.Add(actor);
 
   // Render and notify
@@ -1295,37 +1300,37 @@ int UtcDaliTouchLeaveActorReadded(void)
   END_TEST;
 }
 
-int UtcDaliTouchStencilNonRenderableActor(void)
+int UtcDaliTouchClippingActor(void)
 {
   TestApplication application;
   Stage stage = Stage::GetCurrent();
 
   Actor actor = Actor::New();
-  actor.SetSize(100.0f, 100.0f);
-  actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-  stage.Add(actor);
+  actor.SetSize( 100.0f, 100.0f );
+  actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  stage.Add( actor );
 
-  Actor stencil = Actor::New();
-  stencil.SetSize(50.0f, 50.0f);
-  stencil.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-  stencil.SetDrawMode( DrawMode::STENCIL );
-  stage.Add(stencil);
+  Actor clippingActor = Actor::New();
+  clippingActor.SetSize( 50.0f, 50.0f );
+  clippingActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  clippingActor.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  stage.Add( clippingActor );
 
-  // Render and notify
+  // Render and notify.
   application.SendNotification();
   application.Render();
 
-  // Connect to actor's touched signal
+  // Connect to actor's touched signal.
   SignalData data;
   TouchEventFunctor functor( data );
   actor.TouchedSignal().Connect( &application, functor );
 
-  // Emit an event within stencil area
+  // Emit an event within clipped area.
   application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
-  // Emit an event outside the stencil area but within the actor area, we should have a hit!
+  // Emit an event outside the clipped area but within the actor area, we should have a hit.
   application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 60.0f, 60.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();