From: Eunki Hong <eunkiki.hong@samsung.com>
Date: Fri, 31 Mar 2023 13:22:35 +0000 (+0000)
Subject: Merge "Fix UTC error for TextSpannable" into devel/master
X-Git-Tag: dali_2.2.21~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4fcab525a105570b208ed3860633c326efc1b319;hp=db1718edd857025ab6231e2d7647e9f04f2a1e78

Merge "Fix UTC error for TextSpannable" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
index 40f51de..36125c5 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -292,7 +292,7 @@ int UtcDaliToolkitTextLabelSetSpannedText_FontSpan(void)
 
   const Vector<Dali::Toolkit::Text::FontDescriptionRun>& validFontDescriptionRuns = labelImpl.GetTextController()->GetTextModel()->GetFontDescriptionRuns();
   DALI_TEST_EQUALS(validFontDescriptionRuns.Count(), 1u, TEST_LOCATION);
-  std::string familyName = validFontDescriptionRuns[0].familyName;
+  std::string familyName = std::string(validFontDescriptionRuns[0].familyName, validFontDescriptionRuns[0].familyLength);
 
   DALI_TEST_EQUALS(familyName, "TizenSans", TEST_LOCATION);
   DALI_TEST_EQUALS(validFontDescriptionRuns[0].size, expectedPointSize, TEST_LOCATION);