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 "Use stylesheet from StyleMonitor" into tizen
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Alignment.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
index
4dcef68
..
2d9d8cc
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
@@
-924,7
+924,7
@@
int UtcDaliAlignmentChildAddAndRemove(void)
END_TEST;
}
END_TEST;
}
-int UtcDaliAlignment
OnSizeSet
(void)
+int UtcDaliAlignment
SizeSetP
(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
@@
-935,14
+935,14
@@
int UtcDaliAlignmentOnSizeSet(void)
application.SendNotification();
Vector2 size( 100.0f, 200.0f );
application.SendNotification();
Vector2 size( 100.0f, 200.0f );
- alignment.Set
Preferred
Size(size);
+ alignment.SetSize(size);
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(size, alignment.Get
Implementation().GetControl
Size().GetVectorXY(), TEST_LOCATION);
+ DALI_TEST_EQUALS(size, alignment.Get
Target
Size().GetVectorXY(), TEST_LOCATION);
Stage::GetCurrent().Remove(alignment);
END_TEST;
Stage::GetCurrent().Remove(alignment);
END_TEST;
@@
-1010,7
+1010,7
@@
int UtcDaliAlignmentOnSizeAnimation(void)
Stage::GetCurrent().Add(alignment);
Animation animation = Animation::New(100.0f);
Stage::GetCurrent().Add(alignment);
Animation animation = Animation::New(100.0f);
- animation.
Resize(alignment, Vector3(100.0f, 150.0f, 200.0f)
);
+ animation.
AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f )
);
animation.Play();
application.Render();
animation.Play();
application.Render();