#include <config.h>
#include <check.h>
+#include <errno.h>
#include <locale.h>
#include <libsigrok/libsigrok.h>
#include "lib.h"
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
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);
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;
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
/*
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()
START_TEST(test_ghz)
{
- /* Note: Numbers > 2^32 need a ULL suffix. */
-
- test_samplerate(1000000000, "1 GHz");
- test_samplerate(5000000000ULL, "5 GHz");
- test_samplerate(72000000000ULL, "72 GHz");
- test_samplerate(388000000000ULL, "388 GHz");
- test_samplerate(4417594444ULL, "4.417594444 GHz");
- test_samplerate(44175944444ULL, "44.175944444 GHz");
- test_samplerate(441759444441ULL, "441.759444441 GHz");
- test_samplerate(441759000001ULL, "441.759000001 GHz");
- test_samplerate(441050000000ULL, "441.05 GHz");
- test_samplerate(441000000005ULL, "441.000000005 GHz");
- test_samplerate(441500000000ULL, "441.5 GHz");
+ test_samplerate(UINT64_C(1000000000), "1 GHz");
+ test_samplerate(UINT64_C(5000000000), "5 GHz");
+ test_samplerate(UINT64_C(72000000000), "72 GHz");
+ test_samplerate(UINT64_C(388000000000), "388 GHz");
+ test_samplerate(UINT64_C(4417594444), "4.417594444 GHz");
+ test_samplerate(UINT64_C(44175944444), "44.175944444 GHz");
+ test_samplerate(UINT64_C(441759444441), "441.759444441 GHz");
+ test_samplerate(UINT64_C(441759000001), "441.759000001 GHz");
+ test_samplerate(UINT64_C(441050000000), "441.05 GHz");
+ test_samplerate(UINT64_C(441000000005), "441.000000005 GHz");
+ test_samplerate(UINT64_C(441500000000), "441.5 GHz");
/* Again, but now using SR_GHZ(). */
test_samplerate(SR_GHZ(1), "1 GHz");
test_samplerate(SR_GHZ(441.500000000), "441.5 GHz");
/* Now check the biggest-possible samplerate (2^64 Hz). */
- // test_samplerate(18446744073709551615ULL, "18446744073.709551615 GHz");
- // test_samplerate(SR_GHZ(18446744073ULL), "18446744073 GHz");
+ // test_samplerate(UINT64_C(18446744073709551615), "18446744073.709551615 GHz");
+ // test_samplerate(SR_GHZ(UINT64_C(18446744073)), "18446744073 GHz");
}
END_TEST
START_TEST(test_ghz_period)
{
- /* Note: Numbers > 2^32 need a ULL suffix. */
- 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");
+ test_period(1, UINT64_C(1000000000), "1 ns");
+ test_period(1, UINT64_C(5000000000), "200 ps");
+ test_period(1, UINT64_C(72000000000), "13.889 ps");
+ test_period(1, UINT64_C(388000000000), "2.577 ps");
+ test_period(10, UINT64_C(1000000000000), "10 ps");
+ test_period(200, UINT64_C(1000000000000), "200 ps");
/* Again, but now using SR_GHZ(). */
test_period(1, SR_GHZ(1), "1 ns");
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
projects / libsigrok.git / blobdiff