projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Automated Tests) Update test suite after changes to PlatformAbstraction
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-platform-abstraction.cpp
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
d9ea25e
..
5ece3f1
100644
(file)
--- 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
@@
-22,43
+22,44
@@
namespace Dali
{
namespace Dali
{
-/**
- * Constructor
- */
+namespace
+{
+const unsigned int NANOSECONDS_PER_MILLISECOND = 1000000u;
+const unsigned int NANOSECONDS_PER_SECOND = 1000000000u;
+}
+
TestPlatformAbstraction::TestPlatformAbstraction()
TestPlatformAbstraction::TestPlatformAbstraction()
-: mRequest(0)
+: mTrace(),
+ mSeconds( 0u ),
+ mNanoSeconds( 0u ),
+ mIsLoadingResult( false ),
+ mGetDefaultFontSizeResult( 0 ),
+ mResources(),
+ mRequest( NULL ),
+ mSize(),
+ mClosestSize(),
+ mLoadFileResult(),
+ mSaveFileResult( false )
{
Initialize();
}
{
Initialize();
}
-/**
- * Destructor
- */
TestPlatformAbstraction::~TestPlatformAbstraction()
{
}
TestPlatformAbstraction::~TestPlatformAbstraction()
{
}
-/**
- * @copydoc PlatformAbstraction::GetTimeMicroseconds()
- */
-void TestPlatformAbstraction::GetTimeMicroseconds(unsigned int &seconds, unsigned int µSeconds)
+void TestPlatformAbstraction::GetTimeNanoseconds( uint64_t& seconds, uint64_t& nanoseconds )
{
seconds = mSeconds;
{
seconds = mSeconds;
-
microSeconds = mMicr
oSeconds;
- mTrace.PushCall("GetTime
Micr
oseconds", "");
+
nanoseconds = mNan
oSeconds;
+ mTrace.PushCall("GetTime
Nan
oseconds", "");
}
}
-/**
- * @copydoc PlatformAbstraction::Suspend()
- */
void TestPlatformAbstraction::Suspend()
{
mTrace.PushCall("Suspend", "");
}
void TestPlatformAbstraction::Suspend()
{
mTrace.PushCall("Suspend", "");
}
-/**
- * @copydoc PlatformAbstraction::Resume()
- */
void TestPlatformAbstraction::Resume()
{
mTrace.PushCall("Resume", "");
void TestPlatformAbstraction::Resume()
{
mTrace.PushCall("Resume", "");
@@
-86,9
+87,6
@@
ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::Resou
return closestSize;
}
return closestSize;
}
-/**
- * @copydoc PlatformAbstraction::LoadResource()
- */
void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request)
{
std::ostringstream out;
void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request)
{
std::ostringstream out;
@@
-115,17
+113,11
@@
Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration:
return Integration::BitmapPtr();
}
return Integration::BitmapPtr();
}
-/**
- * @copydoc PlatformAbstraction::CancelLoad()
- */
void TestPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId)
{
mTrace.PushCall("CancelLoad", "");
}
void TestPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId)
{
mTrace.PushCall("CancelLoad", "");
}
-/**
- * @copydoc PlatformAbstraction::GetResources()
- */
void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache)
{
mTrace.PushCall("GetResources", "");
void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache)
{
mTrace.PushCall("GetResources", "");
@@
-140,35
+132,23
@@
void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache)
}
}
}
}
-/**
- * @copydoc PlatformAbstraction::IsLoading()
- */
bool TestPlatformAbstraction::IsLoading()
{
mTrace.PushCall("IsLoading", "");
return mIsLoadingResult;
}
bool TestPlatformAbstraction::IsLoading()
{
mTrace.PushCall("IsLoading", "");
return mIsLoadingResult;
}
-/**
- * @copydoc PlatformAbstraction::GetDefaultFontSize()
- */
int TestPlatformAbstraction::GetDefaultFontSize() const
{
int TestPlatformAbstraction::GetDefaultFontSize() const
{
- // TODO
- return
int()
;
+ mTrace.PushCall("GetDefaultFontSize", "");
+ return
mGetDefaultFontSizeResult
;
}
}
-/**
- * @copydoc PlatformAbstraction::SetDpi()
- */
void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
{
mTrace.PushCall("SetDpi", "");
}
void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
{
mTrace.PushCall("SetDpi", "");
}
-/**
- * @copydoc PlatformAbstraction::LoadFile()
- */
bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
{
mTrace.PushCall("LoadFile", "");
bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
{
mTrace.PushCall("LoadFile", "");
@@
-180,9
+160,6
@@
bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vecto
return mLoadFileResult.loadResult;
}
return mLoadFileResult.loadResult;
}
-/**
- * @copydoc PlatformAbstraction::LoadShaderBinaryFile()
- */
bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
{
mTrace.PushCall("LoadShaderBinaryFile", "");
bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
{
mTrace.PushCall("LoadShaderBinaryFile", "");
@@
-194,10
+171,7
@@
bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename,
return mLoadFileResult.loadResult;
}
return mLoadFileResult.loadResult;
}
-/**
- * @copydoc PlatformAbstraction::SaveFile()
- */
-bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const
+bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const
{
mTrace.PushCall("SaveFile", "");
return false;
{
mTrace.PushCall("SaveFile", "");
return false;
@@
-215,7
+189,7
@@
void TestPlatformAbstraction::Initialize()
mTrace.Enable(true);
memset(&mResources, 0, sizeof(Resources));
mSeconds=0;
mTrace.Enable(true);
memset(&mResources, 0, sizeof(Resources));
mSeconds=0;
- m
Micr
oSeconds=0;
+ m
Nan
oSeconds=0;
mIsLoadingResult=false;
if(mRequest)
mIsLoadingResult=false;
if(mRequest)
@@
-225,12
+199,11
@@
void TestPlatformAbstraction::Initialize()
}
}
}
}
-
bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
{
switch(func)
{
bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
{
switch(func)
{
- case GetTime
MicrosecondsFunc: return mTrace.FindMethod("GetTimeMicr
oseconds");
+ case GetTime
NanosecondsFunc: return mTrace.FindMethod("GetTimeNan
oseconds");
case SuspendFunc: return mTrace.FindMethod("Suspend");
case ResumeFunc: return mTrace.FindMethod("Resume");
case LoadResourceFunc: return mTrace.FindMethod("LoadResource");
case SuspendFunc: return mTrace.FindMethod("Suspend");
case ResumeFunc: return mTrace.FindMethod("Resume");
case LoadResourceFunc: return mTrace.FindMethod("LoadResource");
@@
-247,19
+220,19
@@
bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
return false;
}
return false;
}
-void TestPlatformAbstraction::SetGetTime
MicrosecondsResult(size_t sec, size_t u
sec)
+void TestPlatformAbstraction::SetGetTime
NanosecondsResult(size_t sec, size_t n
sec)
{
mSeconds = sec;
{
mSeconds = sec;
- m
MicroSeconds = u
sec;
+ m
NanoSeconds = n
sec;
}
void TestPlatformAbstraction::IncrementGetTimeResult(size_t milliseconds)
{
}
void TestPlatformAbstraction::IncrementGetTimeResult(size_t milliseconds)
{
- m
MicroSeconds += milliseconds * 1000u
;
- unsigned int additionalSeconds = m
MicroSeconds / 1000000u
;
+ m
NanoSeconds += milliseconds * NANOSECONDS_PER_MILLISECOND
;
+ unsigned int additionalSeconds = m
NanoSeconds / NANOSECONDS_PER_SECOND
;
mSeconds += additionalSeconds;
mSeconds += additionalSeconds;
- m
MicroSeconds -= additionalSeconds * 1000000u
;
+ m
NanoSeconds -= additionalSeconds * NANOSECONDS_PER_SECOND
;
}
void TestPlatformAbstraction::SetIsLoadingResult(bool result)
}
void TestPlatformAbstraction::SetIsLoadingResult(bool result)