Revert "Make focus navigatable between windows."

This reverts commit b518cba3149ab3cab193b28699a8dccf42b03103.

Change-Id: I9494cb96f8506d2f39af191f18c253cac983a72c

diff --git a/include/app_tracker.h b/include/app_tracker.h
index 148f50450b6788415370fd26a14d638ab6dafebe..7cea472a5a626613e019f2475a99bf586912e9eb 100644 (file)
--- a/include/app_tracker.h
+++ b/include/app_tracker.h
@@ -59,24 +59,6 @@ void app_tracker_scroll_gesture_required_object_info_send(App_Tracker_Data* atd)
  */
 AtspiAccessible* app_tracker_top_window_get(App_Tracker_Data *atd);
 
-/**
- * @brief Return next accessible window from current root
- *
- * @param atd internal data of app tracker module
- * @param current_root root of current window to start search with
- * @return accessible object of the next window
- */
-AtspiAccessible* app_tracker_next_window_get(App_Tracker_Data *atd, AtspiAccessible *current_root);
-
-/**
- * @brief Return previous accessible window from current root
- *
- * @param atd internal data of app tracker module
- * @param current_root root of current window to start search with
- * @return accessible object of the previous window
- */
-AtspiAccessible* app_tracker_prev_window_get(App_Tracker_Data *atd, AtspiAccessible *current_root);
-
 /**
  * @brief This function allows access to submodule functinality of app_tracker.
  *

diff --git a/include/flat_navi.h b/include/flat_navi.h
index 0554711be3b884352c02c098f0af084d579b8044..f303629ef9a0f4cdcc5d9dba95ca2d8ded2e1a8f 100644 (file)
--- a/include/flat_navi.h
+++ b/include/flat_navi.h
@@ -7,7 +7,6 @@
 
 typedef struct _FlatNaviContext FlatNaviContext;
 typedef enum { SEARCH_FORWARD = 1, SEARCH_BACKWARD = 2 } search_direction;
-typedef enum { CTX_SETUP_FAIL = -1, CTX_SETUP_SUCCESS = 0, CTX_SETUP_SUCCESS_HIGHLIGHT = 1 } context_setup_result;
 typedef Eina_Bool(*StopConditionCb)(AtspiAccessible *);
 
 /**
@@ -34,28 +33,12 @@ FlatNaviContext *flat_navi_context_create();
  * @param ctx - an allocated FlatNaviContext. Should be created first with flat_navi_context_create().
  * @param root - a node from AT-SPI2 accessibility tree that defines the root of flat navigation context, this means, navigation will be limited to the sub-tree of this node.
  *
- * @return context_setup_result
+ * @return Initialized FlatNaviContext.
  *
  * @note Context will use heuristics to filter elements of UI which can be navigated.
  * @note By default, current element is the first object in first line.
  */
-context_setup_result flat_navi_context_setup(FlatNaviContext *ctx, AtspiAccessible *root);
-
-/**
- * @brief Returns whether the context root is switched to next/prev window.
- *
- * @param ctx FlatNaviContext
- *
- * @return Eina_Bool true if flat_navi result requires root change.
- */
-Eina_Bool flat_navi_context_requires_root_change(FlatNaviContext *ctx);
-
-/**
- * @brief Falls back to strategy to loop in the same root.
- *
- * @note This is called if no valid next/prev window is found.
- */
-void flat_navi_fallback_to_loop_in_same_root(FlatNaviContext *ctx);
+int flat_navi_context_setup(FlatNaviContext *ctx, AtspiAccessible *root);
 
 /**
  * @brief Changes context root

diff --git a/include/utils.h b/include/utils.h
index e5a04fc3d416c243e6b0d924d520e274ddda802c..7b16cc5dad802c16fcdf5b4714fe80aa48b8a1ee 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -165,10 +165,5 @@ static inline void ESAL(Eina_Strbuf *buf, const char *txt)
        // strlen() by a constant if it knows the length of the string.
        eina_strbuf_append_length(buf, txt, strlen(txt));
 }
-typedef enum {
-       OBJECT_VALID, OBJECT_NOT_VALID, OBJECT_NOT_VISIBLE
-} object_state;
-
-object_state is_object_showing_and_not_defunct(AtspiAccessible *obj, char *object_name);
 
 #endif /* UTILS_H_ */

diff --git a/include/window_tracker.h b/include/window_tracker.h
index 0c7301f22aef2e86fb0ceba8113b6139ef1dd19a..5bc26914d36a077c2896591a81ad48e92b3c1bbb 100644 (file)
--- a/include/window_tracker.h
+++ b/include/window_tracker.h
@@ -52,24 +52,6 @@ AtspiAccessible *window_tracker_top_win_get(WindowTrackerData *wtd);
  */
 AtspiAccessible *window_tracker_top_window_get(WindowTrackerData *wtd);
 
