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 "(Visual) Support CORNER_RADIUS_POLICY" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-VideoView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
a38ec18
..
e15a99a
--- a/
automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-152,7
+152,7
@@
int UtcDaliVideoViewProperty1b(void)
Toolkit::VideoView view = Toolkit::VideoView::New();
DALI_TEST_CHECK( view );
Toolkit::VideoView view = Toolkit::VideoView::New();
DALI_TEST_CHECK( view );
-
Stage stage = Stage::GetCurrent
();
+
Integration::Scene stage = application.GetScene
();
std::string file;
Property::Map map;
std::string file;
Property::Map map;
@@
-358,7
+358,7
@@
int UtcDaliVideoViewCustomShaderForCoverage(void)
bool isUnderlay = videoView.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
DALI_TEST_CHECK( !isUnderlay );
bool isUnderlay = videoView.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
DALI_TEST_CHECK( !isUnderlay );
-
Stage::GetCurrent
().Add( videoView );
+
application.GetScene
().Add( videoView );
videoView.SetProperty( VideoView::Property::VIDEO, "testvideo" );
Property::Map customShader;
videoView.SetProperty( VideoView::Property::VIDEO, "testvideo" );
Property::Map customShader;
@@
-387,7
+387,7
@@
int UtcDaliVideoViewMethodsForCoverage2(void)
windowSurfaceTarget.Insert( RENDERING_TYPE, "windowSurfaceTarget" );
windowSurfaceTarget.Insert( RENDERING_TYPE, "windowSurfaceTarget" );
-
Stage::GetCurrent
().Add( videoView );
+
application.GetScene
().Add( videoView );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
@@
-405,14
+405,14
@@
int UtcDaliVideoViewMethodsForCoverage2(void)
Vector3 vector(100.0f, 100.0f, 0.0f);
Vector3 vector(100.0f, 100.0f, 0.0f);
- DALI_TEST_CHECK(vector != videoView.GetCurrent
Size(
));
- videoView.Set
Size(
vector );
+ DALI_TEST_CHECK(vector != videoView.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
));
+ videoView.Set
Property( Actor::Property::SIZE,
vector );
application.SendNotification();
application.Render();
// Check the size in the new frame
application.SendNotification();
application.Render();
// Check the size in the new frame
- DALI_TEST_CHECK(vector == videoView.GetCurrent
Size(
));
+ DALI_TEST_CHECK(vector == videoView.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
));
END_TEST;
}
END_TEST;
}
@@
-426,7
+426,7
@@
int UtcDaliVideoViewPropertyUnderlay(void)
VideoView view = VideoView::New();
DALI_TEST_CHECK( view );
VideoView view = VideoView::New();
DALI_TEST_CHECK( view );
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
view.Play();
application.SendNotification();
view.Play();
application.SendNotification();
@@
-474,7
+474,7
@@
int UtcDaliVideoViewPropertyPlayPosition(void)
VideoView view = VideoView::New();
DALI_TEST_CHECK( view );
VideoView view = VideoView::New();
DALI_TEST_CHECK( view );
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
view.Play();
application.SendNotification();
view.Play();
application.SendNotification();
@@
-501,7
+501,7
@@
int UtcDaliVideoViewNew2(void)
VideoView view = VideoView::New( true );
DALI_TEST_CHECK( view );
VideoView view = VideoView::New( true );
DALI_TEST_CHECK( view );
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
view.Play();
application.SendNotification();
view.Play();
application.SendNotification();
@@
-510,7
+510,7
@@
int UtcDaliVideoViewNew2(void)
VideoView view2 = VideoView::New( "", false );
DALI_TEST_CHECK( view2 );
VideoView view2 = VideoView::New( "", false );
DALI_TEST_CHECK( view2 );
-
Stage::GetCurrent
().Add( view2 );
+
application.GetScene
().Add( view2 );
view2.Play();
application.SendNotification();
view2.Play();
application.SendNotification();
@@
-527,7
+527,7
@@
int UtcDaliVideoViewPropertyDisplayMode(void)
VideoView view = VideoView::New();
DALI_TEST_CHECK( view );
VideoView view = VideoView::New();
DALI_TEST_CHECK( view );
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
view.Play();
application.SendNotification();
view.Play();
application.SendNotification();
@@
-555,7
+555,7
@@
int UtcDaliVideoViewCustomShader(void)
bool isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
DALI_TEST_CHECK( !isUnderlay );
bool isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
DALI_TEST_CHECK( !isUnderlay );
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
view.SetProperty( VideoView::Property::VIDEO, "testvideo" );
/* insert custom shader */
view.SetProperty( VideoView::Property::VIDEO, "testvideo" );
/* insert custom shader */
@@
-573,7
+573,7
@@
int UtcDaliVideoViewCustomShader(void)
view.SetProperty( VideoView::Property::VIDEO, map );
/* do render for check custom shader */
view.SetProperty( VideoView::Property::VIDEO, map );
/* do render for check custom shader */
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
view.Play();
application.SendNotification();
view.Play();
application.SendNotification();