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-Popup.cpp;h=8c5fbf7ea9ad7c197cc1e2cf8408ba59353a9f1b;hp=08f601eb1d6298d738bbddae38a978c6e1156e0d;hb=5aaba5adcf1a717e1ece3ef9c55c8912420993b5;hpb=1710c1317e96351975f49bd208314f573021ae54

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
index 08f601e..8c5fbf7 100755
--- a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@ -25,6 +25,7 @@
 #include <dali.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/integration-api/events/wheel-event-integ.h>
 #include <dali/devel-api/actors/actor-devel.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali-toolkit/dali-toolkit.h>
@@ -600,8 +601,8 @@ int UtcDaliPopupShowHide(void)
   Actor container = Actor::New();
   PushButton button1 = PushButton::New();
   PushButton button2 = PushButton::New();
-  button1.SetSize( DEFAULT_BUTTON_SIZE.GetVectorXY() );
-  button2.SetSize( DEFAULT_BUTTON_SIZE.GetVectorXY() );
+  button1.SetProperty( Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY() );
+  button2.SetProperty( Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY() );
   container.Add( button1 );
   container.Add( button2 );
   popup.SetFooter( container );
@@ -678,7 +679,7 @@ int UtcDaliPopupOnTouchedOutsideSignal(void)
   popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   popup.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::CENTER );
   popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
-  popup.SetSize( 50.0f, 50.0f );
+  popup.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) );
   popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
   Stage::GetCurrent().Add( popup );
   popup.OutsideTouchedSignal().Connect( &OnPopupTouchedOutside );
@@ -738,7 +739,7 @@ int UtcDaliPopupPropertyAutoHide(void)
 
   Actor container = Actor::New();
   PushButton button1 = PushButton::New();
-  button1.SetSize( DEFAULT_BUTTON_SIZE.GetVectorXY() );
+  button1.SetProperty( Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY() );
   container.Add( button1 );
   popup.SetFooter( container );
 
@@ -957,7 +958,7 @@ int UtcDaliPopupPropertyContextualMode(void)
   Actor placement = Actor::New();
   placement.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   placement.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  placement.SetSize( 1.0f, 1.0f );
+  placement.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) );
   placement.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
   Stage::GetCurrent().Add( placement );
 
@@ -1169,14 +1170,14 @@ int UtcDaliPopupPropertyTouchTransparent(void)
   popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
   popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  popup.SetSize( 100, 100 );
+  popup.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
   popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
 
   // Create a button (to go underneath the popup).
   PushButton button = Toolkit::PushButton::New();
   button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetSize( 100, 100 );
+  button.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
   button.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
 
   button.ClickedSignal().Connect( &PushButtonClicked );
@@ -1207,6 +1208,12 @@ int UtcDaliPopupPropertyTouchTransparent(void)
 
   DALI_TEST_CHECK( !gPushButtonClicked );
 
+  // Perform a wheel event
+  Dali::Integration::WheelEvent wheelEvent( Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2( 10.0f, 10.0f ), 1, 1000u );
+  application.ProcessEvent( wheelEvent );
+  application.SendNotification();
+  application.Render();
+
   // Enable touch transparency.
   popup.SetProperty( Popup::Property::TOUCH_TRANSPARENT, true );
   bool propertyResult;
@@ -1240,7 +1247,7 @@ int UtcDaliPopupPropertyTail(void)
   Popup popup = Popup::New();
   popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  popup.SetSize( 100, 100 );
+  popup.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
   popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
   TextLabel content = TextLabel::New( "text" );
   popup.SetContent( content );