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=1544a601061ed3b9696a117c993dbf7b4c13466b;hp=c67b2aed5e02783275ac965007030dc6b4bb1dd8;hb=5e351965bad7e1de2e94027548b022bac692603c;hpb=72ea28bfe5df526ce47369c36edf1390641fff5a

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index c67b2ae..1544a60 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) 2017 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.
@@ -19,10 +19,8 @@
 #include <stdlib.h>
 #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>
 
 
 using namespace Dali;
@@ -34,13 +32,29 @@ namespace
 static bool gCheckBoxButtonState = false;
 bool CheckBoxButtonClicked( Button button )
 {
-  gCheckBoxButtonState = button.IsSelected();
+  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 std::string GetButtonText( Button button )
+{
+  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+
+  Property::Map *labelProperty = value.GetMap();
+
+  std::string textLabel;
+
+  if ( labelProperty )
+  {
+    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+    value->Get( textLabel );
+  }
+
+  return textLabel;
+}
 
 } // namespace
 
@@ -129,7 +143,7 @@ int UtcDaliCheckBoxButtonDownCastN(void)
   END_TEST;
 }
 
-int UtcDaliCheckBoxButtonSetGetSelected(void)
+int UtcDaliCheckBoxButtonSelectedPropertyP(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected");
@@ -140,19 +154,19 @@ int UtcDaliCheckBoxButtonSetGetSelected(void)
   // global var used to check if CheckBoxButtonClicked is called;
   gCheckBoxButtonState = false;
 
-  checkBoxButton.SetSelected( true );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsSelected() );
+  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION );
   DALI_TEST_CHECK( gCheckBoxButtonState );
 
-  checkBoxButton.SetSelected( false );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), false );
 
-  DALI_TEST_CHECK( !checkBoxButton.IsSelected() );
+  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), false, TEST_LOCATION );
   DALI_TEST_CHECK( !gCheckBoxButtonState );
 
-  checkBoxButton.SetSelected( true );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsSelected() );
+  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION );
   DALI_TEST_CHECK( gCheckBoxButtonState );
   END_TEST;
 }
@@ -165,17 +179,17 @@ int UtcDaliCheckBoxSetLabelP(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( checkBox.GetPropertyIndex("label"), propertyMap );
 
-  DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GerProperty once that code is implemented
+  DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION );
   END_TEST;
 }
 
-int UtcDaliCheckBoxSetLabelDisabledP(void)
+int UtcDaliCheckBoxSetDisabledPropertyP(void)
 {
   TestApplication application;
 
@@ -183,22 +197,22 @@ int UtcDaliCheckBoxSetLabelDisabledP(void)
   Stage::GetCurrent().Add( checkBox );
 
   checkBox.SetSize( Vector2( 20.0f, 20.0f ) );
-  checkBox.SetDisabledBackgroundImage( "Image.jpg" );
+  checkBox.SetProperty(checkBox.GetPropertyIndex("disabledUnselectedBackgroundVisual"),  "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 );
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
   checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
 
-  DALI_TEST_CHECK(  checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
-  DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GetProperty once that code is implemented
+  DALI_TEST_EQUALS( checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION );
 
   END_TEST;
 }
@@ -229,7 +243,7 @@ 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 );
 
@@ -268,7 +282,7 @@ 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 );
 
@@ -315,3 +329,61 @@ int UtcDaliCheckBoxSetForegroundPadding(void)
 
   END_TEST;
 }
+
+// Deprecated API Tests
+
+int UtcDaliCheckBoxButtonSetGetSelected(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected");
+
+  CheckBoxButton checkBoxButton = CheckBoxButton::New();
+  checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
+
+  // global var used to check if CheckBoxButtonClicked is called;
+  gCheckBoxButtonState = false;
+
+  checkBoxButton.SetSelected( true );
+
+  DALI_TEST_CHECK( checkBoxButton.IsSelected() );
+  DALI_TEST_CHECK( gCheckBoxButtonState );
+
+  checkBoxButton.SetSelected( false );
+
+  DALI_TEST_CHECK( !checkBoxButton.IsSelected() );
+  DALI_TEST_CHECK( !gCheckBoxButtonState );
+
+  checkBoxButton.SetSelected( true );
+
+  DALI_TEST_CHECK( checkBoxButton.IsSelected() );
+  DALI_TEST_CHECK( gCheckBoxButtonState );
+  END_TEST;
+}
+
+int UtcDaliCheckBoxSetLabelDisabledP(void)
+{
+  TestApplication application;
+
+  CheckBoxButton checkBox = CheckBoxButton::New();
+  Stage::GetCurrent().Add( checkBox );
+
+  checkBox.SetSize( Vector2( 20.0f, 20.0f ) );
+  checkBox.SetDisabledBackgroundImage( "Image.jpg" );
+
+  application.SendNotification();
+  application.Render();
+
+  Property::Map propertyMap;
+
+  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 );
+
+  DALI_TEST_CHECK(  checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
+  DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION );
+
+  END_TEST;
+}
\ No newline at end of file