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
Deleted Move/Copy operators & constructors from Internal::Control
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-BloomView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
index
fa3f10c
..
2105c4a
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
@@
-121,19
+121,19
@@
int UtcDaliBloomViewAddRemove(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, application.GetScene
().GetSize());
view.Add(actor);
view.Add(actor);
-
Stage::GetCurrent
().Add(view);
+
application.GetScene
().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;
}
@@
-146,21
+146,21
@@
int UtcDaliBloomActivateDeactivate(void)
Toolkit::BloomView view = Toolkit::BloomView::New();
DALI_TEST_CHECK( view );
Toolkit::BloomView view = Toolkit::BloomView::New();
DALI_TEST_CHECK( view );
- RenderTaskList taskList =
Stage::GetCurrent
().GetRenderTaskList();
+ RenderTaskList taskList =
application.GetScene
().GetRenderTaskList();
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
- 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, application.GetScene
().GetSize());
view.Add(Actor::New());
view.Add(Actor::New());
-
Stage::GetCurrent
().Add(view);
+
application.GetScene
().Add(view);
view.Activate();
view.Activate();
- RenderTaskList taskList2 =
Stage::GetCurrent
().GetRenderTaskList();
+ RenderTaskList taskList2 =
application.GetScene
().GetRenderTaskList();
DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
view.Deactivate();
DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
view.Deactivate();
- RenderTaskList taskList3 =
Stage::GetCurrent
().GetRenderTaskList();
+ RenderTaskList taskList3 =
application.GetScene
().GetRenderTaskList();
DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
END_TEST;
}
DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
END_TEST;
}
@@
-209,18
+209,18
@@
int UtcDaliBloomOnSizeSet(void)
BloomView view = Toolkit::BloomView::New();
BloomView view = Toolkit::BloomView::New();
-
Stage::GetCurrent
().Add( view );
+
application.GetScene
().Add( view );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- Vector3 size( 200.0f, 300.0f,
20
0.0f );
- view.Set
Size(
size );
+ Vector3 size( 200.0f, 300.0f, 0.0f );
+ view.Set
Property( Actor::Property::SIZE,
size );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( view.GetCurrent
Size(
), size, TEST_LOCATION );
+ DALI_TEST_EQUALS( view.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
), size, TEST_LOCATION );
END_TEST;
}
END_TEST;
}