projects / platform / core / uifw / dali-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert "[Tizen] Appendix log for ttrace + Print keycode and timestamp"
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-KeyEvent.cpp
diff --git a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
index d1a0118..32fb3d8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
+++ b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
@@ -15,14 +15,13 @@
  *
  */
 
-#include <iostream>
-
-#include <stdlib.h>
-#include <dali/public-api/dali-core.h>
-#include <dali/integration-api/events/key-event-integ.h>
+#include <dali-test-suite-utils.h>
 #include <dali/devel-api/events/key-event-devel.h>
+#include <dali/integration-api/events/key-event-integ.h>
+#include <dali/public-api/dali-core.h>
+#include <stdlib.h>
 
-#include <dali-test-suite-utils.h>
+#include <iostream>
 
 using namespace Dali;
 
@@ -38,24 +37,23 @@ void utc_dali_key_event_cleanup(void)
 
 namespace
 {
-
 // Key Event Test references
-const static int SHIFT_MODIFIER  = 0x1;
-const static int CTRL_MODIFIER  = 0x2;
-const static int ALT_MODIFIER  = 0x4;
-const static int SHIFT_AND_CTRL_MODIFIER  = SHIFT_MODIFIER | CTRL_MODIFIER;
+const static int SHIFT_MODIFIER          = 0x1;
+const static int CTRL_MODIFIER           = 0x2;
+const static int ALT_MODIFIER            = 0x4;
+const static int SHIFT_AND_CTRL_MODIFIER = SHIFT_MODIFIER | CTRL_MODIFIER;
 const static int SHIFT_AND_ALT_MODIFIER  = SHIFT_MODIFIER | ALT_MODIFIER;
-const static int CTRL_AND_ALT_MODIFIER  = CTRL_MODIFIER | ALT_MODIFIER;
+const static int CTRL_AND_ALT_MODIFIER   = CTRL_MODIFIER | ALT_MODIFIER;
 
 const static char* TEST_STRING_1 = "alpha";
 
-
 // Stores data that is populated in the callback and will be read by the TET cases
 struct SignalData
 {
   SignalData()
   : functorCalled(false)
-  {}
+  {
+  }
 
   void Reset()
   {
@@ -66,21 +64,24 @@ struct SignalData
     keyedActor.Reset();
   }
 
-  bool functorCalled;
+  bool     functorCalled;
   KeyEvent receivedKeyEvent;
-  Actor keyedActor;
+  Actor    keyedActor;
 };
 
 // Functor that sets the data when called
 struct KeyEventReceivedFunctor
 {
-  KeyEventReceivedFunctor( SignalData& data ) : signalData( data ) { }
+  KeyEventReceivedFunctor(SignalData& data)
+  : signalData(data)
+  {
+  }
 
-  bool operator()( Actor actor, const KeyEvent& keyEvent )
+  bool operator()(Actor actor, const KeyEvent& keyEvent)
   {
-    signalData.functorCalled = true;
+    signalData.functorCalled    = true;
     signalData.receivedKeyEvent = keyEvent;
-    signalData.keyedActor = actor;
+    signalData.keyedActor       = actor;
 
     return true;
   }
@@ -88,25 +89,25 @@ struct KeyEventReceivedFunctor
   SignalData& signalData;
 };
 
-} // anon namespace
+} // namespace
 
 int UtcDaliKeyEventConstructor(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, event.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION); // check device class
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, event.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
   END_TEST;
