From: Paul Wisbey
Date: Thu, 9 Apr 2015 09:49:33 +0000 (-0700)
Subject: Merge "Add the paragraph's direction to all lines." into new_text
X-Git-Tag: dali_1.0.38~11^2~11
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=889e6219ec8606f27e1c8f37a37907752b07f699;hp=438b85b845eb6ce7d1d8f800be64704b74838b59
Merge "Add the paragraph's direction to all lines." into new_text
---
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
index 2148042..0aaf295 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@ -191,7 +191,19 @@ int UtcDaliPopupSetBackgroundImage(void)
int UtcDaliPopupSetTitle(void)
{
- // TODO
+ ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+ tet_infoline(" UtcDaliPopupSetTitle");
+
+ // Create the Popup actor
+ Popup popup = Popup::New();
+ Stage::GetCurrent().Add( popup );
+ // Put in show state so it's layer is connected to popup (for ancestor check).
+ popup.SetState(Popup::POPUP_SHOW, 0.0f);
+
+ popup.SetTitle("title");
+
+ DALI_TEST_CHECK( popup.GetTitle() == "title" );
+
END_TEST;
}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 850f6a4..0d259d9 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -316,6 +316,9 @@ int UtcDaliPushButtonSetLabelText(void)
pushButton.SetLabel( STR );
+ TextLabel label = TextLabel::DownCast( pushButton.GetLabel() );
+ DALI_TEST_CHECK( STR == label.GetProperty( TextLabel::Property::TEXT ) );
+
END_TEST;
}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
index a3fed65..c20a167 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
@@ -103,7 +103,17 @@ int UtcDaliRadioButtonDownCast(void)
int UtcDaliRadioButtonLabelActor(void)
{
- // TODO
+ ToolkitTestApplication application;
+
+ TextLabel actor1 = TextLabel::New( "test actor 1" );
+
+ RadioButton radioButton = RadioButton::New( actor1 );
+ DALI_TEST_CHECK( actor1 == radioButton.GetLabel() );
+
+ TextLabel actor2 = TextLabel::New( "test actor 2" );
+ radioButton.SetLabel( actor2 );
+ DALI_TEST_CHECK( actor2 == radioButton.GetLabel() );
+
END_TEST;
}