X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-CheckBoxButton.cpp;h=a43cbf2e76590029ed842f880db8856f964214ee;hb=2c6a6697e24d39ef061f134b39f30acc5c47b0cb;hp=443dd30db5fc44edc8d585882ee45c165572852c;hpb=ee0a89caeed19cf95b4388a19651fb2403102671;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index 443dd30..a43cbf2 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -21,8 +21,6 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <test-application.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>
 
 
 using namespace Dali;
@@ -72,7 +70,7 @@ void checkbox_button_cleanup(void)
 
 int UtcDaliCheckBoxButtonConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox;
 
@@ -82,7 +80,7 @@ int UtcDaliCheckBoxButtonConstructorP(void)
 
 int UtcDaliCheckBoxButtonCopyConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
   CheckBoxButton checkBox = CheckBoxButton::New();
@@ -94,7 +92,7 @@ int UtcDaliCheckBoxButtonCopyConstructorP(void)
 
 int UtcDaliCheckBoxButtonAssignmentOperatorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
@@ -107,7 +105,7 @@ int UtcDaliCheckBoxButtonAssignmentOperatorP(void)
 
 int UtcDaliCheckBoxButtonNewP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
@@ -117,7 +115,7 @@ int UtcDaliCheckBoxButtonNewP(void)
 
 int UtcDaliCheckBoxButtonDownCastP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
@@ -133,7 +131,7 @@ int UtcDaliCheckBoxButtonDownCastP(void)
 
 int UtcDaliCheckBoxButtonDownCastN(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   BaseHandle unInitializedObject;
 
@@ -175,13 +173,13 @@ int UtcDaliCheckBoxButtonSelectedPropertyP(void)
 
 int UtcDaliCheckBoxSetLabelP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
              .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
              .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
 
@@ -193,7 +191,7 @@ int UtcDaliCheckBoxSetLabelP(void)
 
 int UtcDaliCheckBoxSetDisabledPropertyP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
   Stage::GetCurrent().Add( checkBox );
@@ -206,7 +204,7 @@ int UtcDaliCheckBoxSetDisabledPropertyP(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
              .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
              .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
 
@@ -245,11 +243,11 @@ int UtcDaliCheckBoxSetLabelPadding(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
              .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
              .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::LABEL, propertyMap );
+  checkBox.SetProperty( Toolkit::Button::Property::LABEL, propertyMap );
 
   application.SendNotification();
   application.Render();
@@ -284,11 +282,11 @@ int UtcDaliCheckBoxSetForegroundPadding(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
              .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
              .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::LABEL, propertyMap );
+  checkBox.SetProperty( Toolkit::Button::Property::LABEL, propertyMap );
   checkBox.SetProperty( Toolkit::DevelButton::Property::LABEL_PADDING, Vector4( 5.0f, 5.0f, 5.0f, 5.0f ) );
 
   application.SendNotification();
@@ -299,8 +297,8 @@ int UtcDaliCheckBoxSetForegroundPadding(void)
   TestPlatformAbstraction& platform = application.GetPlatform();
   platform.SetClosestImageSize( TEST_IMAGE_SIZE );
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
-  checkBox.SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
+  checkBox.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
+  checkBox.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
 
 
   application.SendNotification();
@@ -345,39 +343,39 @@ int UtcDaliCheckBoxButtonSetGetSelected(void)
   // global var used to check if CheckBoxButtonClicked is called;
   gCheckBoxButtonState = false;
 
-  checkBoxButton.SetSelected( true );
+  checkBoxButton.SetProperty( Button::Property::SELECTED, true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsSelected() );
+  DALI_TEST_EQUALS( checkBoxButton.GetProperty( Button::Property::SELECTED ).Get<bool>(), true, TEST_LOCATION );
   DALI_TEST_CHECK( gCheckBoxButtonState );
 
-  checkBoxButton.SetSelected( false );
+  checkBoxButton.SetProperty( Button::Property::SELECTED, false );
 
-  DALI_TEST_CHECK( !checkBoxButton.IsSelected() );
+  DALI_TEST_EQUALS( checkBoxButton.GetProperty( Button::Property::SELECTED ).Get<bool>(), false, TEST_LOCATION );
   DALI_TEST_CHECK( !gCheckBoxButtonState );
 
-  checkBoxButton.SetSelected( true );
+  checkBoxButton.SetProperty( Button::Property::SELECTED, true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsSelected() );
+  DALI_TEST_EQUALS( checkBoxButton.GetProperty( Button::Property::SELECTED ).Get<bool>(), true, TEST_LOCATION );
   DALI_TEST_CHECK( gCheckBoxButtonState );
   END_TEST;
 }
 
 int UtcDaliCheckBoxSetLabelDisabledP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
   Stage::GetCurrent().Add( checkBox );
 
   checkBox.SetSize( Vector2( 20.0f, 20.0f ) );
-  checkBox.SetDisabledBackgroundImage( "Image.jpg" );
+  checkBox.SetProperty(Button::Property::DISABLED_UNSELECTED_VISUAL, "Image.jpg" );
 
   application.SendNotification();
   application.Render();
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
              .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
              .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
 
@@ -385,7 +383,7 @@ int UtcDaliCheckBoxSetLabelDisabledP(void)
   checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
 
   DALI_TEST_CHECK(  checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
-  DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION );
+  DALI_TEST_EQUALS( GetButtonText(checkBox), "activate", TEST_LOCATION );
 
   END_TEST;
-}
\ No newline at end of file
+}