@@ -115,49 +116,49 @@ int UtcDaliKeyEventConstructor(void)
 int UtcDaliKeyEventCopyAssignment(void)
 {
   // Test Assignment operator
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, event.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION); // check device class
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, event.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
-  Dali::KeyEvent event2 = DevelKeyEvent::New(TEST_STRING_1, "J", "j", 88, CTRL_MODIFIER, 0lu, KeyEvent::Up, "", "", Device::Class::USER, Device::Subclass::FINGER);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event2 );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event2.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("J", event2.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("j", event2.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(88, event2.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(CTRL_MODIFIER, event2.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event2.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Up, event2.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event2.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event2.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::USER, event2.GetDeviceClass(), TEST_LOCATION); // check device class
+  Dali::KeyEvent event2 = DevelKeyEvent::New(TEST_STRING_1, "J", "j", 88, CTRL_MODIFIER, 0lu, KeyEvent::UP, "", "", Device::Class::USER, Device::Subclass::FINGER); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event2);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event2.GetKeyName(), TEST_LOCATION);                   // check key name
+  DALI_TEST_EQUALS("J", event2.GetLogicalKey(), TEST_LOCATION);                          // check logical key string
+  DALI_TEST_EQUALS("j", event2.GetKeyString(), TEST_LOCATION);                           // check key string
+  DALI_TEST_EQUALS(88, event2.GetKeyCode(), TEST_LOCATION);                              // check keyCode
+  DALI_TEST_EQUALS(CTRL_MODIFIER, event2.GetKeyModifier(), TEST_LOCATION);               // check modifier
+  DALI_TEST_EQUALS(0lu, event2.GetTime(), TEST_LOCATION);                                // check time
+  DALI_TEST_EQUALS(KeyEvent::UP, event2.GetState(), TEST_LOCATION);                      // check state
+  DALI_TEST_EQUALS("", event2.GetCompose(), TEST_LOCATION);                              // check compose
+  DALI_TEST_EQUALS("", event2.GetDeviceName(), TEST_LOCATION);                           // check device name
+  DALI_TEST_EQUALS(Device::Class::USER, event2.GetDeviceClass(), TEST_LOCATION);         // check device class
   DALI_TEST_EQUALS(Device::Subclass::FINGER, event2.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
   event = event2;
-  DALI_TEST_CHECK( event );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("J", event.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("j", event.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(88, event.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(CTRL_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Up, event.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::USER, event.GetDeviceClass(), TEST_LOCATION); // check device class
+  DALI_TEST_CHECK(event);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);                   // check key name
+  DALI_TEST_EQUALS("J", event.GetLogicalKey(), TEST_LOCATION);                          // check logical key string
+  DALI_TEST_EQUALS("j", event.GetKeyString(), TEST_LOCATION);                           // check key string
+  DALI_TEST_EQUALS(88, event.GetKeyCode(), TEST_LOCATION);                              // check keyCode
+  DALI_TEST_EQUALS(CTRL_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);               // check modifier
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);                                // check time
+  DALI_TEST_EQUALS(KeyEvent::UP, event.GetState(), TEST_LOCATION);                      // check state
+  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION);                              // check compose
+  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION);                           // check device name
+  DALI_TEST_EQUALS(Device::Class::USER, event.GetDeviceClass(), TEST_LOCATION);         // check device class
   DALI_TEST_EQUALS(Device::Subclass::FINGER, event.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
   END_TEST;
@@ -166,34 +167,34 @@ int UtcDaliKeyEventCopyAssignment(void)
 int UtcDaliKeyEventCopyConstructor(void)
 {
   // Test Assignment operator
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, event.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION); // check device class
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, event.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
-  KeyEvent event2( event );
-  DALI_TEST_CHECK( event2 );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event2.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", event2.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", event2.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, event2.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, event2.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event2.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, event2.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event2.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event2.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, event2.GetDeviceClass(), TEST_LOCATION); // check device class
+  KeyEvent event2(event);
+  DALI_TEST_CHECK(event2);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event2.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", event2.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", event2.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, event2.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event2.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, event2.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event2.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", event2.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", event2.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, event2.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, event2.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
   END_TEST;
@@ -202,38 +203,38 @@ int UtcDaliKeyEventCopyConstructor(void)
 int UtcDaliKeyEventMoveAssignment(void)
 {
   // Test Assignment operator
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, event.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION); // check device class
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, event.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
   KeyEvent move;
-  move = std::move( event );
-  DALI_TEST_CHECK( move );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, move.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", move.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", move.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, move.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, move.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, move.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, move.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", move.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", move.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, move.GetDeviceClass(), TEST_LOCATION); // check device class
+  move = std::move(event);
+  DALI_TEST_CHECK(move);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, move.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", move.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", move.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, move.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, move.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, move.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, move.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", move.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", move.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, move.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, move.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
-  DALI_TEST_CHECK( !event );
+  DALI_TEST_CHECK(!event);
 
   END_TEST;
 }
