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 "bug fixed about the rtl markup behavior." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-KeyInputFocusManager.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
3eb9c26
..
4623958
--- a/
automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-250,7
+250,7
@@
int UtcDaliKeyInputFocusManagerKeyEventPropagation01(void)
manager.SetFocus( dummy3 );
DALI_TEST_CHECK( dummy3Impl.keyInputFocusGained );
manager.SetFocus( dummy3 );
DALI_TEST_CHECK( dummy3Impl.keyInputFocusGained );
- Integration::KeyEvent event(
"a", "a", 0, 0, 0, Integration::KeyEvent::Up, ""
);
+ Integration::KeyEvent event(
"a", "a", 0, 0, 0, Integration::KeyEvent::Up, "", "", Device::Class::TOUCH, Device::Subclass::NONE
);
application.ProcessEvent(event);
DALI_TEST_CHECK( callback1.mIsCalled );
application.ProcessEvent(event);
DALI_TEST_CHECK( callback1.mIsCalled );
@@
-296,7
+296,7
@@
int UtcDaliKeyInputFocusManagerKeyEventPropagation02(void)
manager.SetFocus( dummy3 );
DALI_TEST_CHECK( dummy3Impl.keyInputFocusGained );
manager.SetFocus( dummy3 );
DALI_TEST_CHECK( dummy3Impl.keyInputFocusGained );
- Integration::KeyEvent event(
"a", "a", 0, 0, 0, Integration::KeyEvent::Up, ""
);
+ Integration::KeyEvent event(
"a", "a", 0, 0, 0, Integration::KeyEvent::Up, "", "", Device::Class::TOUCH, Device::Subclass::NONE
);
application.ProcessEvent(event);
DALI_TEST_CHECK( !callback1.mIsCalled );
application.ProcessEvent(event);
DALI_TEST_CHECK( !callback1.mIsCalled );