X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-adaptor-internal%2Futc-Dali-FontClient.cpp;h=a02925d00a795b83621375b8981b18577b5c5d87;hb=b59a021650a941e4c1b5a0644bdd64034a8254be;hp=208deb14faa76197e03e8332fdb6e38e5a2e535f;hpb=8890132f2bb9a8779f69142a0c697b83b250b373;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
index 208deb1..a02925d 100644
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
@@ -139,9 +139,9 @@ int UtcDaliFontClientAtlasLimitationEnabled(void)
 
   // Block's width or height are less than 512
   tet_infoline("UtcDaliFontClientAtlasLimitationEnabled PointSize=200");
-  uint32_t                                     pointSize200 = 200 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
-  TextAbstraction::FontId                      fontId200    = fontClient.GetFontId(fontDescription, pointSize200);
-  TextAbstraction::FontClient::GlyphBufferData glyphBufferData200;
+  uint32_t                         pointSize200 = 200 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
+  TextAbstraction::FontId          fontId200    = fontClient.GetFontId(fontDescription, pointSize200);
+  TextAbstraction::GlyphBufferData glyphBufferData200;
   glyphBufferData200.width  = 0;
   glyphBufferData200.height = 0;
   fontClient.CreateBitmap(fontId200, 68, false, false, glyphBufferData200, 0);
@@ -152,8 +152,8 @@ int UtcDaliFontClientAtlasLimitationEnabled(void)
   // Block's width or height are  greater than 512 and less than 1024
   uint32_t pointSize1000 = 1000 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
   tet_infoline("UtcDaliFontClientAtlasLimitationEnabled PointSize=1000");
-  TextAbstraction::FontId                      fontId1000 = fontClient.GetFontId(fontDescription, pointSize1000);
-  TextAbstraction::FontClient::GlyphBufferData glyphBufferData1000;
+  TextAbstraction::FontId          fontId1000 = fontClient.GetFontId(fontDescription, pointSize1000);
+  TextAbstraction::GlyphBufferData glyphBufferData1000;
   glyphBufferData1000.width  = 0;
   glyphBufferData1000.height = 0;
   fontClient.CreateBitmap(fontId1000, 68, false, false, glyphBufferData1000, 0);
@@ -164,8 +164,8 @@ int UtcDaliFontClientAtlasLimitationEnabled(void)
   // Block's width or height are greater than 1024 and less than 2048
   uint32_t pointSize2000 = 2000 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
   tet_infoline("UtcDaliFontClientAtlasLimitationEnabled PointSize=2000");
-  TextAbstraction::FontId                      fontId2000 = fontClient.GetFontId(fontDescription, pointSize2000);
-  TextAbstraction::FontClient::GlyphBufferData glyphBufferData2000;
+  TextAbstraction::FontId          fontId2000 = fontClient.GetFontId(fontDescription, pointSize2000);
+  TextAbstraction::GlyphBufferData glyphBufferData2000;
   glyphBufferData2000.width  = 0;
   glyphBufferData2000.height = 0;
   fontClient.CreateBitmap(fontId2000, 68, false, false, glyphBufferData2000, 0);
@@ -196,9 +196,9 @@ int UtcDaliFontClientAtlasLimitationDisabled(void)
 
   // Block's width or height are less than 512
   tet_infoline("UtcDaliFontClientAtlasLimitationDisabled PointSize=200");
-  uint32_t                                     pointSize200 = 200 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
-  TextAbstraction::FontId                      fontId200    = fontClient.GetFontId(fontDescription, pointSize200);
-  TextAbstraction::FontClient::GlyphBufferData glyphBufferData200;
+  uint32_t                         pointSize200 = 200 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
+  TextAbstraction::FontId          fontId200    = fontClient.GetFontId(fontDescription, pointSize200);
+  TextAbstraction::GlyphBufferData glyphBufferData200;
   glyphBufferData200.width  = 0;
   glyphBufferData200.height = 0;
   fontClient.CreateBitmap(fontId200, 68, false, false, glyphBufferData200, 0);
@@ -208,9 +208,9 @@ int UtcDaliFontClientAtlasLimitationDisabled(void)
 
   // Block's width or height are  greater than 512 and less than 1024
   tet_infoline("UtcDaliFontClientAtlasLimitationDisabled PointSize=1000");
