From 2ba39291994a339b1cf310cc14d42573df53e499 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Mon, 20 Jun 2016 17:50:46 +0100 Subject: [PATCH] [UTC][dali-toolkit][ACR-686][Added test cases for new properties in TextLabel and TextFiled] All pass in mobile profile Change-Id: I23e291db1ed18fb851f76689e31bf51725b95ee9 --- .../tct-dali-toolkit-core_common_iot.h | 26 ++ .../dali-toolkit/tct-dali-toolkit-core_mobile.h | 26 ++ src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h | 26 ++ .../dali-toolkit/tct-dali-toolkit-core_wearable.h | 26 ++ .../text-field/utc-dali-text-field.cpp | 277 ++++++++++++++++++++- .../text-label/utc-dali-text-label.cpp | 174 ++++++++++++- 6 files changed, 552 insertions(+), 3 deletions(-) diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h index 79dac25..1b77aa8 100644 --- a/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h +++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h @@ -534,12 +534,25 @@ extern int UtcDaliTextFieldDowncastN(void); extern int UtcDaliTextFieldTextChangedSignalP(void); extern int UtcDaliTextFieldPropertyInputColorP(void); extern int UtcDaliTextFieldPropertyEnableMarkupP(void); +extern int UtcDaliTextFieldPropertyUnderlineP(void); +extern int UtcDaliTextFieldPropertyInputUnderlineP(void); +extern int UtcDaliTextFieldPropertyShadowP(void); +extern int UtcDaliTextFieldPropertyInputShadowP(void); +extern int UtcDaliTextFieldPropertyEmbossP(void); +extern int UtcDaliTextFieldPropertyInputEmbossP(void); +extern int UtcDaliTextFieldPropertyOutlineP(void); +extern int UtcDaliTextFieldPropertyInputOutlineP(void); extern int UtcDaliTextLabelNewP(void); extern int UtcDaliTextLabelConstructorP(void); extern int UtcDaliTextLabelCopyConstructorP(void); extern int UtcDaliTextLabelOperatorAssignmentP(void); extern int UtcDaliTextLabelDowncastP(void); extern int UtcDaliTextLabelDowncastN(void); +extern int UtcDaliTextLabelPropertyLineSpacingP(void); +extern int UtcDaliTextLabelPropertyUnderlineP(void); +extern int UtcDaliTextLabelPropertyShadowP(void); +extern int UtcDaliTextLabelPropertyEmbossP(void); +extern int UtcDaliTextLabelPropertyOutlineP(void); extern int UtcDaliToolkitIsVerticalP(void); extern int UtcDaliToolkitIsHorizontalP(void); extern int UtcDaliToolkitWrapActorConstraintP(void); @@ -1006,12 +1019,25 @@ testcase tc_array[] = { {"UtcDaliTextFieldTextChangedSignalP", UtcDaliTextFieldTextChangedSignalP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyInputColorP", UtcDaliTextFieldPropertyInputColorP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyEnableMarkupP", UtcDaliTextFieldPropertyEnableMarkupP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyUnderlineP", UtcDaliTextFieldPropertyUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputUnderlineP", UtcDaliTextFieldPropertyInputUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyShadowP", UtcDaliTextFieldPropertyShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputShadowP", UtcDaliTextFieldPropertyInputShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyEmbossP", UtcDaliTextFieldPropertyEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputEmbossP", UtcDaliTextFieldPropertyInputEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyOutlineP", UtcDaliTextFieldPropertyOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputOutlineP", UtcDaliTextFieldPropertyInputOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextLabelNewP", UtcDaliTextLabelNewP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelConstructorP", UtcDaliTextLabelConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelCopyConstructorP", UtcDaliTextLabelCopyConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelOperatorAssignmentP", UtcDaliTextLabelOperatorAssignmentP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastP", UtcDaliTextLabelDowncastP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastN", UtcDaliTextLabelDowncastN, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyLineSpacingP", UtcDaliTextLabelPropertyLineSpacingP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyUnderlineP", UtcDaliTextLabelPropertyUnderlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyShadowP", UtcDaliTextLabelPropertyShadowP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyEmbossP", UtcDaliTextLabelPropertyEmbossP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyOutlineP", UtcDaliTextLabelPropertyOutlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliToolkitIsVerticalP", UtcDaliToolkitIsVerticalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitIsHorizontalP", UtcDaliToolkitIsHorizontalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitWrapActorConstraintP", UtcDaliToolkitWrapActorConstraintP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h index 0f894fc..b7a0454 100644 --- a/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h +++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h @@ -534,12 +534,25 @@ extern int UtcDaliTextFieldDowncastN(void); extern int UtcDaliTextFieldTextChangedSignalP(void); extern int UtcDaliTextFieldPropertyInputColorP(void); extern int UtcDaliTextFieldPropertyEnableMarkupP(void); +extern int UtcDaliTextFieldPropertyUnderlineP(void); +extern int UtcDaliTextFieldPropertyInputUnderlineP(void); +extern int UtcDaliTextFieldPropertyShadowP(void); +extern int UtcDaliTextFieldPropertyInputShadowP(void); +extern int UtcDaliTextFieldPropertyEmbossP(void); +extern int UtcDaliTextFieldPropertyInputEmbossP(void); +extern int UtcDaliTextFieldPropertyOutlineP(void); +extern int UtcDaliTextFieldPropertyInputOutlineP(void); extern int UtcDaliTextLabelNewP(void); extern int UtcDaliTextLabelConstructorP(void); extern int UtcDaliTextLabelCopyConstructorP(void); extern int UtcDaliTextLabelOperatorAssignmentP(void); extern int UtcDaliTextLabelDowncastP(void); extern int UtcDaliTextLabelDowncastN(void); +extern int UtcDaliTextLabelPropertyLineSpacingP(void); +extern int UtcDaliTextLabelPropertyUnderlineP(void); +extern int UtcDaliTextLabelPropertyShadowP(void); +extern int UtcDaliTextLabelPropertyEmbossP(void); +extern int UtcDaliTextLabelPropertyOutlineP(void); extern int UtcDaliToolkitIsVerticalP(void); extern int UtcDaliToolkitIsHorizontalP(void); extern int UtcDaliToolkitWrapActorConstraintP(void); @@ -1006,12 +1019,25 @@ testcase tc_array[] = { {"UtcDaliTextFieldTextChangedSignalP", UtcDaliTextFieldTextChangedSignalP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyInputColorP", UtcDaliTextFieldPropertyInputColorP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyEnableMarkupP", UtcDaliTextFieldPropertyEnableMarkupP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyUnderlineP", UtcDaliTextFieldPropertyUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputUnderlineP", UtcDaliTextFieldPropertyInputUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyShadowP", UtcDaliTextFieldPropertyShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputShadowP", UtcDaliTextFieldPropertyInputShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyEmbossP", UtcDaliTextFieldPropertyEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputEmbossP", UtcDaliTextFieldPropertyInputEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyOutlineP", UtcDaliTextFieldPropertyOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputOutlineP", UtcDaliTextFieldPropertyInputOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextLabelNewP", UtcDaliTextLabelNewP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelConstructorP", UtcDaliTextLabelConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelCopyConstructorP", UtcDaliTextLabelCopyConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelOperatorAssignmentP", UtcDaliTextLabelOperatorAssignmentP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastP", UtcDaliTextLabelDowncastP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastN", UtcDaliTextLabelDowncastN, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyLineSpacingP", UtcDaliTextLabelPropertyLineSpacingP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyUnderlineP", UtcDaliTextLabelPropertyUnderlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyShadowP", UtcDaliTextLabelPropertyShadowP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyEmbossP", UtcDaliTextLabelPropertyEmbossP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyOutlineP", UtcDaliTextLabelPropertyOutlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliToolkitIsVerticalP", UtcDaliToolkitIsVerticalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitIsHorizontalP", UtcDaliToolkitIsHorizontalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitWrapActorConstraintP", UtcDaliToolkitWrapActorConstraintP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h index ae80100..103f1d3 100644 --- a/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h +++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h @@ -534,12 +534,25 @@ extern int UtcDaliTextFieldDowncastN(void); extern int UtcDaliTextFieldTextChangedSignalP(void); extern int UtcDaliTextFieldPropertyInputColorP(void); extern int UtcDaliTextFieldPropertyEnableMarkupP(void); +extern int UtcDaliTextFieldPropertyUnderlineP(void); +extern int UtcDaliTextFieldPropertyInputUnderlineP(void); +extern int UtcDaliTextFieldPropertyShadowP(void); +extern int UtcDaliTextFieldPropertyInputShadowP(void); +extern int UtcDaliTextFieldPropertyEmbossP(void); +extern int UtcDaliTextFieldPropertyInputEmbossP(void); +extern int UtcDaliTextFieldPropertyOutlineP(void); +extern int UtcDaliTextFieldPropertyInputOutlineP(void); extern int UtcDaliTextLabelNewP(void); extern int UtcDaliTextLabelConstructorP(void); extern int UtcDaliTextLabelCopyConstructorP(void); extern int UtcDaliTextLabelOperatorAssignmentP(void); extern int UtcDaliTextLabelDowncastP(void); extern int UtcDaliTextLabelDowncastN(void); +extern int UtcDaliTextLabelPropertyLineSpacingP(void); +extern int UtcDaliTextLabelPropertyUnderlineP(void); +extern int UtcDaliTextLabelPropertyShadowP(void); +extern int UtcDaliTextLabelPropertyEmbossP(void); +extern int UtcDaliTextLabelPropertyOutlineP(void); extern int UtcDaliToolkitIsVerticalP(void); extern int UtcDaliToolkitIsHorizontalP(void); extern int UtcDaliToolkitWrapActorConstraintP(void); @@ -1006,12 +1019,25 @@ testcase tc_array[] = { {"UtcDaliTextFieldTextChangedSignalP", UtcDaliTextFieldTextChangedSignalP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyInputColorP", UtcDaliTextFieldPropertyInputColorP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyEnableMarkupP", UtcDaliTextFieldPropertyEnableMarkupP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyUnderlineP", UtcDaliTextFieldPropertyUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputUnderlineP", UtcDaliTextFieldPropertyInputUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyShadowP", UtcDaliTextFieldPropertyShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputShadowP", UtcDaliTextFieldPropertyInputShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyEmbossP", UtcDaliTextFieldPropertyEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputEmbossP", UtcDaliTextFieldPropertyInputEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyOutlineP", UtcDaliTextFieldPropertyOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputOutlineP", UtcDaliTextFieldPropertyInputOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextLabelNewP", UtcDaliTextLabelNewP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelConstructorP", UtcDaliTextLabelConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelCopyConstructorP", UtcDaliTextLabelCopyConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelOperatorAssignmentP", UtcDaliTextLabelOperatorAssignmentP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastP", UtcDaliTextLabelDowncastP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastN", UtcDaliTextLabelDowncastN, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyLineSpacingP", UtcDaliTextLabelPropertyLineSpacingP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyUnderlineP", UtcDaliTextLabelPropertyUnderlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyShadowP", UtcDaliTextLabelPropertyShadowP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyEmbossP", UtcDaliTextLabelPropertyEmbossP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyOutlineP", UtcDaliTextLabelPropertyOutlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliToolkitIsVerticalP", UtcDaliToolkitIsVerticalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitIsHorizontalP", UtcDaliToolkitIsHorizontalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitWrapActorConstraintP", UtcDaliToolkitWrapActorConstraintP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h index cdc0022..ca47545 100644 --- a/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h +++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h @@ -534,12 +534,25 @@ extern int UtcDaliTextFieldDowncastN(void); extern int UtcDaliTextFieldTextChangedSignalP(void); extern int UtcDaliTextFieldPropertyInputColorP(void); extern int UtcDaliTextFieldPropertyEnableMarkupP(void); +extern int UtcDaliTextFieldPropertyUnderlineP(void); +extern int UtcDaliTextFieldPropertyInputUnderlineP(void); +extern int UtcDaliTextFieldPropertyShadowP(void); +extern int UtcDaliTextFieldPropertyInputShadowP(void); +extern int UtcDaliTextFieldPropertyEmbossP(void); +extern int UtcDaliTextFieldPropertyInputEmbossP(void); +extern int UtcDaliTextFieldPropertyOutlineP(void); +extern int UtcDaliTextFieldPropertyInputOutlineP(void); extern int UtcDaliTextLabelNewP(void); extern int UtcDaliTextLabelConstructorP(void); extern int UtcDaliTextLabelCopyConstructorP(void); extern int UtcDaliTextLabelOperatorAssignmentP(void); extern int UtcDaliTextLabelDowncastP(void); extern int UtcDaliTextLabelDowncastN(void); +extern int UtcDaliTextLabelPropertyLineSpacingP(void); +extern int UtcDaliTextLabelPropertyUnderlineP(void); +extern int UtcDaliTextLabelPropertyShadowP(void); +extern int UtcDaliTextLabelPropertyEmbossP(void); +extern int UtcDaliTextLabelPropertyOutlineP(void); extern int UtcDaliToolkitIsVerticalP(void); extern int UtcDaliToolkitIsHorizontalP(void); extern int UtcDaliToolkitWrapActorConstraintP(void); @@ -1006,12 +1019,25 @@ testcase tc_array[] = { {"UtcDaliTextFieldTextChangedSignalP", UtcDaliTextFieldTextChangedSignalP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyInputColorP", UtcDaliTextFieldPropertyInputColorP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextFieldPropertyEnableMarkupP", UtcDaliTextFieldPropertyEnableMarkupP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyUnderlineP", UtcDaliTextFieldPropertyUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputUnderlineP", UtcDaliTextFieldPropertyInputUnderlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyShadowP", UtcDaliTextFieldPropertyShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputShadowP", UtcDaliTextFieldPropertyInputShadowP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyEmbossP", UtcDaliTextFieldPropertyEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputEmbossP", UtcDaliTextFieldPropertyInputEmbossP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyOutlineP", UtcDaliTextFieldPropertyOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, + {"UtcDaliTextFieldPropertyInputOutlineP", UtcDaliTextFieldPropertyInputOutlineP, utc_Dali_TextField_startup, utc_Dali_TextField_cleanup}, {"UtcDaliTextLabelNewP", UtcDaliTextLabelNewP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelConstructorP", UtcDaliTextLabelConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelCopyConstructorP", UtcDaliTextLabelCopyConstructorP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelOperatorAssignmentP", UtcDaliTextLabelOperatorAssignmentP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastP", UtcDaliTextLabelDowncastP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliTextLabelDowncastN", UtcDaliTextLabelDowncastN, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyLineSpacingP", UtcDaliTextLabelPropertyLineSpacingP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyUnderlineP", UtcDaliTextLabelPropertyUnderlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyShadowP", UtcDaliTextLabelPropertyShadowP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyEmbossP", UtcDaliTextLabelPropertyEmbossP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, + {"UtcDaliTextLabelPropertyOutlineP", UtcDaliTextLabelPropertyOutlineP, utc_Dali_TextLabel_startup, utc_Dali_TextLabel_cleanup}, {"UtcDaliToolkitIsVerticalP", UtcDaliToolkitIsVerticalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitIsHorizontalP", UtcDaliToolkitIsHorizontalP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, {"UtcDaliToolkitWrapActorConstraintP", UtcDaliToolkitWrapActorConstraintP, utc_Dali_Toolkit_startup, utc_Dali_Toolkit_cleanup}, diff --git a/src/utc/dali-toolkit/text-field/utc-dali-text-field.cpp b/src/utc/dali-toolkit/text-field/utc-dali-text-field.cpp index 68302fc..b3b7480 100755 --- a/src/utc/dali-toolkit/text-field/utc-dali-text-field.cpp +++ b/src/utc/dali-toolkit/text-field/utc-dali-text-field.cpp @@ -44,6 +44,14 @@ void TextFieldDownCastN(); void TextFieldTextChangedSignalP(); void TextFieldPropertyInputColorP(); void TextFieldPropertyEnableMarkupP(); +void TextFieldPropertyUnderlineP(); +void TextFieldPropertyInputUnderlineP(); +void TextFieldPropertyShadowP(); +void TextFieldPropertyInputShadowP(); +void TextFieldPropertyEmbossP(); +void TextFieldPropertyInputEmbossP(); +void TextFieldPropertyOutlineP(); +void TextFieldPropertyInputOutlineP(); namespace { @@ -61,7 +69,15 @@ namespace TEXT_FIELD_DOWNCAST_N, TEXT_FIELD_TEXT_CHANGED_SIGNAL_P, TEXT_FIELD_PROPERTY_INPUT_COLOR_P, - TEXT_FIELD_PROPERTY_ENABLE_MARKUP_P + TEXT_FIELD_PROPERTY_ENABLE_MARKUP_P, + TEXT_FIELD_PROPERTY_UNDERLINE_P, + TEXT_FIELD_PROPERTY_INPUT_UNDERLINE_P, + TEXT_FIELD_PROPERTY_SHADOW_P, + TEXT_FIELD_PROPERTY_INPUT_SHADOW_P, + TEXT_FIELD_PROPERTY_EMBOSS_P, + TEXT_FIELD_PROPERTY_INPUT_EMBOSS_P, + TEXT_FIELD_PROPERTY_OUTLINE_P, + TEXT_FIELD_PROPERTY_INPUT_OUTLINE_P }; struct TextField_TestApp : public ConnectionTracker @@ -119,6 +135,30 @@ namespace case TEXT_FIELD_PROPERTY_ENABLE_MARKUP_P: TextFieldPropertyEnableMarkupP(); break; + case TEXT_FIELD_PROPERTY_UNDERLINE_P: + TextFieldPropertyUnderlineP(); + break; + case TEXT_FIELD_PROPERTY_INPUT_UNDERLINE_P: + TextFieldPropertyInputUnderlineP(); + break; + case TEXT_FIELD_PROPERTY_SHADOW_P: + TextFieldPropertyShadowP(); + break; + case TEXT_FIELD_PROPERTY_INPUT_SHADOW_P: + TextFieldPropertyInputShadowP(); + break; + case TEXT_FIELD_PROPERTY_EMBOSS_P: + TextFieldPropertyEmbossP(); + break; + case TEXT_FIELD_PROPERTY_INPUT_EMBOSS_P: + TextFieldPropertyInputEmbossP(); + break; + case TEXT_FIELD_PROPERTY_OUTLINE_P: + TextFieldPropertyOutlineP(); + break; + case TEXT_FIELD_PROPERTY_INPUT_OUTLINE_P: + TextFieldPropertyInputOutlineP(); + break; } } @@ -153,7 +193,7 @@ void TextFieldCopyConstructorP() TextField copy( textField ); DALI_CHECK_INSTANCE(copy, "TextField handle is empty after copy."); - DALI_CHECK_FAIL( copy.GetProperty( TextLabel::Property::TEXT ) != textField.GetProperty( TextLabel::Property::TEXT ), "TextField::TextField(const TextField&) is failed." ); + DALI_CHECK_FAIL( copy.GetProperty( TextField::Property::TEXT ) != textField.GetProperty( TextField::Property::TEXT ), "TextField::TextField(const TextField&) is failed." ); DaliLog::PrintPass(); } @@ -236,6 +276,95 @@ void TextFieldPropertyEnableMarkupP() DaliLog::PrintPass(); } +void TextFieldPropertyUnderlineP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Underline properties" ); + field.SetProperty( TextField::Property::UNDERLINE, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::UNDERLINE ).Get() != propertyValue, "TextField fails to get the value of UNDERLINE property." ); + + DaliLog::PrintPass(); + +} + +void TextFieldPropertyInputUnderlineP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Underline input properties" ); + field.SetProperty( TextField::Property::INPUT_UNDERLINE, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::INPUT_UNDERLINE ).Get() != propertyValue, "TextField fails to get the value of INPUT_UNDERLINE property." ); + + DaliLog::PrintPass(); +} + +void TextFieldPropertyShadowP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Shadow properties" ); + field.SetProperty( TextField::Property::SHADOW, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::SHADOW ).Get() != propertyValue, "TextField fails to get the value of SHADOW property." ); + + DaliLog::PrintPass(); +} + +void TextFieldPropertyInputShadowP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Shadow input properties" ); + field.SetProperty( TextField::Property::INPUT_SHADOW, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::INPUT_SHADOW ).Get() != propertyValue, "TextField fails to get the value of INPUT_SHADOW property." ); + + DaliLog::PrintPass(); +} + +void TextFieldPropertyEmbossP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Emboss properties" ); + field.SetProperty( TextField::Property::EMBOSS, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::EMBOSS ).Get() != propertyValue, "TextField fails to get the value of EMBOSS EMBOSS." ); + + DaliLog::PrintPass(); +} + +void TextFieldPropertyInputEmbossP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Emboss input properties" ); + field.SetProperty( TextField::Property::INPUT_EMBOSS, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::INPUT_EMBOSS ).Get() != propertyValue, "TextField fails to get the value of INPUT_EMBOSS property." ); + + DaliLog::PrintPass(); +} + +void TextFieldPropertyOutlineP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Outline properties" ); + field.SetProperty( TextField::Property::OUTLINE, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::OUTLINE ).Get() != propertyValue, "TextField fails to get the value of OUTLINE property." ); + + DaliLog::PrintPass(); +} + +void TextFieldPropertyInputOutlineP() +{ + TextField field = TextField::New(); + + std::string propertyValue( "Outline input properties" ); + field.SetProperty( TextField::Property::INPUT_OUTLINE, propertyValue ); + DALI_CHECK_FAIL( field.GetProperty( TextField::Property::INPUT_OUTLINE ).Get() != propertyValue, "TextField fails to get the value of INPUT_OUTLINE property." ); + + DaliLog::PrintPass(); +} + /** * @testcase UtcDaliTextFieldNewP * @since_tizen 2.4 @@ -398,3 +527,147 @@ int UtcDaliTextFieldPropertyEnableMarkupP(void) return test_return_value; } + +/** + * @testcase UtcDaliTextFieldPropertyUnderlineP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the UNDERLINE property + */ + +int UtcDaliTextFieldPropertyUnderlineP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_UNDERLINE_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyInputUnderlineP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the INPUT_UNDERLINE property + */ + +int UtcDaliTextFieldPropertyInputUnderlineP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_INPUT_UNDERLINE_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyShadowP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the SHADOW property + */ + +int UtcDaliTextFieldPropertyShadowP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_SHADOW_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyInputShadowP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the INPUT_SHADOW property + */ + +int UtcDaliTextFieldPropertyInputShadowP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_INPUT_SHADOW_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyEmbossP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the EMBOSS property + */ + +int UtcDaliTextFieldPropertyEmbossP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_EMBOSS_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyInputEmbossP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the INPUT_EMBOSS property + */ + +int UtcDaliTextFieldPropertyInputEmbossP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_INPUT_EMBOSS_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyOutlineP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the OUTLINE property + */ + +int UtcDaliTextFieldPropertyOutlineP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_OUTLINE_P ); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextFieldPropertyInputOutlineP + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the INPUT_OUTLINE property + */ + +int UtcDaliTextFieldPropertyInputOutlineP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextField_TestApp testApp( application, TEXT_FIELD_PROPERTY_INPUT_OUTLINE_P ); + application.MainLoop(); + + return test_return_value; +} diff --git a/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp b/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp index 7d748a2..0d09142 100755 --- a/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp +++ b/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp @@ -33,6 +33,12 @@ void TextLabelCopyConstructorP(); void TextLabelOperatorAssignmentP(); void TextLabelDownCastP(); void TextLabelDownCastN(); +void TextLabelPropertyLineSpacingP(); +void TextLabelPropertyUnderlineP(); +void TextLabelPropertyShadowP(); +void TextLabelPropertyEmbossP(); +void TextLabelPropertyOutlineP(); + namespace { @@ -43,7 +49,12 @@ namespace TEXT_LABEL_COPY_CONSTRUCTOR_P, TEXT_LABEL_OPERATOR_ASSIGNMENT_P, TEXT_LABEL_DOWNCAST_P, - TEXT_LABEL_DOWNCAST_N + TEXT_LABEL_DOWNCAST_N, + TEXT_LABEL_PROPERTY_LINE_SPACING_P, + TEXT_LABEL_PROPERTY_UNDERLINE_P, + TEXT_LABEL_PROPERTY_SHADOW_P, + TEXT_LABEL_PROPERTY_EMBOSS_P, + TEXT_LABEL_PROPERTY_OUTLINE_P }; struct TextLabel_TestApp : public ConnectionTracker @@ -92,6 +103,21 @@ namespace case TEXT_LABEL_DOWNCAST_N: TextLabelDownCastN(); break; + case TEXT_LABEL_PROPERTY_LINE_SPACING_P: + TextLabelPropertyLineSpacingP(); + break; + case TEXT_LABEL_PROPERTY_UNDERLINE_P: + TextLabelPropertyUnderlineP(); + break; + case TEXT_LABEL_PROPERTY_SHADOW_P: + TextLabelPropertyShadowP(); + break; + case TEXT_LABEL_PROPERTY_EMBOSS_P: + TextLabelPropertyEmbossP(); + break; + case TEXT_LABEL_PROPERTY_OUTLINE_P: + TextLabelPropertyOutlineP(); + break; } } // Data @@ -165,6 +191,62 @@ void TextLabelCopyConstructorP() DaliLog::PrintPass(); } +void TextLabelPropertyLineSpacingP() +{ + TextLabel textLabel = TextLabel::New(); + + DALI_CHECK_FAIL( ((textLabel.GetProperty( TextLabel::Property::LINE_SPACING ).Get()) - 0.0f ) > Math::MACHINE_EPSILON_1000, "TextLabel fails to get the default value of LINE_SPACING property." ); + + textLabel.SetProperty( TextLabel::Property::LINE_SPACING, 10.f ); + DALI_CHECK_FAIL( ((textLabel.GetProperty( TextLabel::Property::LINE_SPACING ).Get()) - 10.0f ) > Math::MACHINE_EPSILON_1000, "TextLabel fails to get the current value of LINE_SPACING property." ); + + DaliLog::PrintPass(); +} + +void TextLabelPropertyUnderlineP() +{ + TextLabel textLabel = TextLabel::New(); + + std::string propertyValue( "Underline properties" ); + textLabel.SetProperty( TextLabel::Property::UNDERLINE, propertyValue ); + DALI_CHECK_FAIL( textLabel.GetProperty( TextLabel::Property::UNDERLINE ).Get() != propertyValue, "TextLabel fails to get the value of UNDERLINE property." ); + + DaliLog::PrintPass(); +} + +void TextLabelPropertyShadowP() +{ + TextLabel textLabel = TextLabel::New(); + + std::string propertyValue( "Shadow properties" ); + textLabel.SetProperty( TextLabel::Property::SHADOW, propertyValue ); + DALI_CHECK_FAIL( textLabel.GetProperty( TextLabel::Property::SHADOW ).Get() != propertyValue, "TextLabel fails to get the value of SHADOW property." ); + + DaliLog::PrintPass(); +} + +void TextLabelPropertyEmbossP() +{ + TextLabel textLabel = TextLabel::New(); + + std::string propertyValue( "Emboss properties" ); + textLabel.SetProperty( TextLabel::Property::EMBOSS, propertyValue ); + DALI_CHECK_FAIL( textLabel.GetProperty( TextLabel::Property::EMBOSS ).Get() != propertyValue, "TextLabel fails to get the value of EMBOSS property." ); + + DaliLog::PrintPass(); +} + +void TextLabelPropertyOutlineP() +{ + TextLabel textLabel = TextLabel::New(); + + std::string propertyValue( "Outline properties" ); + textLabel.SetProperty( TextLabel::Property::OUTLINE, propertyValue ); + DALI_CHECK_FAIL( textLabel.GetProperty( TextLabel::Property::OUTLINE ).Get() != propertyValue, "TextLabel fails to get the value of OUTLINE property." ); + + DaliLog::PrintPass(); +} + /** * @testcase UtcDaliTextLabelNewP * @since_tizen 2.4 @@ -273,3 +355,93 @@ int UtcDaliTextLabelDowncastN(void) return test_return_value; } + +/** + * @testcase UtcDaliTextLabelPropertyLineSpacing + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the LINE_SPACING property + */ + +int UtcDaliTextLabelPropertyLineSpacingP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextLabel_TestApp testApp( application, TEXT_LABEL_PROPERTY_LINE_SPACING_P); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextLabelPropertyUnderline + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the UNDERLINE property + */ + +int UtcDaliTextLabelPropertyUnderlineP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextLabel_TestApp testApp( application, TEXT_LABEL_PROPERTY_UNDERLINE_P); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextLabelPropertyShadow + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the SHADOW property + */ + +int UtcDaliTextLabelPropertyShadowP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextLabel_TestApp testApp( application, TEXT_LABEL_PROPERTY_SHADOW_P); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextLabelPropertyEmboss + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the EMBOSS property + */ + +int UtcDaliTextLabelPropertyEmbossP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextLabel_TestApp testApp( application, TEXT_LABEL_PROPERTY_EMBOSS_P); + application.MainLoop(); + + return test_return_value; +} + +/** + * @testcase UtcDaliTextLabelPropertyOutline + * @since_tizen 3.0 + * @description Checks test for correct setting and getting of the OUTLINE property + */ + +int UtcDaliTextLabelPropertyOutlineP(void) +{ + DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__); + + Application application = Application::New( &gArgc, &gArgv ); + CHECK_GL; + TextLabel_TestApp testApp( application, TEXT_LABEL_PROPERTY_OUTLINE_P); + application.MainLoop(); + + return test_return_value; +} -- 2.7.4