X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Fdali-test-suite-utils%2Ftest-platform-abstraction.h;h=3a94578b1b02de85dec6b165a7270639c0063afb;hb=da329824baf93e099121169c134d9dec671c3d4f;hp=6d56e4ec2f580bc0a20f24ef71141607c06d7d0f;hpb=5c66381841dd4dfd82c5a118d34104a00a2e0e1c;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
index 6d56e4e..3a94578 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TEST_PLATFORM_ABSTRACTION_H__
 #define __DALI_TEST_PLATFORM_ABSTRACTION_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <stdint.h>
@@ -27,7 +28,7 @@
 
 #include <dali/integration-api/glyph-set.h>
 #include "test-trace-call-stack.h"
-
+#include "test-dynamics.h"
 
 namespace Dali
 {
@@ -110,9 +111,6 @@ public:
    */
   virtual void LoadResource(const Integration::ResourceRequest& request);
 
-  /**
-   * @copydoc PlatformAbstraction::LoadResourceSynchronously()
-   */
   virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
 
   /**
@@ -138,14 +136,17 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetDefaultFontFamily()
    */
-  virtual std::string GetDefaultFontFamily() const;
+  virtual const std::string& GetDefaultFontFamily() const;
 
   /**
    * @copydoc PlatformAbstraction::GetDefaultFontSize()
    */
-  virtual const float GetDefaultFontSize() const;
+  virtual float GetDefaultFontSize() const;
 
-  virtual const Dali::PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, const CapsHeight& capsHeight) const;
+  /**
+   * @copydoc PlatformAbstraction::GetFontLineHeightFromCapsHeight()
+   */
+  virtual PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const;
 
   /**
    * @copydoc PlatformAbstraction::GetGlyphData()
@@ -181,12 +182,12 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetFontFamilyForChars()
    */
-  virtual std::string GetFontFamilyForChars(const TextArray& charsRequested) const;
+  virtual const std::string& GetFontFamilyForChars(const Integration::TextArray& charsRequested) const;
 
   /**
    * @copydoc PlatformAbstraction::AllGlyphsSupported()
    */
-  virtual bool AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const TextArray& text) const;
+  virtual bool AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const Integration::TextArray& text) const;
 
   /**
    * @copydoc PlatformAbstraction::ValidateFontFamilyName()
@@ -196,7 +197,7 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetFontList()
    */
-  virtual std::vector<std::string> GetFontList( PlatformAbstraction::FontListMode mode ) const;
+  virtual void GetFontList( PlatformAbstraction::FontListMode mode, std::vector<std::string>& fontList ) const;
 
   /**
    * @copydoc PlatformAbstraction::LoadFile()
@@ -229,7 +230,6 @@ public:
                                     const std::string& fontStyle,
                                     const Integration::GlyphSet& glyphSet );
 
-
   virtual void GetFileNamesFromDirectory( const std::string& directoryName,
                                           std::vector<std::string>& fileNames );
 
@@ -322,7 +322,6 @@ public: // TEST FUNCTIONS
 
   void SetReadMetricsResult( bool success, std::vector<Integration::GlyphMetrics>& glyphMetricsContainer );
 
-
 private:
   mutable TraceCallStack        mTrace;
   size_t                        mSeconds;
@@ -343,6 +342,7 @@ private:
   LoadFileResult                mLoadFileResult;
   bool                          mSaveFileResult;
   mutable FontListMode          mFontListMode;
+  TestDynamicsFactory*          mDynamicsFactory;
 };
 
 } // Dali