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

Reformat test_screen() output to show what we're doing

Browse Source
This commit is contained in:
Pim van Pelt
2017-11-26 16:57:45 +01:00
parent e027c4d65b
commit 58fe68c6e3
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
unittest/test_screen.c
View File

@ -9,23 +9,32 @@ static void test_screen_widget_add_and_remove(struct screen_t *s, const char *fn
struct widget_t *w1; struct widget_t *w1;
int num_widgets_before, num_widgets; int num_widgets_before, num_widgets;
bool ret; bool ret;
int mgos_timers_before;
LOG(LL_INFO, ("widget_create_from_file(%s)", fn));
w1 = widget_create_from_file(fn); w1 = widget_create_from_file(fn);
ASSERT(w1, "widget_create_from_file() failed"); ASSERT(w1, "widget_create_from_file() failed");
num_widgets_before = screen_get_num_widgets(s); LOG(LL_INFO, ("widget_set_timer()"));
LOG(LL_INFO, ("Screen has %d widget(s)", num_widgets_before)); mgos_timers_before=_mgos_timers;
widget_set_timer(w1, 1000);
ASSERT(_mgos_timers==mgos_timers_before+1, "timer not found");
num_widgets_before = screen_get_num_widgets(s);
LOG(LL_INFO, ("screen has %d widget(s)", num_widgets_before));
LOG(LL_INFO, ("screen_widget_add() of widget1"));
ret = screen_widget_add(s, w1); ret = screen_widget_add(s, w1);
ASSERT(true == ret, "screen_widget_add() failed for widget1"); ASSERT(true == ret, "screen_widget_add() failed for widget1");
num_widgets = screen_get_num_widgets(s); num_widgets = screen_get_num_widgets(s);
LOG(LL_INFO, ("Screen has %d widget(s)", num_widgets)); LOG(LL_INFO, ("screen has %d widget(s)", num_widgets));
ASSERT(num_widgets == num_widgets_before+1, "Did not see widget in screen"); ASSERT(num_widgets == num_widgets_before+1, "Did not see widget in screen");
LOG(LL_INFO, ("screen_widget_destroy() of widget1"));
ret = screen_widget_destroy(s, &w1); ret = screen_widget_destroy(s, &w1);
ASSERT(true == ret, "screen_widget_destroy() failed for widget1"); ASSERT(true == ret, "screen_widget_destroy() failed for widget1");
num_widgets = screen_get_num_widgets(s); num_widgets = screen_get_num_widgets(s);
LOG(LL_INFO, ("Screen has %d widget(s)", num_widgets)); LOG(LL_INFO, ("screen has %d widget(s)", num_widgets));
ASSERT(num_widgets == num_widgets_before, "Too many widgets in screen"); ASSERT(num_widgets == num_widgets_before, "Too many widgets in screen");
return; return;
@ -84,14 +93,14 @@ int test_screen() {
ASSERT(s, "Could not create screen"); ASSERT(s, "Could not create screen");
num_widgets = screen_get_num_widgets(s); num_widgets = screen_get_num_widgets(s);
LOG(LL_INFO, ("Screen has %d widget(s)", num_widgets)); LOG(LL_INFO, ("screen has %d widget(s)", num_widgets));
ASSERT(num_widgets == 2, "Expecting 2 widgets in screen"); ASSERT(num_widgets == 2, "Expecting 2 widgets in screen");
LOG(LL_INFO, ("test_screen_widget_add_and_remove(data/TestWidget.json)")); LOG(LL_INFO, ("test_screen_widget_add_and_remove(data/TestWidget.json)"));
test_screen_widget_add_and_remove(s, "data/TestWidget.json"); test_screen_widget_add_and_remove(s, "data/TestWidget.json");
num_widgets = screen_get_num_widgets(s); num_widgets = screen_get_num_widgets(s);
LOG(LL_INFO, ("Screen has %d widget(s)", num_widgets)); LOG(LL_INFO, ("screen has %d widget(s)", num_widgets));
ASSERT(num_widgets == 2, "Expecting 2 widgets in screen"); ASSERT(num_widgets == 2, "Expecting 2 widgets in screen");
LOG(LL_INFO, ("test_widget_add_from_file(data/TestWidget.json)")); LOG(LL_INFO, ("test_widget_add_from_file(data/TestWidget.json)"));
@ -99,7 +108,7 @@ int test_screen() {
ASSERT(w, "screen_widget_add_from_file() failed for data/TestWidget.json"); ASSERT(w, "screen_widget_add_from_file() failed for data/TestWidget.json");
num_widgets = screen_get_num_widgets(s); num_widgets = screen_get_num_widgets(s);
LOG(LL_INFO, ("Screen has %d widget(s)", num_widgets)); LOG(LL_INFO, ("screen has %d widget(s)", num_widgets));
ASSERT(num_widgets == 3, "Expecting 3 widgets in screen"); ASSERT(num_widgets == 3, "Expecting 3 widgets in screen");
LOG(LL_INFO, ("screen_widget_destroy()")); LOG(LL_INFO, ("screen_widget_destroy()"));