Index: uspace/lib/ui/test/paint.c
===================================================================
--- uspace/lib/ui/test/paint.c	(revision 1eaead40ef1e81dc0e203498597d60b2e71fcd27)
+++ uspace/lib/ui/test/paint.c	(revision 81ec7e1867942dce648bbef472b80d7b8a71f294)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -75,13 +75,4 @@
 } testgc_bitmap_t;
 
-/** Test box characters */
-static ui_box_chars_t test_box_chars = {
-	{
-		{ "A", "B", "C" },
-		{ "D", " ", "E" },
-		{ "F", "G", "H" }
-	}
-};
-
 /** Paint bevel */
 PCUT_TEST(bevel)
@@ -234,7 +225,4 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	center.x = 0;
-	center.y = 0;
-
 	/* Paint filled circle / upper-left half */
 	rc = ui_paint_filled_circle(gc, &center, 10, ui_fcircle_upleft);
@@ -253,198 +241,4 @@
 }
 
-/** Paint up pointing triangle */
-PCUT_TEST(up_triangle)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_up_triangle(gc, &center, 5);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint down pointing triangle */
-PCUT_TEST(down_triangle)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_down_triangle(gc, &center, 5);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint left pointing triangle */
-PCUT_TEST(left_triangle)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_left_triangle(gc, &center, 5);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint right pointing triangle */
-PCUT_TEST(right_triangle)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_right_triangle(gc, &center, 5);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint diagonal cross (X) */
-PCUT_TEST(cross)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_cross(gc, &center, 5, 1, 2);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint mimimize icon */
-PCUT_TEST(minicon)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	ui_resource_t *resource = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = ui_resource_create(gc, false, &resource);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-	PCUT_ASSERT_NOT_NULL(resource);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_minicon(resource, &center, 8, 6);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	ui_resource_destroy(resource);
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint maximize icon */
-PCUT_TEST(maxicon)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	ui_resource_t *resource = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = ui_resource_create(gc, false, &resource);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-	PCUT_ASSERT_NOT_NULL(resource);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_maxicon(resource, &center, 8, 6);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	ui_resource_destroy(resource);
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint unmaximize icon */
-PCUT_TEST(unmaxicon)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	ui_resource_t *resource = NULL;
-	test_gc_t tgc;
-	gfx_coord2_t center;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = ui_resource_create(gc, false, &resource);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-	PCUT_ASSERT_NOT_NULL(resource);
-
-	center.x = 0;
-	center.y = 0;
-
-	rc = ui_paint_unmaxicon(resource, &center, 8, 8, 3, 3);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	ui_resource_destroy(resource);
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
 /** Paint text box */
 PCUT_TEST(text_box)
@@ -475,40 +269,4 @@
 	/* Paint text box */
 	rc = ui_paint_text_box(resource, &rect, ui_box_single, color);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_color_delete(color);
-	ui_resource_destroy(resource);
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint custom text box */
-PCUT_TEST(text_box_custom)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	ui_resource_t *resource = NULL;
-	gfx_color_t *color = NULL;
-	test_gc_t tgc;
-	gfx_rect_t rect;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = ui_resource_create(gc, false, &resource);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-	PCUT_ASSERT_NOT_NULL(resource);
-
-	rc = gfx_color_new_rgb_i16(1, 2, 3, &color);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rect.p0.x = 10;
-	rect.p0.y = 20;
-	rect.p1.x = 30;
-	rect.p1.y = 40;
-
-	/* Paint text box */
-	rc = ui_paint_text_box_custom(resource, &rect, &test_box_chars, color);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -548,40 +306,4 @@
 	rc = ui_paint_text_hbrace(resource, &rect, ui_box_single,
 	    color);
-
-	gfx_color_delete(color);
-	ui_resource_destroy(resource);
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** Paint text rectangle */
-PCUT_TEST(text_rect)
-{
-	errno_t rc;
-	gfx_context_t *gc = NULL;
-	ui_resource_t *resource = NULL;
-	gfx_color_t *color = NULL;
-	test_gc_t tgc;
-	gfx_rect_t rect;
-
-	memset(&tgc, 0, sizeof(tgc));
-	rc = gfx_context_new(&ops, &tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = ui_resource_create(gc, false, &resource);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-	PCUT_ASSERT_NOT_NULL(resource);
-
-	rc = gfx_color_new_rgb_i16(1, 2, 3, &color);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rect.p0.x = 10;
-	rect.p0.y = 20;
-	rect.p1.x = 30;
-	rect.p1.y = 40;
-
-	/* Paint text box */
-	rc = ui_paint_text_rect(resource, &rect, color, "A");
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
 	gfx_color_delete(color);
