[dali_1.0.14] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit-internal / utc-Dali-TextView-Processor.cpp

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Processor.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Processor.cpp
index 9485689..8fef857 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Processor.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Processor.cpp
@@ -22,6 +22,7 @@
 
 // Internal headers are allowed here
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>
 
 // Internal headers are allowed here
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>

+#include <dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h>

 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
 using namespace Dali;
 using namespace Dali::Toolkit;


@@ -53,11 +54,10 @@ struct BeginsRightToLeftCharacterTest
 
 bool TestBeginsRightToLeftCharacter( const std::string& description, const std::string& input, const bool result, const char* location )
 {
 
 bool TestBeginsRightToLeftCharacter( const std::string& description, const std::string& input, const bool result, const char* location )
 {

-  // Creates a styled text with the markup or plain string.
-  MarkupProcessor::StyledTextArray styledText;
-  MarkupProcessor::GetStyledTextArray( input, styledText, true );
+  // Creates a text with the string.
+  Text text( input );

 
 

-  const bool ret = ( result == TextProcessor::BeginsRightToLeftCharacter( styledText ) );
+  const bool ret = ( result == TextProcessor::BeginsRightToLeftCharacter( text ) );

 
   if( !ret )
   {
 
   if( !ret )
   {


@@ -79,11 +79,10 @@ struct ContainsRightToLeftCharacterTest
 
 bool TestContainsRightToLeftCharacter( const std::string& description, const std::string& input, const bool result, const char* location )
 {
 
 bool TestContainsRightToLeftCharacter( const std::string& description, const std::string& input, const bool result, const char* location )
 {

-  // Creates a styled text with the markup or plain string.
-  MarkupProcessor::StyledTextArray styledText;
-  MarkupProcessor::GetStyledTextArray( input, styledText, true );
+  // Creates a text with the string.
+  Text text( input );

 
 

-  const bool ret = ( result == TextProcessor::ContainsRightToLeftCharacter( styledText ) );
+  const bool ret = ( result == TextProcessor::ContainsRightToLeftCharacter( text ) );

 
   if( !ret )
   {
 
   if( !ret )
   {


@@ -128,28 +127,30 @@ bool TestFindNearestWord( const std::string& description, const std::string& inp
 
 //////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////
 

-struct SplitInLinesTest
+struct SplitInParagraphsTest

 {
   std::string inputText;
 
 {
   std::string inputText;
 

-  std::size_t resultNumberOfLines;
+  std::size_t resultNumberOfParagraphs;

 };
 
 };
 

-bool TestSplitInLines( const SplitInLinesTest& test, const char* location )
+bool TestSplitInParagraphs( const SplitInParagraphsTest& test, const char* location )

 {
   // Creates a styled text with the markup or plain string.
   MarkupProcessor::StyledTextArray styledText;
   MarkupProcessor::GetStyledTextArray( test.inputText, styledText, true );
 
 {
   // Creates a styled text with the markup or plain string.
   MarkupProcessor::StyledTextArray styledText;
   MarkupProcessor::GetStyledTextArray( test.inputText, styledText, true );
 

-  std::vector<MarkupProcessor::StyledTextArray> lines;
+  std::vector<Text> paragraphs;
+  std::vector< Vector<TextStyle*> > styles;

 
 

-  TextProcessor::SplitInLines( styledText,
-                               lines );
+  TextProcessor::SplitInParagraphs( styledText,
+                                    paragraphs,
+                                    styles );

 
 

-  if( lines.size() != test.resultNumberOfLines )
+  if( paragraphs.size() != test.resultNumberOfParagraphs )

   {
     tet_printf( "Fail. %s", location );
   {
     tet_printf( "Fail. %s", location );

-    tet_printf( "Different number of lines, result %d, expected result %d", lines.size(), test.resultNumberOfLines );
+    tet_printf( "Different number of paragraphs, result %d, expected result %d", paragraphs.size(), test.resultNumberOfParagraphs );

 
     return false;
   }
 
     return false;
   }


@@ -163,24 +164,23 @@ struct SplitInWordsTest
 {
   std::string inputText;
 
 {
   std::string inputText;
 

-  std::size_t resultNumberOfWords;
+  std::size_t resultNumberOfSeparators;

 };
 
 bool TestSplitInWords( const SplitInWordsTest& test, const char* location )
 {
 };
 
 bool TestSplitInWords( const SplitInWordsTest& test, const char* location )
 {

-  // Creates a styled text with the markup or plain string.
-  MarkupProcessor::StyledTextArray styledText;
-  MarkupProcessor::GetStyledTextArray( test.inputText, styledText, true );
+  // Creates a text with the string.
+  Text text( test.inputText );

 
 

-  std::vector<MarkupProcessor::StyledTextArray> words;
+  Vector<std::size_t> positions;

 
 

-  TextProcessor::SplitInWords( styledText,
-                               words );
+  TextProcessor::SplitInWords( text,
+                               positions );

 
 

-  if( words.size() != test.resultNumberOfWords )
+  if( positions.Count() != test.resultNumberOfSeparators )

   {
     tet_printf( "Fail. %s", location );
   {
     tet_printf( "Fail. %s", location );

-    tet_printf( "Different number of words, result %d, expected result %d", words.size(), test.resultNumberOfWords );
+    tet_printf( "Different number of separators, result %d, expected result %d", positions.Count(), test.resultNumberOfSeparators );

 
     return false;
   }
 
     return false;
   }


@@ -193,13 +193,13 @@ bool TestSplitInWords( const SplitInWordsTest& test, const char* location )
 } // namespace
 
 
 } // namespace
 
 

-int UtcDaliTextViewSplitInLines(void)
+int UtcDaliTextViewSplitInParagraphs(void)

 {
   ToolkitTestApplication application;
 
 {
   ToolkitTestApplication application;
 

-  tet_infoline("UtcDaliTextViewSplitInLines : ");
+  tet_infoline("UtcDaliTextViewSplitInParagraphs : ");

 
 

-  struct SplitInLinesTest splitInLinesTest[] =
+  struct SplitInParagraphsTest splitInParagraphsTest[] =

   {
     {
       std::string( "Hello world\nhello world." ),
   {
     {
       std::string( "Hello world\nhello world." ),


@@ -214,9 +214,9 @@ int UtcDaliTextViewSplitInLines(void)
 
   for( std::size_t index = 0; index < numberOfTests; ++index )
   {
 
   for( std::size_t index = 0; index < numberOfTests; ++index )
   {

-    const SplitInLinesTest& test = splitInLinesTest[index];
+    const SplitInParagraphsTest& test = splitInParagraphsTest[index];

 
 

-    if( !TestSplitInLines( test, TEST_LOCATION ) )
+    if( !TestSplitInParagraphs( test, TEST_LOCATION ) )

     {
       tet_result( TET_FAIL );
     }
     {
       tet_result( TET_FAIL );
     }


@@ -236,10 +236,14 @@ int UtcDaliTextViewSplitInWords(void)
   {
     {
       std::string( "Hello world, hello word!" ),
   {
     {
       std::string( "Hello world, hello word!" ),

-      7
+      3u

     },
     },

+    {
+      std::string( "Hello world\n" ),
+      2u
+    }

   };
   };

-  const std::size_t numberOfTests( 1 );
+  const std::size_t numberOfTests( 2u );

 
   for( std::size_t index = 0; index < numberOfTests; ++index )
   {
 
   for( std::size_t index = 0; index < numberOfTests; ++index )
   {