/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
namespace
{
static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-static const char* TEST_IMAGE_TWO = TEST_RESOURCE_DIR "/icon-delete.jpg";
static const Vector2 INSIDE_TOUCH_POINT_POSITON = Vector2( 240, 400 );
static const Vector3 BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS = Vector3( 200, 360, 0 );
// Set up the position of the button for the default test events
void SetupButtonForTestTouchEvents( ToolkitTestApplication& application, Button& button, bool useDefaultImages )
{
- button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- button.SetParentOrigin( ParentOrigin::TOP_LEFT );
- button.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
+ button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ button.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
if ( useDefaultImages )
{
const Vector2 TEST_IMAGE_SIZE = Vector2( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
TestPlatformAbstraction& platform = application.GetPlatform();
platform.SetClosestImageSize( TEST_IMAGE_SIZE );
- button.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
- button.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
+ button.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
+ button.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
}
}
int UtcDaliPushButtonConstructorP(void)
{
- TestApplication application;
+ ToolkitTestApplication application;
PushButton button;
int UtcDaliPushButtonCopyConstructorP(void)
{
- TestApplication application;
+ ToolkitTestApplication application;
// Initialize an object, ref count == 1
PushButton button = PushButton::New();
END_TEST;
}
+int UtcDaliPushButtonMoveConstructor(void)
+{
+ ToolkitTestApplication application;
+
+ PushButton button = PushButton::New();
+ DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
+ button.SetProperty( Button::Property::TOGGLABLE, true );
+ DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+
+ PushButton moved = std::move( button );
+ DALI_TEST_CHECK( moved );
+ DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+ DALI_TEST_CHECK( !button );
+
+ END_TEST;
+}
+
int UtcDaliPushButtonAssignmentOperatorP(void)
{
- TestApplication application;
+ ToolkitTestApplication application;
PushButton button = PushButton::New();
END_TEST;
}
+int UtcDaliPushButtonMoveAssignment(void)
+{
+ ToolkitTestApplication application;
+
+ PushButton button = PushButton::New();
+ DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
+ button.SetProperty( Button::Property::TOGGLABLE, true );
+ DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+
+ PushButton moved;
+ moved = std::move( button );
+ DALI_TEST_CHECK( moved );
+ DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+ DALI_TEST_CHECK( !button );
+
+ END_TEST;
+}
+
int UtcDaliPushButtonNewP(void)
{
- TestApplication application;
+ ToolkitTestApplication application;
PushButton button = PushButton::New();
int UtcDaliPushButtonDownCastP(void)
{
- TestApplication application;
+ ToolkitTestApplication application;
PushButton button = PushButton::New();
int UtcDaliPushButtonDownCastN(void)
{
- TestApplication application;
+ ToolkitTestApplication application;
BaseHandle unInitializedObject;
application.Render();
pushButton.SetProperty( Toolkit::Button::Property::LABEL,
- Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+ Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
.Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
);
tet_infoline(" UtcDaliPushButtonPressed");
PushButton pushButton = PushButton::New();
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
- pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
- pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
application.SendNotification();
application.Render();
tet_infoline(" UtcDaliPushButtonReleased");
PushButton pushButton = PushButton::New();
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
- pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
- pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
application.SendNotification();
application.Render();
tet_infoline(" UtcDaliPushButtonSelected");
PushButton pushButton = PushButton::New();
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
- pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
- pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
application.SendNotification();
application.Render();
END_TEST;
}
-int UtcDaliPushButtonPropertySetIconAlignment(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliPushButtonPropertySetIconAlignment");
-
- PushButton pushButton = PushButton::New();
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "TOP" );
- DALI_TEST_EQUALS( pushButton.GetProperty<std::string>( Toolkit::PushButton::Property::ICON_ALIGNMENT ), "TOP", TEST_LOCATION );
-
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "RIGHT" );
- DALI_TEST_EQUALS( pushButton.GetProperty<std::string>( Toolkit::PushButton::Property::ICON_ALIGNMENT ), "RIGHT", TEST_LOCATION );
-
- END_TEST;
-}
-
int UtcDaliPushButtonPropertySetLabelPadding(void)
{
ToolkitTestApplication application;
ImageDimensions testImageSize = Dali::GetClosestImageSize( TEST_IMAGE_ONE );
const Vector2 TEST_IMAGE_SIZE( testImageSize.GetWidth(), testImageSize.GetHeight() );
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
- pushButton.SetPosition( 0.0f, 0.0f );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
application.SendNotification();
application.Render();
pushButton.Unparent();
pushButton = PushButton::New();
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
- pushButton.SetPosition( 0.0f, 0.0f );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "RIGHT" );
- pushButton.SetProperty( Toolkit::PushButton::Property::UNSELECTED_ICON, TEST_IMAGE_ONE );
- pushButton.SetProperty( Toolkit::PushButton::Property::SELECTED_ICON, TEST_IMAGE_ONE );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN" );
+ pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
+ pushButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
application.SendNotification();
application.Render();
PushButton pushButton = PushButton::New();
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
- pushButton.SetPosition( 0.0f, 0.0f );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
// Add a label and get size of control
pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" );
( TEST_IMAGE_SIZE.height + TEST_ICON_PADDING.w + TEST_ICON_PADDING.z ) );
// Add Icon and set its alignment
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "RIGHT" );
- pushButton.SetProperty( Toolkit::PushButton::Property::UNSELECTED_ICON, TEST_IMAGE_ONE );
- pushButton.SetProperty( Toolkit::PushButton::Property::SELECTED_ICON, TEST_IMAGE_ONE );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN" );
+ pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
+ pushButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
pushButton.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, TEST_ICON_PADDING );
application.SendNotification();
DALI_TEST_EQUALS( size.height, ( std::max( testImageWithPaddingSize.height, labelAndPaddingSize.height) ) , Math::MACHINE_EPSILON_1000, TEST_LOCATION );
// Now test left alignment matches right for size.
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "LEFT" );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END" );
application.SendNotification();
application.Render();
*
*/
- tet_infoline("SetProperty on ICON_ALIGNMENT should relayout the Button");
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "TOP" );
+ tet_infoline("SetProperty on LABEL_RELATIVE_ALIGNMENT should relayout the Button");
+ pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BOTTOM" );
application.SendNotification();
application.Render();
* +---------+
*/
tet_infoline(" Test Icon BOTTOM alignment - Width grows to largest of Icon or label (plus padding)");
- pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "BOTTOM" );
+ pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "TOP" );
application.SendNotification();
application.Render();
ToolkitTestApplication application;
PushButton pushButton = PushButton::New();
- pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+ pushButton.SetProperty( Actor::Property::SIZE, Vector2( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ) );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
Property::Map propertyMap;
propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
- pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );
+ pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );
tet_infoline(" UNSELECTED_VISUAL Added to button\n");
tet_printf("Remove button from stage\n" );
- Stage::GetCurrent().Remove( pushButton );
+ application.GetScene().Remove( pushButton );
rendererCount = pushButton.GetRendererCount();
tet_printf("After removing pushbutton from stage the renderer count is(%d)\n ", rendererCount );
Property::Map propertyMap2;
propertyMap2.Insert(Visual::Property::TYPE, Visual::COLOR);
propertyMap2.Insert(ColorVisual::Property::MIX_COLOR, Color::RED);
- pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, propertyMap2 );
+ pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap2 );
tet_printf("Added UNSELECTED_VISUAL and add button back to Stage\n");
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
- tet_printf("With UNSELECTED_BACKGROUND_VISUAL and UNSELECTED_ICON the renderer count is(%d)\n", pushButton.GetRendererCount() );
+ tet_printf("With UNSELECTED_BACKGROUND_VISUAL and UNSELECTED_VISUAL the renderer count is(%d)\n", pushButton.GetRendererCount() );
DALI_TEST_EQUALS( pushButton.GetRendererCount(), 2, TEST_LOCATION );
PushButton pushButton = PushButton::New();
- pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
application.SendNotification();
application.Render(0);
tet_printf("RendererCount prior to adding visual(%d)\n",preRendererCount);
DALI_TEST_EQUALS( preRendererCount, 0, TEST_LOCATION );
- Stage::GetCurrent().Remove( pushButton );
+ application.GetScene().Remove( pushButton );
application.SendNotification();
application.Render(0);
colorMap.Insert(Visual::Property::TYPE, BROKEN_VISUAL_TYPE);
colorMap.Insert(BorderVisual::Property::COLOR, Color::BLUE);
colorMap.Insert(BorderVisual::Property::SIZE, 5.f);
- pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, colorMap );
+ pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap );
- Stage::GetCurrent().Add( pushButton );
+ application.GetScene().Add( pushButton );
application.SendNotification();
application.Render(0);
END_TEST;
}
-int UtcDaliPushButtonSetButtonImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetButtonImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetBackgroundImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetBackgroundImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetSelectedImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetSelectedImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetSelectedBackgroundImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetSelectedBackgroundImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetDisabledBackgroundImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetDisabledBackgroundImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
-
-int UtcDaliPushButtonSetDisabledImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetDisabledImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetDisabledSelectedImageP(void)
-{
- ToolkitTestApplication application;
-
- PushButton button = PushButton::New();
- Stage::GetCurrent().Add( button );
-
- try
- {
- button.SetDisabledSelectedImage( ImageView::New() );
- DALI_TEST_CHECK( true );
- }
- catch(...)
- {
- DALI_TEST_CHECK( false );
- }
-
- END_TEST;
-}
-
int UtcDaliPushButtonToggleSignalP(void)
{
ToolkitTestApplication application;
SetupButtonForTestTouchEvents( application, button, true );
- Stage::GetCurrent().Add( button );
+ application.GetScene().Add( button );
application.SendNotification();
application.Render();
PushButton pushButton = PushButton::New();
- pushButton.SetAutoRepeating( true );
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
- DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
- pushButton.SetAutoRepeating( false );
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, false );
- DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION );
- pushButton.SetAutoRepeating( true );
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
- DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
END_TEST;
}
PushButton pushButton = PushButton::New();
- pushButton.SetTogglableButton( true );
+ pushButton.SetProperty( Button::Property::TOGGLABLE, true );
- DALI_TEST_CHECK( pushButton.IsTogglableButton() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), true, TEST_LOCATION );
- pushButton.SetTogglableButton( false );
+ pushButton.SetProperty( Button::Property::TOGGLABLE, false );
- DALI_TEST_CHECK( !pushButton.IsTogglableButton() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), false, TEST_LOCATION );
- pushButton.SetTogglableButton( true );
+ pushButton.SetProperty( Button::Property::TOGGLABLE, true );
- DALI_TEST_CHECK( pushButton.IsTogglableButton() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), true, TEST_LOCATION );
END_TEST;
}
PushButton pushButton = PushButton::New();
- pushButton.SetAutoRepeating( true );
- pushButton.SetTogglableButton( true );
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+ pushButton.SetProperty( Button::Property::TOGGLABLE, true);
- DALI_TEST_CHECK( pushButton.IsTogglableButton() );
- DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION );
- pushButton.SetTogglableButton( true );
- pushButton.SetAutoRepeating( true );
+ pushButton.SetProperty( Button::Property::TOGGLABLE, true);
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), false, TEST_LOCATION );
- DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
- DALI_TEST_CHECK( !pushButton.IsTogglableButton() );
END_TEST;
}
PushButton pushButton = PushButton::New();
- pushButton.SetTogglableButton( true );
+ pushButton.SetProperty( Button::Property::TOGGLABLE, true);
pushButton.StateChangedSignal().Connect( &PushButtonSelected );
gPushButtonSelectedState = false;
- pushButton.SetSelected( true );
+ pushButton.SetProperty( Button::Property::SELECTED, true );
- DALI_TEST_CHECK( pushButton.IsSelected() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), true, TEST_LOCATION );
DALI_TEST_CHECK( gPushButtonSelectedState );
- pushButton.SetSelected( false );
+ pushButton.SetProperty( Button::Property::SELECTED, false );
- DALI_TEST_CHECK( !pushButton.IsSelected() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), false, TEST_LOCATION );
DALI_TEST_CHECK( !gPushButtonSelectedState );
- pushButton.SetSelected( true );
+ pushButton.SetProperty( Button::Property::SELECTED, true );
- DALI_TEST_CHECK( pushButton.IsSelected() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), true, TEST_LOCATION );
DALI_TEST_CHECK( gPushButtonSelectedState );
END_TEST;
}
PushButton pushButton = PushButton::New();
- pushButton.SetTogglableButton( false );
+ tet_infoline(" Set Toggle feature off");
+ pushButton.SetProperty( Button::Property::TOGGLABLE, false);
pushButton.StateChangedSignal().Connect( &PushButtonSelected );
gPushButtonSelectedState = false;
- pushButton.SetSelected( true );
+ tet_infoline(" Try to set to selected, expecting failure as not a toggle button");
+ pushButton.SetProperty( Button::Property::SELECTED, true );
- DALI_TEST_CHECK( !pushButton.IsSelected() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), false, TEST_LOCATION );
DALI_TEST_CHECK( !gPushButtonSelectedState );
- pushButton.SetSelected( false );
+ pushButton.SetProperty( Button::Property::SELECTED, false );
- DALI_TEST_CHECK( !pushButton.IsSelected() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), false, TEST_LOCATION );
DALI_TEST_CHECK( !gPushButtonSelectedState );
- pushButton.SetSelected( true );
+ pushButton.SetProperty( Button::Property::SELECTED, true );
- DALI_TEST_CHECK( !pushButton.IsSelected() );
+ DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED ), false, TEST_LOCATION );
DALI_TEST_CHECK( !gPushButtonSelectedState );
+
END_TEST;
}
PushButton pushButton = PushButton::New();
- pushButton.SetAutoRepeating( true );
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+
+ pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, 1.f);
+ DALI_TEST_EQUALS( pushButton.GetProperty<float>( Button::Property::INITIAL_AUTO_REPEATING_DELAY ), 1.f, TEST_LOCATION );
- pushButton.SetInitialAutoRepeatingDelay( 1.f );
- DALI_TEST_EQUALS( pushButton.GetInitialAutoRepeatingDelay(), 1.f, TEST_LOCATION );
+ pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 1.f);
- pushButton.SetNextAutoRepeatingDelay( 1.f );
- DALI_TEST_EQUALS( pushButton.GetNextAutoRepeatingDelay(), 1.f, TEST_LOCATION );
+ DALI_TEST_EQUALS( pushButton.GetProperty<float>( Button::Property::NEXT_AUTO_REPEATING_DELAY ), 1.f, TEST_LOCATION );
END_TEST;
}
bool assert1( false );
bool assert2( false );
- pushButton.SetAutoRepeating( true );
+ pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
try
{
- pushButton.SetInitialAutoRepeatingDelay( -1.f );
+ pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, -1.f );
}
catch( Dali::DaliException& e )
{
try
{
- pushButton.SetNextAutoRepeatingDelay( -1.f );
+ pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f );
}
catch( Dali::DaliException& e )
{
PushButton pushButton = PushButton::New();
pushButton.SetProperty( Toolkit::Button::Property::LABEL,
- Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+ Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
.Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
);
application.SendNotification();
application.Render();
- pushButton.SetLabelText( STR );
-
- DALI_TEST_EQUALS( pushButton.GetLabelText(), STR, TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetButtonImageDeprecatedP(void)
-{
- ToolkitTestApplication application;
- Image setButtonImage = ResourceImage::New( TEST_IMAGE_ONE);
- PushButton pushButton = PushButton::New();
- pushButton.SetButtonImage( setButtonImage );
- Image retreivedButtonImage = ImageView::DownCast(pushButton.GetButtonImage()).GetImage();
- DALI_TEST_EQUALS( retreivedButtonImage, setButtonImage , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetSelectedImageDeprecatedP(void)
-{
- ToolkitTestApplication application;
- Image setButtonImage = ResourceImage::New( TEST_IMAGE_ONE);
- PushButton pushButton = PushButton::New();
- pushButton.SetSelectedImage( setButtonImage );
- Image retreivedButtonImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage();
- DALI_TEST_EQUALS( retreivedButtonImage, setButtonImage , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonGetButtonImageURLDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButtonGetButtonImageURLDeprecatedP Testing mix use of API");
-
- ToolkitTestApplication application;
-
- PushButton pushButton = PushButton::New();
- pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
-
- ImageView retreivedButtonImageView = ImageView::DownCast(pushButton.GetButtonImage());
- Image retreivedButtonImage = retreivedButtonImageView.GetImage();
- ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage );
-
- DALI_TEST_EQUALS( resourceImage.GetUrl(), TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonGetSelectedImageURLDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButtonGetSelectedImageURLDeprecatedP Testing mix use of API");
-
- ToolkitTestApplication application;
-
- PushButton pushButton = PushButton::New();
-
- pushButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
-
- Image retreivedButtonImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage();
- ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage );
- DALI_TEST_EQUALS( resourceImage.GetUrl(), TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetSelectedImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetSelectedImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetSelectedImage( imgViewSet );
-
- ImageView imageView = ImageView::DownCast( pushButton.GetSelectedImage());
-
- DALI_TEST_CHECK( imageView );
-
- Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
- Property::Map map;
- value.Get( map );
- DALI_TEST_CHECK( !map.Empty() );
- DALI_TEST_EQUALS( map[ "filename" ].Get<std::string>(), TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetButtonImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetButtonImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetButtonImage( imgViewSet );
-
- ImageView imageView = ImageView::DownCast( pushButton.GetButtonImage());
-
- DALI_TEST_CHECK( imageView );
-
- Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
- Property::Map map;
- value.Get( map );
- DALI_TEST_CHECK( !map.Empty() );
- DALI_TEST_EQUALS( map[ "filename" ].Get<std::string>(), TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetBackgroundImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetBackgroundImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetBackgroundImage( imgViewSet );
-
- ImageView imageView = ImageView::DownCast( pushButton.GetButtonImage());
-
- DALI_TEST_CHECK( imageView );
-
- Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
- Property::Map map;
- value.Get( map );
- DALI_TEST_CHECK( !map.Empty() );
- DALI_TEST_EQUALS( map[ "filename" ].Get<std::string>(), TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-
-int UtcDaliPushButtonSetSelectedBackgroundImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetSelectedBackgroundImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetSelectedBackgroundImage( imgViewSet );
-
- ImageView imageView = ImageView::DownCast( pushButton.GetSelectedImage());
-
- DALI_TEST_CHECK( imageView );
-
- Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
- Property::Map map;
- value.Get( map );
- DALI_TEST_CHECK( !map.Empty() );
- DALI_TEST_EQUALS( map[ "filename" ].Get<std::string>(), TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetDisabledBackgroundImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetDisabledBackgroundImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetDisabledBackgroundImage( imgViewSet );
-
- Property::Value value = pushButton.GetProperty( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL );
- Property::Map map;
- value.Get( map );
-
- Property::Value* urlValue = map.Find( ImageVisual::Property::URL );
-
- std::string urlString;
- urlValue->Get( urlString );
- DALI_TEST_EQUALS( urlString , TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetDisabledImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetDisabledImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetDisabledImage( imgViewSet );
-
- Property::Value value = pushButton.GetProperty( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL );
-
- Property::Map map;
- value.Get( map );
-
- Property::Value* urlValue = map.Find( ImageVisual::Property::URL );
-
- std::string urlString;
- urlValue->Get( urlString );
- DALI_TEST_EQUALS( urlString , TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonSetDisabledSelectedImageWithActorDeprecatedP(void)
-{
- tet_infoline(" UtcDaliPushButton SetDisabledSelectedImage With ImageView (Actor)");
-
- ToolkitTestApplication application;
-
- Image image = ResourceImage::New( TEST_IMAGE_ONE );
-
- DALI_TEST_CHECK( image );
-
- ImageView imgViewSet = ImageView::New(image);
-
- DALI_TEST_CHECK(imgViewSet );
-
- PushButton pushButton = PushButton::New();
-
- DALI_TEST_CHECK( pushButton );
-
- pushButton.SetDisabledSelectedImage( imgViewSet );
-
- Property::Value value = pushButton.GetProperty( Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL );
-
- Property::Map map;
- value.Get( map );
-
- Property::Value* urlValue = map.Find( ImageVisual::Property::URL );
-
- std::string urlString;
- urlValue->Get( urlString );
- DALI_TEST_EQUALS( urlString , TEST_IMAGE_ONE , TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPushButtonReplaceButtonImageP2(void)
-{
- tet_infoline("Set button image then replace with new image and query url");
-
- ToolkitTestApplication application;
-
- ResourceImage setImage = ResourceImage::New( TEST_IMAGE_ONE );
- DALI_TEST_CHECK(setImage);
-
- Actor imgActorSet = ImageView::New(setImage);
- DALI_TEST_CHECK(imgActorSet);
-
- PushButton pushButton = PushButton::New();
- pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_TWO );
-
-
- Stage::GetCurrent().Add( pushButton );
-
- pushButton.SetButtonImage( imgActorSet );
- application.SendNotification();
- application.Render();
-
- tet_infoline("Get button image before it has been able to load");
-
- ImageView imageView = ImageView::DownCast(pushButton.GetButtonImage());
-
- ResourceImage getImage = ResourceImage::DownCast( imageView.GetImage() );
+ pushButton.SetProperty( Button::Property::LABEL, STR );
- tet_infoline("Check if url matches last assignment even if not loaded yet");
- DALI_TEST_EQUALS( getImage.GetUrl(), setImage.GetUrl() , TEST_LOCATION );
+ DALI_TEST_EQUALS(GetButtonText( pushButton ), STR, TEST_LOCATION);
END_TEST;
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff