tests: echo text input when rational conversion fails

[libsigrok.git] / tests / strutil.c

diff --git a/tests/strutil.c b/tests/strutil.c
index a629486de045a58f86948be5a97570854bb575f2..14240f049f1f4c181d74cbe820803cb7d2f00072 100644 (file)
--- a/tests/strutil.c
+++ b/tests/strutil.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <check.h>
+#include <errno.h>
 #include <locale.h>
 #include <libsigrok/libsigrok.h>
 #include "lib.h"
@@ -37,9 +38,10 @@ static void test_vsnprintf(const char *expected, char *format, ...)
        len = vsnprintf(s, len, format, args);
        va_end(args);
 
-       fail_unless(s != NULL, "len = %i, s = s", len);
+       fail_unless(s != NULL,
+                       "Invalid result for '%s': len = %i.", expected, len);
        fail_unless(!strcmp(s, expected),
-                   "Invalid result for '%s': %s.", expected, s);
+                       "Invalid result for '%s': %s.", expected, s);
        g_free(s);
 }
 #endif
@@ -57,7 +59,32 @@ static void test_sr_vsnprintf_ascii(const char *expected, char *format, ...)
        len = sr_vsnprintf_ascii(s, len, format, args);
        va_end(args);
 
-       fail_unless(s != NULL, "len = %i, s = s", len);
+       fail_unless(s != NULL,
+                       "Invalid result for '%s': len = %i.", expected, len);
+       fail_unless(!strcmp(s, expected),
+                       "Invalid result for '%s': %s.", expected, s);
+       g_free(s);
+}
+
+static void test_sr_vsprintf_ascii(const char *expected, char *format, ...)
+{
+       va_list args, args_copy;
+       char *s;
+       int len;
+
+       /* Get length of buffer required. */
+       va_start(args, format);
+       va_copy(args_copy, args);
+       len = sr_vsnprintf_ascii(NULL, 0, format, args);
+       va_end(args);
+
+       /* Allocate buffer and write out command. */
+       s = g_malloc0(len + 1);
+       len = sr_vsprintf_ascii(s, format, args_copy);
+       va_end(args_copy);
+
+       fail_unless(s != NULL,
+                       "Invalid result for '%s': len = %i.", expected, len);
        fail_unless(!strcmp(s, expected),
                        "Invalid result for '%s': %s.", expected, s);
        g_free(s);
@@ -91,7 +118,8 @@ static void test_rational(const char *input, struct sr_rational expected)
        struct sr_rational rational;
 
        ret = sr_parse_rational(input, &rational);
-       fail_unless(ret == SR_OK);
+       fail_unless(ret == SR_OK, "Unexpected rc for '%s': %d, errno %d.",
+               input, ret, errno);
        fail_unless((expected.p == rational.p) && (expected.q == rational.q),
                    "Invalid result for '%s': %ld/%ld'.",
                    input, rational.p, rational.q);
@@ -144,6 +172,13 @@ START_TEST(test_locale)
        test_sr_vsnprintf_ascii("0.12345", "%.5f", (double)0.12345);
        test_sr_vsnprintf_ascii("0.123456", "%.6f", (double)0.123456);
 
+       test_sr_vsprintf_ascii("0.1", "%.1f", (double)0.1);
+       test_sr_vsprintf_ascii("0.12", "%.2f", (double)0.12);
+       test_sr_vsprintf_ascii("0.123", "%.3f", (double)0.123);
+       test_sr_vsprintf_ascii("0.1234", "%.4f", (double)0.1234);
+       test_sr_vsprintf_ascii("0.12345", "%.5f", (double)0.12345);
+       test_sr_vsprintf_ascii("0.123456", "%.6f", (double)0.123456);
+
 #if 0
        /*
         * These tests can be used to tell on which platforms the printf()