@@ -241,37 +242,37 @@ int UtcDaliKeyEventMoveAssignment(void)
 int UtcDaliKeyEventMoveConstructor(void)
 {
   // Test Assignment operator
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, event.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION); // check device class
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", event.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", event.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", event.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, event.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, event.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
-  KeyEvent move = std::move( event );
-  DALI_TEST_CHECK( move );
-
-  DALI_TEST_EQUALS(TEST_STRING_1, move.GetKeyName(), TEST_LOCATION); // check key name
-  DALI_TEST_EQUALS("I", move.GetLogicalKey(), TEST_LOCATION); // check logical key string
-  DALI_TEST_EQUALS("i", move.GetKeyString(), TEST_LOCATION); // check key string
-  DALI_TEST_EQUALS(99, move.GetKeyCode(), TEST_LOCATION); // check keyCode
-  DALI_TEST_EQUALS(SHIFT_MODIFIER, move.GetKeyModifier(), TEST_LOCATION); // check modifier
-  DALI_TEST_EQUALS(0lu, move.GetTime(), TEST_LOCATION); // check time
-  DALI_TEST_EQUALS(KeyEvent::Down, move.GetState(), TEST_LOCATION); // check state
-  DALI_TEST_EQUALS("", move.GetCompose(), TEST_LOCATION); // check compose
-  DALI_TEST_EQUALS("", move.GetDeviceName(), TEST_LOCATION); // check device name
-  DALI_TEST_EQUALS(Device::Class::NONE, move.GetDeviceClass(), TEST_LOCATION); // check device class
+  KeyEvent move = std::move(event);
+  DALI_TEST_CHECK(move);
+
+  DALI_TEST_EQUALS(TEST_STRING_1, move.GetKeyName(), TEST_LOCATION);                 // check key name
+  DALI_TEST_EQUALS("I", move.GetLogicalKey(), TEST_LOCATION);                        // check logical key string
+  DALI_TEST_EQUALS("i", move.GetKeyString(), TEST_LOCATION);                         // check key string
+  DALI_TEST_EQUALS(99, move.GetKeyCode(), TEST_LOCATION);                            // check keyCode
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, move.GetKeyModifier(), TEST_LOCATION);            // check modifier
+  DALI_TEST_EQUALS(0lu, move.GetTime(), TEST_LOCATION);                              // check time
+  DALI_TEST_EQUALS(KeyEvent::DOWN, move.GetState(), TEST_LOCATION);                  // check state
+  DALI_TEST_EQUALS("", move.GetCompose(), TEST_LOCATION);                            // check compose
+  DALI_TEST_EQUALS("", move.GetDeviceName(), TEST_LOCATION);                         // check device name
+  DALI_TEST_EQUALS(Device::Class::NONE, move.GetDeviceClass(), TEST_LOCATION);       // check device class
   DALI_TEST_EQUALS(Device::Subclass::NONE, move.GetDeviceSubclass(), TEST_LOCATION); // check device subclass
 
-  DALI_TEST_CHECK( !event );
+  DALI_TEST_CHECK(!event);
 
   END_TEST;
 }
