Revert "[3.0] Added test cases for public api."

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

diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
index 2fe2760..62052ed 100644 (file)
--- 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;
 }
 
@@ -956,12 +959,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 +1006,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