-/**
- * @brief Return next accessible window from current root
- *
- * @param wtd internal data struct of window tracker
- * @param current_root root of current window to start search with
- * @return accessible object of the next window
- */
-AtspiAccessible *window_tracker_next_window_get(WindowTrackerData *wtd, AtspiAccessible *current_root);
-
-/**
- * @brief Return previous accessible window from current root
- *
- * @param wtd internal data struct of window tracker
- * @param current_root root of current window to start search with
- * @return accessible object of the previous window
- */
-AtspiAccessible *window_tracker_prev_window_get(WindowTrackerData *wtd, AtspiAccessible *current_root);
-
 /*
  * @brief Appends window from window list
  */

diff --git a/src/app_tracker.c b/src/app_tracker.c
index ca47585cbeaafc043d1b9c7c999597a8d18ebf6b..da74bd28f0e9fed7e800e457938ef352cd000eb3 100644 (file)
--- a/src/app_tracker.c
+++ b/src/app_tracker.c
@@ -839,16 +839,6 @@ AtspiAccessible* app_tracker_top_window_get(App_Tracker_Data *atd)
        return atd ? window_tracker_top_window_get(atd->window_tracker_data) : NULL;
 }
 
-AtspiAccessible* app_tracker_next_window_get(App_Tracker_Data *atd, AtspiAccessible *current_root)
-{
-       return atd ? window_tracker_next_window_get(atd->window_tracker_data, current_root) : NULL;
-}
-
-AtspiAccessible* app_tracker_prev_window_get(App_Tracker_Data *atd, AtspiAccessible *current_root)
-{
-       return atd ? window_tracker_prev_window_get(atd->window_tracker_data, current_root) : NULL;
-}
-
 AtspiAccessible* app_tracker_at_point_window_get(App_Tracker_Data *atd, int x, int y)
 {
        return atd ? window_tracker_at_point_window_get(atd->window_tracker_data, x, y) : NULL;

diff --git a/src/flat_navi.c b/src/flat_navi.c
index 287f6518fbe24eff6aa75d08e2d53d520dd895a2..98648fe306ac1329d82f11c4c4823d66b65aa550 100644 (file)
--- a/src/flat_navi.c
+++ b/src/flat_navi.c
@@ -34,9 +34,7 @@
 typedef enum {
        LAST_ENTRY_NONE,
        LAST_ENTRY_FIRST,
-       LAST_ENTRY_LAST,
-       LAST_ENTRY_FIRST_NAV_NEXT,
-       LAST_ENTRY_LAST_NAV_NEXT
+       LAST_ENTRY_LAST
 } last_entry_mode;
 
 struct _FlatNaviContext {
@@ -380,23 +378,6 @@ static void _on_chain_end(FlatNaviContext *ctx, search_direction direction)
                _on_chain_end_loop(ctx, direction);
 }
 
-static Eina_Bool _should_navigate_to_next_win(FlatNaviContext *ctx)
-{
-#ifndef SCREEN_READER_TV
-       AtspiRole role = atspi_accessible_get_role(ctx->root, NULL);
-       return role == ATSPI_ROLE_COMBO_BOX ? EINA_FALSE : EINA_TRUE;
-#endif
-       return EINA_FALSE;
-}
-
-static void _on_last_item_reached(FlatNaviContext *ctx, search_direction direction)
-{
-       /* TODO Is it a proper place for sound generation? */
-       if (vc_get_sound_feedback())
-               smart_notification(FOCUS_CHAIN_END_NOTIFICATION_EVENT, 0, 0);
-       ctx->last_entry = direction == SEARCH_FORWARD ? LAST_ENTRY_LAST : LAST_ENTRY_FIRST;
-}
-
 static void _navigate_by_one(FlatNaviContext *ctx, search_direction direction)
 {
        if (direction != SEARCH_FORWARD && direction != SEARCH_BACKWARD) {
@@ -411,15 +392,20 @@ static void _navigate_by_one(FlatNaviContext *ctx, search_direction direction)
                DEBUG("%s", direction == SEARCH_FORWARD ?
                                                                "Last item reached or failed" :
                                                                "first item reached or failed");
+
                if (ctx->last_entry == (direction == SEARCH_FORWARD ? LAST_ENTRY_LAST : LAST_ENTRY_FIRST)) {
                        _on_chain_end(ctx, direction);
-               } else if (_should_navigate_to_next_win(ctx)) {
-                       ctx->last_entry = direction == SEARCH_FORWARD ? LAST_ENTRY_LAST_NAV_NEXT : LAST_ENTRY_FIRST_NAV_NEXT;
-               } else {
-                       _on_last_item_reached(ctx, direction);
+               }
+               else {
+                       /* TODO Is it a proper place for sound generation? */
+                       if (vc_get_sound_feedback())
+                               smart_notification(FOCUS_CHAIN_END_NOTIFICATION_EVENT, 0, 0);
+
+                       ctx->last_entry = direction == SEARCH_FORWARD ? LAST_ENTRY_LAST : LAST_ENTRY_FIRST;
                }
                if (ret) g_object_unref(ret);
-       } else {
+       }
+       else {
                if (ctx->current) g_object_unref(ctx->current);
                ctx->current = ret;
                ctx->last_entry = LAST_ENTRY_NONE;
@@ -445,14 +431,14 @@ static bool _return_to_old_root(AtspiAccessible *old_root)
        return (role == ATSPI_ROLE_COMBO_BOX);
 }
 
-context_setup_result flat_navi_context_setup(FlatNaviContext *ctx, AtspiAccessible *root)
+int flat_navi_context_setup(FlatNaviContext *ctx, AtspiAccessible *root)
 {
        AtspiAccessible *old_root;
 
        DEBUG("START");
        if (!ctx) {
                DEBUG("END -- no context");
-               return CTX_SETUP_FAIL;
+               return -1;
        }
        char *root_name = atspi_accessible_get_name(root, NULL);
        gchar *id = atspi_accessible_get_unique_id(root, NULL);
@@ -470,32 +456,12 @@ context_setup_result flat_navi_context_setup(FlatNaviContext *ctx, AtspiAccessib
                ctx->current = old_root;
        } else {
                if (old_root) g_object_unref(old_root);
-               if (ctx->last_entry == LAST_ENTRY_FIRST_NAV_NEXT) {
-                       ctx->current = _last(ctx);
-               } else {
-                       ctx->current = _first(ctx);
-               }
+               ctx->current = _first(ctx);
        }
-       Eina_Bool highlight_current =
-               ctx->last_entry == LAST_ENTRY_FIRST_NAV_NEXT || ctx->last_entry == LAST_ENTRY_LAST_NAV_NEXT;
        ctx->last_entry = LAST_ENTRY_NONE;
 
        DEBUG("END");
-       return highlight_current ? CTX_SETUP_SUCCESS_HIGHLIGHT : CTX_SETUP_SUCCESS;
-}
-
-Eina_Bool flat_navi_context_requires_root_change(FlatNaviContext *ctx)
-{
-       return ctx->last_entry == LAST_ENTRY_FIRST_NAV_NEXT || ctx->last_entry == LAST_ENTRY_LAST_NAV_NEXT;
-}
-
-void flat_navi_fallback_to_loop_in_same_root(FlatNaviContext *ctx)
-{
-       if (ctx->last_entry == LAST_ENTRY_FIRST_NAV_NEXT) {
-               _on_last_item_reached(ctx, SEARCH_BACKWARD);
-       } else if (ctx->last_entry == LAST_ENTRY_LAST_NAV_NEXT) {
-               _on_last_item_reached(ctx, SEARCH_FORWARD);
-       }
+       return 0;
 }
 
 void flat_navi_context_root_change(FlatNaviContext *ctx, AtspiAccessible *root)
@@ -605,6 +571,39 @@ AtspiAccessible *flat_navi_context_last(FlatNaviContext *ctx)
        return ret;
 }
 
+typedef enum {
+       OBJECT_VALID, OBJECT_NOT_VALID, OBJECT_NOT_VISIBLE
+} object_state;
+
+static object_state is_object_showing_and_not_defunct(AtspiAccessible *obj, char *object_name)
+{
+       if (!obj) DEBUG("%s is null", object_name);
+       if (!obj)
+               return OBJECT_NOT_VALID;
+       AtspiStateSet *ss = atspi_accessible_get_state_set(obj);
+       if (!ss) {
+               ERROR("failed to get state set for %s", object_name);
+               return OBJECT_NOT_VALID;
+       }
+
+       Eina_Bool showing = atspi_state_set_contains(ss, ATSPI_STATE_SHOWING);
+       Eina_Bool defunct = atspi_state_set_contains(ss, ATSPI_STATE_DEFUNCT);
+       g_object_unref(ss);
+
+       if (defunct) {
+               gchar *id = atspi_accessible_get_unique_id(obj, NULL);
+               DEBUG("%s %s is defunct", object_name, id);
+               g_free(id);
+       } else if (!showing) {
+               gchar *id = atspi_accessible_get_unique_id(obj, NULL);
+               DEBUG("%s %s is not showing", object_name, id);
+               g_free(id);
+       }
+       if (defunct)
+               return OBJECT_NOT_VALID;
+       return showing ? OBJECT_VALID : OBJECT_NOT_VISIBLE;
+}
+
 FlatNaviContextValidity flat_navi_is_valid(FlatNaviContext *context, AtspiAccessible *new_root)
 {
        if (!context)

diff --git a/src/navigator.c b/src/navigator.c
index 2183e23cb700df75ab34a567b44df134c478ace3..d4be93fc801c2830992d4e8c359972716f10349f 100644 (file)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -585,32 +585,6 @@ TIZEN_PROD_STATIC Eina_Bool _focus_next_prev_is_movable(AtspiAccessible *obj)
        return ret;
 }
 
-static Eina_Bool _switch_to_next_root_if_valid(NavigatorData *nd, Eina_Bool is_forward)
-{
-       DEBUG("START");
-       if (flat_navi_context_requires_root_change(nd->flat_navi_context)) {
-               AtspiAccessible *current_root = flat_navi_context_root_get(nd->flat_navi_context);
-               if (current_root) {
-                       AtspiAccessible *new_root = NULL;
-                       if (is_forward)
-                               new_root = app_tracker_next_window_get(nd->app_tracker_data, current_root);
-                       else
-                               new_root = app_tracker_prev_window_get(nd->app_tracker_data, current_root);
-
-                       if (new_root && new_root != app_tracker_desktop_get(nd->app_tracker_data) && nd->context_switch_cb) {
-                               DEBUG("switching to new_root for flat_nav_context");
-                               nd->context_switch_cb(nd->context_switch_data, new_root);
-                               return EINA_TRUE;
-                       } else {
-                               flat_navi_fallback_to_loop_in_same_root(nd->flat_navi_context);
-                       }
-               }
-       }
-
-       DEBUG("END");
-       return EINA_FALSE;
-}
-
 TIZEN_PROD_STATIC void _focus_next(NavigatorData *nd)
 {
        DEBUG("START");
@@ -635,10 +609,8 @@ TIZEN_PROD_STATIC void _focus_next(NavigatorData *nd)
                        return;
                }
 
-               if (_focus_next_prev_is_movable(obj)) { /* case: highlight_clear, set can_highlight of current to FALSE */
+               if (_focus_next_prev_is_movable(obj)) /* case: highlight_clear, set can_highlight of current to FALSE */
                        obj = flat_navi_context_next(nd->flat_navi_context);
-                       if (_switch_to_next_root_if_valid(nd, EINA_TRUE)) return;
-               }
        }
 
        if (obj)