@@ -281,13 +282,13 @@ int UtcDaliKeyEventIsShiftModifier(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, CTRL_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, CTRL_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
 
   DALI_TEST_EQUALS(CTRL_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
   DALI_TEST_EQUALS(false, event.IsShiftModifier(), TEST_LOCATION); // check IsShiftModifier
 
-  DevelKeyEvent::SetKeyModifier( event, SHIFT_MODIFIER ); // Set to Shift Modifier
+  DevelKeyEvent::SetKeyModifier(event, SHIFT_MODIFIER); // Set to Shift Modifier
 
   DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check able to set
 
@@ -301,13 +302,13 @@ int UtcDaliKeyEventIsCtrlModifier(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
 
   DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
   DALI_TEST_EQUALS(false, event.IsCtrlModifier(), TEST_LOCATION); // check IsCtrlModifier
 
-  DevelKeyEvent::SetKeyModifier( event, CTRL_MODIFIER ); // Set to Ctrl Modifier
+  DevelKeyEvent::SetKeyModifier(event, CTRL_MODIFIER); // Set to Ctrl Modifier
 
   DALI_TEST_EQUALS(CTRL_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check able to set
 
@@ -320,17 +321,17 @@ int UtcDaliKeyEventIsAltModifier(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);  // set name to test, key string to i and modifier to shift
-  DALI_TEST_CHECK( event );
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE); // set name to test, key string to i and modifier to shift
+  DALI_TEST_CHECK(event);
 
   DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
   DALI_TEST_EQUALS(false, event.IsAltModifier(), TEST_LOCATION); // check IsAltModifier
 
-  DevelKeyEvent::SetKeyModifier( event, ALT_MODIFIER ); // Set to Alt Modifier
+  DevelKeyEvent::SetKeyModifier(event, ALT_MODIFIER); // Set to Alt Modifier
 
   DALI_TEST_EQUALS(ALT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION); // check able to set
 
-  DALI_TEST_EQUALS(true, event.IsAltModifier(), TEST_LOCATION);  // IsAltModifier
+  DALI_TEST_EQUALS(true, event.IsAltModifier(), TEST_LOCATION); // IsAltModifier
   END_TEST;
 }
 
@@ -339,7 +340,7 @@ int UtcDaliKeyEventIsNotShiftModifier(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, CTRL_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, CTRL_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
   DALI_TEST_EQUALS(CTRL_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
 
@@ -352,7 +353,7 @@ int UtcDaliKeyEventIsNotCtrlModifier(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, ALT_MODIFIER, 0lu, KeyEvent::Up, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, ALT_MODIFIER, 0lu, KeyEvent::UP, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
   DALI_TEST_EQUALS(ALT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
 
@@ -365,7 +366,7 @@ int UtcDaliKeyEventIsNotAltModifier(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, SHIFT_MODIFIER, 0lu, KeyEvent::Up, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, SHIFT_MODIFIER, 0lu, KeyEvent::UP, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
   DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
 
@@ -378,10 +379,10 @@ int UtcDaliKeyEventANDModifer(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, SHIFT_AND_CTRL_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, SHIFT_AND_CTRL_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
   DALI_TEST_EQUALS(true, (bool)(event.IsCtrlModifier() & event.IsShiftModifier()), TEST_LOCATION);
 
-  DevelKeyEvent::SetKeyModifier( event, SHIFT_MODIFIER ); // Set to Shift Modifier
+  DevelKeyEvent::SetKeyModifier(event, SHIFT_MODIFIER); // Set to Shift Modifier
 
   DALI_TEST_EQUALS(false, (bool)(event.IsCtrlModifier() & event.IsShiftModifier()), TEST_LOCATION);
   END_TEST;
@@ -392,10 +393,10 @@ int UtcDaliKeyEventORModifer(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, SHIFT_AND_CTRL_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New("i", "I", "i", 0, SHIFT_AND_CTRL_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
   DALI_TEST_EQUALS(true, (bool)(event.IsCtrlModifier() | event.IsAltModifier()), TEST_LOCATION);
 
-  DevelKeyEvent::SetKeyModifier( event, SHIFT_MODIFIER ); // Set to Shift Modifier
+  DevelKeyEvent::SetKeyModifier(event, SHIFT_MODIFIER); // Set to Shift Modifier
 
   DALI_TEST_EQUALS(false, (bool)(event.IsCtrlModifier() & event.IsAltModifier()), TEST_LOCATION);
   END_TEST;
@@ -407,46 +408,46 @@ int UtcDaliIntegrationKeyEvent(void)
 
   {
     Integration::KeyEvent keyEvent;
-    DALI_TEST_EQUALS( keyEvent.type, Integration::Event::Key, TEST_LOCATION );
-    DALI_TEST_CHECK( keyEvent.keyName == std::string() );
-    DALI_TEST_CHECK( keyEvent.logicalKey == std::string() );
-    DALI_TEST_CHECK( keyEvent.keyString == std::string() );
-    DALI_TEST_EQUALS( keyEvent.keyCode, -1, TEST_LOCATION );
-    DALI_TEST_EQUALS( keyEvent.keyModifier, 0, TEST_LOCATION );
-    DALI_TEST_EQUALS( keyEvent.time, 0lu, TEST_LOCATION );
-    DALI_TEST_EQUALS( keyEvent.state, Integration::KeyEvent::Down, TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.compose, std::string(), TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.deviceName, std::string(), TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.deviceClass, Device::Class::NONE, TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.deviceSubclass, Device::Subclass::NONE, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.type, Integration::Event::Key, TEST_LOCATION);
+    DALI_TEST_CHECK(keyEvent.keyName == std::string());
+    DALI_TEST_CHECK(keyEvent.logicalKey == std::string());
+    DALI_TEST_CHECK(keyEvent.keyString == std::string());
+    DALI_TEST_EQUALS(keyEvent.keyCode, -1, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.keyModifier, 0, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.time, 0lu, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.state, Integration::KeyEvent::DOWN, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.compose, std::string(), TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.deviceName, std::string(), TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.deviceClass, Device::Class::NONE, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.deviceSubclass, Device::Subclass::NONE, TEST_LOCATION);
   }
 
   {
-    const std::string keyName("keyName");
-    const std::string logicalKey("logicalKey");
-    const std::string keyString("keyString");
-    const int keyCode(333);
-    const int keyModifier(312);
-    const unsigned long timeStamp(132);
-    const Integration::KeyEvent::State keyState(Integration::KeyEvent::Up);
-    const std::string compose("compose");
-    const std::string deviceName("hwKeyboard");
-    const Device::Class::Type deviceClass = Device::Class::KEYBOARD;
-    const Device::Subclass::Type deviceSubclass = Device::Subclass::NONE;
-
-    Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, keyModifier, timeStamp, keyState, compose, deviceName, deviceClass, deviceSubclass );
-    DALI_TEST_EQUALS( keyEvent.type, Integration::Event::Key, TEST_LOCATION );
-    DALI_TEST_CHECK( keyEvent.keyName == keyName );
-    DALI_TEST_CHECK( keyEvent.logicalKey == logicalKey );
-    DALI_TEST_CHECK( keyEvent.keyString == keyString );
-    DALI_TEST_EQUALS( keyEvent.keyCode, keyCode, TEST_LOCATION );
-    DALI_TEST_EQUALS( keyEvent.keyModifier, keyModifier, TEST_LOCATION );
-    DALI_TEST_EQUALS( keyEvent.time, timeStamp, TEST_LOCATION );
-    DALI_TEST_EQUALS( keyEvent.state, keyState, TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.compose, compose, TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.deviceName, deviceName, TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.deviceClass, deviceClass, TEST_LOCATION);
-    DALI_TEST_EQUALS( keyEvent.deviceSubclass, deviceSubclass, TEST_LOCATION);
+    const std::string                  keyName("keyName");
+    const std::string                  logicalKey("logicalKey");
+    const std::string                  keyString("keyString");
+    const int                          keyCode(333);
+    const int                          keyModifier(312);
+    const unsigned long                timeStamp(132);
+    const Integration::KeyEvent::State keyState(Integration::KeyEvent::UP);
+    const std::string                  compose("compose");
+    const std::string                  deviceName("hwKeyboard");
+    const Device::Class::Type          deviceClass    = Device::Class::KEYBOARD;
+    const Device::Subclass::Type       deviceSubclass = Device::Subclass::NONE;
+
+    Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, keyModifier, timeStamp, keyState, compose, deviceName, deviceClass, deviceSubclass);
+    DALI_TEST_EQUALS(keyEvent.type, Integration::Event::Key, TEST_LOCATION);
+    DALI_TEST_CHECK(keyEvent.keyName == keyName);
+    DALI_TEST_CHECK(keyEvent.logicalKey == logicalKey);
+    DALI_TEST_CHECK(keyEvent.keyString == keyString);
+    DALI_TEST_EQUALS(keyEvent.keyCode, keyCode, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.keyModifier, keyModifier, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.time, timeStamp, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.state, keyState, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.compose, compose, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.deviceName, deviceName, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.deviceClass, deviceClass, TEST_LOCATION);
+    DALI_TEST_EQUALS(keyEvent.deviceSubclass, deviceSubclass, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -455,12 +456,12 @@ int UtcDaliKeyEventSetKeyName(void)
 {
   TestApplication application;
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
-  DALI_TEST_EQUALS( TEST_STRING_1, event.GetKeyName(), TEST_LOCATION );
+  DALI_TEST_EQUALS(TEST_STRING_1, event.GetKeyName(), TEST_LOCATION);
 
-  DevelKeyEvent::SetKeyName( event, "keyName" );
-  DALI_TEST_EQUALS( "keyName", event.GetKeyName(), TEST_LOCATION );
+  DevelKeyEvent::SetKeyName(event, "keyName");
+  DALI_TEST_EQUALS("keyName", event.GetKeyName(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -469,12 +470,12 @@ int UtcDaliKeyEventSetKeyString(void)
 {
   TestApplication application;
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
-  DALI_TEST_EQUALS( "i", event.GetKeyString(), TEST_LOCATION );
+  DALI_TEST_EQUALS("i", event.GetKeyString(), TEST_LOCATION);
 
-  DevelKeyEvent::SetKeyString( event, "keyString" );
-  DALI_TEST_EQUALS( "keyString", event.GetKeyString(), TEST_LOCATION );
+  DevelKeyEvent::SetKeyString(event, "keyString");
+  DALI_TEST_EQUALS("keyString", event.GetKeyString(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -483,12 +484,12 @@ int UtcDaliKeyEventSetKeyCode(void)
 {
   TestApplication application;
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
-  DALI_TEST_EQUALS( 99, event.GetKeyCode(), TEST_LOCATION );
+  DALI_TEST_EQUALS(99, event.GetKeyCode(), TEST_LOCATION);
 
-  DevelKeyEvent::SetKeyCode( event, 88 );
-  DALI_TEST_EQUALS( 88, event.GetKeyCode(), TEST_LOCATION );
+  DevelKeyEvent::SetKeyCode(event, 88);
+  DALI_TEST_EQUALS(88, event.GetKeyCode(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -497,12 +498,12 @@ int UtcDaliKeyEventSetKeyModifier(void)
 {
   TestApplication application;
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
-  DALI_TEST_EQUALS( SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION );
+  DALI_TEST_EQUALS(SHIFT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
 
-  DevelKeyEvent::SetKeyModifier( event, ALT_MODIFIER );
-  DALI_TEST_EQUALS( ALT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION );
+  DevelKeyEvent::SetKeyModifier(event, ALT_MODIFIER);
+  DALI_TEST_EQUALS(ALT_MODIFIER, event.GetKeyModifier(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -511,12 +512,12 @@ int UtcDaliKeyEventSetTime(void)
 {
   TestApplication application;
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
-  DALI_TEST_EQUALS( 0lu, event.GetTime(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0lu, event.GetTime(), TEST_LOCATION);
 
-  DevelKeyEvent::SetTime( event, 100lu );
-  DALI_TEST_EQUALS( 100lu, event.GetTime(), TEST_LOCATION );
+  DevelKeyEvent::SetTime(event, 100lu);
+  DALI_TEST_EQUALS(100lu, event.GetTime(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -525,12 +526,12 @@ int UtcDaliKeyEventSetState(void)
 {
   TestApplication application;
 
-  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down, "", "", Device::Class::NONE, Device::Subclass::NONE);
+  Dali::KeyEvent event = DevelKeyEvent::New(TEST_STRING_1, "I", "i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE);
 
-  DALI_TEST_EQUALS( KeyEvent::Down, event.GetState(), TEST_LOCATION );
+  DALI_TEST_EQUALS(KeyEvent::DOWN, event.GetState(), TEST_LOCATION);
 
-  DevelKeyEvent::SetState( event, KeyEvent::Up );
-  DALI_TEST_EQUALS( KeyEvent::Up, event.GetState(), TEST_LOCATION );
+  DevelKeyEvent::SetState(event, KeyEvent::UP);
+  DALI_TEST_EQUALS(KeyEvent::UP, event.GetState(), TEST_LOCATION);
 
   END_TEST;
 }
Domain: Graphics System / DALi;