From 1c30e27a6363cb89217671b1efa5ce1c38b9afbe Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Wed, 8 Apr 2015 09:21:57 +0100
Subject: [PATCH] TCT fixes
Change-Id: I9937b263589b8fbd640a268a91b50d7c840457ba
---
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp | 14 +++++++++++++-
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp | 3 +++
automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp | 12 +++++++++++-
3 files changed, 27 insertions(+), 2 deletions(-)
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;
}
--
2.7.4