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-CheckBoxButton.cpp;h=799a069cc207f56b3c68921634fb50fdf1ae903c;hp=443dd30db5fc44edc8d585882ee45c165572852c;hb=HEAD;hpb=ee0a89caeed19cf95b4388a19651fb2403102671

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index 443dd30..abce046 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) 2022 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.
@@ -15,44 +15,42 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
 #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>
 
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <test-application.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
 static bool gCheckBoxButtonState = false;
-bool CheckBoxButtonClicked( Button button )
+bool        CheckBoxButtonClicked(Button button)
 {
-  gCheckBoxButtonState = button.GetProperty<bool>(button.GetPropertyIndex("selected")) ;
+  gCheckBoxButtonState = button.GetProperty<bool>(button.GetPropertyIndex("selected"));
   return true;
 }
 
-static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-const Vector2 TEST_IMAGE_SIZE = Vector2( 66.0f, 66.0f );
+static const char* TEST_IMAGE_ONE  = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const Vector2      TEST_IMAGE_SIZE = Vector2(66.0f, 66.0f);
 
-static std::string GetButtonText( Button button )
+static std::string GetButtonText(Button button)
 {
-  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+  Property::Value value = button.GetProperty(Toolkit::Button::Property::LABEL);
 
-  Property::Map *labelProperty = value.GetMap();
+  Property::Map* labelProperty = value.GetMap();
 
   std::string textLabel;
 
-  if ( labelProperty )
+  if(labelProperty)
   {
-    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
-    value->Get( textLabel );
+    Property::Value* value = labelProperty->Find(Toolkit::TextVisual::Property::TEXT);
+    value->Get(textLabel);
   }
 
   return textLabel;
@@ -72,76 +70,115 @@ void checkbox_button_cleanup(void)
 
 int UtcDaliCheckBoxButtonConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox;
 
-  DALI_TEST_CHECK( !checkBox );
+  DALI_TEST_CHECK(!checkBox);
   END_TEST;
 }
 
 int UtcDaliCheckBoxButtonCopyConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
   CheckBoxButton checkBox = CheckBoxButton::New();
 
-  CheckBoxButton copy( checkBox );
-  DALI_TEST_CHECK( copy );
+  CheckBoxButton copy(checkBox);
+  DALI_TEST_CHECK(copy);
+  END_TEST;
+}
+
+int UtcDaliCheckBoxButtonMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  CheckBoxButton button = CheckBoxButton::New();
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, false);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+
+  CheckBoxButton 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), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
+
   END_TEST;
 }
 
 int UtcDaliCheckBoxButtonAssignmentOperatorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
-  CheckBoxButton copy( checkBox );
-  DALI_TEST_CHECK( copy );
+  CheckBoxButton copy(checkBox);
+  DALI_TEST_CHECK(copy);
+
+  DALI_TEST_CHECK(checkBox == copy);
+  END_TEST;
+}
+
+int UtcDaliCheckBoxButtonMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  CheckBoxButton button = CheckBoxButton::New();
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, false);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+
+  CheckBoxButton 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), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
-  DALI_TEST_CHECK( checkBox == copy );
   END_TEST;
 }
 
 int UtcDaliCheckBoxButtonNewP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
-  DALI_TEST_CHECK( checkBox );
+  DALI_TEST_CHECK(checkBox);
   END_TEST;
 }
 
 int UtcDaliCheckBoxButtonDownCastP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
   BaseHandle object(checkBox);
 
-  CheckBoxButton checkBox2 = CheckBoxButton::DownCast( object );
+  CheckBoxButton checkBox2 = CheckBoxButton::DownCast(object);
   DALI_TEST_CHECK(checkBox2);
 
-  CheckBoxButton checkBox3 = DownCast< CheckBoxButton >(object);
+  CheckBoxButton checkBox3 = DownCast<CheckBoxButton>(object);
   DALI_TEST_CHECK(checkBox3);
   END_TEST;
 }
 
 int UtcDaliCheckBoxButtonDownCastN(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   BaseHandle unInitializedObject;
 
-  CheckBoxButton checkBox1 = CheckBoxButton::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !checkBox1 );
+  CheckBoxButton checkBox1 = CheckBoxButton::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!checkBox1);
 
