X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-TextEditor.cpp;h=2dae96793e0e36ba6c7a62a99830505ac75f200f;hp=dd9a80532ec972f518c7c5b9fcdf57bc2c361014;hb=675f5551ef3c7ca20ec45c36b865a5092883af43;hpb=5f58a4de80835daf8db03a9e6b9c04cf5f556831 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp index dd9a805..2dae967 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp @@ -1248,15 +1248,10 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); - // Check there are the expected number of children ( offscreen root actor, and the offscreen image view - DALI_TEST_EQUALS( editor.GetChildCount(), 2u, TEST_LOCATION ); + // Check there are the expected number of children (the stencil). + DALI_TEST_EQUALS( editor.GetChildCount(), 1u, TEST_LOCATION ); - Actor offscreenRoot = editor.GetChildAt( 0u ); - DALI_TEST_CHECK( offscreenRoot.IsLayer() ); - DALI_TEST_EQUALS( offscreenRoot.GetChildCount(), 1u, TEST_LOCATION ); // The camera actor. - - Actor offscreenImage = editor.GetChildAt( 1u ); - DALI_TEST_CHECK( offscreenImage ); + Actor stencil = editor.GetChildAt( 0u ); // Create a tap event to touch the text editor. application.ProcessEvent( GenerateTap( Gesture::Possible, 1u, 1u, Vector2( 150.0f, 25.0f ) ) ); @@ -1266,11 +1261,11 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); - Actor layer = editor.GetChildAt( 2u ); + Actor layer = editor.GetChildAt( 1u ); DALI_TEST_CHECK( layer.IsLayer() ); DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor. - DALI_TEST_EQUALS( offscreenRoot.GetChildCount(), 1u, TEST_LOCATION ); // The camera actor. + DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION ); // Now the text editor has the focus, so it can handle the key events. application.ProcessEvent( GenerateKey( "a", "a", 0, 0, 0, Integration::KeyEvent::Down ) ); @@ -1282,16 +1277,13 @@ int utcDaliTextEditorEvent02(void) // Checks the cursor and the renderer have been created. DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor. - DALI_TEST_EQUALS( offscreenRoot.GetChildCount(), 2u, TEST_LOCATION ); // The camera actor and the renderer + DALI_TEST_EQUALS( stencil.GetChildCount(), 1u, TEST_LOCATION ); // The renderer Control cursor = Control::DownCast( layer.GetChildAt( 0u ) ); DALI_TEST_CHECK( cursor ); - CameraActor camera = CameraActor::DownCast( offscreenRoot.GetChildAt( 0u ) ); - DALI_TEST_CHECK( camera ); - - // The offscreen root actor has a container with all the actors which contain the text renderers. - Actor container = offscreenRoot.GetChildAt( 1u ); + // The stencil actor has a container with all the actors which contain the text renderers. + Actor container = stencil.GetChildAt( 0u ); for( unsigned int index = 0; index < container.GetChildCount(); ++index ) { Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u ); @@ -1365,7 +1357,7 @@ int utcDaliTextEditorEvent02(void) DALI_TEST_EQUALS( position2, position6, TEST_LOCATION );// Should be in the same position2. // Should not be a renderer. - DALI_TEST_EQUALS( offscreenRoot.GetChildCount(), 1u, TEST_LOCATION ); // The camera actor only. + DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION ); END_TEST; } @@ -1422,22 +1414,18 @@ int utcDaliTextEditorEvent03(void) application.SendNotification(); application.Render(); - // The offscreen root actor should have three actors: the camera, a renderer and the highlight actor. - Actor offscreenRoot = editor.GetChildAt( 0u ); - DALI_TEST_CHECK( offscreenRoot.IsLayer() ); - - CameraActor camera = CameraActor::DownCast( offscreenRoot.GetChildAt( 0u ) ); - DALI_TEST_CHECK( camera ); + // The stencil actor should have two actors: the renderer and the highlight actor. + Actor stencil = editor.GetChildAt( 0u ); - // The offscreen root actor has a container with all the actors which contain the text renderers. - Actor container = offscreenRoot.GetChildAt( 1u ); + // The stencil actor has a container with all the actors which contain the text renderers. + Actor container = stencil.GetChildAt( 0u ); for( unsigned int index = 0; index < container.GetChildCount(); ++index ) { Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u ); DALI_TEST_CHECK( renderer ); } - Renderer highlight = offscreenRoot.GetChildAt( 2u ).GetRendererAt( 0u ); + Renderer highlight = stencil.GetChildAt( 1u ).GetRendererAt( 0u ); DALI_TEST_CHECK( highlight ); END_TEST;