@@ -746,10 +718,8 @@ TIZEN_PROD_STATIC void _focus_prev(NavigatorData *nd)
                        return;
                }
 
-               if (_focus_next_prev_is_movable(obj)) { /* case: highlight_clear, set can_highlight of current to FALSE */
+               if (_focus_next_prev_is_movable(obj)) /* case: highlight_clear, set can_highlight of current to FALSE */
                        obj = flat_navi_context_prev(nd->flat_navi_context);
-                       if (_switch_to_next_root_if_valid(nd, EINA_FALSE)) return;
-               }
        }
 
        if (obj)
@@ -2599,15 +2569,13 @@ TIZEN_PROD_STATIC void _view_content_changed(AtspiAccessible *root, AtspiRole ro
        AtspiAccessible *old_root = NULL;
        if (flat_navi_context_root_get(nd->flat_navi_context))
                old_root = g_object_ref(flat_navi_context_root_get(nd->flat_navi_context));
-       context_setup_result setup_result = flat_navi_context_setup(nd->flat_navi_context, root);
-       if (setup_result == CTX_SETUP_FAIL) {
+       if (flat_navi_context_setup(nd->flat_navi_context, root)) {
                DEBUG("END -- setup failed");
                if (old_root) g_object_unref(old_root);
                return;
        }
-
        AtspiAccessible *new_current = flat_navi_context_current_get(nd->flat_navi_context);
-       if (setup_result == CTX_SETUP_SUCCESS_HIGHLIGHT || atspi_accessible_is_equal(old_root, new_current)) {
+       if (atspi_accessible_is_equal(old_root, new_current)) {
                // when returning to old context root as current in new context we should highlight the current immediately without providing default label
                default_label_enabled = EINA_FALSE;
        }

diff --git a/src/utils.c b/src/utils.c
index 6b56644e1d5f537611e62a5be47f96338e674457..f34c690a7fb047ee40aa494a11d44e94f2f11bba 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -393,32 +393,3 @@ end:
 
        return status;
 }
-
-object_state is_object_showing_and_not_defunct(AtspiAccessible *obj, char *object_name)
-{
-       if (!obj) DEBUG("%s is null", object_name);
-       if (!obj)
-               return OBJECT_NOT_VALID;
-       AtspiStateSet *ss = atspi_accessible_get_state_set(obj);
-       if (!ss) {
-               ERROR("failed to get state set for %s", object_name);
-               return OBJECT_NOT_VALID;
-       }
-
-       Eina_Bool showing = atspi_state_set_contains(ss, ATSPI_STATE_SHOWING);
-       Eina_Bool defunct = atspi_state_set_contains(ss, ATSPI_STATE_DEFUNCT);
-       g_object_unref(ss);
-
-       if (defunct) {
-               gchar *id = atspi_accessible_get_unique_id(obj, NULL);
-               DEBUG("%s %s is defunct", object_name, id);
-               g_free(id);
-       } else if (!showing) {
-               gchar *id = atspi_accessible_get_unique_id(obj, NULL);
-               DEBUG("%s %s is not showing", object_name, id);
-               g_free(id);
-       }
-       if (defunct)
-               return OBJECT_NOT_VALID;
-       return showing ? OBJECT_VALID : OBJECT_NOT_VISIBLE;
-}

diff --git a/src/window_tracker.c b/src/window_tracker.c
index fe8aeadb19793c0369324de895fcd845aa6760e5..562389b281b1a11dfe31b7529c071b4a7bbb214c 100644 (file)
--- a/src/window_tracker.c
+++ b/src/window_tracker.c
@@ -629,166 +629,6 @@ AtspiAccessible *window_tracker_top_window_get(WindowTrackerData *wtd)
        return _top_window_get(wtd);
 }
 
-static Eina_Bool _is_equal_window_to_root(WindowInfo *wi, AtspiAccessible *root)
-{
-       AtspiAccessibleDefaultLabelInfo *dli = atspi_accessible_get_default_label_info(wi->window, NULL);
-       Eina_Bool ret = EINA_FALSE;
-       if (dli) {
-               if (dli->obj) {
-                       if (atspi_accessible_is_equal(root, dli->obj)) {
-                               DEBUG("Found equal default label to root");
-                               ret = EINA_TRUE;
-                       }
-                       g_object_unref(dli->obj);
-               }
-
-               if (dli->attributes) {
-                       g_hash_table_unref(dli->attributes);
-               }
-
-               g_free(dli);
-       } else if (atspi_accessible_is_equal(root, wi->window)) {
-               DEBUG("Found equal window to root");
-               ret = EINA_TRUE;
-       }
-
-       return ret;
-}
-
-Eina_Bool _has_navigable_object_in_window(AtspiAccessible *window)
-{
-       Eina_Bool has_navigable = EINA_FALSE;
-       AtspiAccessible *ret = atspi_accessible_get_neighbor(window, NULL, ATSPI_NEIGHBOR_SEARCH_FORWARD, NULL);
-       if (ret) {
-               has_navigable = EINA_TRUE;
-               g_object_unref(ret);
-       }
-       return has_navigable;
-}
-
-Eina_Bool _is_next_valid_win(WindowInfo *wi, AtspiAccessible *current_root, AtspiAccessible *current_win, Eina_Bool *hit_current_win)
-{
-       DEBUG("START");
-       if (wi->window == current_win) {
-               if (hit_current_win) *hit_current_win = EINA_TRUE;
-       } else if (is_object_showing_and_not_defunct(wi->window, "root") == OBJECT_VALID
-               && _has_navigable_object_in_window(wi->window)) {
-               DEBUG("found valid next win");
-               return EINA_TRUE;
-       }
-       return EINA_FALSE;
-}
-
-typedef enum { WIN_SEARCH_FORWARD = 0, WIN_SEARCH_BACKWARD = 1 } win_search_direction;
-
-Eina_Iterator *_alloc_iterator_by_search_direction(WindowTrackerData *wtd, win_search_direction direction)
-{
-       if (direction == WIN_SEARCH_FORWARD) {
-               return eina_list_iterator_new(wtd->window_infos);
-       } else {
-               return eina_list_iterator_reversed_new(wtd->window_infos);
-       }
-}
-
-AtspiAccessible *_circular_search_next_valid_win(WindowTrackerData *wtd, AtspiAccessible *current_root, win_search_direction direction)
-{
-       AtspiAccessible *current_win = NULL;
-       AtspiAccessible *target_win = NULL;
-       WindowInfo *wi;
-       Eina_Iterator *iter;
-
-       // 1st loop:
-       //  First, search equal win from curren_root which will become the starting point.
-       //    Example: [1, 2, 3, 4, 5]  => 3 is current_win
-       //  From the current_win, iterate to the end of the list.
-       //    Example: [1, 2, 3, 4, 5]  => Return first valid win from 4, 5. If both are invalid, go to 2nd iteration.
-       iter = _alloc_iterator_by_search_direction(wtd, direction);
-       if (iter == NULL) {
-               ERROR("Unable allocate new iterator");
-               return NULL;
-       }
-
-       EINA_ITERATOR_FOREACH(iter, wi) {
-               if (!wi) continue;
-               if (current_win == NULL) {
-                       if (_is_equal_window_to_root(wi, current_root)) {
-                               current_win = wi->window;
-                       }
-               } else if (_is_next_valid_win(wi, current_root, current_win, NULL)) {
-                       target_win = wi->window;
-                       break;
-               }
-       }
-       eina_iterator_free(iter);
-
-       if (target_win) {
-               DEBUG("Returning next valid window from 1st iteration");
-               return target_win;
-       }
-
-       if (current_win == NULL) {
-               ERROR("Unable to find current window");
-               return NULL;
-       }
-
-
-       // 2nd loop:
-       //  If we didn't find a valid win from the first iteration, try searching from the first item of the list.
-       //    Example: [1, 2, 3, 4, 5]  => Return first valid win from 1, 2. If both are invalid, return NULL.
-       iter = _alloc_iterator_by_search_direction(wtd, direction);
-       if (iter == NULL) {
-               ERROR("Unable allocate new iterator");
-               return NULL;
-       }
-       EINA_ITERATOR_FOREACH(iter, wi) {
-               if (!wi) continue;
-               Eina_Bool hit_current_win = EINA_FALSE;
-               if (_is_next_valid_win(wi, current_root, current_win, &hit_current_win)) {
-                       target_win = wi->window;
-                       break;
-               }
-               if (hit_current_win) break;
-       }
-       eina_iterator_free(iter);
-
-       if (target_win) {
-               DEBUG("Returning next valid window from 2nd iteration");
-               return target_win;
-       }
-
-       DEBUG("Unable to find valid next window");
-       return NULL;
-}
-
-AtspiAccessible *_find_next_valid_win(WindowTrackerData *wtd, AtspiAccessible *current_root, win_search_direction direction)
-{
-       if (current_root == NULL) {
-               ERROR("passed root is NULL. Returing NULL");
-               return NULL;
-       }
-
-       int count = eina_list_count(wtd->window_infos);
-       DEBUG("window_count = %d", count);
-       if (count < 2) {
-               DEBUG("Only a single window exists in the list. Returning NULL");
-               return NULL;
-       }
-
-       return _circular_search_next_valid_win(wtd, current_root, direction);
-}
-
-AtspiAccessible *window_tracker_next_window_get(WindowTrackerData *wtd, AtspiAccessible *current_root)
-{
-       DEBUG("START");
-       return _find_next_valid_win(wtd, current_root, WIN_SEARCH_FORWARD);
-}
-
-AtspiAccessible *window_tracker_prev_window_get(WindowTrackerData *wtd, AtspiAccessible *current_root)
-{
-       DEBUG("START");
-       return _find_next_valid_win(wtd, current_root, WIN_SEARCH_BACKWARD);
-}
-
 void window_tracker_window_append(WindowTrackerData *wtd, AtspiAccessible *window)
 {
        if (atspi_accessible_is_equal(wtd->keyboard_window, window)) {

diff --git a/tests2/wrappers/mocked_app_tracker.cpp b/tests2/wrappers/mocked_app_tracker.cpp
index dba4fb5a91567768e31ae6e1bb41cbfce5220886..6a806fee6e06930a3619ca0da587ce7a2e697dc6 100644 (file)
--- a/tests2/wrappers/mocked_app_tracker.cpp
+++ b/tests2/wrappers/mocked_app_tracker.cpp
@@ -26,7 +26,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_app_tracker.h b/tests2/wrappers/mocked_app_tracker.h
index 10a19657dbc4e935bad0440cba13a725af47a995..c0f98d4b6a886a913ac23b541c645463e7f49188 100644 (file)
--- a/tests2/wrappers/mocked_app_tracker.h
+++ b/tests2/wrappers/mocked_app_tracker.h
@@ -40,7 +40,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_dbus_direct_reading_adapter.cpp b/tests2/wrappers/mocked_dbus_direct_reading_adapter.cpp
index 1bf0946dfdf1224e7ce858e0698b15f3303a3103..2f76342c72671be0145fc43e41124dbf5dd6716b 100644 (file)
--- a/tests2/wrappers/mocked_dbus_direct_reading_adapter.cpp
+++ b/tests2/wrappers/mocked_dbus_direct_reading_adapter.cpp
@@ -20,7 +20,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_dbus_direct_reading_adapter.h b/tests2/wrappers/mocked_dbus_direct_reading_adapter.h
index bff92e7038721a7843c65327afb880aaf374b4c8..b2ea3f0800030bbf4a524afb8be81c21eb1d2f13 100644 (file)
--- a/tests2/wrappers/mocked_dbus_direct_reading_adapter.h
+++ b/tests2/wrappers/mocked_dbus_direct_reading_adapter.h
@@ -29,7 +29,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_flat_navi.cpp b/tests2/wrappers/mocked_flat_navi.cpp
index 7486dc6e69f4a34ceaa79c9cda6309a15b2ed3f7..a6d1b42578200adfc51ea889dd3f56cb0fe72007 100644 (file)
--- a/tests2/wrappers/mocked_flat_navi.cpp
+++ b/tests2/wrappers/mocked_flat_navi.cpp
@@ -20,7 +20,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_get_accuracy, get_accuracy, int(double, int));

diff --git a/tests2/wrappers/mocked_flat_navi.h b/tests2/wrappers/mocked_flat_navi.h
index 92b267d33c5674c95280396673b2e67dda66414f..3561c9a8cf952caf6801d2266ea7c18617417c9d 100644 (file)
--- a/tests2/wrappers/mocked_flat_navi.h
+++ b/tests2/wrappers/mocked_flat_navi.h
@@ -32,7 +32,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_get_accuracy, get_accuracy, int(double, int));

diff --git a/tests2/wrappers/mocked_granularity_read.cpp b/tests2/wrappers/mocked_granularity_read.cpp
index 835c836715e99d8e9ad9f254e58459959ec47bf3..5a8a4f43b3ea803b809b71479b1e677147bf63b0 100644 (file)
--- a/tests2/wrappers/mocked_granularity_read.cpp
+++ b/tests2/wrappers/mocked_granularity_read.cpp
@@ -17,7 +17,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_granularity_read.h b/tests2/wrappers/mocked_granularity_read.h
index 5fa64102a08eae55c3611ce4d49518af415c1a88..355fa184d9a3009ef8fbb021b322302082329ed8 100644 (file)
--- a/tests2/wrappers/mocked_granularity_read.h
+++ b/tests2/wrappers/mocked_granularity_read.h
@@ -30,7 +30,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_keyboard_tracker.cpp b/tests2/wrappers/mocked_keyboard_tracker.cpp
index 121f2620d541882252048cca80ad2a6088c9f6f7..27cc9890b472b09ab6ab8c7a2bd284f791db5dcc 100644 (file)
--- a/tests2/wrappers/mocked_keyboard_tracker.cpp
+++ b/tests2/wrappers/mocked_keyboard_tracker.cpp
@@ -15,7 +15,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_keyboard_tracker.h b/tests2/wrappers/mocked_keyboard_tracker.h
index b3fa4fa23993d8250f335baf001cd1bc910e3660..af7c2fc77aa8b8f30afe22a824d95b31db629627 100644 (file)
--- a/tests2/wrappers/mocked_keyboard_tracker.h
+++ b/tests2/wrappers/mocked_keyboard_tracker.h
@@ -26,7 +26,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_main.cpp b/tests2/wrappers/mocked_main.cpp
index 7b6abcf6321b0c18778a56261647532513ac6909..8f7f3572037b4fcd777fffd9cbd3a260d5c4a5ef 100644 (file)
--- a/tests2/wrappers/mocked_main.cpp
+++ b/tests2/wrappers/mocked_main.cpp
@@ -20,7 +20,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_main.h b/tests2/wrappers/mocked_main.h
index f6acec00cb737ae054fd32837d03c3eba9d28cb5..974141acb02035cd29dc76aa602103760c725847 100644 (file)
--- a/tests2/wrappers/mocked_main.h
+++ b/tests2/wrappers/mocked_main.h
@@ -46,7 +46,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_navigator.cpp b/tests2/wrappers/mocked_navigator.cpp
index d9e266b5191a5fbf58c73ba9a537a2f1d83b7afe..c927d58dbba6c3677d1c65c47e45a1e6db1c9922 100644 (file)
--- a/tests2/wrappers/mocked_navigator.cpp
+++ b/tests2/wrappers/mocked_navigator.cpp
@@ -81,7 +81,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_navigator.h b/tests2/wrappers/mocked_navigator.h
index 86cb7ce3e39ed7e50d5814bcf8a38fb574d30bef..53c9f6bc2f0e3a667cce4a2c4853133920f0afd4 100644 (file)
--- a/tests2/wrappers/mocked_navigator.h
+++ b/tests2/wrappers/mocked_navigator.h
@@ -161,7 +161,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_screen_reader.cpp b/tests2/wrappers/mocked_screen_reader.cpp
index 7594da0eaea92cea37f3e65ef19d37701633495f..207fb045b2378d23c79e0371d9c53096236af45e 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader.cpp
+++ b/tests2/wrappers/mocked_screen_reader.cpp
@@ -15,7 +15,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_screen_reader.h b/tests2/wrappers/mocked_screen_reader.h
index fb1ab415cd48ec41f9117e6f9f7dee66c13ba00d..e6897507c23b006503ed29d0404fc38c4cf0b122 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader.h
+++ b/tests2/wrappers/mocked_screen_reader.h
@@ -26,7 +26,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_screen_reader_spi.cpp b/tests2/wrappers/mocked_screen_reader_spi.cpp
index fd1cfc6ce0604a6870f8394afb378e51e194493d..554724e5e8f4906cb0641e3bf871fe7c4df1b8be 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader_spi.cpp
+++ b/tests2/wrappers/mocked_screen_reader_spi.cpp
@@ -17,7 +17,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_free_shtd, free_shtd, void(SignalHandlingTimerData *));

