pim/mongoose-touch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Plumb default_widget_handler and default_user_data for widgets read from JSON/File

Browse Source
This commit is contained in:
Pim van Pelt
2017-11-26 19:06:44 +01:00
parent fda8b332db
commit e826324244
7 changed files with 94 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
unittest/test_screen.c
View File

@ -4,6 +4,25 @@
extern int _mgos_timers;
static void test_screen_default_ev(int ev, struct widget_t *w, void *ev_data) {
if (!w)
return;
LOG(LL_INFO, ("Event %d received for widget '%s'", ev, w->name));
switch(ev) {
case EV_WIDGET_CREATE:
case EV_WIDGET_DRAW:
case EV_WIDGET_REDRAW:
case EV_WIDGET_TIMER:
case EV_WIDGET_TOUCH_UP:
case EV_WIDGET_TOUCH_DOWN:
case EV_WIDGET_DESTROY:
default: // EV_WIDGET_NONE
break;
}
(void) ev_data;
}
static void test_screen_widget_add_and_remove(struct screen_t *s, const char *fn) {
struct widget_t *w1;
@ -84,12 +103,12 @@ int test_screen() {
uint16_t num_widgets;
LOG(LL_INFO, ("screen_create_from_file(data/TestScreen-invalid.json)"));
s = screen_create_from_file("data/TestScreen-invalid.json");
s = screen_create_from_file("data/TestScreen-invalid.json", test_screen_default_ev, NULL);
ASSERT(!s, "created screen from invalid date");
num_widgets = screen_get_num_widgets(s);
LOG(LL_INFO, ("screen_create_from_file(data/TestScreen.json)"));
s = screen_create_from_file("data/TestScreen.json");
s = screen_create_from_file("data/TestScreen.json", test_screen_default_ev, NULL);
ASSERT(s, "Could not create screen");
num_widgets = screen_get_num_widgets(s);

24
unittest/test_widget.c
View File

@ -3,6 +3,26 @@
extern int _mgos_timers;
static void test_widget_default_ev(int ev, struct widget_t *w, void *ev_data) {
if (!w)
return;
LOG(LL_INFO, ("Event %d received for widget '%s'", ev, w->name));
switch(ev) {
case EV_WIDGET_CREATE:
case EV_WIDGET_DRAW:
case EV_WIDGET_REDRAW:
case EV_WIDGET_TIMER:
case EV_WIDGET_TOUCH_UP:
case EV_WIDGET_TOUCH_DOWN:
case EV_WIDGET_DESTROY:
default: // EV_WIDGET_NONE
break;
}
(void) ev_data;
}
static int test_widget_create_from_file(void) {
struct widget_t *w;
int ret;
@ -24,6 +44,10 @@ static int test_widget_create_from_file(void) {
widget_set_timer(w, 1000);
ASSERT(_mgos_timers==1, "timer not found");
LOG(LL_INFO, ("widget_set_handler()"));
widget_set_handler(w, test_widget_default_ev, NULL);
LOG(LL_INFO, ("widget_delete_timer()"));
widget_delete_timer(w);
ASSERT(_mgos_timers==0, "timers found");