Test fix for N_SE-53275

Change-Id: I2fa28c5b85e51d54bff9fb958e14960eea93083b
Signed-off-by: Saravana Balaji S <saravana.bs@samsung.com>
Signed-off-by: Vinay Dutt Vyas <vinay.vyas@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index 4a7e31a..05199f6 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -2555,18 +2555,23 @@ _TableViewPresenter::GetPreviousItemPosition(const TableViewItemTag& currentItem
 
                        return true;
                }
+               else
+               {
+                       prevItem.groupIndex = currentItemPos.groupIndex - 1;
+                       prevItem.itemIndex = __pListModel->GetItemCountInGroup(prevItem.groupIndex) - 1;
+
+                       return true;
+               }
        }
 
        if (__pListModel->IsGroupExpanded(currentItemPos.groupIndex) == false)
        {
-               if (currentItemPos.groupIndex == 0 && currentItemPos.itemIndex == -1)
+               if (currentItemPos.itemIndex >= 0)
                {
-                       return false;
+                       prevItem.groupIndex = currentItemPos.groupIndex;
+                       prevItem.itemIndex = -1;
                }
 
-               prevItem.groupIndex = currentItemPos.groupIndex - 1;
-               prevItem.itemIndex = __pListModel->GetItemCountInGroup(prevItem.groupIndex) - 1;
-
                return true;
        }
 
@@ -5812,7 +5817,7 @@ _TableViewPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInf
                                pItem->GetItemIndex(itemPos.groupIndex, itemPos.itemIndex);
                                TableViewItemTag lastItemPos = {-1, -1};
                                GetLastItem(lastItemPos);
-                               if (itemPos.groupIndex == lastItemPos.groupIndex && itemPos.itemIndex == lastItemPos.itemIndex)
+                               if (itemPos.groupIndex == lastItemPos.groupIndex && (itemPos.itemIndex == lastItemPos.itemIndex || __pListModel->IsGroupExpanded(itemPos.groupIndex) == false))
                                {
                                        SetTableViewFocused(false);
                                        return false;
@@ -5838,7 +5843,8 @@ _TableViewPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInf
                                                TableViewItemTag lastItemPos = {-1, -1};
                                                GetLastItem(lastItemPos);
 
-                                               if (itemPos.groupIndex == lastItemPos.groupIndex && itemPos.itemIndex == lastItemPos.itemIndex)
+                                               if (itemPos.groupIndex == lastItemPos.groupIndex && (itemPos.itemIndex == lastItemPos.itemIndex
+                                                               || __pListModel->IsGroupExpanded(itemPos.groupIndex) == false))
                                                {
                                                        SetTableViewFocused(false);
                                                        return false;
@@ -6012,10 +6018,8 @@ _TableViewPresenter::OnDrawFocus(void)
 
                ScrollToItem(itemPos.groupIndex, itemPos.itemIndex, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_TOP);
                pItem = FindItem(itemPos);
-               SysTryReturnVoidResult(NID_UI_CTRL, pItem != null, E_SYSTEM, "Failed to get Focussed Item.");
 
-               if (pItem->GetEnableState() && pItem->GetVisibleState()
-                               && pItem->IsFocusable())
+               if (pItem != null && pItem->GetEnableState() && pItem->GetVisibleState() && pItem->IsFocusable())
                {
                        SetItemFocus(pItem, itemPos);
                        return;
@@ -6074,10 +6078,7 @@ _TableViewPresenter::OnDrawFocus(void)
                ScrollToItem(itemPos.groupIndex, itemPos.itemIndex, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
                pItem = FindItem(itemPos);
 
-               SysTryReturnVoidResult(NID_UI_CTRL, pItem != null, E_SYSTEM, "Failed to get Focussed Item.");
-
-               if (pItem->GetEnableState() && pItem->GetVisibleState()
-                               && pItem->IsFocusable())
+               if (pItem != null && pItem->GetEnableState() && pItem->GetVisibleState() && pItem->IsFocusable())
                {
                        SetItemFocus(pItem, itemPos);
                        return;