X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fstrutil.c;h=ec2233329b769c5eecc9597bdeb6d8e7564f4694;hb=6205515cc8bed6bc17c2facf9612a072facdfd3e;hp=e2a0a20a86e3444007aeb2e5c310671c26900546;hpb=7ca40d2d1cd22ceb741d822c2630d05eafc43260;p=libsigrok.git

diff --git a/tests/strutil.c b/tests/strutil.c
index e2a0a20a..ec223332 100644
--- 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"
@@ -117,12 +118,22 @@ 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);
 }
 
+static void test_rational_fail(const char *input)
+{
+	int ret;
+	struct sr_rational rational;
+
+	ret = sr_parse_rational(input, &rational);
+	fail_unless(ret != SR_OK, "Unexpected success for '%s'.", input);
+}
+
 static void test_voltage(uint64_t v_p, uint64_t v_q, const char *expected)
 {
 	char *s;
@@ -143,7 +154,7 @@ START_TEST(test_locale)
 	fprintf(stderr, "Old locale = %s\n", old_locale);
 	/* Copy the name so it won’t be clobbered by setlocale. */
 	saved_locale = g_strdup(old_locale);
-	ck_assert_msg(saved_locale != NULL);
+	ck_assert(saved_locale != NULL);
 
 #ifdef _WIN32
 	/*
@@ -386,6 +397,16 @@ START_TEST(test_fractional)
 	test_rational("+.1", (struct sr_rational){1, 10});
 	test_rational("-0.1", (struct sr_rational){-1, 10});
 	test_rational("-.1", (struct sr_rational){-1, 10});
+	test_rational(".1", (struct sr_rational){1, 10});
+	test_rational(".123", (struct sr_rational){123, 1000});
+	test_rational("1.", (struct sr_rational){1, 1});
+	test_rational("123.", (struct sr_rational){123, 1});
+	test_rational("-.1", (struct sr_rational){-1, 10});
+	test_rational(" .1", (struct sr_rational){1, 10});
+	test_rational("+.1", (struct sr_rational){1, 10});
+	test_rational_fail(".");
+	test_rational_fail(".e");
+	test_rational_fail(".e1");
 }
 END_TEST