Changeset 120031a5 in mainline

Timestamp:

2020-09-25T12:26:53Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

453f203b

Parents:

ea459d4

git-author:

Jiri Svoboda <jiri@…> (2020-09-24 17:26:44)

git-committer:

Jiri Svoboda <jiri@…> (2020-09-25 12:26:53)

Message:

Make TPF save/load test more elaborate

File:

• uspace/lib/gfxfont/test/tpf.c (modified) (6 diffs)

uspace/lib/gfxfont/test/tpf.c

@@ -30 +30 @@
 #include <gfx/font.h>
 #include <gfx/glyph.h>
+#include <gfx/glyph_bmp.h>
 #include <gfx/typeface.h>
 #include <pcut/pcut.h>
+#include <str.h>
 #include "../private/font.h"
 #include "../private/typeface.h"
@@ -69 +71 @@
 } testgc_bitmap_t;
 
+enum {
+        test_font_size = 9,
+        test_font_flags = gff_bold_italic,
+        test_font_ascent = 4,
+        test_font_descent = 3,
+        test_font_leading = 2,
+        test_glyph_advance = 10
+};
+
+static const char *test_glyph_pattern = "ff";
+
 /** Test saving typeface to and loading from TPF file */
 PCUT_TEST(save_load)
@@ -75 +88 @@
         char *p;
         gfx_font_props_t props;
+        gfx_font_props_t rprops;
         gfx_font_metrics_t metrics;
+        gfx_font_metrics_t rmetrics;
         gfx_glyph_metrics_t gmetrics;
+        gfx_glyph_metrics_t rgmetrics;
+        gfx_glyph_pattern_t *pat;
+        const char *str;
         gfx_typeface_t *tface;
         gfx_font_t *font;
@@ -82 +100 @@
         gfx_context_t *gc;
         gfx_glyph_t *glyph;
+        gfx_glyph_bmp_t *bmp;
+        int pix;
         test_gc_t tgc;
         errno_t rc;
@@ -91 +111 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        rc = gfx_typeface_create(gc, &tface);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_font_props_init(&props);
+        props.size = test_font_size;
+        props.flags = test_font_flags;
+
         gfx_font_metrics_init(&metrics);
-
-        rc = gfx_typeface_create(gc, &tface);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        gfx_font_props_init(&props);
-        gfx_font_metrics_init(&metrics);
+        metrics.ascent = test_font_ascent;
+        metrics.descent = test_font_descent;
+        metrics.leading = test_font_leading;
+
         rc = gfx_font_create(tface, &props, &metrics, &font);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
         gfx_glyph_metrics_init(&gmetrics);
+        gmetrics.advance = test_glyph_advance;
+
         rc = gfx_glyph_create(font, &gmetrics, &glyph);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_set_pattern(glyph, test_glyph_pattern);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_open(glyph, &bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_setpix(bmp, 0, 0, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_setpix(bmp, 1, 1, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_save(bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_glyph_bmp_close(bmp);
 
         rc = gfx_typeface_save(tface, fname);
@@ -118 +162 @@
         PCUT_ASSERT_NOT_NULL(finfo);
 
+        gfx_font_get_props(finfo, &rprops);
+        PCUT_ASSERT_INT_EQUALS(props.size, rprops.size);
+        PCUT_ASSERT_INT_EQUALS(props.flags, rprops.flags);
+
         rc = gfx_font_open(finfo, &font);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(font);
+
+        gfx_font_get_metrics(font, &rmetrics);
+        PCUT_ASSERT_INT_EQUALS(metrics.ascent, rmetrics.ascent);
+        PCUT_ASSERT_INT_EQUALS(metrics.descent, rmetrics.descent);
+        PCUT_ASSERT_INT_EQUALS(metrics.leading, rmetrics.leading);
 
         glyph = gfx_font_first_glyph(font);
         PCUT_ASSERT_NOT_NULL(glyph);
+
+        gfx_glyph_get_metrics(glyph, &rgmetrics);
+        PCUT_ASSERT_INT_EQUALS(gmetrics.advance, rgmetrics.advance);
+
+        pat = gfx_glyph_first_pattern(glyph);
+        str = gfx_glyph_pattern_str(pat);
+        PCUT_ASSERT_INT_EQUALS(0, str_cmp(test_glyph_pattern, str));
+
+        rc = gfx_glyph_bmp_open(glyph, &bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, 0);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+        pix = gfx_glyph_bmp_getpix(bmp, 1, 1);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+        pix = gfx_glyph_bmp_getpix(bmp, 1, 0);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+        pix = gfx_glyph_bmp_getpix(bmp, 0, 1);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
+        gfx_glyph_bmp_close(bmp);
 
         gfx_typeface_destroy(tface);