X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fstrutil.c;h=0138fa9dffcfa2a9712d0cddf1653b39c51d06b1;hb=641107aa6c5864bd5d66f3f6dafa7c2493d55de5;hp=b168f1c4b3aecb8e6362f6ebe0632ae10cc8b0b0;hpb=b5df922e4fbe30d04882658778d2900939e869fe;p=libsigrok.git

diff --git a/tests/strutil.c b/tests/strutil.c
index b168f1c4..0138fa9d 100644
--- a/tests/strutil.c
+++ b/tests/strutil.c
@@ -19,9 +19,50 @@
 
 #include <config.h>
 #include <check.h>
+#include <locale.h>
 #include <libsigrok/libsigrok.h>
 #include "lib.h"
 
+#if 0
+static void test_vsnprintf(const char *expected, char *format, ...)
+{
+	va_list args;
+	char *s;
+	int len;
+
+	len = 16;
+	s = g_malloc0(len + 1);
+
+	va_start(args, format);
+	len = vsnprintf(s, len, format, args);
+	va_end(args);
+
+	fail_unless(s != NULL, "len = %i, s = s", len);
+	fail_unless(!strcmp(s, expected),
+		    "Invalid result for '%s': %s.", expected, s);
+	g_free(s);
+}
+#endif
+
+static void test_sr_vsnprintf_ascii(const char *expected, char *format, ...)
+{
+	va_list args;
+	char *s;
+	int len;
+
+	len = 16;
+	s = g_malloc0(len + 1);
+
+	va_start(args, format);
+	len = sr_vsnprintf_ascii(s, len, format, args);
+	va_end(args);
+
+	fail_unless(s != NULL, "len = %i, s = s", len);
+	fail_unless(!strcmp(s, expected),
+			"Invalid result for '%s': %s.", expected, s);
+	g_free(s);
+}
+
 static void test_samplerate(uint64_t samplerate, const char *expected)
 {
 	char *s;
@@ -67,6 +108,61 @@ static void test_voltage(uint64_t v_p, uint64_t v_q, const char *expected)
 	g_free(s);
 }
 
+START_TEST(test_locale)
+{
+	char *old_locale, *saved_locale;
+
+	/* Get the the current locale. */
+	old_locale = setlocale(LC_NUMERIC, NULL);
+	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);
+
+#ifdef _WIN32
+	/*
+	 * See: https://msdn.microsoft.com/en-us/library/cc233982.aspx
+	 * Doesn't work! Locale is not set!
+	 */
+	setlocale(LC_NUMERIC, "de-DE");
+#else
+	/*
+	 * For all *nix and OSX systems, change the locale for all threads to
+	 * one that is known for not working correctly with printf(), e.g.
+	 * "de_DE.UTF-8".
+	 *
+	 * Find all your available system locales with "locale -a".
+	 */
+	setlocale(LC_NUMERIC, "de_DE.UTF-8");
+#endif
+	fprintf(stderr, "New locale = %s\n", setlocale(LC_NUMERIC, NULL));
+
+	test_sr_vsnprintf_ascii("0.1", "%.1f", (double)0.1);
+	test_sr_vsnprintf_ascii("0.12", "%.2f", (double)0.12);
+	test_sr_vsnprintf_ascii("0.123", "%.3f", (double)0.123);
+	test_sr_vsnprintf_ascii("0.1234", "%.4f", (double)0.1234);
+	test_sr_vsnprintf_ascii("0.12345", "%.5f", (double)0.12345);
+	test_sr_vsnprintf_ascii("0.123456", "%.6f", (double)0.123456);
+
+#if 0
+	/*
+	 * These tests can be used to tell on which platforms the printf()
+	 * functions are locale-dependent (i.e. these tests will fail).
+	 */
+	test_vsnprintf("0.1", "%.1f", (double)0.1);
+	test_vsnprintf("0.12", "%.2f", (double)0.12);
+	test_vsnprintf("0.123", "%.3f", (double)0.123);
+	test_vsnprintf("0.1234", "%.4f", (double)0.1234);
+	test_vsnprintf("0.12345", "%.5f", (double)0.12345);
+	test_vsnprintf("0.123456", "%.6f", (double)0.123456);
+#endif
+
+	/* Restore the original locale. */
+	setlocale(LC_NUMERIC, saved_locale);
+	g_free(saved_locale);
+}
+END_TEST
+
 /*
  * Check various inputs for sr_samplerate_string():
  *
@@ -255,6 +351,11 @@ START_TEST(test_fractional)
 	test_rational("12.34", (struct sr_rational){1234, 100});
 	test_rational("-12.34", (struct sr_rational){-1234, 100});
 	test_rational("10.00", (struct sr_rational){1000, 100});
+	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("-0.1", (struct sr_rational){-1, 10});
+	test_rational("-.1", (struct sr_rational){-1, 10});
 }
 END_TEST
 
@@ -270,6 +371,11 @@ START_TEST(test_exponent)
 	test_rational("0.001e3", (struct sr_rational){1, 1});
 	test_rational("0.001e0", (struct sr_rational){1, 1000});
 	test_rational("0.001e-3", (struct sr_rational){1, 1000000});
+	test_rational("43.737E-3", (struct sr_rational){43737, 1000000});
+	test_rational("-0.1e-2", (struct sr_rational){-1, 1000});
+	test_rational("-.1e-2", (struct sr_rational){-1, 1000});
+	test_rational("-.0e-2", (struct sr_rational){0, 1000});
+	test_rational("+.0e-2", (struct sr_rational){0, 1000});
 }
 END_TEST
 
@@ -282,6 +388,7 @@ Suite *suite_strutil(void)
 
 	tc = tcase_create("sr_samplerate_string");
 	tcase_add_checked_fixture(tc, srtest_setup, srtest_teardown);
+	tcase_add_test(tc, test_locale);
 	tcase_add_test(tc, test_hz);
 	tcase_add_test(tc, test_khz);
 	tcase_add_test(tc, test_mhz);