[ITC][DALi-toolkit][Non-ACR] Fixed tc fail issue caused by FONT_STYLE

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: If2f28db3a851b14e4f5a952289e39994013386f1

diff --git a/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp b/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp
old mode 100755 (executable)
new mode 100644 (file)
index b7fc0d7..d32a68a
--- a/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp
+++ b/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp
@@ -258,8 +258,8 @@ void TextEditorSetGetProperty()
        // Check font properties.
        editor.SetProperty( TextEditor::Property::FONT_FAMILY, "Setting font family" );
        DALI_CHECK_FAIL( editor.GetProperty<std::string>( TextEditor::Property::FONT_FAMILY ) != std::string("Setting font family"), "Set/Get Property mismatch" );
-       editor.SetProperty( TextEditor::Property::FONT_STYLE, "Setting font style" );
-       DALI_CHECK_FAIL( editor.GetProperty<std::string>( TextEditor::Property::FONT_STYLE ) != std::string("Setting font style"), "Set/Get Property mismatch" );
+       editor.SetProperty( TextEditor::Property::FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+       DALI_CHECK_FAIL( editor.GetProperty<std::string>( TextEditor::Property::FONT_STYLE ) != std::string("{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}"), "Set/Get Property mismatch" );
        editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
        DALI_CHECK_FAIL( editor.GetProperty<float>( TextEditor::Property::POINT_SIZE ) - 10.f > Math::MACHINE_EPSILON_1000, "Set/Get Property mismatch" );
 
@@ -323,8 +323,8 @@ void TextEditorSetGetProperty()
        // Check input font properties.
        editor.SetProperty( TextEditor::Property::INPUT_FONT_FAMILY, "Setting input font family" );
        DALI_CHECK_FAIL( editor.GetProperty<std::string>( TextEditor::Property::INPUT_FONT_FAMILY ) != "Setting input font family", "Set/Get Property mismatch" );
-       editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, "Setting input font style" );
-       DALI_CHECK_FAIL( editor.GetProperty<std::string>( TextEditor::Property::INPUT_FONT_STYLE ) != "Setting input font style", "Set/Get Property mismatch" );
+       editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+       DALI_CHECK_FAIL( editor.GetProperty<std::string>( TextEditor::Property::INPUT_FONT_STYLE ) != "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}", "Set/Get Property mismatch" );
        editor.SetProperty( TextEditor::Property::INPUT_POINT_SIZE, 12.f );
        DALI_CHECK_FAIL( editor.GetProperty<float>( TextEditor::Property::INPUT_POINT_SIZE ) - 12.f > Math::MACHINE_EPSILON_1000, "Set/Get Property mismatch" );
 

diff --git a/src/itc/dali-toolkit/text-field/ITs-text-field.cpp b/src/itc/dali-toolkit/text-field/ITs-text-field.cpp
old mode 100755 (executable)
new mode 100644 (file)
index e87bea0..acee5dd
--- a/src/itc/dali-toolkit/text-field/ITs-text-field.cpp
+++ b/src/itc/dali-toolkit/text-field/ITs-text-field.cpp
@@ -372,8 +372,8 @@ void TextFieldSetGetPropertiesAndIndex()
 
        textField.SetProperty( TextField::Property::FONT_FAMILY, "Setting font family" );
        DALI_CHECK_FAIL( textField.GetProperty<std::string>( TextField::Property::FONT_FAMILY ) != std::string("Setting font family"), "Property value not match." );
-       textField.SetProperty( TextField::Property::FONT_STYLE, "Setting font style" );
-       DALI_CHECK_FAIL( textField.GetProperty<std::string>( TextField::Property::FONT_STYLE ) != std::string("Setting font style"), "Property value not match." );
+       textField.SetProperty( TextField::Property::FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+       DALI_CHECK_FAIL( textField.GetProperty<std::string>( TextField::Property::FONT_STYLE ) != std::string("{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}"), "Property value not match." );
        textField.SetProperty( TextField::Property::POINT_SIZE, 10.f );
        DALI_CHECK_FAIL( textField.GetProperty<float>( TextField::Property::POINT_SIZE ) - 10.f> Math::MACHINE_EPSILON_1000, "Property value not match." );
 
@@ -444,8 +444,9 @@ void TextFieldSetGetPropertiesAndIndex()
 
        textField.SetProperty( TextField::Property::INPUT_FONT_FAMILY, "Setting input font family" );
        DALI_CHECK_FAIL( textField.GetProperty<std::string>( TextField::Property::INPUT_FONT_FAMILY ) != "Setting input font family", "Property value not match." );
-       textField.SetProperty( TextField::Property::INPUT_FONT_STYLE, "Setting input font style" );
-       DALI_CHECK_FAIL( textField.GetProperty<std::string>( TextField::Property::INPUT_FONT_STYLE ) != "Setting input font style", "Property value not match." );
+       textField.SetProperty( TextField::Property::INPUT_FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+       DALI_CHECK_FAIL( textField.GetProperty<std::string>( TextField::Property::INPUT_FONT_STYLE ) != "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}", "Property value not match." );
+
        textField.SetProperty( TextField::Property::INPUT_POINT_SIZE, 12.f );
        DALI_CHECK_FAIL( textField.GetProperty<float>( TextField::Property::INPUT_POINT_SIZE ) - 12.f > Math::MACHINE_EPSILON_1000, "Property value not match." );
 

diff --git a/src/itc/dali-toolkit/text-label/ITs-text-label.cpp b/src/itc/dali-toolkit/text-label/ITs-text-label.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 68e5627..e3a5f0f
--- a/src/itc/dali-toolkit/text-label/ITs-text-label.cpp
+++ b/src/itc/dali-toolkit/text-label/ITs-text-label.cpp
@@ -151,8 +151,8 @@ void TextLabelGetSetPropertiesWithAssignment()
 
        label.SetProperty( TextLabel::Property::FONT_FAMILY, "Setting font family" );
        DALI_CHECK_FAIL( label.GetProperty<std::string>( TextLabel::Property::FONT_FAMILY ) != std::string("Setting font family"), "TextLabel font family set/get failed." );
-       label.SetProperty( TextLabel::Property::FONT_STYLE, "Setting font style" );
-       DALI_CHECK_FAIL( label.GetProperty<std::string>( TextLabel::Property::FONT_STYLE ) != std::string("Setting font style"), "TextLabel font style set/get failed." );
+       label.SetProperty( TextLabel::Property::FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+       DALI_CHECK_FAIL( label.GetProperty<std::string>( TextLabel::Property::FONT_STYLE ) != std::string("{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}"), "TextLabel font style set/get failed." );
        label.SetProperty( TextLabel::Property::POINT_SIZE, 10.f );
        DALI_CHECK_FAIL( label.GetProperty<float>( TextLabel::Property::POINT_SIZE ) != 10.f, "TextLabel point size set/get failed." );