-  uint32_t                                     pointSize1000 = 1000 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
-  TextAbstraction::FontId                      fontId1000    = fontClient.GetFontId(fontDescription, pointSize1000);
-  TextAbstraction::FontClient::GlyphBufferData glyphBufferData1000;
+  uint32_t                         pointSize1000 = 1000 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
+  TextAbstraction::FontId          fontId1000    = fontClient.GetFontId(fontDescription, pointSize1000);
+  TextAbstraction::GlyphBufferData glyphBufferData1000;
   glyphBufferData1000.width  = 0;
   glyphBufferData1000.height = 0;
   fontClient.CreateBitmap(fontId1000, 68, false, false, glyphBufferData1000, 0);
@@ -220,9 +220,9 @@ int UtcDaliFontClientAtlasLimitationDisabled(void)
 
   // Block's width or height are greater than 1024 and less than 2048
   tet_infoline("UtcDaliFontClientAtlasLimitationDisabled PointSize=2000");
-  uint32_t                                     pointSize2000 = 2000 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
-  TextAbstraction::FontId                      fontId2000    = fontClient.GetFontId(fontDescription, pointSize2000);
-  TextAbstraction::FontClient::GlyphBufferData glyphBufferData2000;
+  uint32_t                         pointSize2000 = 2000 * TextAbstraction::FontClient::NUMBER_OF_POINTS_PER_ONE_UNIT_OF_POINT_SIZE;
+  TextAbstraction::FontId          fontId2000    = fontClient.GetFontId(fontDescription, pointSize2000);
+  TextAbstraction::GlyphBufferData glyphBufferData2000;
   glyphBufferData2000.width  = 0;
   glyphBufferData2000.height = 0;
   fontClient.CreateBitmap(fontId2000, 68, false, false, glyphBufferData2000, 0);
@@ -230,6 +230,20 @@ int UtcDaliFontClientAtlasLimitationDisabled(void)
   DALI_TEST_GREATER(1024u, glyphBufferData2000.width, TEST_LOCATION);  //924u
   DALI_TEST_GREATER(glyphBufferData2000.height, 1024u, TEST_LOCATION); //1148u
 
+  // Test GlyphBufferData move
+  TextAbstraction::GlyphBufferData movedGlyphBufferData2000 = std::move(glyphBufferData2000);
+
+  for(int i = 0; i < 50; ++i)
+  {
+    TextAbstraction::GlyphBufferData dummy = std::move(movedGlyphBufferData2000);
+    movedGlyphBufferData2000               = std::move(dummy);
+
+    // Test moved GlyphBufferData destruct well
+  }
+
+  DALI_TEST_GREATER(1024u, movedGlyphBufferData2000.width, TEST_LOCATION);  //924u
+  DALI_TEST_GREATER(movedGlyphBufferData2000.height, 1024u, TEST_LOCATION); //1148u
+
   END_TEST;
 }
 
@@ -246,8 +260,11 @@ int UtcDaliFontClientCurrentMaximumBlockSizeFitInAtlas(void)
   Size maximumTextAtlasSize              = fontClient.GetMaximumTextAtlasSize();
   Size currentMaximumBlockSizeFitInAtlas = fontClient.GetCurrentMaximumBlockSizeFitInAtlas();
 
-  tet_infoline("CurrentMaximumBlockSizeFitInAtlas start with default ");
-  DALI_TEST_EQUALS(currentMaximumBlockSizeFitInAtlas, defaultTextAtlasSize, TEST_LOCATION);
+  // TODO : This UTC pass only if we don't create fontClient plugin. Currently we always create plugin at Get API, due to performance
+  //tet_infoline("CurrentMaximumBlockSizeFitInAtlas start with default ");
+  //DALI_TEST_EQUALS(currentMaximumBlockSizeFitInAtlas, defaultTextAtlasSize, TEST_LOCATION);
+
+  currentMaximumBlockSizeFitInAtlas = defaultTextAtlasSize;
 
   tet_infoline("SetCurrentMaximumBlockSizeFitInAtlas is changed with current ");
   isChanged = fontClient.SetCurrentMaximumBlockSizeFitInAtlas(currentMaximumBlockSizeFitInAtlas);