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.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
index
c083fef
..
b1fb01b
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
@@
-21,15
+21,13
@@
// EXTERNAL INCLUDES
#include <stdint.h>
#include <cstring>
// EXTERNAL INCLUDES
#include <stdint.h>
#include <cstring>
-#include <
dali/public-api/images/image-operations.h
>
+#include <
string
>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <dali/devel-api/common/set-wrapper.h>
#include <dali/integration-api/platform-abstraction.h>
#include "test-trace-call-stack.h"
#include <dali/integration-api/platform-abstraction.h>
#include "test-trace-call-stack.h"
-
namespace Dali
{
namespace Dali
{
@@
-51,14
+49,6
@@
public:
bool loadFailed;
Integration::ResourceId loadFailedId;
Integration::ResourceFailure loadFailure;
bool loadFailed;
Integration::ResourceId loadFailedId;
Integration::ResourceFailure loadFailure;
-
- bool saved;
- Integration::ResourceId savedId;
- Integration::ResourceTypeId savedType;
-
- bool saveFailed;
- Integration::ResourceId saveFailedId;
- Integration::ResourceFailure saveFailure;
};
struct LoadFileResult
};
struct LoadFileResult
@@
-70,7
+60,7
@@
public:
}
bool loadResult;
}
bool loadResult;
-
std::v
ector< unsigned char> buffer;
+
Dali::V
ector< unsigned char> buffer;
};
/**
};
/**
@@
-84,9
+74,9
@@
public:
virtual ~TestPlatformAbstraction();
/**
virtual ~TestPlatformAbstraction();
/**
- * @copydoc PlatformAbstraction::GetTime
Micr
oseconds()
+ * @copydoc PlatformAbstraction::GetTime
Nan
oseconds()
*/
*/
- virtual void GetTime
Microseconds(unsigned int &seconds, unsigned int µSeconds
);
+ virtual void GetTime
Nanoseconds( uint64_t& seconds, uint64_t& nanoseconds
);
/**
* @copydoc PlatformAbstraction::Suspend()
/**
* @copydoc PlatformAbstraction::Suspend()
@@
-103,7
+93,7
@@
public:
*/
virtual ImageDimensions GetClosestImageSize( const std::string& filename,
ImageDimensions size,
*/
virtual ImageDimensions GetClosestImageSize( const std::string& filename,
ImageDimensions size,
- FittingMode::Type
scal
ingMode,
+ FittingMode::Type
fitt
ingMode,
SamplingMode::Type samplingMode,
bool orientationCorrection );
SamplingMode::Type samplingMode,
bool orientationCorrection );
@@
-112,7
+102,7
@@
public:
*/
virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
ImageDimensions size,
*/
virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
ImageDimensions size,
- FittingMode::Type
scal
ingMode,
+ FittingMode::Type
fitt
ingMode,
SamplingMode::Type samplingMode,
bool orientationCorrection );
SamplingMode::Type samplingMode,
bool orientationCorrection );
@@
-127,9
+117,9
@@
public:
virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
/**
virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
/**
- * @copydoc PlatformAbstraction::
SaveResource
()
+ * @copydoc PlatformAbstraction::
DecodeBuffer
()
*/
*/
- virtual
void SaveResource(const Integration::ResourceRequest& request
);
+ virtual
Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size
);
/**
* @copydoc PlatformAbstraction::CancelLoad()
/**
* @copydoc PlatformAbstraction::CancelLoad()
@@
-147,11
+137,6
@@
public:
virtual bool IsLoading();
/**
virtual bool IsLoading();
/**
- * @copydoc PlatformAbstraction::GetDefaultFontDescription()
- */
- virtual void GetDefaultFontDescription( std::string& family, std::string& style ) const;
-
- /**
* @copydoc PlatformAbstraction::GetDefaultFontSize()
*/
virtual int GetDefaultFontSize() const;
* @copydoc PlatformAbstraction::GetDefaultFontSize()
*/
virtual int GetDefaultFontSize() const;
@@
-160,44
+145,47
@@
public:
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
+
/**
* @copydoc PlatformAbstraction::LoadFile()
*/
/**
* @copydoc PlatformAbstraction::LoadFile()
*/
- virtual bool LoadFile( const std::string& filename,
std::v
ector< unsigned char >& buffer ) const;
+ virtual bool LoadFile( const std::string& filename,
Dali::V
ector< unsigned char >& buffer ) const;
/**
/**
- * @copydoc PlatformAbstraction::LoadShaderBinFile()
+ * @copydoc PlatformAbstraction::LoadShaderBin
ary
File()
*/
*/
- virtual bool LoadShaderBin
File( const std::string& filename, std::v
ector< unsigned char >& buffer ) const;
+ virtual bool LoadShaderBin
aryFile( const std::string& filename, Dali::V
ector< unsigned char >& buffer ) const;
/**
* @copydoc PlatformAbstraction::SaveFile()
*/
/**
* @copydoc PlatformAbstraction::SaveFile()
*/
- virtual bool SaveFile(const std::string& filename,
std::vector< unsigned char >& buffer
) const;
+ virtual bool SaveFile(const std::string& filename,
const unsigned char * buffer, unsigned int numBytes
) const;
- virtual void JoinLoaderThreads();
+ /**
+ * @copydoc PlatformAbstraction::SaveShaderBinaryFile()
+ */
+ virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; }
- virtual
Integration::DynamicsFactory* GetDynamicsFactory
();
+ virtual
void JoinLoaderThreads
();
public: // TEST FUNCTIONS
// Enumeration of Platform Abstraction methods
typedef enum
{
public: // TEST FUNCTIONS
// Enumeration of Platform Abstraction methods
typedef enum
{
- GetTime
Micr
osecondsFunc,
+ GetTime
Nan
osecondsFunc,
SuspendFunc,
ResumeFunc,
LoadResourceFunc,
SuspendFunc,
ResumeFunc,
LoadResourceFunc,
- SaveResourceFunc,
SaveFileFunc,
LoadFileFunc,
SaveFileFunc,
LoadFileFunc,
- LoadShaderBinFileFunc,
+ LoadShaderBinaryFileFunc,
+ SaveShaderBinaryFileFunc,
CancelLoadFunc,
GetResourcesFunc,
IsLoadingFunc,
SetDpiFunc,
JoinLoaderThreadsFunc,
CancelLoadFunc,
GetResourcesFunc,
IsLoadingFunc,
SetDpiFunc,
JoinLoaderThreadsFunc,
- GetDynamicsFactoryFunc,
} TestFuncEnum;
/** Call this every test */
} TestFuncEnum;
/** Call this every test */
@@
-209,18
+197,14
@@
public: // TEST FUNCTIONS
bool WasCalled(TestFuncEnum func);
bool WasCalled(TestFuncEnum func);
- void SetGetTime
MicrosecondsResult(size_t sec, size_t u
sec);
+ void SetGetTime
NanosecondsResult(size_t sec, size_t n
sec);
void IncrementGetTimeResult(size_t milliseconds);
void SetIsLoadingResult(bool result);
void IncrementGetTimeResult(size_t milliseconds);
void SetIsLoadingResult(bool result);
- void SetGetDefaultFontFamilyResult(std::string result);
-
void SetGetDefaultFontSizeResult(float result);
void SetGetDefaultFontSizeResult(float result);
- void SetGetFontPathResult(std::string& result);
-
void ClearReadyResources();
void SetResourceLoaded(Integration::ResourceId loadedId,
void ClearReadyResources();
void SetResourceLoaded(Integration::ResourceId loadedId,
@@
-230,27
+214,22
@@
public: // TEST FUNCTIONS
void SetResourceLoadFailed(Integration::ResourceId id,
Integration::ResourceFailure failure);
void SetResourceLoadFailed(Integration::ResourceId id,
Integration::ResourceFailure failure);
- void SetResourceSaved(Integration::ResourceId savedId,
- Integration::ResourceTypeId savedType);
-
- void SetResourceSaveFailed(Integration::ResourceId id,
- Integration::ResourceFailure failure);
-
Integration::ResourceRequest* GetRequest();
void DiscardRequest();
void SetClosestImageSize(const Vector2& size);
Integration::ResourceRequest* GetRequest();
void DiscardRequest();
void SetClosestImageSize(const Vector2& size);
- void SetLoadFileResult( bool result,
std::v
ector< unsigned char >& buffer );
+ void SetLoadFileResult( bool result,
Dali::V
ector< unsigned char >& buffer );
void SetSaveFileResult( bool result );
private:
mutable TraceCallStack mTrace;
void SetSaveFileResult( bool result );
private:
mutable TraceCallStack mTrace;
-
size_t
mSeconds;
-
size_t mMicr
oSeconds;
+
uint64_t
mSeconds;
+
uint64_t mNan
oSeconds;
bool mIsLoadingResult;
bool mIsLoadingResult;
+ int mGetDefaultFontSizeResult;
Resources mResources;
Integration::ResourceRequest* mRequest;
Vector2 mSize;
Resources mResources;
Integration::ResourceRequest* mRequest;
Vector2 mSize;