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
Merge "Added pixel format to fix bug with ktx loader" into devel/graphics
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-feedback-player.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-feedback-player.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-feedback-player.cpp
index
999249a
..
946880e
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-feedback-player.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-feedback-player.cpp
@@
-15,7
+15,7
@@
*/
#include <dali/devel-api/adaptor-framework/feedback-player.h>
*/
#include <dali/devel-api/adaptor-framework/feedback-player.h>
-#include <dali/devel-api/
adaptor-framework
/singleton-service.h>
+#include <dali/devel-api/
common
/singleton-service.h>
#include <dali/public-api/object/base-object.h>
using namespace Dali;
#include <dali/public-api/object/base-object.h>
using namespace Dali;
@@
-85,11
+85,17
@@
public:
bool LoadFile(const std::string& filename, std::string& data)
{
bool LoadFile(const std::string& filename, std::string& data)
{
- return true;
+ return mLoadFileReturn;
+ }
+
+ void SetLoadFileReturnValue(bool value)
+ {
+ mLoadFileReturn = value;
}
private:
FeedbackPlayer()
}
private:
FeedbackPlayer()
+ : mLoadFileReturn{true}
{
}
{
}
@@
-105,6
+111,8
@@
private:
{
return *this;
}
{
return *this;
}
+
+ bool mLoadFileReturn;
};
} // Adaptor
};
} // Adaptor
@@
-177,4
+185,17
@@
FeedbackPlayer::FeedbackPlayer( Internal::Adaptor::FeedbackPlayer* player )
{
}
{
}
+namespace Internal
+{
+namespace Adaptor
+{
+
+void SetLoadFileReturnValue(Dali::FeedbackPlayer feedbackPlayer, bool returnValue)
+{
+ GetImplementation(feedbackPlayer).SetLoadFileReturnValue( returnValue );
+}
+
+} // Adaptor
+} // Internal
+
} // Dali
} // Dali