From 01b185f9795340e28b53f46a4bd8af7de6299c47 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: ćšć, 08 10æ 2015 03:00:34 +0800
Subject: [PATCH] integer parser: fix array length for double variables
---
libscpi/test/test_scpi_utils.c | 461 +++++++++++++++++++++++++-------------------------------
1 files changed, 207 insertions(+), 254 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index 3c637b7..f3302c3 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -36,6 +36,9 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
#include "CUnit/Basic.h"
#include "scpi/scpi.h"
@@ -68,321 +71,269 @@
static void test_Int32ToStr() {
const size_t max=32+1;
+ int32_t val[] = {0, 1, -1, INT32_MIN, INT32_MAX, 0x01234567, 0x89abcdef};
+ int N = sizeof(val) / sizeof(int32_t);
+ int i;
char str[max];
+ char ref[max];
size_t len;
- // test conversion to decimal numbers
- len = SCPI_Int32ToStr(0, str, max, 10);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(1, str, max, 10);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "1");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(-1, str, max, 10);
- CU_ASSERT(len == 2);
- CU_ASSERT_STRING_EQUAL(str, "-1");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0x7fffffff, str, max, 10);
- CU_ASSERT(len == 10);
- CU_ASSERT_STRING_EQUAL(str, "2147483647");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0x80000000, str, max, 10);
- CU_ASSERT(len == 11);
- CU_ASSERT_STRING_EQUAL(str, "-2147483648");
- CU_ASSERT(str[len] == '\0');
-
- // test conversion to binary numbers
- len = SCPI_Int32ToStr(0, str, max, 2);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(1, str, max, 2);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "1");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(-1, str, max, 2);
- CU_ASSERT(len == 32);
- CU_ASSERT_STRING_EQUAL(str, "11111111111111111111111111111111");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0x01234567, str, max, 2);
- CU_ASSERT(len == 25);
- CU_ASSERT_STRING_EQUAL(str, "1001000110100010101100111");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0x89abcdef, str, max, 2);
- CU_ASSERT(len == 32);
- CU_ASSERT_STRING_EQUAL(str, "10001001101010111100110111101111");
- CU_ASSERT(str[len] == '\0');
-
- // test conversion to hexadecimal numbers
- len = SCPI_Int32ToStr(0x0, str, max, 16);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0x01234567, str, max, 16);
- CU_ASSERT(len == 7);
- CU_ASSERT_STRING_EQUAL(str, "1234567");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0x89ABCDEF, str, max, 16);
- CU_ASSERT(len == 8);
- CU_ASSERT_STRING_EQUAL(str, "89ABCDEF");
- CU_ASSERT(str[len] == '\0');
-
- // test conversion to octal numbers
- len = SCPI_Int32ToStr(0, str, max, 8);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(0xffffffff, str, max, 8);
- CU_ASSERT(len == 11);
- CU_ASSERT_STRING_EQUAL(str, "37777777777");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int32ToStr(076543210, str, max, 8);
- CU_ASSERT(len == 8);
- CU_ASSERT_STRING_EQUAL(str, "76543210");
- CU_ASSERT(str[len] == '\0');
+ // test signed conversion to decimal numbers
+ for (i=0; i<N; i++) {
+ len = SCPI_Int32ToStr(val[i], str, max);
+ snprintf(ref, max, "%"PRIi32, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
}
-static void test_UInt32ToStr() {
+static void test_UInt32ToStrBase() {
const size_t max=32+1;
+ uint32_t val[] = {0, 1, -1, INT32_MIN, INT32_MAX, 0x01234567, 0x89abcdef};
+ int N = sizeof(val) / sizeof(uint32_t);
+ int i;
char str[max];
+ char ref[max];
size_t len;
// test conversion to decimal numbers
- len = SCPI_UInt32ToStr(0, str, max, 10);
+ for (i=0; i<N; i++) {
+ len = SCPI_UInt32ToStrBase(val[i], str, max, 10);
+ snprintf(ref, max, "%"PRIu32, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ // test conversion to hexadecimal numbers
+ for (i=0; i<N; i++) {
+ len = SCPI_UInt32ToStrBase(val[i], str, max, 16);
+ snprintf(ref, max, "%"PRIX32, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ // test conversion to octal numbers
+ for (i=0; i<N; i++) {
+ len = SCPI_UInt32ToStrBase(val[i], str, max, 8);
+ snprintf(ref, max, "%"PRIo32, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ // test conversion to binary numbers
+ len = SCPI_UInt32ToStrBase(0, str, max, 2);
CU_ASSERT(len == 1);
CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
- len = SCPI_UInt32ToStr(1, str, max, 10);
+ len = SCPI_UInt32ToStrBase(1, str, max, 2);
CU_ASSERT(len == 1);
CU_ASSERT_STRING_EQUAL(str, "1");
- CU_ASSERT(str[len] == '\0');
- len = SCPI_UInt32ToStr(-1, str, max, 10);
- CU_ASSERT(len == 10);
- CU_ASSERT_STRING_EQUAL(str, "4294967295");
- CU_ASSERT(str[len] == '\0');
+ len = SCPI_UInt32ToStrBase(-1, str, max, 2);
+ CU_ASSERT(len == 32);
+ CU_ASSERT_STRING_EQUAL(str, "11111111111111111111111111111111");
- len = SCPI_UInt32ToStr(0x7fffffff, str, max, 10);
- CU_ASSERT(len == 10);
- CU_ASSERT_STRING_EQUAL(str, "2147483647");
- CU_ASSERT(str[len] == '\0');
+ len = SCPI_UInt32ToStrBase(0x01234567, str, max, 2);
+ CU_ASSERT(len == 25);
+ CU_ASSERT_STRING_EQUAL(str, "1001000110100010101100111");
- len = SCPI_UInt32ToStr(0x80000000, str, max, 10);
- CU_ASSERT(len == 10);
- CU_ASSERT_STRING_EQUAL(str, "2147483648");
- CU_ASSERT(str[len] == '\0');
+ len = SCPI_UInt32ToStrBase(0x89abcdef, str, max, 2);
+ CU_ASSERT(len == 32);
+ CU_ASSERT_STRING_EQUAL(str, "10001001101010111100110111101111");
}
static void test_Int64ToStr() {
const size_t max=64+1;
+ int64_t val[] = {0, 1, -1, INT64_MIN, INT64_MAX, 0x0123456789abcdef, 0xfedcba9876543210};
+ int N = sizeof(val) / sizeof(int64_t);
+ int i;
char str[max];
+ char ref[max];
size_t len;
// test conversion to decimal numbers
- len = SCPI_Int64ToStr(0, str, max, 10);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(1, str, max, 10);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "1");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(-1, str, max, 10);
- CU_ASSERT(len == 2);
- CU_ASSERT_STRING_EQUAL(str, "-1");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(0x7fffffffffffffff, str, max, 10);
- CU_ASSERT(len == 19);
- CU_ASSERT_STRING_EQUAL(str, "9223372036854775807");
- CU_ASSERT(str[len] == '\0');
- printf("\n");
- printf(str);
- printf("\n");
-
- len = SCPI_Int64ToStr(0x8000000000000000, str, max, 10);
- CU_ASSERT(len == 20);
- CU_ASSERT_STRING_EQUAL(str, "-9223372036854775808");
- CU_ASSERT(str[len] == '\0');
-
- // test conversion to binary numbers
- len = SCPI_Int64ToStr(0, str, max, 2);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(1, str, max, 2);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "1");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(-1, str, max, 2);
- CU_ASSERT(len == 64);
- CU_ASSERT_STRING_EQUAL(str, "1111111111111111111111111111111111111111111111111111111111111111");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(0x0123456789abcdef, str, max, 2);
- CU_ASSERT(len == 57);
- CU_ASSERT_STRING_EQUAL(str, "100100011010001010110011110001001101010111100110111101111");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(0xfedcba9876543210, str, max, 2);
- CU_ASSERT(len == 64);
- CU_ASSERT_STRING_EQUAL(str, "1111111011011100101110101001100001110110010101000011001000010000");
- CU_ASSERT(str[len] == '\0');
-
- // test conversion to hexadecimal numbers
- len = SCPI_Int64ToStr(0x0, str, max, 16);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(0x0123456789abcdef, str, max, 16);
- CU_ASSERT(len == 15);
- CU_ASSERT_STRING_EQUAL(str, "123456789ABCDEF");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(0xfedcba9876543210, str, max, 16);
- CU_ASSERT(len == 16);
- CU_ASSERT_STRING_EQUAL(str, "FEDCBA9876543210");
- CU_ASSERT(str[len] == '\0');
-
- // test conversion to octal numbers
- len = SCPI_Int64ToStr(0, str, max, 8);
- CU_ASSERT(len == 1);
- CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(0xffffffffffffffff, str, max, 8);
- CU_ASSERT(len == 22);
- CU_ASSERT_STRING_EQUAL(str, "1777777777777777777777");
- CU_ASSERT(str[len] == '\0');
-
- len = SCPI_Int64ToStr(076543210, str, max, 8);
- CU_ASSERT(len == 8);
- CU_ASSERT_STRING_EQUAL(str, "76543210");
- CU_ASSERT(str[len] == '\0');
+ for (i=0; i<N; i++) {
+ len = SCPI_Int64ToStr(val[i], str, max);
+ snprintf(ref, max, "%"PRIi64, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
}
-static void test_UInt64ToStr() {
+static void test_UInt64ToStrBase() {
const size_t max=64+1;
+ uint64_t val[] = {0, 1, -1, INT64_MIN, INT64_MAX, 0x0123456789abcdef, 0xfedcba9876543210};
+ int N = sizeof(val) / sizeof(uint64_t);
+ int i;
char str[max];
+ char ref[max];
size_t len;
// test conversion to decimal numbers
- len = SCPI_UInt64ToStr(0, str, max, 10);
+ for (i=0; i<N; i++) {
+ len = SCPI_UInt64ToStrBase(val[i], str, max, 10);
+ snprintf(ref, max, "%"PRIu64, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ // test conversion to hexadecimal numbers
+ for (i=0; i<N; i++) {
+ len = SCPI_UInt64ToStrBase(val[i], str, max, 16);
+ snprintf(ref, max, "%"PRIX64, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ // test conversion to octal numbers
+ for (i=0; i<N; i++) {
+ len = SCPI_UInt64ToStrBase(val[i], str, max, 8);
+ snprintf(ref, max, "%"PRIo64, val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
+
+ // test conversion to binary numbers
+ len = SCPI_UInt64ToStrBase(0, str, max, 2);
CU_ASSERT(len == 1);
CU_ASSERT_STRING_EQUAL(str, "0");
- CU_ASSERT(str[len] == '\0');
- len = SCPI_UInt64ToStr(1, str, max, 10);
+ len = SCPI_UInt64ToStrBase(1, str, max, 2);
CU_ASSERT(len == 1);
CU_ASSERT_STRING_EQUAL(str, "1");
- CU_ASSERT(str[len] == '\0');
- len = SCPI_UInt64ToStr(-1, str, max, 10);
- CU_ASSERT(len == 20);
- CU_ASSERT_STRING_EQUAL(str, "18446744073709551615");
- CU_ASSERT(str[len] == '\0');
+ len = SCPI_UInt64ToStrBase(-1, str, max, 2);
+ CU_ASSERT(len == 64);
+ CU_ASSERT_STRING_EQUAL(str, "1111111111111111111111111111111111111111111111111111111111111111");
- len = SCPI_UInt64ToStr(0x7fffffffffffffff, str, max, 10);
- CU_ASSERT(len == 19);
- CU_ASSERT_STRING_EQUAL(str, "9223372036854775807");
- CU_ASSERT(str[len] == '\0');
+ len = SCPI_UInt64ToStrBase(0x0123456789abcdef, str, max, 2);
+ CU_ASSERT(len == 57);
+ CU_ASSERT_STRING_EQUAL(str, "100100011010001010110011110001001101010111100110111101111");
- len = SCPI_UInt64ToStr(0x8000000000000000, str, max, 10);
- CU_ASSERT(len == 19);
- CU_ASSERT_STRING_EQUAL(str, "9223372036854775808");
- CU_ASSERT(str[len] == '\0');
+ len = SCPI_UInt64ToStrBase(0xfedcba9876543210, str, max, 2);
+ CU_ASSERT(len == 64);
+ CU_ASSERT_STRING_EQUAL(str, "1111111011011100101110101001100001110110010101000011001000010000");
}
static void test_doubleToStr() {
- size_t result;
- char str[50];
+ const size_t max=49+1;
+ double val[] = {1, -1, 1.1, -1.1, 1e3, 1e30, -1.3e30, -1.3e-30};
+ int N = sizeof(val) / sizeof(double);
+ int i;
+ char str[max];
+ char ref[max];
+ size_t len;
-#define TEST_DOUBLE_TO_STR(v, r, s) \
- do { \
- result = SCPI_DoubleToStr(v, str, sizeof(str)); \
- CU_ASSERT_EQUAL(result, r); \
- CU_ASSERT_STRING_EQUAL(str, s); \
- } while(0) \
-
-
- TEST_DOUBLE_TO_STR(1, 1, "1");
- TEST_DOUBLE_TO_STR(-1, 2, "-1");
- TEST_DOUBLE_TO_STR(1.1, 3, "1.1");
- TEST_DOUBLE_TO_STR(-1.1, 4, "-1.1");
- TEST_DOUBLE_TO_STR(1e3, 4, "1000");
- TEST_DOUBLE_TO_STR(1e30, 5, "1e+30");
- TEST_DOUBLE_TO_STR(-1.3e30, 8, "-1.3e+30");
- TEST_DOUBLE_TO_STR(-1.3e-30, 8, "-1.3e-30");
+ for (i=0; i<N; i++) {
+ len = SCPI_DoubleToStr(val[i], str, max);
+ snprintf(ref, max, "%lg", val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
}
-static void test_strToInt32() {
+static void test_strBaseToInt32() {
size_t result;
int32_t val;
-#define TEST_STR_TO_LONG(s, r, v, b) \
+#define TEST_STR_TO_INT32(s, r, v, b) \
do { \
- result = strToInt32(s, &val, b); \
+ result = strBaseToInt32(s, &val, b); \
CU_ASSERT_EQUAL(val, v); \
CU_ASSERT_EQUAL(result, r); \
} while(0) \
- TEST_STR_TO_LONG("", 0, 0, 10);
- TEST_STR_TO_LONG("1", 1, 1, 10);
- TEST_STR_TO_LONG("10", 2, 10, 10);
- TEST_STR_TO_LONG("-50", 3, -50, 10);
- TEST_STR_TO_LONG("100MHz", 3, 100, 10);
- TEST_STR_TO_LONG("MHz", 0, 0, 10);
- TEST_STR_TO_LONG("1.4", 1, 1, 10);
- TEST_STR_TO_LONG(" 1", 2, 1, 10);
- TEST_STR_TO_LONG(" +100", 5, 100, 10); // space and +
- TEST_STR_TO_LONG("FF", 2, 255, 16); // hexadecimal FF
- TEST_STR_TO_LONG("77", 2, 63, 8); // octal 77
- TEST_STR_TO_LONG("18", 1, 1, 8); // octal 1, 8 is ignored
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_INT32("", 0, 0, 10);
+ TEST_STR_TO_INT32("1", 1, 1, 10);
+ TEST_STR_TO_INT32("10", 2, 10, 10);
+ TEST_STR_TO_INT32("-50", 3, -50, 10);
+ TEST_STR_TO_INT32("100MHz", 3, 100, 10);
+ TEST_STR_TO_INT32("MHz", 0, 0, 10);
+ TEST_STR_TO_INT32("1.4", 1, 1, 10);
+ TEST_STR_TO_INT32(" 1", 2, 1, 10);
+ TEST_STR_TO_INT32(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_INT32("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_INT32("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_INT32("18", 1, 1, 8); // octal 1, 8 is ignored
}
-static void test_strToUInt32() {
+static void test_strBaseToUInt32() {
size_t result;
uint32_t val;
-#define TEST_STR_TO_ULONG(s, r, v, b) \
+#define TEST_STR_TO_UINT32(s, r, v, b) \
do { \
- result = strToUInt32(s, &val, b); \
+ result = strBaseToUInt32(s, &val, b); \
CU_ASSERT_EQUAL(val, v); \
CU_ASSERT_EQUAL(result, r); \
} while(0) \
- TEST_STR_TO_ULONG("", 0, 0, 10);
- TEST_STR_TO_ULONG("1", 1, 1, 10);
- TEST_STR_TO_ULONG("10", 2, 10, 10);
- TEST_STR_TO_ULONG("100MHz", 3, 100, 10);
- TEST_STR_TO_ULONG("MHz", 0, 0, 10);
- TEST_STR_TO_ULONG("1.4", 1, 1, 10);
- TEST_STR_TO_ULONG(" 1", 2, 1, 10);
- TEST_STR_TO_ULONG(" +100", 5, 100, 10); // space and +
- TEST_STR_TO_ULONG("FF", 2, 255, 16); // hexadecimal FF
- TEST_STR_TO_ULONG("77", 2, 63, 8); // octal 77
- TEST_STR_TO_ULONG("18", 1, 1, 8); // octal 1, 8 is ignored
- TEST_STR_TO_ULONG("FFFFFFFF", 8, 0xffffffffu, 16); // octal 1, 8 is ignored
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_UINT32("", 0, 0, 10);
+ TEST_STR_TO_UINT32("1", 1, 1, 10);
+ TEST_STR_TO_UINT32("10", 2, 10, 10);
+ TEST_STR_TO_UINT32("100MHz", 3, 100, 10);
+ TEST_STR_TO_UINT32("MHz", 0, 0, 10);
+ TEST_STR_TO_UINT32("1.4", 1, 1, 10);
+ TEST_STR_TO_UINT32(" 1", 2, 1, 10);
+ TEST_STR_TO_UINT32(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_UINT32("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_UINT32("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_UINT32("18", 1, 1, 8); // octal 1, 8 is ignored
+ TEST_STR_TO_UINT32("FFFFFFFF", 8, 0xffffffffu, 16); // octal 1, 8 is ignored
+}
+
+static void test_strBaseToInt64() {
+ size_t result;
+ int64_t val;
+
+#define TEST_STR_TO_INT64(s, r, v, b) \
+ do { \
+ result = strBaseToInt64(s, &val, b); \
+ CU_ASSERT_EQUAL(val, v); \
+ CU_ASSERT_EQUAL(result, r); \
+ } while(0) \
+
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_INT64("", 0, 0, 10);
+ TEST_STR_TO_INT64("1", 1, 1, 10);
+ TEST_STR_TO_INT64("10", 2, 10, 10);
+ TEST_STR_TO_INT64("-50", 3, -50, 10);
+ TEST_STR_TO_INT64("100MHz", 3, 100, 10);
+ TEST_STR_TO_INT64("MHz", 0, 0, 10);
+ TEST_STR_TO_INT64("1.4", 1, 1, 10);
+ TEST_STR_TO_INT64(" 1", 2, 1, 10);
+ TEST_STR_TO_INT64(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_INT64("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_INT64("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_INT64("18", 1, 1, 8); // octal 1, 8 is ignored
+}
+
+static void test_strBaseToUInt64() {
+ size_t result;
+ uint64_t val;
+
+#define TEST_STR_TO_UINT64(s, r, v, b) \
+ do { \
+ result = strBaseToUInt64(s, &val, b); \
+ CU_ASSERT_EQUAL(val, v); \
+ CU_ASSERT_EQUAL(result, r); \
+ } while(0) \
+
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_UINT64("", 0, 0, 10);
+ TEST_STR_TO_UINT64("1", 1, 1, 10);
+ TEST_STR_TO_UINT64("10", 2, 10, 10);
+ TEST_STR_TO_UINT64("100MHz", 3, 100, 10);
+ TEST_STR_TO_UINT64("MHz", 0, 0, 10);
+ TEST_STR_TO_UINT64("1.4", 1, 1, 10);
+ TEST_STR_TO_UINT64(" 1", 2, 1, 10);
+ TEST_STR_TO_UINT64(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_UINT64("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_UINT64("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_UINT64("18", 1, 1, 8); // octal 1, 8 is ignored
+ TEST_STR_TO_UINT64("FFFFFFFF", 8, 0xffffffffu, 16); // octal 1, 8 is ignored
}
static void test_strToDouble() {
@@ -698,12 +649,14 @@
if (0
|| (NULL == CU_add_test(pSuite, "strnpbrk", test_strnpbrk))
|| (NULL == CU_add_test(pSuite, "Int32ToStr", test_Int32ToStr))
- || (NULL == CU_add_test(pSuite, "UInt32ToStr", test_UInt32ToStr))
+ || (NULL == CU_add_test(pSuite, "UInt32ToStrBase", test_UInt32ToStrBase))
|| (NULL == CU_add_test(pSuite, "Int64ToStr", test_Int64ToStr))
- || (NULL == CU_add_test(pSuite, "UInt64ToStr", test_UInt64ToStr))
+ || (NULL == CU_add_test(pSuite, "UInt64ToStrBase", test_UInt64ToStrBase))
|| (NULL == CU_add_test(pSuite, "doubleToStr", test_doubleToStr))
- || (NULL == CU_add_test(pSuite, "strToInt32", test_strToInt32))
- || (NULL == CU_add_test(pSuite, "strToUInt32", test_strToUInt32))
+ || (NULL == CU_add_test(pSuite, "strBaseToInt32", test_strBaseToInt32))
+ || (NULL == CU_add_test(pSuite, "strBaseToUInt32", test_strBaseToUInt32))
+ || (NULL == CU_add_test(pSuite, "strBaseToInt64", test_strBaseToInt64))
+ || (NULL == CU_add_test(pSuite, "strBaseToUInt64", test_strBaseToUInt64))
|| (NULL == CU_add_test(pSuite, "strToDouble", test_strToDouble))
|| (NULL == CU_add_test(pSuite, "compareStr", test_compareStr))
|| (NULL == CU_add_test(pSuite, "compareStrAndNum", test_compareStrAndNum))
--
Gitblit v1.9.1