Merge "Toolkit - Fixes TC build issues and compile warnings." into tizen

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

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp
index 177a44d..52d91f4 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 #include <iostream>
 #include <stdlib.h>
@@ -181,7 +182,7 @@ int UtcDaliTextInputGetStyleAtCursor(void)
   TextStyle retreivedStyleAtCursor = textInput.GetStyleAtCursor();
 
   DALI_TEST_CHECK( style == retreivedStyleAtCursor );
-  DALI_TEST_CHECK( !retreivedStyleAtCursor.GetItalics() );
+  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsItalicsEnabled() );
 
   tet_infoline("Set style before adding new character");
   style.SetItalics( true );
@@ -195,10 +196,10 @@ int UtcDaliTextInputGetStyleAtCursor(void)
   tet_infoline("Confirm style at cursor is correct style");
   retreivedStyleAtCursor = textInput.GetStyleAtCursor();
 
-  DALI_TEST_CHECK( retreivedStyleAtCursor.GetItalics() );
+  DALI_TEST_CHECK( retreivedStyleAtCursor.IsItalicsEnabled() );
 
   tet_infoline("Confirm style at cursor is not a style that was not set");
-  DALI_TEST_CHECK( !retreivedStyleAtCursor.GetUnderline() );
+  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsUnderlineEnabled() );
 
   tet_infoline("Confirm markup text is correct");
   DALI_TEST_EQUALS( styledString, textInput.GetMarkupText(), TEST_LOCATION);