github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: scr -> screen, act->active, del->delete, remove in obj_clear_flag/state

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-10-12 20:37:27 +02:00
parent 0ff2d1c2e4
commit 9ec5417dd3
468 changed files with 1330 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/src/test_cases/draw/test_clip_corner.c
View File

@@ -15,7 +15,7 @@ void tearDown(void)
static lv_obj_t * create_panel(lv_coord_t radius, bool transform)
{
lv_obj_t * parent = lv_obj_create(lv_scr_act());
lv_obj_t * parent = lv_obj_create(lv_screen_active());
lv_obj_set_style_pad_all(parent, 3, 0);
lv_obj_set_style_radius(parent, radius, 0);
lv_obj_set_style_clip_corner(parent, true, 0);
@@ -38,9 +38,9 @@ static lv_obj_t * create_panel(lv_coord_t radius, bool transform)
void test_func_1(void)
{
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_style_pad_column(lv_scr_act(), 40, 0);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_style_pad_column(lv_screen_active(), 40, 0);
create_panel(0, false);
create_panel(10, false);

8
tests/src/test_cases/draw/test_draw_arc.c
View File

@@ -7,8 +7,8 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
void tearDown(void)
@@ -66,7 +66,7 @@ static void draw_arcs(lv_draw_arc_dsc_t * arc_dsc, const char * fn)
{
static uint8_t canvas_buf[CANVAS_WIDTH_TO_STRIDE(760, 4) * 440];
lv_obj_t * canvas = lv_canvas_create(lv_scr_act());
lv_obj_t * canvas = lv_canvas_create(lv_screen_active());
lv_canvas_set_buffer(canvas, canvas_buf, 760, 440, LV_COLOR_FORMAT_ARGB8888);
lv_canvas_fill_bg(canvas, lv_palette_lighten(LV_PALETTE_RED, 2), LV_OPA_50);
@@ -100,7 +100,7 @@ static void draw_arcs(lv_draw_arc_dsc_t * arc_dsc, const char * fn)
lv_snprintf(fn_buf, sizeof(fn_buf), "draw/arc_%s.png", fn);
TEST_ASSERT_EQUAL_SCREENSHOT(fn_buf);
lv_obj_del(canvas);
lv_obj_delete(canvas);
}
void test_colored_arc(void)

12
tests/src/test_cases/draw/test_draw_blend.c
View File

@@ -7,8 +7,8 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
@@ -20,7 +20,7 @@ void tearDown(void)
static void canvas_basic_render(uint8_t * canvas_buf, lv_color_format_t render_cf, const char * name_main,
const char * name_sub)
{
lv_obj_t * canvas = lv_canvas_create(lv_scr_act());
lv_obj_t * canvas = lv_canvas_create(lv_screen_active());
lv_canvas_set_buffer(canvas, canvas_buf, 180, 180, render_cf);
lv_canvas_fill_bg(canvas, lv_palette_lighten(LV_PALETTE_LIGHT_BLUE, 2), LV_OPA_COVER);
@@ -85,7 +85,7 @@ static void canvas_basic_render(uint8_t * canvas_buf, lv_color_format_t render_c
lv_canvas_finish_layer(canvas, &layer);
lv_obj_del(canvas);
lv_obj_delete(canvas);
}
@@ -120,13 +120,13 @@ void canvas_blend_test(lv_obj_t * canvas_large, lv_draw_image_dsc_t * img_dsc,
static void canvas_draw(const char * name, lv_color_format_t large_render_cf)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
static uint8_t canvas_buf[CANVAS_WIDTH_TO_STRIDE(180, 4) * 180 + LV_DRAW_BUF_ALIGN];
static uint8_t canvas2_buf[CANVAS_WIDTH_TO_STRIDE(768, 4) * 390 + LV_DRAW_BUF_ALIGN];
lv_obj_t * canvas2 = lv_canvas_create(lv_scr_act());
lv_obj_t * canvas2 = lv_canvas_create(lv_screen_active());
lv_canvas_set_buffer(canvas2, lv_draw_buf_align(canvas2_buf, large_render_cf), 768, 390, large_render_cf);
lv_canvas_fill_bg(canvas2, lv_palette_lighten(LV_PALETTE_BLUE_GREY, 2), LV_OPA_COVER);

12
tests/src/test_cases/draw/test_draw_label.c
View File

@@ -6,21 +6,21 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
static lv_obj_t * label_create(const lv_font_t * font, lv_style_t * style, const char * text_base)
{
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_obj_t * label = lv_label_create(lv_screen_active());
lv_label_set_text_fmt(label, "%s: the quick brown fox jumps over the lazy dog", text_base);
// lv_label_set_text_fmt(label, "l");
lv_obj_set_style_text_font(label, font, 0);
@@ -89,7 +89,7 @@ static lv_obj_t * decor_label_create(lv_text_decor_t decor, lv_text_align_t alig
lv_color_t sel_bg_color = lv_palette_lighten(LV_PALETTE_RED, 4);
lv_color_t sel_color = lv_palette_darken(LV_PALETTE_RED, 4);
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_obj_t * label = lv_label_create(lv_screen_active());
lv_label_set_text(label, "Hi,\nTesting the\nlabels.");
lv_obj_set_style_text_decor(label, decor, 0);
lv_obj_set_style_text_color(label, color, 0);
@@ -131,7 +131,7 @@ void test_label_decor(void)
void test_label_placeholder(void)
{
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_obj_t * label = lv_label_create(lv_screen_active());
lv_label_set_text(label, "ABCÁÉŐ\naáeéoő");
TEST_ASSERT_EQUAL_SCREENSHOT("draw/label_placeholder.png");

8
tests/src/test_cases/draw/test_draw_layer.c
View File

@@ -6,14 +6,14 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
@@ -22,7 +22,7 @@ static const char * lorem_ipsum =
static lv_obj_t * create_test_obj(const char * text, bool simple)
{
lv_obj_t * obj = lv_button_create(lv_scr_act());
lv_obj_t * obj = lv_button_create(lv_screen_active());
lv_obj_set_size(obj, 120, 80);
if(simple) {

2
tests/src/test_cases/draw/test_draw_line.c
View File

@@ -21,7 +21,7 @@ static void radial_lines_create(lv_style_t * style, uint32_t line_index)
uint32_t i;
for(i = 0; i < 24; i ++) {
lv_obj_t * line = lv_line_create(lv_scr_act());
lv_obj_t * line = lv_line_create(lv_screen_active());
if(style) lv_obj_add_style(line, style, 0);
p[i][0].x = 140;
p[i][0].y = 100;

8
tests/src/test_cases/draw/test_draw_rectangle.c
View File

@@ -6,8 +6,8 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
void tearDown(void)
@@ -24,13 +24,13 @@ static void create_rects(lv_style_t * style, const char * name, lv_opa_t opa)
char buf[64];
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
uint32_t ri;
for(ri = 0; ri < sizeof(r) / sizeof(r[0]); ri++) {
uint32_t si;
for(si = 0; si < sizeof(w) / sizeof(w[0]); si++) {
lv_obj_t * obj = lv_obj_create(lv_scr_act());
lv_obj_t * obj = lv_obj_create(lv_screen_active());
lv_obj_remove_style_all(obj);
lv_obj_add_style(obj, style, 0);
lv_obj_set_style_radius(obj, r[ri], 0);

12
tests/src/test_cases/draw/test_draw_transform.c
View File

@@ -7,8 +7,8 @@
void setUp(void)
{
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
void tearDown(void)
@@ -19,7 +19,7 @@ void tearDown(void)
static void canvas_basic_render(lv_color_format_t render_cf, uint8_t * canvas_buf)
{
lv_obj_t * canvas = lv_canvas_create(lv_scr_act());
lv_obj_t * canvas = lv_canvas_create(lv_screen_active());
lv_canvas_set_buffer(canvas, canvas_buf, 100, 100, render_cf);
lv_canvas_fill_bg(canvas, lv_palette_lighten(LV_PALETTE_RED, 2), LV_OPA_TRANSP);
@@ -46,7 +46,7 @@ static void canvas_basic_render(lv_color_format_t render_cf, uint8_t * canvas_bu
lv_canvas_finish_layer(canvas, &layer);
lv_obj_del(canvas);
lv_obj_delete(canvas);
}
static void draw_images(lv_layer_t * layer, lv_draw_image_dsc_t * dsc)
@@ -151,7 +151,7 @@ void create_test_screen(lv_color_format_t render_cf, const char * name)
{
static uint8_t canvas_buf_large[CANVAS_WIDTH_TO_STRIDE(768, 4) * 440 + LV_DRAW_BUF_ALIGN];
lv_obj_t * canvas = lv_canvas_create(lv_scr_act());
lv_obj_t * canvas = lv_canvas_create(lv_screen_active());
lv_canvas_set_buffer(canvas, lv_draw_buf_align(canvas_buf_large, LV_COLOR_FORMAT_ARGB8888), 768, 440,
LV_COLOR_FORMAT_ARGB8888);
@@ -183,7 +183,7 @@ void create_test_screen(lv_color_format_t render_cf, const char * name)
lv_snprintf(buf, sizeof(buf), "/draw/transform_%s.png", name);
TEST_ASSERT_EQUAL_SCREENSHOT(buf);
lv_obj_del(canvas);
lv_obj_delete(canvas);
}
void test_draw_transform_rgb565(void)

6
tests/src/test_cases/draw/test_draw_triangle.c
View File

@@ -7,8 +7,8 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
}
void tearDown(void)
@@ -59,7 +59,7 @@ void test_draw_triangle(void)
static uint8_t canvas_buf[CANVAS_WIDTH_TO_STRIDE(768, 4) * 440 * 4];
lv_obj_t * canvas = lv_canvas_create(lv_scr_act());
lv_obj_t * canvas = lv_canvas_create(lv_screen_active());
lv_canvas_set_buffer(canvas, canvas_buf, 768, 440, LV_COLOR_FORMAT_ARGB8888);
lv_canvas_fill_bg(canvas, lv_palette_lighten(LV_PALETTE_RED, 2), LV_OPA_50);

8
tests/src/test_cases/draw/test_image_formats.c
View File

@@ -6,10 +6,10 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_scr_act(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
@@ -21,7 +21,7 @@ void tearDown(void)
static void img_create(const char * name, const void * img_src, bool rotate, bool recolor)
{
lv_obj_t * cont = lv_obj_create(lv_scr_act());
lv_obj_t * cont = lv_obj_create(lv_screen_active());
lv_obj_set_size(cont, 120, LV_SIZE_CONTENT);
lv_obj_set_style_bg_color(cont, lv_palette_main(LV_PALETTE_LIGHT_BLUE), 0);
lv_obj_set_style_pad_all(cont, 5, 0);

2
tests/src/test_cases/libs/test_barcode.c
View File

@@ -9,7 +9,7 @@ static lv_obj_t * active_screen = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

6
tests/src/test_cases/libs/test_libjpeg_turbo.c
View File

@@ -16,11 +16,11 @@ void tearDown(void)
static void create_images(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_obj_t * img;
img = lv_image_create(lv_scr_act());
img = lv_image_create(lv_screen_active());
lv_image_set_src(img, "A:src/test_assets/test_img_lvgl_logo.jpg");
lv_obj_center(img);
}
@@ -39,7 +39,7 @@ void test_jpg_2(void)
for(uint32_t i = 0; i < 20; i++) {
create_images();
lv_obj_invalidate(lv_scr_act());
lv_obj_invalidate(lv_screen_active());
lv_refr_now(NULL);
}

6
tests/src/test_cases/libs/test_libpng.c
View File

@@ -16,11 +16,11 @@ void tearDown(void)
static void create_images(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_obj_t * img;
img = lv_image_create(lv_scr_act());
img = lv_image_create(lv_screen_active());
lv_image_set_src(img, "A:src/test_assets/test_img_lvgl_logo.png");
lv_obj_center(img);
}
@@ -39,7 +39,7 @@ void test_libpng_1(void)
for(uint32_t i = 0; i < 20; i++) {
create_images();
lv_obj_invalidate(lv_scr_act());
lv_obj_invalidate(lv_screen_active());
lv_refr_now(NULL);
}

12
tests/src/test_cases/libs/test_lodepng.c
View File

@@ -16,25 +16,25 @@ void tearDown(void)
static void create_images(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_obj_t * img;
lv_obj_t * label;
LV_IMG_DECLARE(test_img_lvgl_logo_png);
img = lv_image_create(lv_scr_act());
img = lv_image_create(lv_screen_active());
lv_image_set_src(img, &test_img_lvgl_logo_png);
lv_obj_align(img, LV_ALIGN_CENTER, -100, -20);
label = lv_label_create(lv_scr_act());
label = lv_label_create(lv_screen_active());
lv_label_set_text(label, "Array");
lv_obj_align(label, LV_ALIGN_CENTER, -100, 20);
img = lv_image_create(lv_scr_act());
img = lv_image_create(lv_screen_active());
lv_image_set_src(img, "A:src/test_assets/test_img_lvgl_logo.png");
lv_obj_align(img, LV_ALIGN_CENTER, 100, -20);
label = lv_label_create(lv_scr_act());
label = lv_label_create(lv_screen_active());
lv_label_set_text(label, "File");
lv_obj_align(label, LV_ALIGN_CENTER, 100, 20);
}
@@ -53,7 +53,7 @@ void test_lodepng_1(void)
for(uint32_t i = 0; i < 20; i++) {
create_images();
lv_obj_invalidate(lv_scr_act());
lv_obj_invalidate(lv_screen_active());
lv_refr_now(NULL);
}

2
tests/src/test_cases/libs/test_tiny_ttf.c
View File

@@ -31,7 +31,7 @@ void test_tiny_ttf_rendering_test(void)
/*Create a label with the new style*/
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_obj_t * label = lv_label_create(lv_screen_active());
lv_obj_add_style(label, &style, 0);
lv_label_set_text(label, "Hello world\n"
"I'm a font created with Tiny TTF\n"

12
tests/src/test_cases/libs/test_tjpgd.c
View File

@@ -16,25 +16,25 @@ void tearDown(void)
static void create_images(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_obj_t * img;
lv_obj_t * label;
LV_IMG_DECLARE(test_img_lvgl_logo_jpg);
img = lv_image_create(lv_scr_act());
img = lv_image_create(lv_screen_active());
lv_image_set_src(img, &test_img_lvgl_logo_jpg);
lv_obj_align(img, LV_ALIGN_CENTER, -100, -20);
label = lv_label_create(lv_scr_act());
label = lv_label_create(lv_screen_active());
lv_label_set_text(label, "Array");
lv_obj_align(label, LV_ALIGN_CENTER, -100, 20);
img = lv_image_create(lv_scr_act());
img = lv_image_create(lv_screen_active());
lv_image_set_src(img, "A:src/test_assets/test_img_lvgl_logo.jpg");
lv_obj_align(img, LV_ALIGN_CENTER, 100, -20);
label = lv_label_create(lv_scr_act());
label = lv_label_create(lv_screen_active());
lv_label_set_text(label, "File");
lv_obj_align(label, LV_ALIGN_CENTER, 100, 20);
}
@@ -53,7 +53,7 @@ void test_tjpgd_1(void)
for(uint32_t i = 0; i < 20; i++) {
create_images();
lv_obj_invalidate(lv_scr_act());
lv_obj_invalidate(lv_screen_active());
lv_refr_now(NULL);
}

4
tests/src/test_cases/test_event.c
View File

@@ -7,7 +7,7 @@ static void event_object_deletion_cb(const lv_obj_class_t * cls, lv_event_t * e)
{
LV_UNUSED(cls);
if(lv_event_get_code(e) == LV_EVENT_VALUE_CHANGED) {
lv_obj_del(lv_event_get_target(e));
lv_obj_delete(lv_event_get_target(e));
}
}
@@ -20,7 +20,7 @@ static const lv_obj_class_t event_object_deletion_class = {
/* Checks for memory leaks/invalid memory accesses on deleted objects */
void test_event_object_deletion(void)
{
lv_obj_t * obj = lv_obj_class_create_obj(&event_object_deletion_class, lv_scr_act());
lv_obj_t * obj = lv_obj_class_create_obj(&event_object_deletion_class, lv_screen_active());
lv_obj_send_event(obj, LV_EVENT_VALUE_CHANGED, NULL);
}

4
tests/src/test_cases/test_font_loader.c
View File

@@ -64,7 +64,7 @@ void setUp(void)
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_font_free(font_1_bin);
lv_font_free(font_2_bin);
@@ -78,7 +78,7 @@ static void common(void)
compare_fonts(&font_3, font_3_bin);
/* create labels for testing */
lv_obj_t * scr = lv_scr_act();
lv_obj_t * scr = lv_screen_active();
lv_obj_t * label1 = lv_label_create(scr);
lv_obj_t * label2 = lv_label_create(scr);
lv_obj_t * label3 = lv_label_create(scr);

6
tests/src/test_cases/test_grid.c
View File

@@ -6,7 +6,7 @@
void setUp(void)
{
/* Function run before every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
void tearDown(void)
@@ -31,7 +31,7 @@ void test_subgrid_row(void)
const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
const lv_coord_t row_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
lv_obj_t * cont_main = lv_obj_create(lv_scr_act());
lv_obj_t * cont_main = lv_obj_create(lv_screen_active());
lv_obj_set_size(cont_main, 700, 300);
lv_obj_center(cont_main);
lv_obj_set_grid_dsc_array(cont_main, col_dsc, row_dsc);
@@ -64,7 +64,7 @@ void test_subgrid_col(void)
const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
const lv_coord_t row_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
lv_obj_t * cont_main = lv_obj_create(lv_scr_act());
lv_obj_t * cont_main = lv_obj_create(lv_screen_active());
lv_obj_set_size(cont_main, 700, 300);
lv_obj_center(cont_main);
lv_obj_set_grid_dsc_array(cont_main, col_dsc, row_dsc);

8
tests/src/test_cases/test_group.c
View File

@@ -18,10 +18,10 @@ void test_group_count(void)
TEST_ASSERT_EQUAL_UINT32(lv_group_get_count(), 2U);
lv_group_del(group_2);
lv_group_delete(group_2);
TEST_ASSERT_EQUAL_UINT32(lv_group_get_count(), 1U);
lv_group_del(group_1);
lv_group_delete(group_1);
TEST_ASSERT_EQUAL_UINT32(lv_group_get_count(), 0U);
}
@@ -34,8 +34,8 @@ void test_group_by_index(void)
TEST_ASSERT_EQUAL_PTR(lv_group_by_index(0), group_1);
TEST_ASSERT_EQUAL_PTR(lv_group_by_index(1), group_2);
lv_group_del(group_1);
lv_group_del(group_2);
lv_group_delete(group_1);
lv_group_delete(group_2);
}
#endif

2
tests/src/test_cases/test_margin_align.c
View File

@@ -7,7 +7,7 @@ static lv_obj_t * active_screen = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/src/test_cases/test_margin_flex.c
View File

@@ -7,7 +7,7 @@ static lv_obj_t * active_screen = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/src/test_cases/test_margin_grid.c
View File

@@ -7,7 +7,7 @@ static lv_obj_t * active_screen = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

8
tests/src/test_cases/test_obj_flags.c
View File

@@ -12,7 +12,7 @@ void setUp(void)
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
static void ext_draw_size_event_cb(lv_event_t * e)
@@ -28,7 +28,7 @@ static void btn_clicked_event_cb(lv_event_t * e)
void test_obj_flag_overflow_visible_1(void)
{
lv_obj_t * obj_main = lv_obj_create(lv_scr_act());
lv_obj_t * obj_main = lv_obj_create(lv_screen_active());
lv_obj_set_size(obj_main, 400, 300);
lv_obj_set_style_bg_color(obj_main, lv_palette_main(LV_PALETTE_RED), 0);
lv_obj_add_flag(obj_main, LV_OBJ_FLAG_OVERFLOW_VISIBLE);
@@ -43,7 +43,7 @@ void test_obj_flag_overflow_visible_1(void)
lv_obj_t * btn_1 = lv_button_create(obj_child_1);
lv_obj_set_size(btn_1, 100, 100);
lv_obj_align(btn_1, LV_ALIGN_LEFT_MID, -75, 0);
lv_obj_clear_flag(btn_1, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
lv_obj_remove_flag(btn_1, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
uint32_t cnt_1;
lv_obj_add_event(btn_1, btn_clicked_event_cb, LV_EVENT_CLICKED, &cnt_1);
@@ -61,7 +61,7 @@ void test_obj_flag_overflow_visible_1(void)
lv_obj_t * btn_2 = lv_button_create(obj_child_2);
lv_obj_set_size(btn_2, 100, 100);
lv_obj_align(btn_2, LV_ALIGN_RIGHT_MID, 75, 0);
lv_obj_clear_flag(btn_2, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
lv_obj_remove_flag(btn_2, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
uint32_t cnt_2;
lv_obj_add_event(btn_2, btn_clicked_event_cb, LV_EVENT_CLICKED, &cnt_2);

28
tests/src/test_cases/test_obj_tree.c
View File

@@ -8,30 +8,30 @@ void test_obj_tree_2(void);
void test_obj_tree_1(void)
{
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_scr_act()), 0);
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_screen_active()), 0);
}
void test_obj_tree_2(void)
{
lv_obj_create(lv_scr_act());
lv_obj_t * o2 = lv_obj_create(lv_scr_act());
lv_obj_create(lv_scr_act());
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_scr_act()), 3);
lv_obj_create(lv_screen_active());
lv_obj_t * o2 = lv_obj_create(lv_screen_active());
lv_obj_create(lv_screen_active());
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_screen_active()), 3);
lv_obj_del(o2);
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_scr_act()), 2);
lv_obj_delete(o2);
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_screen_active()), 2);
lv_obj_clean(lv_scr_act());
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_scr_act()), 0);
lv_obj_clean(lv_screen_active());
TEST_ASSERT_EQUAL(lv_obj_get_child_cnt(lv_screen_active()), 0);
lv_color_t c1 = lv_color_hex(0x444444);
lv_color_t c2 = lv_color_hex3(0x444);
TEST_ASSERT_EQUAL_COLOR(c1, c2);
lv_obj_remove_style_all(lv_scr_act());
lv_obj_set_style_bg_color(lv_scr_act(), lv_color_hex(0x112233), 0);
lv_obj_set_style_bg_opa(lv_scr_act(), LV_OPA_COVER, 0);
lv_obj_remove_style_all(lv_screen_active());
lv_obj_set_style_bg_color(lv_screen_active(), lv_color_hex(0x112233), 0);
lv_obj_set_style_bg_opa(lv_screen_active(), LV_OPA_COVER, 0);
//TEST_ASSERT_EQUAL_SCREENSHOT("scr1.png")
}
@@ -39,8 +39,8 @@ void test_obj_tree_2(void)
void test_obj_tree_3(void)
{
/* tests lv_obj_swap */
lv_obj_t * parent1 = lv_obj_create(lv_scr_act());
lv_obj_t * parent2 = lv_obj_create(lv_scr_act());
lv_obj_t * parent1 = lv_obj_create(lv_screen_active());
lv_obj_t * parent2 = lv_obj_create(lv_screen_active());
lv_obj_t * child1 = lv_obj_create(parent1);
lv_obj_t * child2 = lv_obj_create(parent2);

20
tests/src/test_cases/test_observer.c
View File

@@ -12,7 +12,7 @@ void setUp(void)
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
static int32_t prev_v;
@@ -213,7 +213,7 @@ void test_observer_group(void)
void test_observer_obj_flag(void)
{
lv_obj_t * obj = lv_obj_create(lv_scr_act());
lv_obj_t * obj = lv_obj_create(lv_screen_active());
/*Can bind only to int*/
static lv_subject_t subject_wrong;
@@ -244,7 +244,7 @@ void test_observer_obj_flag(void)
void test_observer_obj_state(void)
{
lv_obj_t * obj = lv_obj_create(lv_scr_act());
lv_obj_t * obj = lv_obj_create(lv_screen_active());
/*Can bind only to int*/
static lv_subject_t subject_wrong;
@@ -275,7 +275,7 @@ void test_observer_obj_state(void)
void test_observer_button_checked(void)
{
lv_obj_t * obj = lv_button_create(lv_scr_act());
lv_obj_t * obj = lv_button_create(lv_screen_active());
lv_obj_set_size(obj, 100, 100);
lv_obj_add_flag(obj, LV_OBJ_FLAG_CHECKABLE);
lv_obj_update_layout(obj);
@@ -302,7 +302,7 @@ void test_observer_button_checked(void)
void test_observer_label_text_normal(void)
{
lv_obj_t * obj = lv_label_create(lv_scr_act());
lv_obj_t * obj = lv_label_create(lv_screen_active());
lv_observer_t * observer;
@@ -350,7 +350,7 @@ void test_observer_label_text_normal(void)
void test_observer_label_text_formatted(void)
{
lv_obj_t * obj = lv_label_create(lv_scr_act());
lv_obj_t * obj = lv_label_create(lv_screen_active());
lv_observer_t * observer;
@@ -406,7 +406,7 @@ void test_observer_label_text_formatted(void)
void test_observer_arc_value(void)
{
lv_obj_t * obj = lv_arc_create(lv_scr_act());
lv_obj_t * obj = lv_arc_create(lv_screen_active());
static lv_subject_t subject;
lv_subject_init_int(&subject, 30);
@@ -430,7 +430,7 @@ void test_observer_arc_value(void)
void test_observer_slider_value(void)
{
lv_obj_t * obj = lv_slider_create(lv_scr_act());
lv_obj_t * obj = lv_slider_create(lv_screen_active());
static lv_subject_t subject;
lv_subject_init_int(&subject, 30);
@@ -457,7 +457,7 @@ void test_observer_slider_value(void)
void test_observer_roller_value(void)
{
lv_obj_t * obj = lv_roller_create(lv_scr_act());
lv_obj_t * obj = lv_roller_create(lv_screen_active());
static lv_subject_t subject;
lv_subject_init_int(&subject, 1);
@@ -477,7 +477,7 @@ void test_observer_roller_value(void)
void test_observer_dropdown_value(void)
{
lv_obj_t * obj = lv_dropdown_create(lv_scr_act());
lv_obj_t * obj = lv_dropdown_create(lv_screen_active());
static lv_subject_t subject;
lv_subject_init_int(&subject, 1);

2
tests/src/test_cases/test_snapshot.c
View File

@@ -21,7 +21,7 @@ void test_snapshot_should_not_leak_memory(void)
initial_available_memory = monitor.free_size;
for(idx = 0; idx < NUM_SNAPSHOTS; idx++) {
snapshots[idx] = lv_snapshot_take(lv_scr_act(), LV_COLOR_FORMAT_NATIVE_WITH_ALPHA);
snapshots[idx] = lv_snapshot_take(lv_screen_active(), LV_COLOR_FORMAT_NATIVE_WITH_ALPHA);
TEST_ASSERT_NOT_NULL(snapshots[idx]);
}

10
tests/src/test_cases/test_span.c
View File

@@ -13,7 +13,7 @@ void setUp(void)
void tearDown(void)
{
lv_obj_del(spangroup);
lv_obj_delete(spangroup);
if(active_screen) {
lv_obj_clean(active_screen);
@@ -46,11 +46,11 @@ void test_spangroup_new_span_with_valid_parameter_returns_not_null_object(void)
TEST_ASSERT_EQUAL_INT(1, lv_spangroup_get_child_cnt(spangroup));
}
void test_spangroup_del_span_span_is_null(void)
void test_spangroup_delete_span_span_is_null(void)
{
lv_span_t * span = lv_spangroup_new_span(spangroup);
lv_spangroup_del_span(spangroup, span);
lv_spangroup_delete_span(spangroup, span);
TEST_ASSERT_EQUAL_INT(0, lv_spangroup_get_child_cnt(spangroup));
}
@@ -213,7 +213,7 @@ void test_spangroup_get_max_line_h(void)
void test_spangroup_draw(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
spangroup = lv_spangroup_create(active_screen);
lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_BREAK);
lv_obj_set_width(spangroup, 100);
@@ -263,7 +263,7 @@ void test_spangroup_get_expand_width(void)
{
const uint32_t experimental_size = 232;
const uint32_t constrained_size = 232;
active_screen = lv_scr_act();
active_screen = lv_screen_active();
spangroup = lv_spangroup_create(active_screen);
lv_span_t * span = lv_spangroup_new_span(spangroup);

6
tests/src/test_cases/test_style.c
View File

@@ -12,7 +12,7 @@ static void obj_set_height_helper(void * obj, int32_t height)
void test_gradient_vertical_misalignment(void)
{
/* Tests gradient caching as the height of widget changes.*/
lv_obj_t * obj = lv_obj_create(lv_scr_act());
lv_obj_t * obj = lv_obj_create(lv_screen_active());
lv_obj_set_style_bg_grad_dir(obj, LV_GRAD_DIR_VER, 0);
lv_obj_set_style_bg_grad_color(obj, lv_color_hex(0xff0000), 0);
lv_obj_set_style_bg_color(obj, lv_color_hex(0x00ff00), 0);
@@ -80,7 +80,7 @@ LV_STYLE_CONST_INIT(const_style, const_style_props);
void test_const_style(void)
{
lv_obj_t * obj = lv_obj_create(lv_scr_act());
lv_obj_t * obj = lv_obj_create(lv_screen_active());
lv_obj_add_style(obj, &const_style, LV_PART_MAIN);
TEST_ASSERT_EQUAL(51, lv_obj_get_style_width(obj, LV_PART_MAIN));
TEST_ASSERT_EQUAL(50, lv_obj_get_style_height(obj, LV_PART_MAIN));
@@ -99,7 +99,7 @@ void test_style_replacement(void)
lv_style_set_bg_color(&style_blue, lv_color_hex(0x0000ff));
/*Create object with style*/
lv_obj_t * obj = lv_obj_create(lv_scr_act());
lv_obj_t * obj = lv_obj_create(lv_screen_active());
lv_obj_add_style(obj, &style_red, LV_PART_MAIN);
TEST_ASSERT_EQUAL_COLOR(lv_color_hex(0xff0000), lv_obj_get_style_bg_color(obj, LV_PART_MAIN));

2
tests/src/test_cases/widgets/test_animimg.c
View File

@@ -28,7 +28,7 @@ void test_animimg_start(void);
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
animimg = lv_animimg_create(active_screen);
}

10
tests/src/test_cases/widgets/test_arc.c
View File

@@ -23,12 +23,12 @@ static void dummy_event_cb(lv_event_t * e);
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
void test_arc_creation_successfull(void)
@@ -115,7 +115,7 @@ void test_arc_angles_when_reversed(void)
int16_t expected_value = 40;
lv_obj_t * arcBlack;
arcBlack = lv_arc_create(lv_scr_act());
arcBlack = lv_arc_create(lv_screen_active());
lv_arc_set_mode(arcBlack, LV_ARC_MODE_REVERSE);
@@ -130,7 +130,7 @@ void test_arc_angles_when_reversed(void)
void test_arc_click_area_with_adv_hittest(void)
{
arc = lv_arc_create(lv_scr_act());
arc = lv_arc_create(lv_screen_active());
lv_obj_set_size(arc, 100, 100);
lv_obj_set_style_arc_width(arc, 10, 0);
lv_obj_add_flag(arc, LV_OBJ_FLAG_ADV_HITTEST);
@@ -165,7 +165,7 @@ void test_arc_click_area_with_adv_hittest(void)
void test_arc_basic_render(void)
{
arc = lv_arc_create(lv_scr_act());
arc = lv_arc_create(lv_screen_active());
lv_obj_set_size(arc, 100, 100);
lv_obj_center(arc);
TEST_ASSERT_EQUAL_SCREENSHOT("arc_1.png");

4
tests/src/test_cases/widgets/test_bar.c
View File

@@ -10,7 +10,7 @@ static lv_obj_t * bar = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
bar = lv_bar_create(active_screen);
}
@@ -147,7 +147,7 @@ void test_bar_normal(void)
lv_color_t bg_color = lv_color_black();
lv_color_t indic_color = lv_color_hex(0x0000FF);
lv_obj_t * screen = lv_obj_create(lv_scr_act());
lv_obj_t * screen = lv_obj_create(lv_screen_active());
lv_obj_remove_style_all(screen);
lv_obj_set_size(screen, 800, 480);
lv_obj_center(screen);

2
tests/src/test_cases/widgets/test_btn.c
View File

@@ -7,7 +7,7 @@ static lv_obj_t * active_screen = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/src/test_cases/widgets/test_btnmatrix.c
View File

@@ -10,7 +10,7 @@ lv_event_code_t exp_evt_code;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
btnm = lv_buttonmatrix_create(active_screen);
TEST_ASSERT_NOT_NULL(btnm);
event_triggered = false;

2
tests/src/test_cases/widgets/test_calendar.c
View File

@@ -27,7 +27,7 @@ static lv_obj_t * calendar = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
calendar = lv_calendar_create(active_screen);
}

2
tests/src/test_cases/widgets/test_chart.c
View File

@@ -10,7 +10,7 @@ static lv_color_t red_color;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
chart = lv_chart_create(active_screen);
red_color = lv_palette_main(LV_PALETTE_RED);

12
tests/src/test_cases/widgets/test_checkbox.c
View File

@@ -28,7 +28,7 @@ static void event_handler(lv_event_t * e)
void test_checkbox_creation_successfull(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
checkbox = lv_checkbox_create(active_screen);
TEST_ASSERT_NOT_NULL(checkbox);
@@ -36,7 +36,7 @@ void test_checkbox_creation_successfull(void)
void test_checkbox_should_call_event_handler_on_click_when_enabled(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
checkbox = lv_checkbox_create(active_screen);
lv_obj_add_state(checkbox, LV_STATE_CHECKED);
@@ -53,7 +53,7 @@ void test_checkbox_should_have_default_text_when_created(void)
{
const char * default_text = "Check box";
active_screen = lv_scr_act();
active_screen = lv_screen_active();
checkbox = lv_checkbox_create(active_screen);
TEST_ASSERT_EQUAL_STRING(default_text, lv_checkbox_get_text(checkbox));
@@ -64,7 +64,7 @@ void test_checkbox_should_return_dinamically_allocated_text(void)
{
const char * message = "Hello World!";
active_screen = lv_scr_act();
active_screen = lv_screen_active();
checkbox = lv_checkbox_create(active_screen);
lv_checkbox_set_text(checkbox, message);
@@ -81,7 +81,7 @@ void test_checkbox_should_allocate_memory_for_static_text(void)
lv_mem_monitor_t m1;
lv_mem_monitor(&m1);
active_screen = lv_scr_act();
active_screen = lv_screen_active();
checkbox = lv_checkbox_create(active_screen);
initial_available_memory = m1.free_size;
@@ -98,7 +98,7 @@ void test_checkbox_rtl(void)
const char * message =
"מעבד, או בשמו המלא יחידת עיבוד מרכזית (באנגלית: CPU - Central Processing Unit).";
lv_obj_t * screen = lv_obj_create(lv_scr_act());
lv_obj_t * screen = lv_obj_create(lv_screen_active());
lv_obj_remove_style_all(screen);
lv_obj_set_size(screen, 800, 480);
lv_obj_center(screen);

90
tests/src/test_cases/widgets/test_dropdown.c
View File

@@ -12,38 +12,38 @@ void setUp(void)
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
void test_dropdown_create_delete(void)
{
lv_dropdown_create(lv_scr_act());
TEST_ASSERT_EQUAL(2, lv_obj_get_child_cnt(lv_scr_act()));
lv_dropdown_create(lv_screen_active());
TEST_ASSERT_EQUAL(2, lv_obj_get_child_cnt(lv_screen_active()));
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd2 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd2, 200, 0);
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_screen_active()));
TEST_ASSERT_FALSE(lv_dropdown_is_open(dd2));
lv_dropdown_open(dd2);
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_screen_active()));
TEST_ASSERT_TRUE(lv_dropdown_is_open(dd2));
lv_dropdown_open(dd2); /*Try to open again*/
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_screen_active()));
lv_obj_t * dd3 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd3 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd3, 400, 0);
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_screen_active()));
lv_dropdown_open(dd3);
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_screen_active()));
lv_dropdown_close(dd3);
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_screen_active()));
lv_dropdown_close(dd3); /*Try to close again*/
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_scr_act()));
TEST_ASSERT_EQUAL(6, lv_obj_get_child_cnt(lv_screen_active()));
lv_obj_del(dd2);
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_scr_act()));
lv_obj_delete(dd2);
TEST_ASSERT_EQUAL(4, lv_obj_get_child_cnt(lv_screen_active()));
lv_obj_clean(lv_scr_act());
TEST_ASSERT_EQUAL(0, lv_obj_get_child_cnt(lv_scr_act()));
lv_obj_clean(lv_screen_active());
TEST_ASSERT_EQUAL(0, lv_obj_get_child_cnt(lv_screen_active()));
}
@@ -53,7 +53,7 @@ void test_dropdown_set_options(void)
lv_mem_monitor_t m1;
lv_mem_monitor(&m1);
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
TEST_ASSERT_EQUAL_STRING("Option 1\nOption 2\nOption 3", lv_dropdown_get_options(dd1));
TEST_ASSERT_EQUAL(3, lv_dropdown_get_option_cnt(dd1));
@@ -106,7 +106,7 @@ void test_dropdown_set_options(void)
TEST_ASSERT_EQUAL_STRING("", lv_dropdown_get_options(dd1));
TEST_ASSERT_EQUAL(0, lv_dropdown_get_option_cnt(dd1));
lv_obj_del(dd1);
lv_obj_delete(dd1);
lv_mem_monitor_t m2;
lv_mem_monitor(&m2);
@@ -115,7 +115,7 @@ void test_dropdown_set_options(void)
void test_dropdown_select(void)
{
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_selected(dd1, 2);
TEST_ASSERT_EQUAL(2, lv_dropdown_get_selected(dd1));
@@ -136,8 +136,8 @@ void test_dropdown_select(void)
void test_dropdown_click(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
lv_obj_update_layout(dd1);
TEST_ASSERT_FALSE(lv_dropdown_is_open(dd1));
@@ -160,18 +160,18 @@ static void dd_event(lv_event_t * e)
void test_dropdown_keypad(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_group_t * g = lv_group_create();
lv_indev_set_group(lv_test_keypad_indev, g);
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd1, 20, 20);
lv_dropdown_set_options(dd1, "1\n2\n3\n4\n5\n6\n7\n8");
lv_group_add_obj(g, dd1);
lv_obj_add_event(dd1, dd_event, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd2 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd2, 300, 20);
lv_group_add_obj(g, dd2);
@@ -257,24 +257,24 @@ void test_dropdown_keypad(void)
TEST_ASSERT_NOT_NULL(lv_dropdown_get_list(dd2));
lv_indev_set_group(lv_test_keypad_indev, NULL);
lv_group_del(g);
lv_group_delete(g);
}
void test_dropdown_encoder(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_group_t * g = lv_group_create();
lv_indev_set_group(lv_test_encoder_indev, g);
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd1, 20, 20);
lv_dropdown_set_options(dd1, "1\n2\n3\n4\n5\n6\n7\n8");
lv_group_add_obj(g, dd1);
lv_obj_add_event(dd1, dd_event, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd2 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd2, 300, 20);
lv_group_add_obj(g, dd2);
@@ -314,19 +314,19 @@ void test_dropdown_encoder(void)
TEST_ASSERT_TRUE(lv_dropdown_is_open(dd2));
lv_indev_set_group(lv_test_encoder_indev, NULL);
lv_group_del(g);
lv_group_delete(g);
}
void test_dropdown_render_1(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd1, 10, 10);
lv_dropdown_set_selected(dd1, 1);
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd2 = lv_dropdown_create(lv_screen_active());
lv_obj_set_pos(dd2, 200, 10);
lv_obj_set_width(dd2, 200);
lv_dropdown_set_selected(dd2, 2);
@@ -335,7 +335,7 @@ void test_dropdown_render_1(void)
lv_dropdown_set_selected_highlight(dd2, false);
TEST_ASSERT_FALSE(lv_dropdown_get_selected_highlight(dd2));
lv_obj_t * dd3 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd3 = lv_dropdown_create(lv_screen_active());
lv_obj_set_style_pad_hor(dd3, 5, 0);
lv_obj_set_style_pad_ver(dd3, 20, 0);
lv_obj_set_pos(dd3, 500, 150);
@@ -366,28 +366,28 @@ void test_dropdown_render_1(void)
void test_dropdown_render_2(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
LV_IMAGE_DECLARE(test_image_caret_down);
lv_obj_t * dd1 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd1 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd1, "Short");
lv_dropdown_set_options(dd1, "1\n2");
lv_dropdown_set_symbol(dd1, &test_image_caret_down);
lv_dropdown_open(dd1);
lv_obj_t * dd2 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd2 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd2, "Go Up");
lv_dropdown_set_options(dd2, "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15");
lv_dropdown_set_symbol(dd2, NULL);
lv_obj_align(dd2, LV_ALIGN_LEFT_MID, 150, 50);
lv_dropdown_open(dd2);
lv_obj_t * dd3 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd3 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd3, "Limit Down");
lv_dropdown_set_options(dd3, "1aaaaaaaaaaaaaaaa\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15");
lv_obj_align(dd3, LV_ALIGN_LEFT_MID, 300, -10);
lv_dropdown_open(dd3);
lv_obj_t * dd4 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd4 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd4, "Limit Top");
lv_dropdown_set_options(dd4, "1aaaaaaaaaaaaaaaa\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15");
lv_obj_align(dd4, LV_ALIGN_LEFT_MID, 450, 10);
@@ -395,7 +395,7 @@ void test_dropdown_render_2(void)
lv_dropdown_set_symbol(dd4, LV_SYMBOL_UP);
lv_dropdown_open(dd4);
lv_obj_t * dd5 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd5 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd5, "Go Down");
lv_dropdown_set_options(dd5, "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15");
lv_dropdown_set_dir(dd5, LV_DIR_TOP);
@@ -403,7 +403,7 @@ void test_dropdown_render_2(void)
lv_obj_align(dd5, LV_ALIGN_LEFT_MID, 650, -200);
lv_dropdown_open(dd5);
lv_obj_t * dd6 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd6 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd6, "Right");
lv_dropdown_set_options(dd6, "1aaa\n2aa\n3aa");
lv_dropdown_set_dir(dd6, LV_DIR_RIGHT);
@@ -412,7 +412,7 @@ void test_dropdown_render_2(void)
lv_dropdown_open(dd6);
lv_obj_set_style_text_align(lv_dropdown_get_list(dd6), LV_TEXT_ALIGN_RIGHT, 0);
lv_obj_t * dd7 = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd7 = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_text(dd7, "Left");
lv_dropdown_set_options(dd7, "1aaa\n2\n3");
lv_dropdown_set_dir(dd7, LV_DIR_LEFT);
@@ -426,25 +426,25 @@ void test_dropdown_render_2(void)
/* See #2893 */
void test_dropdown_should_list_on_top(void)
{
lv_obj_t * cont1 = lv_obj_create(lv_scr_act());
lv_obj_t * cont1 = lv_obj_create(lv_screen_active());
lv_obj_set_size(cont1, 200, 100);
lv_obj_t * dd = lv_dropdown_create(cont1);
lv_obj_t * cont2 = lv_obj_create(lv_scr_act());
lv_obj_t * cont2 = lv_obj_create(lv_screen_active());
lv_obj_set_size(cont2, 200, 100);
lv_obj_set_pos(cont2, 0, 100);
lv_dropdown_open(dd);
lv_obj_t * list = lv_dropdown_get_list(dd);
TEST_ASSERT_EQUAL_PTR(lv_scr_act(), lv_obj_get_parent(list));
TEST_ASSERT_EQUAL_PTR(lv_screen_active(), lv_obj_get_parent(list));
TEST_ASSERT_EQUAL_INT(2, lv_obj_get_index(list));
}
/* See #4191 */
void test_dropdown_get_options_should_check_lengths(void)
{
lv_obj_t * dd = lv_dropdown_create(lv_scr_act());
lv_obj_t * dd = lv_dropdown_create(lv_screen_active());
lv_dropdown_set_options(dd, "abc\nab");
TEST_ASSERT_EQUAL_INT(1, lv_dropdown_get_option_index(dd, "ab"));

10
tests/src/test_cases/widgets/test_label.c
View File

@@ -17,7 +17,7 @@ static lv_obj_t * empty_label;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
label = lv_label_create(active_screen);
long_label = lv_label_create(active_screen);
long_label_multiline = lv_label_create(active_screen);
@@ -30,10 +30,10 @@ void setUp(void)
void tearDown(void)
{
lv_obj_del(label);
lv_obj_del(long_label);
lv_obj_del(long_label_multiline);
lv_obj_del(empty_label);
lv_obj_delete(label);
lv_obj_delete(long_label);
lv_obj_delete(long_label_multiline);
lv_obj_delete(empty_label);
}
void test_label_creation(void)

2
tests/src/test_cases/widgets/test_led.c
View File

@@ -7,7 +7,7 @@ static lv_obj_t * active_screen = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/src/test_cases/widgets/test_line.c
View File

@@ -12,7 +12,7 @@ static const lv_coord_t final_extra_draw_size = 10U;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
line = lv_line_create(active_screen);
}

4
tests/src/test_cases/widgets/test_list.c
View File

@@ -7,7 +7,7 @@ static lv_obj_t * list;
void setUp(void)
{
list = lv_list_create(lv_scr_act());
list = lv_list_create(lv_screen_active());
}
void tearDown(void)
@@ -49,7 +49,7 @@ void test_list_get_text_from_label(void)
void test_list_snapshot(void)
{
lv_obj_t * snapshot_list = lv_list_create(lv_scr_act());
lv_obj_t * snapshot_list = lv_list_create(lv_screen_active());
lv_list_add_text(snapshot_list, "File");
lv_list_add_button(snapshot_list, LV_SYMBOL_FILE, "New");

2
tests/src/test_cases/widgets/test_msgbox.c
View File

@@ -31,7 +31,7 @@ static const char * buttons_txts[] = {"Apply", "Cancel", NULL};
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/src/test_cases/widgets/test_roller.c
View File

@@ -20,7 +20,7 @@ static const char * default_infinite_roller_options = "One\nTwo\nThree\nFour\nFi
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
roller = lv_roller_create(active_screen);
roller_infinite = lv_roller_create(active_screen);
roller_mouse = lv_roller_create(active_screen);

2
tests/src/test_cases/widgets/test_slider.c
View File

@@ -13,7 +13,7 @@ static lv_group_t * g = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
slider = lv_slider_create(active_screen);
sliderRangeMode = lv_slider_create(active_screen);
sliderNormalMode = lv_slider_create(active_screen);

8
tests/src/test_cases/widgets/test_spinbox.c
View File

@@ -17,7 +17,7 @@ static const uint8_t SPINBOX_DECIMAL_POSITION = 1U;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
spinbox_negative_min_range = lv_spinbox_create(active_screen);
spinbox_zero_min_range = lv_spinbox_create(active_screen);
spinbox_events = lv_spinbox_create(active_screen);
@@ -33,9 +33,9 @@ void tearDown(void)
{
lv_group_remove_obj(spinbox_events);
lv_obj_del(spinbox_negative_min_range);
lv_obj_del(spinbox_zero_min_range);
lv_obj_del(spinbox_events);
lv_obj_delete(spinbox_negative_min_range);
lv_obj_delete(spinbox_zero_min_range);
lv_obj_delete(spinbox_events);
lv_obj_clean(active_screen);
}

4
tests/src/test_cases/widgets/test_spinner.c
View File

@@ -8,8 +8,8 @@ static lv_obj_t * spinner = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
spinner = lv_spinner_create(lv_scr_act());
active_screen = lv_screen_active();
spinner = lv_spinner_create(lv_screen_active());
lv_obj_set_size(spinner, 100, 100);
lv_obj_center(spinner);
}

4
tests/src/test_cases/widgets/test_switch.c
View File

@@ -15,7 +15,7 @@ lv_obj_t * sw = NULL;
void setUp(void)
{
/* Function run before every test */
scr = lv_scr_act();
scr = lv_screen_active();
sw = lv_switch_create(scr);
}
@@ -62,7 +62,7 @@ void test_switch_should_not_leak_memory_after_deletion(void)
}
for(idx = 0; idx < SWITCHES_CNT; idx++) {
lv_obj_del(switches[idx]);
lv_obj_delete(switches[idx]);
}
lv_mem_monitor(&monitor);

4
tests/src/test_cases/widgets/test_table.c
View File

@@ -8,13 +8,13 @@ static lv_obj_t * table = NULL;
void setUp(void)
{
scr = lv_scr_act();
scr = lv_screen_active();
table = lv_table_create(scr);
}
void tearDown(void)
{
lv_obj_clean(lv_scr_act());
lv_obj_clean(lv_screen_active());
}
void test_table_should_return_assigned_cell_value(void)

2
tests/src/test_cases/widgets/test_tabview.c
View File

@@ -28,7 +28,7 @@ static lv_obj_t * tabview = NULL;
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/src/test_cases/widgets/test_textarea.c
View File

@@ -10,7 +10,7 @@ static const char * textarea_default_text = "";
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
textarea = lv_textarea_create(active_screen);
}

2
tests/src/test_cases/widgets/test_win.c
View File

@@ -11,7 +11,7 @@ const char * dummy_text = "Hello LVGL!";
void setUp(void)
{
active_screen = lv_scr_act();
active_screen = lv_screen_active();
}
void tearDown(void)

2
tests/unity/unity_support.c
View File

@@ -69,7 +69,7 @@ bool lv_test_assert_image_eq(const char * fn_ref)
sprintf(fn_ref_full, "%s%s", REF_IMGS_PATH, fn_ref);
//lv_obj_invalidate(lv_scr_act());
//lv_obj_invalidate(lv_screen_active());
lv_refr_now(NULL);
extern uint8_t * last_flushed_buf;