-  CheckBoxButton checkBox2 = DownCast< CheckBoxButton >( unInitializedObject );
-  DALI_TEST_CHECK( !checkBox2 );
+  CheckBoxButton checkBox2 = DownCast<CheckBoxButton>(unInitializedObject);
+  DALI_TEST_CHECK(!checkBox2);
   END_TEST;
 }
 
@@ -151,70 +188,70 @@ int UtcDaliCheckBoxButtonSelectedPropertyP(void)
   tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected");
 
   CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
+  checkBoxButton.StateChangedSignal().Connect(&CheckBoxButtonClicked);
 
   // global var used to check if CheckBoxButtonClicked is called;
   gCheckBoxButtonState = false;
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true );
+  checkBoxButton.SetProperty(checkBoxButton.GetPropertyIndex("selected"), true);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gCheckBoxButtonState);
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), false );
+  checkBoxButton.SetProperty(checkBoxButton.GetPropertyIndex("selected"), false);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gCheckBoxButtonState);
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true );
+  checkBoxButton.SetProperty(checkBoxButton.GetPropertyIndex("selected"), true);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gCheckBoxButtonState);
   END_TEST;
 }
 
 int UtcDaliCheckBoxSetLabelP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  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( checkBox.GetPropertyIndex("label"), propertyMap );
+  checkBox.SetProperty(checkBox.GetPropertyIndex("label"), propertyMap);
 
-  DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(checkBox), "activate", TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliCheckBoxSetDisabledPropertyP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
-  Stage::GetCurrent().Add( checkBox );
+  application.GetScene().Add(checkBox);
 
-  checkBox.SetSize( Vector2( 20.0f, 20.0f ) );
-  checkBox.SetProperty(checkBox.GetPropertyIndex("disabledUnselectedBackgroundVisual"),  "Image.jpg" );
+  checkBox.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+  checkBox.SetProperty(checkBox.GetPropertyIndex("disabledUnselectedBackgroundVisual"), "Image.jpg");
 
   application.SendNotification();
   application.Render();
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  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(checkBox.GetPropertyIndex("disabled"), true);
-  checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+  checkBox.SetProperty(checkBox.GetPropertyIndex("label"), propertyMap);
 
-  DALI_TEST_EQUALS( checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION );
+  DALI_TEST_EQUALS(checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetButtonText(checkBox), "activate", TEST_LOCATION);
 
   END_TEST;
 }
@@ -226,11 +263,11 @@ int UtcDaliCheckBoxSettingDisabled(void)
   CheckBoxButton checkBox = CheckBoxButton::New();
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
-  DALI_TEST_CHECK(  checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
+  DALI_TEST_CHECK(checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")));
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), false);
 
