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-PushButton.cpp;h=0d259d92bbfa4b680d636c6a8f1dcca3112bb8dc;hp=723d35db14eeb7f303dfbc4965428bb85e9e039a;hb=1c30e27a6363cb89217671b1efa5ce1c38b9afbe;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index 723d35d..0d259d9 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp @@ -42,10 +42,10 @@ void utc_dali_toolkit_pushbutton_cleanup(void) namespace { -static bool gPushButtonToggleState = false; -bool PushButtonToggled( Button button, bool toggled ) +static bool gPushButtonSelectedState = false; +bool PushButtonSelected( Button button ) { - gPushButtonToggleState = toggled && ( toggled == static_cast( button ).IsToggled() ); + gPushButtonSelectedState = button.IsSelected(); return true; } @@ -73,12 +73,9 @@ const Dali::TouchPoint pointMotionOut( 0, TouchPoint::Motion, 10, 10 ); const Dali::TouchPoint pointDownOutside( 0, TouchPoint::Down, 10, 10 ); const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 ); -static bool gOnTouchPointInterrupted = false; - - Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height ) { - BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 ); + BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 ); // Create the image PixelBuffer* pixbuf = imageData.GetBuffer(); @@ -121,101 +118,101 @@ int UtcDaliPushButtonSetGetAutoRepeating(void) END_TEST; } -int UtcDaliPushButtonSetGetToggleButton(void) +int UtcDaliPushButtonSetGetTogglableButton(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliPushButtonSetGetToggleButton"); + tet_infoline(" UtcDaliPushButtonSetGetTogglableButton"); PushButton pushButton = PushButton::New(); - pushButton.SetToggleButton( true ); + pushButton.SetTogglableButton( true ); - DALI_TEST_CHECK( pushButton.IsToggleButton() ); + DALI_TEST_CHECK( pushButton.IsTogglableButton() ); - pushButton.SetToggleButton( false ); + pushButton.SetTogglableButton( false ); - DALI_TEST_CHECK( !pushButton.IsToggleButton() ); + DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); - pushButton.SetToggleButton( true ); + pushButton.SetTogglableButton( true ); - DALI_TEST_CHECK( pushButton.IsToggleButton() ); + DALI_TEST_CHECK( pushButton.IsTogglableButton() ); END_TEST; } -int UtcDaliPushButtonSetGetAutoRepeatingAndToggleButton(void) +int UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndToggleButton"); + tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton"); PushButton pushButton = PushButton::New(); pushButton.SetAutoRepeating( true ); - pushButton.SetToggleButton( true ); + pushButton.SetTogglableButton( true ); - DALI_TEST_CHECK( pushButton.IsToggleButton() ); + DALI_TEST_CHECK( pushButton.IsTogglableButton() ); DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); - pushButton.SetToggleButton( true ); + pushButton.SetTogglableButton( true ); pushButton.SetAutoRepeating( true ); DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); - DALI_TEST_CHECK( !pushButton.IsToggleButton() ); + DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); END_TEST; } -int UtcDaliPushButtonSetGetToggled01(void) +int UtcDaliPushButtonSetGetSelected01(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliPushButtonSetGetToggled01"); + tet_infoline(" UtcDaliPushButtonSetGetSelected01"); PushButton pushButton = PushButton::New(); - pushButton.SetToggleButton( true ); - pushButton.ToggledSignal().Connect( &PushButtonToggled ); + pushButton.SetTogglableButton( true ); + pushButton.StateChangedSignal().Connect( &PushButtonSelected ); - gPushButtonToggleState = false; - pushButton.SetToggled( true ); + gPushButtonSelectedState = false; + pushButton.SetSelected( true ); - DALI_TEST_CHECK( pushButton.IsToggled() ); - DALI_TEST_CHECK( gPushButtonToggleState ); + DALI_TEST_CHECK( pushButton.IsSelected() ); + DALI_TEST_CHECK( gPushButtonSelectedState ); - pushButton.SetToggled( false ); + pushButton.SetSelected( false ); - DALI_TEST_CHECK( !pushButton.IsToggled() ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); - pushButton.SetToggled( true ); + pushButton.SetSelected( true ); - DALI_TEST_CHECK( pushButton.IsToggled() ); - DALI_TEST_CHECK( gPushButtonToggleState ); + DALI_TEST_CHECK( pushButton.IsSelected() ); + DALI_TEST_CHECK( gPushButtonSelectedState ); END_TEST; } -int UtcDaliPushButtonSetGetToggled02(void) +int UtcDaliPushButtonSetGetSelected02(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliPushButtonSetGetToggled02"); + tet_infoline(" UtcDaliPushButtonSetGetSelected02"); PushButton pushButton = PushButton::New(); - pushButton.SetToggleButton( false ); - pushButton.ToggledSignal().Connect( &PushButtonToggled ); + pushButton.SetTogglableButton( false ); + pushButton.StateChangedSignal().Connect( &PushButtonSelected ); - gPushButtonToggleState = false; - pushButton.SetToggled( true ); + gPushButtonSelectedState = false; + pushButton.SetSelected( true ); - DALI_TEST_CHECK( !pushButton.IsToggled() ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); - pushButton.SetToggled( false ); + pushButton.SetSelected( false ); - DALI_TEST_CHECK( !pushButton.IsToggled() ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); - pushButton.SetToggled( true ); + pushButton.SetSelected( true ); - DALI_TEST_CHECK( !pushButton.IsToggled() ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); END_TEST; } @@ -254,8 +251,8 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) } catch( Dali::DaliException& e ) { - tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str()); - DALI_TEST_EQUALS(e.mCondition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION); + DALI_TEST_PRINT_ASSERT( e ); + DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION); assert1 = true; } @@ -265,8 +262,8 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) } catch( Dali::DaliException& e ) { - tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str()); - DALI_TEST_EQUALS(e.mCondition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION); + DALI_TEST_PRINT_ASSERT( e ); + DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION); assert2 = true; } @@ -282,27 +279,10 @@ int UtcDaliPushButtonSetImages(void) Actor imageActor; Image image01 = CreateSolidColorImage( Color::RED, 10, 10 ); - ImageActor imageActor01 = CreateSolidColorActor( Color::RED ); - imageActor01.SetSize( 20.f, 20.f ); - - Image image02 = CreateSolidColorImage( Color::RED, 30, 30 ); - ImageActor imageActor02 = CreateSolidColorActor( Color::RED ); - imageActor02.SetSize( 40.f, 40.f ); - - Image image03 = CreateSolidColorImage( Color::RED, 50, 50 ); - ImageActor imageActor03 = CreateSolidColorActor( Color::RED ); - imageActor03.SetSize( 60.f, 60.f ); - - Image image04 = CreateSolidColorImage( Color::RED, 70, 70 ); - ImageActor imageActor04 = CreateSolidColorActor( Color::RED ); - imageActor04.SetSize( 80.f, 80.f ); - - Image image05 = CreateSolidColorImage( Color::RED, 90, 90 ); - ImageActor imageActor05 = CreateSolidColorActor( Color::RED ); - imageActor05.SetSize( 100.f, 100.f ); Vector3 size; PushButton pushButton = PushButton::New(); + Stage::GetCurrent().Add( pushButton ); application.SendNotification(); application.Render(); @@ -314,100 +294,11 @@ int UtcDaliPushButtonSetImages(void) application.SendNotification(); application.Render(); - size = pushButton.GetButtonImage().GetCurrentSize(); + size = pushButton.GetCurrentSize(); DALI_TEST_EQUALS( size.width, 10.f, TEST_LOCATION ); DALI_TEST_EQUALS( size.height, 10.f, TEST_LOCATION ); - pushButton.SetButtonImage( imageActor01 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetButtonImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION ); - - pushButton.SetBackgroundImage( image02 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetBackgroundImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 30.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 30.f, TEST_LOCATION ); - - pushButton.SetBackgroundImage( imageActor02 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetBackgroundImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION ); - - pushButton.SetPressedImage( image03 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetPressedImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION ); - - pushButton.SetPressedImage( imageActor03 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetPressedImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION ); - - pushButton.SetDimmedBackgroundImage( image04 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetDimmedBackgroundImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION ); - - pushButton.SetDimmedBackgroundImage( imageActor04 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetDimmedBackgroundImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION ); - - pushButton.SetDimmedImage( image05 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetDimmedImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 90.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 90.f, TEST_LOCATION ); - - pushButton.SetDimmedImage( imageActor05 ); - - application.SendNotification(); - application.Render(); - - size = pushButton.GetDimmedImage().GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 100.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 100.f, TEST_LOCATION ); END_TEST; } @@ -423,18 +314,11 @@ int UtcDaliPushButtonSetLabelText(void) application.SendNotification(); application.Render(); - TextView textView; - - pushButton.SetLabelText( STR ); - - textView = TextView::DownCast( pushButton.GetLabelText() ); - DALI_TEST_CHECK( STR == textView.GetText() ); + pushButton.SetLabel( STR ); - TextView text = TextView::New( STR ); - pushButton.SetLabelText( text ); + TextLabel label = TextLabel::DownCast( pushButton.GetLabel() ); + DALI_TEST_CHECK( STR == label.GetProperty( TextLabel::Property::TEXT ) ); - textView = TextView::DownCast( pushButton.GetLabelText() ); - DALI_TEST_CHECK( STR == textView.GetText() ); END_TEST; } @@ -554,10 +438,10 @@ int UtcDaliPushButtonReleased(void) END_TEST; } -int UtcDaliPushButtonToggled(void) +int UtcDaliPushButtonSelected(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliPushButtonToggled"); + tet_infoline(" UtcDaliPushButtonSelected"); PushButton pushButton = PushButton::New(); pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); @@ -571,13 +455,13 @@ int UtcDaliPushButtonToggled(void) application.Render(); // connect to its touch signal - pushButton.ToggledSignal().Connect( &PushButtonToggled ); + pushButton.StateChangedSignal().Connect( &PushButtonSelected ); Dali::Integration::TouchEvent event; - // Test1. No toggle button. + // Test1. No togglable button. - gPushButtonToggleState = false; + gPushButtonSelectedState = false; event = Dali::Integration::TouchEvent(); event.AddPoint( pointDownInside ); application.ProcessEvent( event ); @@ -586,13 +470,13 @@ int UtcDaliPushButtonToggled(void) event.AddPoint( pointUpInside ); application.ProcessEvent( event ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); - // Set toggle property. - pushButton.SetToggleButton( true ); + // Set togglable property. + pushButton.SetTogglableButton( true ); // Test2. Touch point down and up inside the button twice. - gPushButtonToggleState = false; + gPushButtonSelectedState = false; event = Dali::Integration::TouchEvent(); event.AddPoint( pointDownInside ); application.ProcessEvent( event ); @@ -601,7 +485,7 @@ int UtcDaliPushButtonToggled(void) event.AddPoint( pointUpInside ); application.ProcessEvent( event ); - DALI_TEST_CHECK( gPushButtonToggleState ); + DALI_TEST_CHECK( gPushButtonSelectedState ); event = Dali::Integration::TouchEvent(); event.AddPoint( pointDownInside ); @@ -611,11 +495,11 @@ int UtcDaliPushButtonToggled(void) event.AddPoint( pointUpInside ); application.ProcessEvent( event ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); // Test3. Touch point down and up outside the button. - gPushButtonToggleState = false; + gPushButtonSelectedState = false; event = Dali::Integration::TouchEvent(); event.AddPoint( pointDownOutside ); application.ProcessEvent( event ); @@ -624,11 +508,11 @@ int UtcDaliPushButtonToggled(void) event.AddPoint( pointUpOutside ); application.ProcessEvent( event ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); // Test4. Touch point down inside and up outside the button. - gPushButtonToggleState = false; + gPushButtonSelectedState = false; event = Dali::Integration::TouchEvent(); event.AddPoint( pointDownInside ); application.ProcessEvent( event ); @@ -641,11 +525,11 @@ int UtcDaliPushButtonToggled(void) event.AddPoint( pointUpOutside ); application.ProcessEvent( event ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); // Test5. Touch point down outside and up inside the button. - gPushButtonToggleState = false; + gPushButtonSelectedState = false; event = Dali::Integration::TouchEvent(); event.AddPoint( pointDownOutside ); application.ProcessEvent( event ); @@ -658,6 +542,6 @@ int UtcDaliPushButtonToggled(void) event.AddPoint( pointUpInside ); application.ProcessEvent( event ); - DALI_TEST_CHECK( !gPushButtonToggleState ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); END_TEST; }