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
Remove dead slide effect code and incorrect ref-objects from scroll effects
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-unmanaged
/
utc-Dali-PageTurnView.cpp
diff --git
a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-PageTurnView.cpp
b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-PageTurnView.cpp
index
d594aa9
..
4b314c0
100644
(file)
--- a/
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-PageTurnView.cpp
+++ b/
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-PageTurnView.cpp
@@
-26,18
+26,6
@@
using namespace Dali;
using namespace Dali::Toolkit;
using namespace Dali;
using namespace Dali::Toolkit;
-void dali_page_turn_view_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void dali_page_turn_view_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-
-
namespace
{
const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
namespace
{
const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
@@
-61,20
+49,14
@@
static void TestCallback(BaseHandle handle)
*
* @param application Test application instance
* @param duration Time to pass in milliseconds.
*
* @param application Test application instance
* @param duration Time to pass in milliseconds.
- * @return The actual time passed in milliseconds
*/
*/
-
int
Wait(ToolkitTestApplication& application, int duration = 0)
+
void
Wait(ToolkitTestApplication& application, int duration = 0)
{
{
- int time = 0;
-
for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
{
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
{
application.SendNotification();
application.Render(RENDER_FRAME_INTERVAL);
- time += RENDER_FRAME_INTERVAL;
}
}
-
- return time;
}
// Generate a PanGestureEvent to send to Core
}
// Generate a PanGestureEvent to send to Core
@@
-256,6
+238,15
@@
private:
}// namespace
}// namespace
+void dali_page_turn_view_startup(void)
+{
+ test_return_value = TET_UNDEF;
+}
+
+void dali_page_turn_view_cleanup(void)
+{
+ test_return_value = TET_PASS;
+}
int UtcDaliPageTurnPortraitViewNew(void)
{
int UtcDaliPageTurnPortraitViewNew(void)
{
@@
-374,6
+365,8
@@
int UtcDaliPageTurnViewEnterLeaveEditMode(void)
tet_infoline( " UtcDaliPageTurnViewEnterLeaveEditMode " );
tet_infoline( " UtcDaliPageTurnViewEnterLeaveEditMode " );
+ application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+
TestPageFactory factory(application);
factory.EnableOffscreenRendering( );
TestPageFactory factory(application);
factory.EnableOffscreenRendering( );
@@
-423,6
+416,8
@@
int UtcDaliPageTurnViewGetHitActor(void)
tet_infoline(" UtcDaliPageTurnViewGetHitActor ");
tet_infoline(" UtcDaliPageTurnViewGetHitActor ");
+ application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+
TestPageFactory factory(application);
factory.EnableOffscreenRendering( );
TestPageFactory factory(application);
factory.EnableOffscreenRendering( );
@@
-458,6
+453,8
@@
int UtcDaliPageTurnViewRefresh(void)
tet_infoline(" UtcDaliPageTurnViewRefresh ");
tet_infoline(" UtcDaliPageTurnViewRefresh ");
+ application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+
TestPageFactory factory(application);
factory.EnableOffscreenRendering( );
PageTurnView pageTurnView = PageTurnPortraitView::New( factory, PAGE_SIZE );
TestPageFactory factory(application);
factory.EnableOffscreenRendering( );
PageTurnView pageTurnView = PageTurnPortraitView::New( factory, PAGE_SIZE );
@@
-496,6
+493,8
@@
int UtcDaliPageTurnViewSignals(void)
tet_infoline(" UtcDaliPageTurnViewSignals ");
tet_infoline(" UtcDaliPageTurnViewSignals ");
+ application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+
TestPageFactory factory(application);
Vector2 size = Stage::GetCurrent().GetSize();
PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
TestPageFactory factory(application);
Vector2 size = Stage::GetCurrent().GetSize();
PageTurnView portraitView = PageTurnPortraitView::New( factory, size );