diff --git a/tests2/wrappers/mocked_screen_reader_spi.h b/tests2/wrappers/mocked_screen_reader_spi.h
index d298eac93f3b16efcec11737527347ce898b8dec..b2a79f7f50224b15ca3fdbc7a3d1c0140239262d 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader_spi.h
+++ b/tests2/wrappers/mocked_screen_reader_spi.h
@@ -32,7 +32,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_free_shtd, free_shtd, void(SignalHandlingTimerData *));

diff --git a/tests2/wrappers/mocked_screen_reader_system.cpp b/tests2/wrappers/mocked_screen_reader_system.cpp
index 2aa9d415c3907591ef07fe4181ebbac2d5636ceb..c2278cf4ed30876ccc8721ceef2f94551ad2c84c 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader_system.cpp
+++ b/tests2/wrappers/mocked_screen_reader_system.cpp
@@ -18,7 +18,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_screen_reader_system.h b/tests2/wrappers/mocked_screen_reader_system.h
index 96600c85f77e3ccb2406ecad47c15da55b857515..87c46bf554a3ac52acc1544294c45ca279420d5d 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader_system.h
+++ b/tests2/wrappers/mocked_screen_reader_system.h
@@ -37,7 +37,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_screen_reader_tts.cpp b/tests2/wrappers/mocked_screen_reader_tts.cpp
index 63eb59e694b6e3b2ad720666537b2cb17132c7b9..5a2a3c574636b83e4f60179c6e33f490b32ffa72 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader_tts.cpp
+++ b/tests2/wrappers/mocked_screen_reader_tts.cpp
@@ -22,7 +22,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_screen_reader_tts.h b/tests2/wrappers/mocked_screen_reader_tts.h
index d756c54b98b67d41aef43549fc9c6b158c968858..bd73b26a20653b43463f86b631c8b7cffd337260 100644 (file)
--- a/tests2/wrappers/mocked_screen_reader_tts.h
+++ b/tests2/wrappers/mocked_screen_reader_tts.h
@@ -34,7 +34,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_smart_notification.cpp b/tests2/wrappers/mocked_smart_notification.cpp
index b5d0f34e800216454e9f11f8075ca090c40948f0..bc631ae37cb60553bc63792107575feedf7c555d 100644 (file)
--- a/tests2/wrappers/mocked_smart_notification.cpp
+++ b/tests2/wrappers/mocked_smart_notification.cpp
@@ -15,7 +15,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_smart_notification.h b/tests2/wrappers/mocked_smart_notification.h
index 8fafb8e136ec40b139e91ef247bc496ec4263caf..5d8ad152c6b66264d316a3afe94f6745023341c3 100644 (file)
--- a/tests2/wrappers/mocked_smart_notification.h
+++ b/tests2/wrappers/mocked_smart_notification.h
@@ -29,7 +29,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_window_tracker.cpp b/tests2/wrappers/mocked_window_tracker.cpp
index 4143016e4d085e628c75c80971935e46f92710e8..e22f5a842596ba3dc23c50d518d79e8a2250ee71 100644 (file)
--- a/tests2/wrappers/mocked_window_tracker.cpp
+++ b/tests2/wrappers/mocked_window_tracker.cpp
@@ -17,7 +17,7 @@ IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, At
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 IMPLEMENT_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 IMPLEMENT_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));

