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
Add Text input style changed signal.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-timer.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
index
864e41e
..
2f1ce14
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
@@
-34,12
+34,17
@@
class Timer;
typedef IntrusivePtr<Timer> TimerPtr;
typedef IntrusivePtr<Timer> TimerPtr;
+Dali::Timer::TimerSignalType gTickSignal;
+
/**
* Implementation of the timer
*/
class Timer : public BaseObject
{
public:
/**
* Implementation of the timer
*/
class Timer : public BaseObject
{
public:
+ void MockEmitSignal();
+
+public:
static TimerPtr New( unsigned int milliSec );
Timer( unsigned int milliSec );
virtual ~Timer();
static TimerPtr New( unsigned int milliSec );
Timer( unsigned int milliSec );
virtual ~Timer();
@@
-63,7
+68,6
@@
private: // Implementation
private: // Data
private: // Data
- Dali::Timer::TimerSignalType mTickSignal;
unsigned int mInterval;
};
unsigned int mInterval;
};
@@
-87,7
+91,7
@@
inline const Timer& GetImplementation(const Dali::Timer& timer)
TimerPtr Timer::New( unsigned int milliSec )
{
TimerPtr Timer::New( unsigned int milliSec )
{
- TimerPtr timerImpl = new Timer(
10
);
+ TimerPtr timerImpl = new Timer(
milliSec
);
return timerImpl;
}
return timerImpl;
}
@@
-130,9
+134,17
@@
bool Timer::Tick()
Dali::Timer::TimerSignalType& Timer::TickSignal()
{
Dali::Timer::TimerSignalType& Timer::TickSignal()
{
- return mTickSignal;
+ return gTickSignal;
+}
+
+// Mock setup functions:
+
+void Timer::MockEmitSignal()
+{
+ gTickSignal.Emit();
}
}
+
} // namespace Adaptor
} // namespace Internal
} // namespace Adaptor
} // namespace Internal
@@
-206,5
+218,12
@@
Timer::Timer(Internal::Adaptor::Timer* timer)
{
}
{
}
+// Mock setup functions:
+
+void Timer::MockEmitSignal()
+{
+ Internal::Adaptor::GetImplementation( *this ).MockEmitSignal();
+}
+
} // namespace Dali
} // namespace Dali