[ITC][dali-adaptor][Non-ACR][fixed crash issue]

    (gdb)
    No symbol table info available.
    No symbol table info available.
    No symbol table info available.
    No symbol table info available.
    No symbol table info available.
    (this=0xb76376d8, __in_chrg=<optimized out>) at
    ../../../dali/internal/adaptor/tizen/framework-tizen.cpp:742
    No locals.
    (this=0xb7637468, __in_chrg=<optimized out>) at
    ../../../dali/internal/adaptor/common/application-impl.cpp:126
    No locals.
    (this=0xb7637468, __in_chrg=<optimized out>) at
    ../../../dali/internal/adaptor/common/application-impl.cpp:127
    No locals.
    No symbol table info available.
    /lib/libdali-core-cxx11.so.0
    No symbol table info available.
    __in_chrg=<optimized out>) at
    ../../../dali/public-api/adaptor-framework/application.cpp:123
    No locals.
            __FUNCTION__ = "ITcKeyGrabGrabKey"
            application = {<Dali::BaseHandle> = {mObjectHandle = {mPtr =
    0xb7637468}}, <No data fields>}
            testApp = warning: RTTI symbol not found for class
    'Dali::ConnectionTrackerInterface'
    {<Dali::ConnectionTracker> = {<No data fields>}, mApplication =
    @0xbea4e1dc, mTestCase = 0, mTimer = {<Dali::BaseHandle> =
    {mObjectHandle = {mPtr = 0xb76698b8}}, <No data fields>}}
    src/tct-dali-adaptor-native.cpp:105
            result = -1
            i = 13
            smack_mode = 1
            byte_size = 48
            encoded_byte = 0xbea4e63e
    "MAAAAAEEAAAOAAAAdGVzdGNhc2VfbmFtZQASAAAASVRjS2V5R3JhYkdyYWJLZXkA"
            byte = 0xb7637050 ""
            sz_byte_len = 4
            sz_type = 4
            sz_keysize = 4
            sz_size = 4
            func_name = 0xb7636c80 ""
            __FUNCTION__ = "main"
    (gdb)

Change-Id: I656046aefdf7dc7aef3649013edadb72198108e6
Signed-off-by: Joogab Yun <joogab.yun@samsung.com>

diff --git a/src/itc/dali-adaptor/key-grab/ITs-key-grab.cpp b/src/itc/dali-adaptor/key-grab/ITs-key-grab.cpp
index f5f85688e495faf6cf8a37343ec1945a3a54d8c9..41c64391f977b07c76d41710a67e7afcb7ee1db6 100755 (executable)
--- a/src/itc/dali-adaptor/key-grab/ITs-key-grab.cpp
+++ b/src/itc/dali-adaptor/key-grab/ITs-key-grab.cpp
@@ -27,12 +27,10 @@ struct KeyGrapTest
        KEY Key;
 };
 
-void KeyGrabGrabKey();
-void KeyGrabUngrabKey();
-void KeyGrabGrabKeyTopmost();
-void KeyGrabUngrabKeyTopmost();
-
-Window gWindow;
+void KeyGrabGrabKey(Application& mApplication);
+void KeyGrabUngrabKey(Application& mApplication);
+void KeyGrabGrabKeyTopmost(Application& mApplication);
+void KeyGrabUngrabKeyTopmost(Application& mApplication);
 
 #define KEY_COUNT 5
 #define KEY_MODE_COUNT 1
@@ -88,7 +86,6 @@ namespace
 
          void OnInit(Application& app)
          {
-                 gWindow = app.GetWindow();
                  mTimer = Timer::New( INTERVAL );
                  mTimer.TickSignal().Connect( this, &KeyGrab_TestApp::Tick );
                  mTimer.Start();
@@ -107,19 +104,19 @@ namespace
                  switch (mTestCase)
                  {
                          case KEY_GRAB_GRABKEY:
-                         KeyGrabGrabKey();
+                          KeyGrabGrabKey(mApplication);
                          break;
                          
                          case KEY_GRAB_UNGRABKEY:
-                         KeyGrabUngrabKey();
+                          KeyGrabUngrabKey(mApplication);
                          break;
                          
                          case KEY_GRAB_GRABKEYTOPMOST:
-                         KeyGrabGrabKeyTopmost();
+                          KeyGrabGrabKeyTopmost(mApplication);
                          break;
                          
                          case KEY_GRAB_UNGRABKEYTOPMOST:
-                         KeyGrabUngrabKeyTopmost();
+                          KeyGrabUngrabKeyTopmost(mApplication);
                          break;
                  }
          }
@@ -139,48 +136,52 @@ namespace
  * ##############################
  **/
 
