Index: uspace/lib/gfxfont/test/text.c
===================================================================
--- uspace/lib/gfxfont/test/text.c	(revision 458301502f6afa8083247442aa9832ffb402f9f9)
+++ uspace/lib/gfxfont/test/text.c	(revision 7470d97aaec04abd08ce2ad450cda9e6ff912bd4)
@@ -30,5 +30,4 @@
 #include <gfx/context.h>
 #include <gfx/font.h>
-#include <gfx/glyph.h>
 #include <gfx/text.h>
 #include <gfx/typeface.h>
@@ -135,314 +134,10 @@
 
 	gfx_text_fmt_init(&fmt);
-	fmt.font = font;
 	fmt.color = color;
 	pos.x = 0;
 	pos.y = 0;
 
-	rc = gfx_puttext(&pos, &fmt, "Hello world!");
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_font_close(font);
-	gfx_typeface_destroy(tface);
-	gfx_color_delete(color);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** gfx_text_start_pos() correctly computes text start position */
-PCUT_TEST(text_start_pos)
-{
-	gfx_font_props_t props;
-	gfx_font_metrics_t metrics;
-	gfx_typeface_t *tface;
-	gfx_font_t *font;
-	gfx_context_t *gc;
-	gfx_color_t *color;
-	gfx_text_fmt_t fmt;
-	gfx_coord2_t pos;
-	test_gc_t tgc;
-	errno_t rc;
-
-	rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_typeface_create(gc, &tface);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_font_props_init(&props);
-	gfx_font_metrics_init(&metrics);
-	metrics.ascent = 10; // XXX
-	metrics.descent = 10; // XXX
-	rc = gfx_font_create(tface, &props, &metrics, &font);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_text_fmt_init(&fmt);
-	fmt.font = font;
-	fmt.color = color;
-	pos.x = 0;
-	pos.y = 0;
-
-	rc = gfx_puttext(&pos, &fmt, "Hello world!");
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_font_close(font);
-	gfx_typeface_destroy(tface);
-	gfx_color_delete(color);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** gfx_text_find_pos() finds position in text */
-PCUT_TEST(text_find_pos)
-{
-	gfx_font_props_t props;
-	gfx_font_metrics_t metrics;
-	gfx_typeface_t *tface;
-	gfx_font_t *font;
-	gfx_glyph_metrics_t gmetrics;
-	gfx_glyph_t *glyph1;
-	gfx_glyph_t *glyph2;
-	gfx_context_t *gc;
-	gfx_text_fmt_t fmt;
-	gfx_coord2_t anchor;
-	gfx_coord2_t fpos;
-	size_t off;
-	test_gc_t tgc;
-	errno_t rc;
-
-	rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_typeface_create(gc, &tface);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_font_props_init(&props);
-	gfx_font_metrics_init(&metrics);
-	rc = gfx_font_create(tface, &props, &metrics, &font);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	/* Need to create some glyphs with metrics */
-	gfx_glyph_metrics_init(&gmetrics);
-	gmetrics.advance = 10;
-
-	rc = gfx_glyph_create(font, &gmetrics, &glyph1);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_glyph_set_pattern(glyph1, "A");
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_glyph_metrics_init(&gmetrics);
-	gmetrics.advance = 1;
-
-	rc = gfx_glyph_create(font, &gmetrics, &glyph2);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_glyph_set_pattern(glyph2, "i");
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	gfx_text_fmt_init(&fmt);
-	fmt.font = font;
-	anchor.x = 10;
-	anchor.y = 0;
-
-	fpos.x = 9;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(0, off);
-
-	fpos.x = 10;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(0, off);
-
-	fpos.x = 11;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(0, off);
-
-	fpos.x = 19;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(1, off);
-
-	fpos.x = 20;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(2, off);
-
-	fpos.x = 21;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(3, off);
-
-	fpos.x = 22;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Aii", &fpos);
-	PCUT_ASSERT_INT_EQUALS(3, off);
-
-	gfx_glyph_destroy(glyph1);
-	gfx_glyph_destroy(glyph2);
-
-	gfx_font_close(font);
-	gfx_typeface_destroy(tface);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** gfx_text_find_pos() finds position in text in text mode */
-PCUT_TEST(text_find_pos_text)
-{
-	gfx_typeface_t *tface;
-	gfx_font_t *font;
-	gfx_context_t *gc;
-	test_gc_t tgc;
-	size_t off;
-	gfx_text_fmt_t fmt;
-	gfx_coord2_t anchor;
-	gfx_coord2_t fpos;
-	errno_t rc;
-
-	rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_typeface_create(gc, &tface);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_font_create_textmode(tface, &font);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	anchor.x = 10;
-	anchor.y = 0;
-	gfx_text_fmt_init(&fmt);
-	fmt.font = font;
-
-	fpos.x = 9;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Abc", &fpos);
-	PCUT_ASSERT_INT_EQUALS(0, off);
-
-	fpos.x = 10;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Abc", &fpos);
-	PCUT_ASSERT_INT_EQUALS(0, off);
-
-	fpos.x = 11;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Abc", &fpos);
-	PCUT_ASSERT_INT_EQUALS(1, off);
-
-	fpos.x = 12;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Abc", &fpos);
-	PCUT_ASSERT_INT_EQUALS(2, off);
-
-	fpos.x = 13;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Abc", &fpos);
-	PCUT_ASSERT_INT_EQUALS(3, off);
-
-	fpos.x = 14;
-	fpos.y = 0;
-	off = gfx_text_find_pos(&anchor, &fmt, "Abc", &fpos);
-	PCUT_ASSERT_INT_EQUALS(3, off);
-
-	gfx_font_close(font);
-	gfx_typeface_destroy(tface);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** gfx_text_cont() produces correct continuation parameters */
-PCUT_TEST(text_cont)
-{
-	gfx_typeface_t *tface;
-	gfx_font_t *font;
-	gfx_context_t *gc;
-	gfx_color_t *color;
-	test_gc_t tgc;
-	gfx_text_fmt_t fmt;
-	gfx_coord2_t anchor;
-	gfx_coord2_t cpos;
-	gfx_text_fmt_t cfmt;
-	errno_t rc;
-
-	rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_typeface_create(gc, &tface);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_font_create_textmode(tface, &font);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	anchor.x = 10;
-	anchor.y = 20;
-	gfx_text_fmt_init(&fmt);
-	fmt.font = font;
-	fmt.color = color;
-
-	gfx_text_cont(&anchor, &fmt, "Abc", &cpos, &cfmt);
-
-	PCUT_ASSERT_INT_EQUALS(13, cpos.x);
-	PCUT_ASSERT_INT_EQUALS(20, cpos.y);
-	PCUT_ASSERT_EQUALS(fmt.color, cfmt.color);
-	PCUT_ASSERT_EQUALS(gfx_halign_left, cfmt.halign);
-	PCUT_ASSERT_EQUALS(gfx_valign_baseline, cfmt.valign);
-
-	gfx_font_close(font);
-	gfx_typeface_destroy(tface);
-	gfx_color_delete(color);
-
-	rc = gfx_context_delete(gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-}
-
-/** gfx_text_rect() computes bounding rectangle */
-PCUT_TEST(text_rect)
-{
-	gfx_typeface_t *tface;
-	gfx_font_t *font;
-	gfx_context_t *gc;
-	gfx_color_t *color;
-	test_gc_t tgc;
-	gfx_text_fmt_t fmt;
-	gfx_coord2_t anchor;
-	gfx_rect_t rect;
-	errno_t rc;
-
-	rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_typeface_create(gc, &tface);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_font_create_textmode(tface, &font);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	anchor.x = 10;
-	anchor.y = 20;
-	gfx_text_fmt_init(&fmt);
-	fmt.font = font;
-	fmt.color = color;
-
-	gfx_text_rect(&anchor, &fmt, "Abc", &rect);
-
-	PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
-	PCUT_ASSERT_INT_EQUALS(20, rect.p0.y);
-	PCUT_ASSERT_INT_EQUALS(13, rect.p1.x);
-	PCUT_ASSERT_INT_EQUALS(21, rect.p1.y);
+	rc = gfx_puttext(font, &pos, &fmt, "Hello world!");
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
 	gfx_font_close(font);
