X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fstrutil.c;h=0138fa9dffcfa2a9712d0cddf1653b39c51d06b1;hb=16e88c6b93d164f4c4e7c437f907789ed27281ad;hp=86f25f395d06caa54b84bd332ecdf8fe75b93d9d;hpb=5223412ebe3cadaab0e9b2a65e591b7cf575c404;p=libsigrok.git diff --git a/tests/strutil.c b/tests/strutil.c index 86f25f39..0138fa9d 100644 --- a/tests/strutil.c +++ b/tests/strutil.c @@ -19,9 +19,50 @@ #include #include +#include #include #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; @@ -33,11 +74,11 @@ static void test_samplerate(uint64_t samplerate, const char *expected) g_free(s); } -static void test_period(uint64_t frequency, const char *expected) +static void test_period(uint64_t v_p, uint64_t v_q, const char *expected) { char *s; - s = sr_period_string(frequency); + s = sr_period_string(v_p, v_q); fail_unless(s != NULL); fail_unless(!strcmp(s, expected), "Invalid result for '%s': %s.", expected, s); @@ -56,6 +97,72 @@ static void test_rational(const char *input, struct sr_rational expected) input, rational.p, rational.q); } +static void test_voltage(uint64_t v_p, uint64_t v_q, const char *expected) +{ + char *s; + + s = sr_voltage_string(v_p, v_q); + fail_unless(s != NULL); + fail_unless(!strcmp(s, expected), + "Invalid result for '%s': %s.", expected, s); + 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(): * @@ -179,33 +286,51 @@ END_TEST START_TEST(test_hz_period) { - test_period(1, "1000 ms"); - test_period(5, "200 ms"); - test_period(72, "13 ms"); - test_period(388, "2 ms"); + test_period(1, 1, "1 s"); + test_period(1, 5, "200 ms"); + test_period(1, 72, "13.889 ms"); + test_period(1, 388, "2.577 ms"); + test_period(10, 1000, "10 ms"); /* Again, but now using SR_HZ(). */ - test_period(SR_HZ(1), "1000 ms"); - test_period(SR_HZ(5), "200 ms"); - test_period(SR_HZ(72), "13 ms"); - test_period(SR_HZ(388), "2 ms"); + test_period(1, SR_HZ(1), "1 s"); + test_period(1, SR_HZ(5), "200 ms"); + test_period(1, SR_HZ(72), "13.889 ms"); + test_period(1, SR_HZ(388), "2.577 ms"); + test_period(10, SR_HZ(100), "100 ms"); } END_TEST START_TEST(test_ghz_period) { /* Note: Numbers > 2^32 need a ULL suffix. */ - - test_period(1000000000, "1000 ps"); - test_period(5000000000ULL, "200 ps"); - test_period(72000000000ULL, "13 ps"); - test_period(388000000000ULL, "2 ps"); + test_period(1, 1000000000, "1 ns"); + test_period(1, 5000000000ULL, "200 ps"); + test_period(1, 72000000000ULL, "13.889 ps"); + test_period(1, 388000000000ULL, "2.577 ps"); + test_period(10, 1000000000000, "10 ps"); + test_period(200, 1000000000000ULL, "200 ps"); /* Again, but now using SR_GHZ(). */ - test_period(SR_GHZ(1), "1000 ps"); - test_period(SR_GHZ(5), "200 ps"); - test_period(SR_GHZ(72), "13 ps"); - test_period(SR_GHZ(388), "2 ps"); + test_period(1, SR_GHZ(1), "1 ns"); + test_period(1, SR_GHZ(5), "200 ps"); + test_period(1, SR_GHZ(72), "13.889 ps"); + test_period(1, SR_GHZ(388), "2.577 ps"); + test_period(10, SR_GHZ(1), "10 ns"); + test_period(200, SR_GHZ(1000), "200 ps"); +} +END_TEST + +START_TEST(test_volt) +{ + test_voltage(34, 1, "34 V"); + test_voltage(34, 2, "17 V"); + test_voltage(1, 1, "1 V"); + test_voltage(1, 5, "0.2 V"); + test_voltage(200, 1000, "200 mV"); + test_voltage(1, 72, "0.0138889 V"); + test_voltage(1, 388, "0.00257732 V"); + test_voltage(10, 1000, "10 mV"); } END_TEST @@ -226,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 @@ -241,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 @@ -253,12 +388,14 @@ 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); tcase_add_test(tc, test_ghz); tcase_add_test(tc, test_hz_period); tcase_add_test(tc, test_ghz_period); + tcase_add_test(tc, test_volt); tcase_add_test(tc, test_integral); tcase_add_test(tc, test_fractional); tcase_add_test(tc, test_exponent);