summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-01-13 18:59:22 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-01-13 18:59:35 +0100
commitf5fd009992cd0cd6c1b61ecc0960290376451b56 (patch)
tree07efd5e4a1a0c3bd7b396cbb8051d366b02fb43c
parent2f8029412daf51f721cb5a28d774a57792364887 (diff)
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.
-rw-r--r--src/tests/elementary/efl_ui_test_spin_button.c53
-rw-r--r--src/tests/elementary/suite_helpers.c13
-rw-r--r--src/tests/elementary/suite_helpers.h1
3 files changed, 0 insertions, 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 @@
3#endif 3#endif
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_entry_eo.h" //needed to check that spin is in text mode
7#include <Efl_Ui.h> 6#include <Efl_Ui.h>
8#include "efl_ui_suite.h" 7#include "efl_ui_suite.h"
9 8
@@ -210,56 +209,6 @@ EFL_START_TEST (spin_double_values_hitting_max_with_step)
210} 209}
211EFL_END_TEST 210EFL_END_TEST
212 211
213static inline void
214_try_direct_text_input(const char *text, double result)
215{
216 Eo *entry = efl_content_get(efl_part(spin, "efl.entry"));
217 ck_assert_int_eq(efl_isa(entry, ELM_ENTRY_CLASS), 1);
218
219 write_key_sequence(spin, text);
220 efl_ui_focus_util_focus(efl_content_get(efl_part(spin, "efl.inc_button")));
221 if (EINA_DBL_EQ(efl_ui_range_value_get(spin), result) != 1)
222 ck_assert_msg("Double %g does not match %g", efl_ui_range_value_get(spin), result);
223}
224
225EFL_START_TEST (spin_direct_text_input)
226{
227 efl_ui_spin_button_direct_text_input_set(spin, EINA_TRUE);
228 efl_ui_range_limits_set(spin, -30, 30);
229 efl_ui_range_value_set(spin, 20);
230 efl_ui_focus_util_focus(efl_content_get(efl_part(spin, "efl.text_button")));
231 DISABLE_ABORT_ON_CRITICAL_START; //FIXME there is a bug in the cnp handling code
232 get_me_to_those_events(spin);
233 DISABLE_ABORT_ON_CRITICAL_END;
234
235 _try_direct_text_input("1asdf2", 12);
236 _try_direct_text_input("1-2", 12);
237 _try_direct_text_input("-12", -12);
238 _try_direct_text_input("-100", -30);
239 _try_direct_text_input("10.8", 10);
240 _try_direct_text_input("12342435", 30);
241}
242EFL_END_TEST
243
244EFL_START_TEST (spin_direct_text_input_comma_value)
245{
246 efl_ui_spin_button_direct_text_input_set(spin, EINA_TRUE);
247 efl_ui_range_limits_set(spin, -30, 30);
248 efl_ui_range_value_set(spin, 20);
249 efl_ui_format_string_set(spin, "%.2f", EFL_UI_FORMAT_STRING_TYPE_SIMPLE);
250 efl_ui_focus_util_focus(efl_content_get(efl_part(spin, "efl.text_button")));
251 DISABLE_ABORT_ON_CRITICAL_START; //FIXME there is a bug in the cnp handling code
252 get_me_to_those_events(spin);
253 DISABLE_ABORT_ON_CRITICAL_END;
254
255 _try_direct_text_input("1asdf2.1", 12.1);
256 _try_direct_text_input("1-2.2", 12.2);
257 _try_direct_text_input("-12.8", -12.8);
258 _try_direct_text_input("-100", -30);
259 _try_direct_text_input("10.8", 10.8);
260 _try_direct_text_input("12342435.12312341342", 30);
261}
262EFL_END_TEST
263void efl_ui_test_spin_button(TCase *tc) 212void efl_ui_test_spin_button(TCase *tc)
264{ 213{
265 tcase_add_checked_fixture(tc, fail_on_errors_setup, fail_on_errors_teardown); 214 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)
271 tcase_add_test(tc, spin_wraparound); 220 tcase_add_test(tc, spin_wraparound);
272 tcase_add_test(tc, spin_double_values); 221 tcase_add_test(tc, spin_double_values);
273 tcase_add_test(tc, spin_double_values_hitting_max_with_step); 222 tcase_add_test(tc, spin_double_values_hitting_max_with_step);
274 tcase_add_test(tc, spin_direct_text_input);
275 tcase_add_test(tc, spin_direct_text_input_comma_value);
276} 223}
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)
618 evas_event_feed_mouse_move(e, x + dx, y + dy, 0, NULL); 618 evas_event_feed_mouse_move(e, x + dx, y + dy, 0, NULL);
619 evas_event_feed_mouse_up(e, 1, 0, 0, NULL); 619 evas_event_feed_mouse_up(e, 1, 0, 0, NULL);
620} 620}
621
622void
623write_key_sequence(Eo *obj, const char *seqence)
624{
625 Evas *e = evas_object_evas_get(obj);
626 for (unsigned int i = 0; i < strlen(seqence); ++i)
627 {
628 const char part_seq[] = {seqence[i], '\0'};
629 evas_event_feed_key_down(e, part_seq, part_seq, part_seq, part_seq, 0, NULL);
630 evas_event_feed_key_up(e, part_seq, part_seq, part_seq, part_seq, 0, NULL);
631 ecore_main_loop_iterate();
632 }
633}
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);
22void click_part_flags(Eo *obj, const char *part, int flags); 22void click_part_flags(Eo *obj, const char *part, int flags);
23void click_object_at(Eo *obj, int x, int y); 23void click_object_at(Eo *obj, int x, int y);
24void click_object_at_flags(Eo *obj, int x, int y, int flags); 24void click_object_at_flags(Eo *obj, int x, int y, int flags);
25void write_key_sequence(Eo *obj, const char *seqence);
26void drag_object(Eo *obj, int x, int y, int dx, int dy, Eina_Bool iterate); 25void drag_object(Eo *obj, int x, int y, int dx, int dy, Eina_Bool iterate);
27void wheel_object(Eo *obj, Eina_Bool horiz, Eina_Bool down); 26void wheel_object(Eo *obj, Eina_Bool horiz, Eina_Bool down);
28void wheel_part(Eo *obj, const char *part, Eina_Bool horiz, Eina_Bool down); 27void wheel_part(Eo *obj, const char *part, Eina_Bool horiz, Eina_Bool down);