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 non-touch related deprecated APIs
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-EffectsView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
index
d597f7a
..
e7761e6
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
@@
-106,21
+106,21
@@
int UtcDaliEffectsViewAddRemoveDropShadow(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.SetP
arentOrigin(
ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER);
+ 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
) );
DALI_TEST_CHECK( actor.GetParent() );
DALI_TEST_CHECK( actor.GetParent() != view );
view.Remove(actor);
DALI_TEST_CHECK( actor.GetParent() );
DALI_TEST_CHECK( actor.GetParent() != view );
view.Remove(actor);
- DALI_TEST_CHECK( !actor.
OnStage(
) );
+ DALI_TEST_CHECK( !actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) );
END_TEST;
}
END_TEST;
}
@@
-153,16
+153,16
@@
int UtcDaliEffectsViewAddRemoveEmboss(void)
Actor actor = Actor::New();
actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Actor actor = Actor::New();
actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
- DALI_TEST_CHECK( !actor.
OnStage(
) );
+ DALI_TEST_CHECK( !actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) );
- view.SetP
arentOrigin(
ParentOrigin::CENTER);
+ view.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER);
view.Add(actor);
view.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
stage.Add(view);
view.Add(actor);
view.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
stage.Add(view);
- DALI_TEST_CHECK( actor.
OnStage(
) );
+ DALI_TEST_CHECK( actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
@@
-207,7
+207,7
@@
int UtcDaliEffectsViewOnStage(void)
ToolkitTestApplication application;
EffectsView view = EffectsView::New(EffectsView::EMBOSS);
ToolkitTestApplication application;
EffectsView view = EffectsView::New(EffectsView::EMBOSS);
- view.Set
Size(100.f, 100.f
);
+ view.Set
Property( Actor::Property::SIZE, Vector2(100.f, 100.f)
);
Stage stage = Stage::GetCurrent();
DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
Stage stage = Stage::GetCurrent();
DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
@@
-224,7
+224,7
@@
int UtcDaliEffectsViewOffStage(void)
ToolkitTestApplication application;
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
ToolkitTestApplication application;
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
- view.Set
Size(100.f, 100.f
);
+ view.Set
Property( Actor::Property::SIZE, Vector2(100.f, 100.f)
);
Stage stage = Stage::GetCurrent();
DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
Stage stage = Stage::GetCurrent();
DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
@@
-457,7
+457,7
@@
int UtcDaliEffectsViewSetRefreshOnDemandP(void)
ToolkitTestApplication application;
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
ToolkitTestApplication application;
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
- view.Set
Size(100.f, 100.f
);
+ view.Set
Property( Actor::Property::SIZE, Vector2(100.f, 100.f)
);
Stage stage = Stage::GetCurrent();
stage.Add( view );
Stage stage = Stage::GetCurrent();
stage.Add( view );
@@
-501,26
+501,26
@@
int UtcDaliEffectsViewSizeSet(void)
{
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
{
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
- view.Set
Size( 200.0f, 200.0f, 0.0f
);
+ view.Set
Property( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f )
);
stage.Add( view );
application.SendNotification();
application.Render();
stage.Add( view );
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( view.GetCurrent
Size(
), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+ DALI_TEST_EQUALS( view.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
}
{
EffectsView view = EffectsView::New(EffectsView::EMBOSS);
}
{
EffectsView view = EffectsView::New(EffectsView::EMBOSS);
- view.Set
Size( 200.0f, 200.0f, 0.0f
);
+ view.Set
Property( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f )
);
stage.Add( view );
application.SendNotification();
application.Render();
stage.Add( view );
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( view.GetCurrent
Size(
), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+ DALI_TEST_EQUALS( view.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
}
{
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
}
{
EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
- view.Set
Size( 200.0f, 200.0f, 0.0f
);
+ view.Set
Property( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f )
);
stage.Add( view );
application.SendNotification();
application.Render();
stage.Add( view );
application.SendNotification();
application.Render();
@@
-529,7
+529,7
@@
int UtcDaliEffectsViewSizeSet(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( view.GetCurrent
Size(
), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+ DALI_TEST_EQUALS( view.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
}
END_TEST;
}
END_TEST;