Button Upgrade to use Text Visual

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-Button.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 60df0f4..c0598cb 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -27,6 +27,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+
 using namespace Dali;
 using namespace Toolkit;
 
@@ -473,6 +476,10 @@ int UtcDaliButtonSetLabelStringP(void)
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
+  button.SetProperty( Toolkit::Button::Property::LABEL,
+                      Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+                                     .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
+                     );
 
   button.SetLabelText( "Button Label" );
 
@@ -489,6 +496,11 @@ int UtcDaliButtonSetLabelPropertyP(void)
 
   Button button = PushButton::New();
 
+  button.SetProperty( Toolkit::Button::Property::LABEL,
+                        Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+                                       .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
+                     );
+
   button.SetProperty( Button::Property::LABEL_TEXT, TEST_LABEL1 );
 
   std::string labelText = button.GetProperty<std::string>( Button::Property::LABEL_TEXT );
@@ -496,8 +508,10 @@ int UtcDaliButtonSetLabelPropertyP(void)
   DALI_TEST_EQUALS( labelText, TEST_LABEL1,  TEST_LOCATION );
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::TextLabel::Property::TEXT,  TEST_LABEL2 );
-  propertyMap.Insert( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::DevelVisual::TEXT );
+  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT,  TEST_LABEL2 );
+  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE );
+  propertyMap.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
   button.SetProperty( Button::Property::LABEL, propertyMap );
 
   labelText = button.GetProperty<std::string>( Button::Property::LABEL_TEXT );
@@ -987,17 +1001,26 @@ int UtcDaliButtonSetButtonImageP(void)
 
   try
   {
-    ResourceImage image1 = ResourceImage::New( "TestImage.jpg");
+    ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
     button.SetButtonImage( image1 );
 
     Property::Value value = button.GetProperty(Button::Property::UNSELECTED_STATE_IMAGE );
-    DALI_TEST_CHECK( value.Get<std::string>() == "TestImage.jpg" );
+    DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
   }
   catch(...)
   {
     DALI_TEST_CHECK( false );
   }
 
+  std::string imageUrl;
+
+  Dali::Actor actor = button.GetButtonImage();
+
+  Toolkit::ImageView imageView = Toolkit::ImageView ::DownCast( actor );
+
+  tet_infoline(" UtcDaliButtonSetButtonImageP Ensure an ImageView is returned\n");
+  DALI_TEST_CHECK ( imageView )
+
   END_TEST;
 }
 
@@ -1009,7 +1032,7 @@ int UtcDaliButtonSetButtonImageN(void)
 
   try
   {
-    ResourceImage image1 = ResourceImage::New( "TestImage.jpg");
+    ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
     button.SetButtonImage( image1 );
 
     DALI_TEST_CHECK( false );
@@ -1033,7 +1056,7 @@ int UtcDaliButtonSetSelectedImageWithImageP(void)
   try
   {
     button.SetSelectedImage( image1 );
-    Property::Value value = button.GetProperty(Button::Property::SELECTED_STATE_IMAGE );
+    Property::Value value = button.GetProperty( Button::Property::SELECTED_STATE_IMAGE );
     DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
   }
   catch(...)
@@ -1041,6 +1064,14 @@ int UtcDaliButtonSetSelectedImageWithImageP(void)
     DALI_TEST_CHECK( false );
   }
 
+  std::string imageUrl;
+
+  Dali::Actor actor = button.GetSelectedImage();
+
+  Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( actor );
+
+  tet_infoline(" UtcDaliButtonSetSelectedImageWithImageP Ensure an ImageView is returned\n");
+
   END_TEST;
 }
 
@@ -1157,6 +1188,7 @@ int UtcDaliButtonSetImagesWithDeprecatedProperties(void)
   tet_infoline(" UtcDaliButtonSetImagesWithDeprecatedProperties");
 
   PushButton pushButton = PushButton::New();
+
   Stage::GetCurrent().Add( pushButton );
 
   Property::Map propertyMap;