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
(AutomatedTests) Remove View test cases
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ControlImpl.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
index
6965f35
..
75a2d85
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@
-218,7
+218,7
@@
int UtcDaliControlImplOnGestureMethods(void)
// Check gesture actually happens
{
DummyControl dummy = DummyControl::New(true);
// Check gesture actually happens
{
DummyControl dummy = DummyControl::New(true);
- dummy.SetSize( Vector
3(100.0f, 100.0f, 100.0f
) );
+ dummy.SetSize( Vector
2(100.0f, 100.0f
) );
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
@@
-278,7
+278,7
@@
int UtcDaliControlImplOnGestureMethods(void)
// Ensure full code coverage
{
DummyControl dummy = DummyControl::New();
// Ensure full code coverage
{
DummyControl dummy = DummyControl::New();
- dummy.SetSize( Vector
3(100.0f, 100.0f, 100.0f
) );
+ dummy.SetSize( Vector
2( 100.0f, 100.0f
) );
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
@@
-449,8
+449,8
@@
int UtcDaliControlImplSizeSet(void)
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS( dummyImpl.sizeSetCalled,
false, TEST_LOCATION );
- Vector
3 size(100.0f, 200.0f,
0.0f);
+ DALI_TEST_EQUALS( dummyImpl.sizeSetCalled,
true, TEST_LOCATION ); // Called from size negotiation
+ Vector
2 size(100.0f, 20
0.0f);
dummy.SetSize(size);
application.Render();
dummy.SetSize(size);
application.Render();
@@
-458,7
+458,7
@@
int UtcDaliControlImplSizeSet(void)
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(size, dummy.GetCurrentSize(), TEST_LOCATION);
+ DALI_TEST_EQUALS(size, dummy.GetCurrentSize()
.GetVectorXY()
, TEST_LOCATION);
DALI_TEST_EQUALS( dummyImpl.sizeSetCalled, true, TEST_LOCATION );
Stage::GetCurrent().Remove(dummy);
DALI_TEST_EQUALS( dummyImpl.sizeSetCalled, true, TEST_LOCATION );
Stage::GetCurrent().Remove(dummy);
@@
-469,8
+469,8
@@
int UtcDaliControlImplSizeSet(void)
DummyControl dummy = DummyControl::New();
Stage::GetCurrent().Add(dummy);
DummyControl dummy = DummyControl::New();
Stage::GetCurrent().Add(dummy);
- Vector
3 size(100.0f, 200.0f,
0.0f);
- DALI_TEST_CHECK( size != dummy.GetCurrentSize() );
+ Vector
2 size(100.0f, 20
0.0f);
+ DALI_TEST_CHECK( size != dummy.GetCurrentSize()
.GetVectorXY()
);
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
@@
-482,7
+482,7
@@
int UtcDaliControlImplSizeSet(void)
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(size, dummy.GetCurrentSize(), TEST_LOCATION);
+ DALI_TEST_EQUALS(size, dummy.GetCurrentSize()
.GetVectorXY()
, TEST_LOCATION);
Stage::GetCurrent().Remove(dummy);
}
Stage::GetCurrent().Remove(dummy);
}
@@
-501,7
+501,7
@@
int UtcDaliControlImplSizeAnimation(void)
DALI_TEST_EQUALS( dummyImpl.sizeAnimationCalled, false, TEST_LOCATION );
Animation animation = Animation::New(1.0f);
DALI_TEST_EQUALS( dummyImpl.sizeAnimationCalled, false, TEST_LOCATION );
Animation animation = Animation::New(1.0f);
- animation.
Resize(dummy, Vector3(100.0f, 150.0f, 200.0f)
);
+ animation.
AnimateTo( Property( dummy, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f )
);
animation.Play();
application.Render();
animation.Play();
application.Render();
@@
-521,7
+521,7
@@
int UtcDaliControlImplSizeAnimation(void)
Stage::GetCurrent().Add(dummy);
Animation animation = Animation::New(1.0f);
Stage::GetCurrent().Add(dummy);
Animation animation = Animation::New(1.0f);
- animation.
Resize(dummy, Vector3(100.0f, 150.0f, 200.0f)
);
+ animation.
AnimateTo( Property( dummy, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f )
);
animation.Play();
application.Render();
animation.Play();
application.Render();
@@
-544,7
+544,7
@@
int UtcDaliControlImplTouchEvent(void)
DummyControl dummy = DummyControl::New( true );
DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
DummyControl dummy = DummyControl::New( true );
DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
- dummy.SetSize(
100.0f, 100.0f
);
+ dummy.SetSize(
Vector2( 100.0f, 100.0f )
);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
@@
-567,7
+567,7
@@
int UtcDaliControlImplTouchEvent(void)
{
DummyControl dummy = DummyControl::New();
{
DummyControl dummy = DummyControl::New();
- dummy.SetSize(
100.0f, 100.0f
);
+ dummy.SetSize(
Vector2( 100.0f, 100.0f )
);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
@@
-769,7
+769,7
@@
int UtcDaliControlImplMouseWheelEvent(void)
DummyControl dummy = DummyControl::New( true );
DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
DummyControl dummy = DummyControl::New( true );
DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
- dummy.SetSize(
100.0f, 100.0f
);
+ dummy.SetSize(
Vector2( 100.0f, 100.0f )
);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
@@
-795,7
+795,7
@@
int UtcDaliControlImplMouseWheelEvent(void)
{
DummyControl dummy = DummyControl::New();
{
DummyControl dummy = DummyControl::New();
- dummy.SetSize(
100.0f, 100.0f
);
+ dummy.SetSize(
Vector2( 100.0f, 100.0f )
);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);
dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(dummy);