projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "atspi: remove property notification" into 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
7007170
..
6e2d632
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
@@
-36,6
+36,7
@@
using namespace Text;
namespace
{
namespace
{
+
///////////////////////////////////////////////////////////
struct TokenComparisonData
///////////////////////////////////////////////////////////
struct TokenComparisonData
@@
-182,9
+183,21
@@
namespace
Vector<ColorRun> colorRuns;
Vector<FontDescriptionRun> fontRuns;
Vector<ColorRun> colorRuns;
Vector<FontDescriptionRun> fontRuns;
- MarkupProcessData markupProcessData( colorRuns, fontRuns );
+ Vector<EmbeddedItem> items;
+ Vector<Anchor> anchors;
+ MarkupProcessData markupProcessData( colorRuns, fontRuns, items, anchors );
ProcessMarkupString( data.xHTMLEntityString, markupProcessData );
ProcessMarkupString( data.xHTMLEntityString, markupProcessData );
+ for( Vector<EmbeddedItem>::Iterator it = items.Begin(),
+ endIt = items.End();
+ it != endIt;
+ ++it )
+ {
+ EmbeddedItem& item = *it;
+ delete[] item.url;
+ }
+ items.Clear();
+
if( markupProcessData.markupProcessedText != data.expectedString )
{
std::cout << " different output string : " << markupProcessData.markupProcessedText << ", expected : " << data.expectedString << " " << std::endl;
if( markupProcessData.markupProcessedText != data.expectedString )
{
std::cout << " different output string : " << markupProcessData.markupProcessedText << ", expected : " << data.expectedString << " " << std::endl;