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 "Move TextSelectionPopup from public to devel" into tizen
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Control.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index
17e8456
..
47a13ec
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Control.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.
@@
-345,7
+345,8
@@
int UtcDaliControlTestParameters(void)
float width = 640.0f;
float height = test.GetHeightForWidth( width );
float width = 640.0f;
float height = test.GetHeightForWidth( width );
- DALI_TEST_CHECK( test.GetWidthForHeight( height ) == width );
+ DALI_TEST_EQUALS( 640.0f, height, TEST_LOCATION );
+ DALI_TEST_EQUALS( 640.0f, test.GetWidthForHeight( height ), TEST_LOCATION );
test.KeyEventSignal();
test.KeyEventSignal();