-void KeyGrabGrabKey()
-{      
+void KeyGrabGrabKey(Application& mApplication)
+{
+  Window window = mApplication.GetWindow();
        for ( std::size_t keyIndex = 0; keyIndex < KEY_COUNT; ++keyIndex )
     {
                for ( std::size_t modeIndex = 0; modeIndex < KEY_MODE_COUNT; ++modeIndex )
                {
-                       DALI_CHECK_FAIL( KeyGrab::GrabKey( gWindow, daliKeys[keyIndex].Key, daliKeyGrabModes[modeIndex].Mode ) != true, "KeyGrab::GrabKey() is failed for Key=" +daliKeys[keyIndex].KeyName +" Mode="+ daliKeyGrabModes[modeIndex].ModeName );
+                       DALI_CHECK_FAIL( KeyGrab::GrabKey( window, daliKeys[keyIndex].Key, daliKeyGrabModes[modeIndex].Mode ) != true, "KeyGrab::GrabKey() is failed for Key=" +daliKeys[keyIndex].KeyName +" Mode="+ daliKeyGrabModes[modeIndex].ModeName );
                }
        }
        DaliLog::PrintPass();
 }
 
-void KeyGrabUngrabKey()
-{      
+void KeyGrabUngrabKey(Application& mApplication)
+{
+  Window window = mApplication.GetWindow();
        for ( std::size_t keyIndex = 0; keyIndex < KEY_COUNT; ++keyIndex )
     {
                for ( std::size_t modeIndex = 0; modeIndex < KEY_MODE_COUNT; ++modeIndex )
                {
-                       DALI_CHECK_FAIL( KeyGrab::GrabKey( gWindow, daliKeys[keyIndex].Key, daliKeyGrabModes[modeIndex].Mode ) != true, "KeyGrab::GrabKey() is failed for Key=" +daliKeys[keyIndex].KeyName +" Mode=" +daliKeyGrabModes[modeIndex].ModeName );
-                       DALI_CHECK_FAIL( KeyGrab::UngrabKey( gWindow, daliKeys[keyIndex].Key ) != true, "KeyGrab::UngrabKey() is failed for Key=" +daliKeys[keyIndex].KeyName );
+                       DALI_CHECK_FAIL( KeyGrab::GrabKey( window, daliKeys[keyIndex].Key, daliKeyGrabModes[modeIndex].Mode ) != true, "KeyGrab::GrabKey() is failed for Key=" +daliKeys[keyIndex].KeyName +" Mode=" +daliKeyGrabModes[modeIndex].ModeName );
+                       DALI_CHECK_FAIL( KeyGrab::UngrabKey( window, daliKeys[keyIndex].Key ) != true, "KeyGrab::UngrabKey() is failed for Key=" +daliKeys[keyIndex].KeyName );
                }
     }
        DaliLog::PrintPass();
 }
 
-void KeyGrabGrabKeyTopmost()
-{      
+void KeyGrabGrabKeyTopmost(Application& mApplication)
+{
+    Window window = mApplication.GetWindow();
        for ( std::size_t keyIndex = 0; keyIndex < KEY_COUNT; ++keyIndex )
     {
                //LOG_I("KeyGrabGrabKeyTopmost");
-               DALI_CHECK_FAIL( KeyGrab::GrabKeyTopmost( gWindow, daliKeys[keyIndex].Key ) != true, "KeyGrab::GrabKeyTopmost() is failed for Key="+ daliKeys[keyIndex].KeyName );
+               DALI_CHECK_FAIL( KeyGrab::GrabKeyTopmost( window, daliKeys[keyIndex].Key ) != true, "KeyGrab::GrabKeyTopmost() is failed for Key="+ daliKeys[keyIndex].KeyName );
     }
        DaliLog::PrintPass();
 }
 
-void KeyGrabUngrabKeyTopmost()
-{      
+void KeyGrabUngrabKeyTopmost(Application& mApplication)
+{
+    Window window = mApplication.GetWindow();
        for ( std::size_t keyIndex = 0; keyIndex < KEY_COUNT; ++keyIndex )
     {
                //LOG_I("KeyGrabUngrabKeyTopmost");
-               DALI_CHECK_FAIL( KeyGrab::GrabKeyTopmost( gWindow, daliKeys[keyIndex].Key ) != true, "KeyGrab::GrabKeyTopmost() is failed for Key=" +daliKeys[keyIndex].KeyName );
-               DALI_CHECK_FAIL( KeyGrab::UngrabKeyTopmost( gWindow, daliKeys[keyIndex].Key ) != true, "KeyGrab::UngrabKeyTopmost is failed for Key=" +daliKeys[keyIndex].KeyName );
+               DALI_CHECK_FAIL( KeyGrab::GrabKeyTopmost( window, daliKeys[keyIndex].Key ) != true, "KeyGrab::GrabKeyTopmost() is failed for Key=" +daliKeys[keyIndex].KeyName );
+               DALI_CHECK_FAIL( KeyGrab::UngrabKeyTopmost( window, daliKeys[keyIndex].Key ) != true, "KeyGrab::UngrabKeyTopmost is failed for Key=" +daliKeys[keyIndex].KeyName );
     }
        DaliLog::PrintPass();
 }