X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-MultiLanguage.cpp;h=94bb4859e85e0a9bb3bfea372c81ed0298e88373;hp=c3f0b9b81145eade197f3e54bf1182635d7a9a23;hb=3fe7030fe503879c909bf28c4a953fd19fee2a3b;hpb=aca65426b302c44e2c88f4e67a08be6096d07447

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
index c3f0b9b..94bb485 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -178,9 +178,11 @@ bool ScriptsTest( const ScriptsData& data )
   Vector<Character> utf32;
   utf32.Resize( data.text.size() );
 
-  const uint32_t numberOfCharacters = Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
-                                                   data.text.size(),
-                                                   &utf32[0u] );
+  const uint32_t numberOfCharacters = ( data.text.size() == 0 ) ? 0 :
+    Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
+                 data.text.size(),
+                 &utf32[0u] );
+
   utf32.Resize( numberOfCharacters );
 
   // 2) Set the script info.
@@ -238,7 +240,7 @@ bool ScriptsTest( const ScriptsData& data )
 
     if( scriptRun1.script != scriptRun2.script )
     {
-      tet_printf("ScriptsTest FAIL: different script. %s, should be %s\n", TextAbstraction::ScriptName[scriptRun1.script], TextAbstraction::ScriptName[scriptRun2.script] );
+      tet_printf("ScriptsTest FAIL: script index: %u, different script. %s, should be %s\n", index, TextAbstraction::ScriptName[scriptRun1.script], TextAbstraction::ScriptName[scriptRun2.script] );
       return false;
     }
   }
@@ -255,7 +257,8 @@ bool ValidateFontTest( const ValidateFontsData& data )
   Vector<Character> utf32;
   utf32.Resize( data.text.size() );
 
-  const uint32_t numberOfCharacters = Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
+  const uint32_t numberOfCharacters = (data.text.size() == 0 ) ? 0 :
+    Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
                                                    data.text.size(),
                                                    &utf32[0u] );
   utf32.Resize( numberOfCharacters );
@@ -959,7 +962,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       0u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1101 =
   {
@@ -967,7 +970,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       3u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1102 =
   {
@@ -983,7 +986,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       25u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1104 =
   {
@@ -991,7 +994,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       28u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1105 =
   {
@@ -1007,7 +1010,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       46u,
       2u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1107 =
   {
@@ -1015,7 +1018,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       48u,
       2u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1108 =
   {
@@ -1023,7 +1026,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       50u,
       2u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   scriptRuns11.PushBack( scriptRun1100 );
   scriptRuns11.PushBack( scriptRun1101 );
@@ -1043,7 +1046,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       0u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1201 =
   {
@@ -1051,7 +1054,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       3u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1202 =
   {
@@ -1059,7 +1062,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       6u,
       3u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   ScriptRun scriptRun1203 =
   {
@@ -1067,7 +1070,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       9u,
       2u,
     },
-    TextAbstraction::LATIN
+    TextAbstraction::UNKNOWN
   };
   scriptRuns12.PushBack( scriptRun1200 );
   scriptRuns12.PushBack( scriptRun1201 );
@@ -1081,7 +1084,7 @@ int UtcDaliTextMultiLanguageSetScripts(void)
       0u,
       4u,
     },
-    TextAbstraction::LATIN // An unknown script is transformed to LATIN
+    TextAbstraction::UNKNOWN
   };
   scriptRuns13.PushBack( scriptRun1301 );