X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-platform-abstraction.cpp;h=4f749ce222b50c92b88eeeee4c1a72d0e6a5bbbf;hb=fca68202d695c569739819fb8d58b9808b8decb5;hp=218279a933fbeef4f0ddd32e5639b18a246aa771;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index 218279a..4f749ce 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp @@ -86,7 +86,19 @@ void TestPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer */ void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request) { - mTrace.PushCall("LoadResource", ""); + std::ostringstream out; + out << "Type:"; + if( request.GetType()->id == Integration::ResourceText ) + { + out << "Text"; + } + else + { + out << request.GetType()->id; + } + out << ", Path: " << request.GetPath() << std::endl ; + + mTrace.PushCall("LoadResource", out.str()); if(mRequest != NULL) { delete mRequest; @@ -160,7 +172,7 @@ bool TestPlatformAbstraction::IsLoading() /** * @copydoc PlatformAbstraction::GetDefaultFontFamily() */ -std::string TestPlatformAbstraction::GetDefaultFontFamily() const +const std::string& TestPlatformAbstraction::GetDefaultFontFamily() const { mTrace.PushCall("GetDefaultFontFamily", ""); return mGetDefaultFontFamilyResult; @@ -169,13 +181,13 @@ std::string TestPlatformAbstraction::GetDefaultFontFamily() const /** * @copydoc PlatformAbstraction::GetDefaultFontSize() */ -const float TestPlatformAbstraction::GetDefaultFontSize() const +float TestPlatformAbstraction::GetDefaultFontSize() const { mTrace.PushCall("GetDefaultFontSize", ""); return mGetDefaultFontSizeResult; } -const PixelSize TestPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, const CapsHeight& capsHeight) const +PixelSize TestPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const { mTrace.PushCall("GetFontLineHeightFromCapsHeight", ""); // LineHeight will be bigger than CapsHeight, so return capsHeight + 1 @@ -310,7 +322,7 @@ void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int d /** * @copydoc PlatformAbstraction::GetFontFamilyForChars() */ -std::string TestPlatformAbstraction::GetFontFamilyForChars(const TextArray& charsRequested) const +const std::string& TestPlatformAbstraction::GetFontFamilyForChars(const TextArray& charsRequested) const { mTrace.PushCall("GetFontFamilyForChars", ""); return mGetDefaultFontFamilyResult; @@ -337,12 +349,10 @@ bool TestPlatformAbstraction::ValidateFontFamilyName(const std::string& fontFami /** * @copydoc PlatformAbstraction::GetFontList() */ -std::vector TestPlatformAbstraction::GetFontList( PlatformAbstraction::FontListMode mode ) const +void TestPlatformAbstraction::GetFontList( PlatformAbstraction::FontListMode mode, std::vector& fonstList ) const { mFontListMode = mode; mTrace.PushCall("ValidateGetFontList", ""); - std::vector fontList; - return fontList; } /**