[dali_2.3.22] Merge branch 'devel/master'

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

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
index 36117f7..3cc1355 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
@@ -24,8 +24,8 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 #include <dali-toolkit/internal/text/text-io.h>
 #include <toolkit-text-utils.h>
@@ -188,7 +188,9 @@ bool XHTMLEntityToUTF8Test(const XHTMLEntityToUTF8Data& data)
   Vector<BoundedParagraphRun>          boundedParagraphRuns;
   Vector<CharacterSpacingCharacterRun> characterSpacingCharacterRuns;
   MarkupProcessData                    markupProcessData(colorRuns, fontRuns, items, anchors, underlinedCharacterRuns, backgroundColorRuns, strikethroughCharacterRuns, boundedParagraphRuns, characterSpacingCharacterRuns);
-  ProcessMarkupString(data.xHTMLEntityString, markupProcessData);
+
+  MarkupPropertyData markupPropertyData(Color::MEDIUM_BLUE, Color::DARK_MAGENTA);
+  ProcessMarkupString(data.xHTMLEntityString, markupPropertyData, markupProcessData);
 
   for(Vector<EmbeddedItem>::Iterator it    = items.Begin(),
                                      endIt = items.End();