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
Adding 'override', removing 'virtual' from overriding functions' declarations in...
[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
230ed02
..
1adedd4
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
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TEST_PLATFORM_ABSTRACTION_H__
-#define
__DALI_TEST_PLATFORM_ABSTRACTION_H__
+#ifndef
DALI_TEST_PLATFORM_ABSTRACTION_H
+#define
DALI_TEST_PLATFORM_ABSTRACTION_H
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,6
+26,7
@@
// INTERNAL INCLUDES
#include <dali/integration-api/platform-abstraction.h>
// INTERNAL INCLUDES
#include <dali/integration-api/platform-abstraction.h>
+#include <dali/public-api/math/vector2.h>
#include "test-trace-call-stack.h"
#include "test-trace-call-stack.h"
@@
-35,7
+36,7
@@
namespace Dali
/**
* Concrete implementation of the platform abstraction class.
*/
/**
* Concrete implementation of the platform abstraction class.
*/
-class DALI_
IMPORT
_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction
+class DALI_
CORE
_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction
{
public:
{
public:
@@
-48,46
+49,55
@@
public:
/**
* Destructor
*/
/**
* Destructor
*/
-
virtual ~TestPlatformAbstraction()
;
+
~TestPlatformAbstraction() override
;
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
-
virtual
ImageDimensions GetClosestImageSize( const std::string& filename,
+ ImageDimensions GetClosestImageSize( const std::string& filename,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
- bool orientationCorrection );
+ bool orientationCorrection )
override
;
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
-
virtual
ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
+ ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
- bool orientationCorrection );
+ bool orientationCorrection )
override
;
/**
* @copydoc PlatformAbstraction::LoadResourceSynchronously()
*/
/**
* @copydoc PlatformAbstraction::LoadResourceSynchronously()
*/
-
virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath )
;
+
Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ) override
;
/**
* @copydoc PlatformAbstraction::DecodeBuffer()
*/
/**
* @copydoc PlatformAbstraction::DecodeBuffer()
*/
-
virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size )
;
+
Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size ) override
;
/**
* @copydoc PlatformAbstraction::LoadShaderBinaryFile()
*/
/**
* @copydoc PlatformAbstraction::LoadShaderBinaryFile()
*/
-
virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
;
+
bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const override
;
/**
* @copydoc PlatformAbstraction::SaveShaderBinaryFile()
*/
/**
* @copydoc PlatformAbstraction::SaveShaderBinaryFile()
*/
- virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; }
+ virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const
override
{ return true; }
+ /**
+ * @copydoc PlatformAbstraction::StartTimer()
+ */
+ uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback ) override;
+
+ /*
+ * @copydoc PlatformAbstraction::CancelTimer()
+ */
+ void CancelTimer ( uint32_t timerId ) override;
public: // TEST FUNCTIONS
public: // TEST FUNCTIONS
@@
-128,7
+138,7
@@
public: // TEST FUNCTIONS
* @brief Sets the value returned by GetClosestImageSize.
* @param[in] size The size that should be returned.
*/
* @brief Sets the value returned by GetClosestImageSize.
* @param[in] size The size that should be returned.
*/
- void SetClosestImageSize(
const Vector2& size
);
+ void SetClosestImageSize(
const Vector2& size
);
/**
* @brief Sets the result return by LoadFile.
/**
* @brief Sets the result return by LoadFile.
@@
-155,6
+165,11
@@
public: // TEST FUNCTIONS
*/
void SetDecodedBitmap( Integration::BitmapPtr bitmap );
*/
void SetDecodedBitmap( Integration::BitmapPtr bitmap );
+ /**
+ * @brief Triggers the previously stored callback function
+ */
+ void TriggerTimer();
+
private:
TestPlatformAbstraction( const TestPlatformAbstraction& ); ///< Undefined
private:
TestPlatformAbstraction( const TestPlatformAbstraction& ); ///< Undefined
@@
-176,16
+191,18
@@
private:
mutable TraceCallStack mTrace;
bool mIsLoadingResult;
mutable TraceCallStack mTrace;
bool mIsLoadingResult;
- Vector2 mSize;
- Vector2 mClosestSize;
+ ImageDimensions mClosestSize;
LoadFileResult mLoadFileResult;
bool mSaveFileResult;
Integration::ResourcePointer mSynchronouslyLoadedResource;
Integration::BitmapPtr mDecodedBitmap;
LoadFileResult mLoadFileResult;
bool mSaveFileResult;
Integration::ResourcePointer mSynchronouslyLoadedResource;
Integration::BitmapPtr mDecodedBitmap;
+
+ uint32_t mTimerId;
+ CallbackBase* mCallbackFunction;
};
} // Dali
};
} // Dali
-#endif /*
__DALI_TET_PLATFORM_ABSTRACTION_H__
*/
+#endif /*
DALI_TEST_PLATFORM_ABSTRACTION_H
*/