diff --git a/tests2/wrappers/mocked_window_tracker.h b/tests2/wrappers/mocked_window_tracker.h
index 9a2804948323dd5c193d7400d37bcdbe797ed735..875a102318cf019ea7715ec8ba197a2dbe2428fe 100644 (file)
--- a/tests2/wrappers/mocked_window_tracker.h
+++ b/tests2/wrappers/mocked_window_tracker.h
@@ -26,7 +26,7 @@ DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_next, flat_navi_context_next, Atsp
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_prev, flat_navi_context_prev, AtspiAccessible *(FlatNaviContext *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_root_change, flat_navi_context_root_change, void(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK1(mock_flat_navi_context_root_get, flat_navi_context_root_get, AtspiAccessible *(FlatNaviContext *));
-DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, context_setup_result(FlatNaviContext *, AtspiAccessible *));
+DECLARE_FUNCTION_MOCK2(mock_flat_navi_context_setup, flat_navi_context_setup, int(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_get_object_in_relation, flat_navi_get_object_in_relation, AtspiAccessible *(AtspiAccessible *, AtspiRelationType));
 DECLARE_FUNCTION_MOCK2(mock_flat_navi_is_valid, flat_navi_is_valid, FlatNaviContextValidity(FlatNaviContext *, AtspiAccessible *));
 DECLARE_FUNCTION_MOCK3(mock_generate_what_to_read_and_speak, generate_what_to_read_and_speak, void(NavigatorData *, AtspiAccessible *, Eina_Bool));