Set DPI when testing font-client

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-test-application.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
index 7a090f5..3c83f7e 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-test-suite-utils.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
 
-#include "toolkit-adaptor.h"
 #include "toolkit-orientation.h"
 
 namespace Dali
@@ -41,6 +41,13 @@ public:
   : TestApplication( false, surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi )
   {
     Initialize();
+
+    // set the DPI value for font rendering
+    Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get();
+    if( fontClient )
+    {
+      fontClient.SetDpi( mDpi.x, mDpi.y );
+    }
   }
 
   ~ToolkitTestApplication()
@@ -50,18 +57,12 @@ public:
     mCore = NULL;
   }
 
-  inline ToolkitAdaptor& GetAdaptor()
-  {
-    return mAdaptor;
-  }
-
   //ToolkitOrientation& GetOrientation()
   //{
   //return mOrientation;
   //}
 
 private:
-  ToolkitAdaptor mAdaptor;
   //ToolkitOrientation mOrientation;
 };
 
@@ -69,7 +70,7 @@ private:
 
 inline ImageActor CreateSolidColorImageActor(ToolkitTestApplication& application, const Vector4& color, int width, int height)
 {
-  ImageActor actor = ImageActor::New(CreateBitmapImage(width, height, color));
+  ImageActor actor = ImageActor::New(CreateBufferImage(width, height, color));
   application.SendNotification();
   application.Render();
   return actor;