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 "Divide Render() into small apis" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-GaussianBlurView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
index
afc6aee
..
fd5cd98
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
@@
-142,19
+142,19
@@
int UtcDaliGaussianBlurViewAddRemove(void)
DALI_TEST_CHECK( view );
Actor actor = Actor::New();
DALI_TEST_CHECK( view );
Actor actor = Actor::New();
- DALI_TEST_CHECK( !actor.
OnStage(
) );
+ DALI_TEST_CHECK( !actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(actor);
Stage::GetCurrent().Add(view);
view.Add(actor);
Stage::GetCurrent().Add(view);
- DALI_TEST_CHECK( actor.
OnStage(
) );
+ DALI_TEST_CHECK( actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) );
view.Remove(actor);
view.Remove(actor);
- DALI_TEST_CHECK( !actor.
OnStage(
) );
+ DALI_TEST_CHECK( !actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) );
END_TEST;
}
END_TEST;
}
@@
-171,7
+171,7
@@
int UtcDaliGaussianBlurActivateDeactivate(void)
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
@@
-202,7
+202,7
@@
int UtcDaliGaussianBlurActivateDeactivateRepeat(void)
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
@@
-254,7
+254,7
@@
int UtcDaliGaussianBlurViewSetGetRenderTarget(void)
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
@@
-281,7
+281,7
@@
int UtcDaliGaussianBlurViewActivateOnce1(void)
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.ActivateOnce();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.ActivateOnce();
@@
-306,7
+306,7
@@
int UtcDaliGaussianBlurActivateOnce2(void)
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.ActivateOnce();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.ActivateOnce();
@@
-335,7
+335,7
@@
int UtcDaliGaussianBlurViewFinishedSignalN(void)
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
DALI_TEST_CHECK( view );
view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();