X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-Scene.cpp;h=f23df12b647cd0209e9e531c472ce295c4e59c89;hb=894cc6056a3be0b9f478504524a54aca151ccffb;hp=c2335ede919e4a724c5f9d215b865a4b14924b5a;hpb=b0f468ba41245cab977c308f7f34b106370a8771;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp index c2335ed..f23df12 100644 --- a/automated-tests/src/dali/utc-Dali-Scene.cpp +++ b/automated-tests/src/dali/utc-Dali-Scene.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -63,9 +64,7 @@ struct KeyEventSignalData { functorCalled = false; - receivedKeyEvent.keyModifier = 0; - receivedKeyEvent.keyPressedName.clear(); - receivedKeyEvent.keyPressed.clear(); + receivedKeyEvent.Reset(); } bool functorCalled; @@ -102,32 +101,13 @@ struct TouchedSignalData functorCalled = false; createNewScene = false; newSceneCreated = false; - - receivedTouchEvent.points.clear(); - receivedTouchEvent.time = 0; - - receivedTouchData.Reset(); + receivedTouchEvent.Reset(); } bool functorCalled; bool createNewScene; bool newSceneCreated; TouchEvent receivedTouchEvent; - TouchData receivedTouchData; -}; - -// Functor that sets the data when touched signal is received -struct TouchedFunctor -{ - TouchedFunctor( TouchedSignalData& data ) : signalData( data ) { } - - void operator()( const TouchEvent& touch ) - { - signalData.functorCalled = true; - signalData.receivedTouchEvent = touch; - } - - TouchedSignalData& signalData; }; // Functor that sets the data when touched signal is received @@ -135,10 +115,10 @@ struct TouchFunctor { TouchFunctor( TouchedSignalData& data ) : signalData( data ) { } - void operator()( const TouchData& touch ) + void operator()( const TouchEvent& touch ) { signalData.functorCalled = true; - signalData.receivedTouchData = touch; + signalData.receivedTouchEvent = touch; if ( signalData.createNewScene ) { @@ -200,9 +180,7 @@ struct KeyEventGeneratedSignalData { functorCalled = false; - receivedKeyEvent.keyModifier = 0; - receivedKeyEvent.keyPressedName.clear(); - receivedKeyEvent.keyPressed.clear(); + receivedKeyEvent.Reset(); } bool functorCalled; @@ -248,6 +226,10 @@ bool DummyTouchCallback( Actor actor, const TouchEvent& touch ) return true; } +void FrameCallback( int frameId ) +{ +} + } // unnamed namespace int UtcDaliSceneAdd(void) @@ -258,10 +240,10 @@ int UtcDaliSceneAdd(void) Dali::Integration::Scene scene = application.GetScene(); Actor actor = Actor::New(); - DALI_TEST_CHECK( !actor.OnStage() ); + DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); scene.Add( actor ); - DALI_TEST_CHECK( actor.OnStage() ); + DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); END_TEST; } @@ -274,13 +256,13 @@ int UtcDaliSceneRemove(void) Dali::Integration::Scene scene = application.GetScene(); Actor actor = Actor::New(); - DALI_TEST_CHECK( !actor.OnStage() ); + DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); scene.Add( actor ); - DALI_TEST_CHECK( actor.OnStage() ); + DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); scene.Remove(actor); - DALI_TEST_CHECK( !actor.OnStage() ); + DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); END_TEST; } @@ -455,7 +437,7 @@ int UtcDaliSceneCreateNewSceneDuringCoreEventProcessing(void) TouchedSignalData data; data.createNewScene = true; TouchFunctor functor( data ); - scene.TouchSignal().Connect( &application, functor ); + scene.TouchedSignal().Connect( &application, functor ); // Render and notify. application.SendNotification(); @@ -579,47 +561,47 @@ int UtcDaliSceneSignalKeyEventP(void) KeyEventReceivedFunctor functor( data ); scene.KeyEventSignal().Connect( &application, functor ); - Integration::KeyEvent event( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Down, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event( "i", "", "i", 0, 0, 0, Integration::KeyEvent::DOWN, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event.state == static_cast( data.receivedKeyEvent.GetState() ) ); data.Reset(); - Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Up, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::UP, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event2 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event2.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event2.state == static_cast( data.receivedKeyEvent.GetState() ) ); data.Reset(); - Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Down, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event3 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event3.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event3.state == static_cast( data.receivedKeyEvent.GetState() ) ); data.Reset(); - Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event4 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event4.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event4.state == static_cast( data.receivedKeyEvent.GetState() ) ); END_TEST; } @@ -638,14 +620,14 @@ int UtcDaliSceneSignalKeyEventN(void) END_TEST; } -int UtcDaliSceneTouchSignalP(void) +int UtcDaliSceneTouchedSignalP(void) { TestApplication application; Dali::Integration::Scene scene = application.GetScene(); TouchedSignalData data; TouchFunctor functor( data ); - scene.TouchSignal().Connect( &application, functor ); + scene.TouchedSignal().Connect( &application, functor ); // Render and notify. application.SendNotification(); @@ -656,21 +638,21 @@ int UtcDaliSceneTouchSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -685,8 +667,8 @@ int UtcDaliSceneTouchSignalP(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); data.Reset(); GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion @@ -697,8 +679,8 @@ int UtcDaliSceneTouchSignalP(void) GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); data.Reset(); } @@ -713,7 +695,7 @@ int UtcDaliSceneTouchSignalP(void) touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); // 2nd point @@ -744,20 +726,20 @@ int UtcDaliSceneTouchSignalP(void) touchEvent.points[0].SetState( PointState::UP ); application.ProcessEvent( touchEvent ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); data.Reset(); } END_TEST; } -int UtcDaliSceneTouchSignalN(void) +int UtcDaliSceneTouchedSignalN(void) { TestApplication application; Dali::Integration::Scene scene = application.GetScene(); TouchedSignalData data; TouchFunctor functor( data ); - scene.TouchSignal().Connect( &application, functor ); + scene.TouchedSignal().Connect( &application, functor ); // Render and notify. application.SendNotification(); @@ -771,8 +753,8 @@ int UtcDaliSceneTouchSignalN(void) GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0)); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0)); data.Reset(); @@ -786,14 +768,14 @@ int UtcDaliSceneTouchSignalN(void) GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0)); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0)); data.Reset(); } // Add an actor to the scene. Actor actor = Actor::New(); - actor.SetSize( 100.0f, 100.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); actor.TouchedSignal().Connect( &DummyTouchCallback ); @@ -808,30 +790,30 @@ int UtcDaliSceneTouchSignalN(void) GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); data.Reset(); GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN ); data.Reset(); GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u ); - DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) ); - DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u ); + DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) ); + DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED ); - DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION ); // Check that getting info about a non-existent point returns an empty handle - Actor actor = data.receivedTouchData.GetHitActor( 1 ); + Actor actor = data.receivedTouchEvent.GetHitActor( 1 ); DALI_TEST_CHECK( !actor ); data.Reset(); @@ -853,12 +835,12 @@ int UtcDaliSceneSignalWheelEventP(void) application.ProcessEvent( event ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event.type) == data.receivedWheelEvent.type ); - DALI_TEST_CHECK( event.direction == data.receivedWheelEvent.direction ); - DALI_TEST_CHECK( event.modifiers == data.receivedWheelEvent.modifiers ); - DALI_TEST_CHECK( event.point == data.receivedWheelEvent.point ); - DALI_TEST_CHECK( event.z == data.receivedWheelEvent.z ); - DALI_TEST_CHECK( event.timeStamp == data.receivedWheelEvent.timeStamp ); + DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event.type) == data.receivedWheelEvent.GetType() ); + DALI_TEST_CHECK( event.direction == data.receivedWheelEvent.GetDirection() ); + DALI_TEST_CHECK( event.modifiers == data.receivedWheelEvent.GetModifiers() ); + DALI_TEST_CHECK( event.point == data.receivedWheelEvent.GetPoint() ); + DALI_TEST_CHECK( event.delta == data.receivedWheelEvent.GetDelta() ); + DALI_TEST_CHECK( event.timeStamp == data.receivedWheelEvent.GetTime() ); data.Reset(); @@ -866,12 +848,12 @@ int UtcDaliSceneSignalWheelEventP(void) application.ProcessEvent( event2 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event2.type) == data.receivedWheelEvent.type ); - DALI_TEST_CHECK( event2.direction == data.receivedWheelEvent.direction ); - DALI_TEST_CHECK( event2.modifiers == data.receivedWheelEvent.modifiers ); - DALI_TEST_CHECK( event2.point == data.receivedWheelEvent.point ); - DALI_TEST_CHECK( event2.z == data.receivedWheelEvent.z ); - DALI_TEST_CHECK( event2.timeStamp == data.receivedWheelEvent.timeStamp ); + DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event2.type) == data.receivedWheelEvent.GetType() ); + DALI_TEST_CHECK( event2.direction == data.receivedWheelEvent.GetDirection() ); + DALI_TEST_CHECK( event2.modifiers == data.receivedWheelEvent.GetModifiers() ); + DALI_TEST_CHECK( event2.point == data.receivedWheelEvent.GetPoint() ); + DALI_TEST_CHECK( event2.delta == data.receivedWheelEvent.GetDelta() ); + DALI_TEST_CHECK( event2.timeStamp == data.receivedWheelEvent.GetTime() ); END_TEST; } @@ -915,8 +897,8 @@ int UtcDaliSceneSurfaceResizedDefaultSceneViewport(void) Actor actor = Actor::New(); actor.AddRenderer(renderer); - actor.SetSize(400, 400); - Stage::GetCurrent().Add(actor); + actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) ); + application.GetScene().Add(actor); // Render before resizing surface application.SendNotification(); @@ -959,7 +941,7 @@ int UtcDaliSceneSurfaceResizedMultipleRenderTasks(void) glAbstraction.EnableViewportCallTrace( true ); // Initial scene setup - auto stage = Stage::GetCurrent(); + auto scene = application.GetScene(); Geometry geometry = CreateQuadGeometry(); Shader shader = CreateShader(); @@ -969,15 +951,15 @@ int UtcDaliSceneSurfaceResizedMultipleRenderTasks(void) actor.AddRenderer(renderer); int testWidth = 400; int testHeight = 400; - actor.SetSize(testWidth, testHeight); - stage.Add(actor); + actor.SetProperty( Actor::Property::SIZE, Vector2( testWidth, testHeight) ); + scene.Add(actor); CameraActor offscreenCameraActor = CameraActor::New( Size( testWidth, testHeight ) ); - Stage::GetCurrent().Add( offscreenCameraActor ); + application.GetScene().Add( offscreenCameraActor ); FrameBuffer newFrameBuffer = FrameBuffer::New( testWidth, testHeight, FrameBuffer::Attachment::NONE ); - RenderTask newTask = stage.GetRenderTaskList().CreateTask(); + RenderTask newTask = scene.GetRenderTaskList().CreateTask(); newTask.SetCameraActor( offscreenCameraActor ); newTask.SetSourceActor( actor ); newTask.SetFrameBuffer( newFrameBuffer ); @@ -999,6 +981,7 @@ int UtcDaliSceneSurfaceResizedMultipleRenderTasks(void) DALI_TEST_CHECK( defaultScene ); // Ensure stage size matches the scene size + auto stage = Stage::GetCurrent(); DALI_TEST_EQUALS( stage.GetSize(), defaultScene.GetSize(), TEST_LOCATION ); // Resize the scene @@ -1063,47 +1046,47 @@ int UtcDaliSceneKeyEventGeneratedSignalP(void) KeyEventGeneratedReceivedFunctor functor( data ); scene.KeyEventGeneratedSignal().Connect( &application, functor ); - Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event.state == static_cast( data.receivedKeyEvent.GetState() ) ); data.Reset(); - Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Up, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::UP, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event2 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event2.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event2.state == static_cast( data.receivedKeyEvent.GetState() ) ); data.Reset(); - Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Down, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event3 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event3.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event3.state == static_cast( data.receivedKeyEvent.GetState() ) ); data.Reset(); - Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); + Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ); application.ProcessEvent( event4 ); DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION ); - DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier ); - DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName ); - DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed ); - DALI_TEST_CHECK( event4.state == static_cast( data.receivedKeyEvent.state ) ); + DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.GetKeyModifier() ); + DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.GetKeyName() ); + DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.GetKeyString() ); + DALI_TEST_CHECK( event4.state == static_cast( data.receivedKeyEvent.GetState() ) ); END_TEST; } @@ -1166,3 +1149,94 @@ int UtcDaliSceneEnsureReplacedSurfaceKeepsClearColor(void) END_TEST; } + +int UtcDaliSceneEmptySceneRendering(void) +{ + tet_infoline( "Ensure not rendering before a Renderer is added" ); + + TestApplication application; + TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); + + // Render without any renderer + application.SendNotification(); + application.Render(); + + // Check the clear count and the render status + DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), 0, TEST_LOCATION ); + DALI_TEST_EQUALS( application.GetRenderNeedsPostRender(), false, TEST_LOCATION ); + + // Add a Renderer + Geometry geometry = CreateQuadGeometry(); + Shader shader = CreateShader(); + Renderer renderer = Renderer::New( geometry, shader ); + + Actor actor = Actor::New(); + actor.AddRenderer( renderer ); + + actor.SetProperty( Actor::Property::SIZE, Vector2( 400, 400 ) ); + application.GetScene().Add( actor ); + + // Render + application.SendNotification(); + application.Render(); + + // Check the clear count and the render status + DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS( application.GetRenderNeedsPostRender(), true, TEST_LOCATION ); + + // Remove the Renderer + application.GetScene().Remove( actor ); + actor.Reset(); + renderer.Reset(); + + // Render + application.SendNotification(); + application.Render(); + + // Check the clear count and the render status + DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), 2, TEST_LOCATION ); // Should be cleared + DALI_TEST_EQUALS( application.GetRenderNeedsPostRender(), true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliSceneFrameRenderedPresentedCallback(void) +{ + tet_infoline( "UtcDaliSceneFrameRenderedCallback" ); + + TestApplication application; + + // Add a Renderer + Geometry geometry = CreateQuadGeometry(); + Shader shader = CreateShader(); + Renderer renderer = Renderer::New( geometry, shader ); + + Actor actor = Actor::New(); + actor.AddRenderer( renderer ); + application.GetScene().Add( actor ); + + Dali::Integration::Scene scene = application.GetScene(); + + int frameId = 1; + scene.AddFrameRenderedCallback( std::unique_ptr< CallbackBase >( MakeCallback( &FrameCallback ) ), frameId ); + scene.AddFramePresentedCallback( std::unique_ptr< CallbackBase >( MakeCallback( &FrameCallback ) ), frameId ); + + // Render + application.SendNotification(); + application.Render(); + + Dali::Integration::Scene::FrameCallbackContainer callbackContainer; + scene.GetFrameRenderedCallback( callbackContainer ); + + DALI_TEST_EQUALS( callbackContainer.size(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS( callbackContainer[0].second, frameId, TEST_LOCATION ); + + callbackContainer.clear(); + + scene.GetFramePresentedCallback( callbackContainer ); + + DALI_TEST_EQUALS( callbackContainer.size(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS( callbackContainer[0].second, frameId, TEST_LOCATION ); + + END_TEST; +}