From f5fd009992cd0cd6c1b61ecc0960290376451b56 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 13 Jan 2020 18:59:22 +0100 Subject: [PATCH] Revert "efl_ui_spin_button: add tests for direct input feature" This reverts commit f62cee28cbb634731d7c39378dd29530d767b505. This seems to cause trouble on the CI - lets recheck that. --- .../elementary/efl_ui_test_spin_button.c | 53 ------------------- src/tests/elementary/suite_helpers.c | 13 ----- src/tests/elementary/suite_helpers.h | 1 - 3 files changed, 67 deletions(-) diff --git a/src/tests/elementary/efl_ui_test_spin_button.c b/src/tests/elementary/efl_ui_test_spin_button.c index a731bb67ce..f723e348af 100644 --- a/src/tests/elementary/efl_ui_test_spin_button.c +++ b/src/tests/elementary/efl_ui_test_spin_button.c @@ -3,7 +3,6 @@ #endif #include -#include "elm_entry_eo.h" //needed to check that spin is in text mode #include #include "efl_ui_suite.h" @@ -210,56 +209,6 @@ EFL_START_TEST (spin_double_values_hitting_max_with_step) } EFL_END_TEST -static inline void -_try_direct_text_input(const char *text, double result) -{ - Eo *entry = efl_content_get(efl_part(spin, "efl.entry")); - ck_assert_int_eq(efl_isa(entry, ELM_ENTRY_CLASS), 1); - - write_key_sequence(spin, text); - efl_ui_focus_util_focus(efl_content_get(efl_part(spin, "efl.inc_button"))); - if (EINA_DBL_EQ(efl_ui_range_value_get(spin), result) != 1) - ck_assert_msg("Double %g does not match %g", efl_ui_range_value_get(spin), result); -} - -EFL_START_TEST (spin_direct_text_input) -{ - efl_ui_spin_button_direct_text_input_set(spin, EINA_TRUE); - efl_ui_range_limits_set(spin, -30, 30); - efl_ui_range_value_set(spin, 20); - efl_ui_focus_util_focus(efl_content_get(efl_part(spin, "efl.text_button"))); - DISABLE_ABORT_ON_CRITICAL_START; //FIXME there is a bug in the cnp handling code - get_me_to_those_events(spin); - DISABLE_ABORT_ON_CRITICAL_END; - - _try_direct_text_input("1asdf2", 12); - _try_direct_text_input("1-2", 12); - _try_direct_text_input("-12", -12); - _try_direct_text_input("-100", -30); - _try_direct_text_input("10.8", 10); - _try_direct_text_input("12342435", 30); -} -EFL_END_TEST - -EFL_START_TEST (spin_direct_text_input_comma_value) -{ - efl_ui_spin_button_direct_text_input_set(spin, EINA_TRUE); - efl_ui_range_limits_set(spin, -30, 30); - efl_ui_range_value_set(spin, 20); - efl_ui_format_string_set(spin, "%.2f", EFL_UI_FORMAT_STRING_TYPE_SIMPLE); - efl_ui_focus_util_focus(efl_content_get(efl_part(spin, "efl.text_button"))); - DISABLE_ABORT_ON_CRITICAL_START; //FIXME there is a bug in the cnp handling code - get_me_to_those_events(spin); - DISABLE_ABORT_ON_CRITICAL_END; - - _try_direct_text_input("1asdf2.1", 12.1); - _try_direct_text_input("1-2.2", 12.2); - _try_direct_text_input("-12.8", -12.8); - _try_direct_text_input("-100", -30); - _try_direct_text_input("10.8", 10.8); - _try_direct_text_input("12342435.12312341342", 30); -} -EFL_END_TEST void efl_ui_test_spin_button(TCase *tc) { tcase_add_checked_fixture(tc, fail_on_errors_setup, fail_on_errors_teardown); @@ -271,6 +220,4 @@ void efl_ui_test_spin_button(TCase *tc) tcase_add_test(tc, spin_wraparound); tcase_add_test(tc, spin_double_values); tcase_add_test(tc, spin_double_values_hitting_max_with_step); - tcase_add_test(tc, spin_direct_text_input); - tcase_add_test(tc, spin_direct_text_input_comma_value); } diff --git a/src/tests/elementary/suite_helpers.c b/src/tests/elementary/suite_helpers.c index c637ff7f77..53c473a9fa 100644 --- a/src/tests/elementary/suite_helpers.c +++ b/src/tests/elementary/suite_helpers.c @@ -618,16 +618,3 @@ drag_object(Eo *obj, int x, int y, int dx, int dy, Eina_Bool iterate) evas_event_feed_mouse_move(e, x + dx, y + dy, 0, NULL); evas_event_feed_mouse_up(e, 1, 0, 0, NULL); } - -void -write_key_sequence(Eo *obj, const char *seqence) -{ - Evas *e = evas_object_evas_get(obj); - for (unsigned int i = 0; i < strlen(seqence); ++i) - { - const char part_seq[] = {seqence[i], '\0'}; - evas_event_feed_key_down(e, part_seq, part_seq, part_seq, part_seq, 0, NULL); - evas_event_feed_key_up(e, part_seq, part_seq, part_seq, part_seq, 0, NULL); - ecore_main_loop_iterate(); - } -} diff --git a/src/tests/elementary/suite_helpers.h b/src/tests/elementary/suite_helpers.h index b9535a8826..40c8dec12b 100644 --- a/src/tests/elementary/suite_helpers.h +++ b/src/tests/elementary/suite_helpers.h @@ -22,7 +22,6 @@ void click_part(Eo *obj, const char *part); void click_part_flags(Eo *obj, const char *part, int flags); void click_object_at(Eo *obj, int x, int y); void click_object_at_flags(Eo *obj, int x, int y, int flags); -void write_key_sequence(Eo *obj, const char *seqence); void drag_object(Eo *obj, int x, int y, int dx, int dy, Eina_Bool iterate); void wheel_object(Eo *obj, Eina_Bool horiz, Eina_Bool down); void wheel_part(Eo *obj, const char *part, Eina_Bool horiz, Eina_Bool down);