From 164f920c36672332e4014e1e76d2981bd546c622 Mon Sep 17 00:00:00 2001 From: Aharon Hillel Date: Tue, 20 Dec 2011 09:08:53 +0000 Subject: [PATCH] exactness: Fixed test errors. TODO: still need to fix two errors in test_index.c, result of API state 3 Signed-off-by: Aharon Hillel SVN revision: 66375 --- src/bin/test_diskselector.c | 14 +++++++------- src/bin/test_index.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c index a513cef..5e70f08 100644 --- a/src/bin/test_diskselector.c +++ b/src/bin/test_diskselector.c @@ -135,26 +135,26 @@ set_api_state(api_data *api) break; case SELECTED_SET: /* 9 */ - { /* Select NEXT item of first disk */ - elm_diskselector_item_selected_set(elm_diskselector_item_next_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))), EINA_TRUE); + { /* Select NEXT item of third disk */ + elm_diskselector_item_selected_set(elm_diskselector_item_next_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 2))), EINA_TRUE); } break; case ITEM_PREV_GET: /* 10 */ - { /* Select PREV item of first disk */ - elm_diskselector_item_selected_set(elm_diskselector_item_prev_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))), EINA_TRUE); + { /* Select PREV item of third disk */ + elm_diskselector_item_selected_set(elm_diskselector_item_prev_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 2))), EINA_TRUE); } break; case ITEM_DEL_NOT_SELECTED: /* 11 */ - { /* Remove selected item of first disk */ - elm_diskselector_item_del(elm_diskselector_item_prev_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)))); + { /* Remove selected item of third disk */ + elm_diskselector_item_del(elm_diskselector_item_prev_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 2)))); } break; case ITEM_DEL: /* 12 */ { /* Remove selected item of first disk */ - elm_diskselector_item_del(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))); + elm_diskselector_item_del(elm_diskselector_selected_item_get(eina_list_nth(disks, 1))); } break; diff --git a/src/bin/test_index.c b/src/bin/test_index.c index 3e3ead9..097d965 100644 --- a/src/bin/test_index.c +++ b/src/bin/test_index.c @@ -18,7 +18,7 @@ index_changed2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i { // called on a change but delayed in case multiple changes happen in a // short timespan - elm_genlist_item_top_bring_in(event_info); + elm_genlist_item_top_bring_in(elm_index_item_data_get(event_info)); } void @@ -32,13 +32,13 @@ void index_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { // called on final select - elm_genlist_item_top_bring_in(event_info); + elm_genlist_item_top_bring_in(elm_index_item_data_get(event_info)); } struct _Idx_Data_Type { Evas_Object *id; /* Pointer to Index */ - void *item; /* Item we use for search */ + Elm_Genlist_Item *item; /* Item we use for search */ }; typedef struct _Idx_Data_Type Idx_Data_Type; @@ -71,7 +71,7 @@ set_api_state(api_data *api) break; case INDEX_APPEND_RELATIVE: /* 2 */ - elm_index_item_append_relative(d->id, "W", d->item, d->item); + elm_index_item_append_relative(d->id, "W", d->item, elm_index_item_find(d->id, d->item)); break; case INDEX_PREPEND: /* 3 */ @@ -79,7 +79,7 @@ set_api_state(api_data *api) break; case INDEX_ITEM_DEL: /* 4 */ - elm_index_item_del(d->id, d->item); + elm_index_item_del(d->id, elm_index_item_find(d->id, d->item)); break; case INDEX_ITEM_FIND: /* 5 */ @@ -263,7 +263,7 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) if (!it_next) { - elm_index_item_del(gui->id, it); + elm_index_item_del(gui->id, elm_index_item_find(gui->id, it)); elm_list_item_del(it); return; } @@ -278,7 +278,7 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) elm_index_item_data_set(iit, it_next); } else - elm_index_item_del(gui->id, it); + elm_index_item_del(gui->id, elm_index_item_find(gui->id, it)); elm_list_item_del(it); }