-  DALI_TEST_CHECK(  !checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
+  DALI_TEST_CHECK(!checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")));
 
   END_TEST;
 }
@@ -245,31 +282,31 @@ int UtcDaliCheckBoxSetLabelPadding(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  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();
 
   Vector3 orginalSize = checkBox.GetNaturalSize();
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::LABEL_PADDING, Vector4( 10.0f, 10.0f, 10.0f, 10.0f ) );
+  checkBox.SetProperty(Toolkit::DevelButton::Property::LABEL_PADDING, Vector4(10.0f, 10.0f, 10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
   Vector3 paddingAddedSize = checkBox.GetNaturalSize();
 
-  DALI_TEST_EQUALS( checkBox.GetProperty<Vector4>( Toolkit::DevelButton::Property::LABEL_PADDING ), Vector4( 10.0f, 10.0f, 10.0f, 10.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(checkBox.GetProperty<Vector4>(Toolkit::DevelButton::Property::LABEL_PADDING), Vector4(10.0f, 10.0f, 10.0f, 10.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   tet_infoline("Comparing original size of button with just text and button size with text and padding\n");
 
-  DALI_TEST_EQUALS( orginalSize.width +10.0f + 10.0f , paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(orginalSize.width + 10.0f + 10.0f, paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( orginalSize.height +10.0f + 10.0f , paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(orginalSize.height + 10.0f + 10.0f, paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -284,50 +321,49 @@ int UtcDaliCheckBoxSetForegroundPadding(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  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::DevelButton::Property::LABEL_PADDING, Vector4( 5.0f, 5.0f, 5.0f, 5.0f ) );
+  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();
   application.Render();
 
-  tet_printf( "Button RelayoutSize with text(%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height );
+  tet_printf("Button RelayoutSize with text(%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height);
 
   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 );
+  platform.SetClosestImageSize(TEST_IMAGE_SIZE);
 
+  checkBox.SetProperty(Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE);
+  checkBox.SetProperty(Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE);
 
   application.SendNotification();
   application.Render();
 
   Vector3 preVisualPaddingSize = checkBox.GetNaturalSize();
 
-  tet_printf( "Button RelayoutSize with text and icon (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height );
+  tet_printf("Button RelayoutSize with text and icon (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height);
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::VISUAL_PADDING, Vector4( 25.0f, 25.0f, 25.0f, 25.0f ) );
+  checkBox.SetProperty(Toolkit::DevelButton::Property::VISUAL_PADDING, Vector4(25.0f, 25.0f, 25.0f, 25.0f));
 
   application.SendNotification();
   application.Render();
 
   Vector3 paddingAddedSize = checkBox.GetNaturalSize();
 
-  tet_printf( "Button RelayoutSize with text, icon and padding (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height );
+  tet_printf("Button RelayoutSize with text, icon and padding (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height);
 
-  DALI_TEST_EQUALS( checkBox.GetProperty<Vector4>( Toolkit::DevelButton::Property::VISUAL_PADDING ), Vector4( 25.0f, 25.0f, 25.0f, 25.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(checkBox.GetProperty<Vector4>(Toolkit::DevelButton::Property::VISUAL_PADDING), Vector4(25.0f, 25.0f, 25.0f, 25.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   tet_infoline("Comparing original size of button before adding padding to visual foreground\n");
 
-  DALI_TEST_GREATER( paddingAddedSize.width, preVisualPaddingSize.width , TEST_LOCATION );
+  DALI_TEST_GREATER(paddingAddedSize.width, preVisualPaddingSize.width, TEST_LOCATION);
 
   tet_infoline("Text and Visual are side by side, visual height and padding must be greater than text height and padding for this test\n");
 
-  DALI_TEST_GREATER( paddingAddedSize.height, preVisualPaddingSize.height , TEST_LOCATION );
+  DALI_TEST_GREATER(paddingAddedSize.height, preVisualPaddingSize.height, TEST_LOCATION);
 
   END_TEST;
 }
@@ -340,52 +376,52 @@ int UtcDaliCheckBoxButtonSetGetSelected(void)
   tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected");
 
   CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
+  checkBoxButton.StateChangedSignal().Connect(&CheckBoxButtonClicked);
 
   // 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_CHECK( gCheckBoxButtonState );
+  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_CHECK( !gCheckBoxButtonState );
+  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_CHECK( gCheckBoxButtonState );
+  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 );
+  application.GetScene().Add(checkBox);
 
-  checkBox.SetSize( Vector2( 20.0f, 20.0f ) );
-  checkBox.SetDisabledBackgroundImage( "Image.jpg" );
+  checkBox.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+  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 )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  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(checkBox.GetPropertyIndex("disabled"), true);
-  checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+  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_CHECK(checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")));
+  DALI_TEST_EQUALS(GetButtonText(checkBox), "activate", TEST_LOCATION);
 
   END_TEST;
-}
\ No newline at end of file
+}