rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=3f6a0d86d9c4faeafa7ca2e7419c6fbe0296d330
commit 3f6a0d86d9c4faeafa7ca2e7419c6fbe0296d330 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Wed Mar 16 11:38:17 2016 +0200 UTC: update diff test function protopypes were changed. undo/redo now has abort() if function returns false, so we shouldn't check this in test --- tests/test_diff/diff_undo_redo.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/tests/test_diff/diff_undo_redo.c b/tests/test_diff/diff_undo_redo.c index 0fa9fd5..cb94847 100644 --- a/tests/test_diff/diff_undo_redo.c +++ b/tests/test_diff/diff_undo_redo.c @@ -68,7 +68,7 @@ END_TEST /* test stubs that check args, return specified value, and report what function was called */ static Eina_Bool _function_type_int_undo_return_true_called = false; static Eina_Bool -_function_type_int_undo_return_true(Evas_Object *obj, int val) +_function_type_int_undo_return_true(Evas_Object *obj, Change *change __UNUSED__, Eina_Bool merge __UNUSED__, int val) { ck_assert(obj == pseudo_object); ck_assert(val == 42); @@ -76,19 +76,9 @@ _function_type_int_undo_return_true(Evas_Object *obj, int val) return true; } -static Eina_Bool _function_type_int_undo_return_false_called = false; -static Eina_Bool -_function_type_int_undo_return_false(Evas_Object *obj, int val) -{ - ck_assert(obj == pseudo_object); - ck_assert(val == 24); - _function_type_int_undo_return_false_called = true; - return false; -} - static Eina_Bool _function_type_int_redo_return_true_called = false; static Eina_Bool -_function_type_int_redo_return_true(Evas_Object *obj, int val) +_function_type_int_redo_return_true(Evas_Object *obj, Change *change __UNUSED__, Eina_Bool merge __UNUSED__, int val) { ck_assert(obj == pseudo_object); ck_assert(val == 42); @@ -96,16 +86,6 @@ _function_type_int_redo_return_true(Evas_Object *obj, int val) return true; } -static Eina_Bool _function_type_int_redo_return_false_called = false; -static Eina_Bool -_function_type_int_redo_return_false(Evas_Object *obj, int val) -{ - ck_assert(obj == pseudo_object); - ck_assert(val == 24); - _function_type_int_redo_return_false_called = true; - return false; -} - /** * @addtogroup diff_undo_redo * @{ @@ -148,17 +128,6 @@ EFLETE_TEST (diff_undo_redo_test_p2) ck_assert(_function_type_int_undo_return_true_called); ck_assert(diff_redo(pseudo_object, &diff) == true); ck_assert(_function_type_int_redo_return_true_called); - - diff.undo.type = FUNCTION_TYPE_INT; - diff.undo.function = _function_type_int_undo_return_false; - diff.undo.args.type_i.i1 = 24; - diff.redo.type = FUNCTION_TYPE_INT; - diff.redo.function = _function_type_int_redo_return_false; - diff.redo.args.type_i.i1 = 24; - ck_assert(diff_undo(pseudo_object, &diff) == false); - ck_assert(_function_type_int_undo_return_false_called); - ck_assert(diff_redo(pseudo_object, &diff) == false); - ck_assert(_function_type_int_redo_return_false_called); } END_TEST --