From c49b34ae42b691518a1100346d7c749e35bc3ba3 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 02:22:07 +0800
Subject: [PATCH] Make public SCPI_LongToStr, SCPI_DoubleToStr
---
libscpi/test/test_scpi_utils.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index 19e7282..ad85399 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -61,6 +61,9 @@
CU_ASSERT(strnpbrk(str, 4, "b") == NULL);
CU_ASSERT(strnpbrk(str, 1, "h") == NULL);
CU_ASSERT(strnpbrk(str, 4, "xo") == (str + 2));
+
+ CU_ASSERT(strnpbrk(str, 4, "j") == (str + 3));
+
}
@@ -69,12 +72,12 @@
char str[32];
size_t len;
- len = longToStr(10, str, 32, 10);
+ len = SCPI_LongToStr(10, str, 32, 10);
CU_ASSERT(len == 2);
CU_ASSERT_STRING_EQUAL(str, "10");
CU_ASSERT(str[len] == '\0');
- len = longToStr(10, str, 32, 2);
+ len = SCPI_LongToStr(10, str, 32, 2);
CU_ASSERT(len == 4);
CU_ASSERT(str[0] == '1');
CU_ASSERT(str[1] == '0');
@@ -82,6 +85,16 @@
CU_ASSERT(str[3] == '0');
CU_ASSERT(str[4] == '\0');
+ len = SCPI_LongToStr(10, str, 32, 16);
+ CU_ASSERT(len == 1);
+ CU_ASSERT(str[0] == 'A');
+ CU_ASSERT(str[1] == '\0');
+
+ len = SCPI_LongToStr(10, str, 32, 8);
+ CU_ASSERT(len == 2);
+ CU_ASSERT(str[0] == '1');
+ CU_ASSERT(str[1] == '2');
+ CU_ASSERT(str[2] == '\0');
}
void test_doubleToStr() {
@@ -90,7 +103,7 @@
#define TEST_DOUBLE_TO_STR(v, r, s) \
do { \
- result = doubleToStr(v, str, sizeof(str)); \
+ result = SCPI_DoubleToStr(v, str, sizeof(str)); \
CU_ASSERT_EQUAL(result, r); \
CU_ASSERT_STRING_EQUAL(str, s); \
} while(0) \
--
Gitblit v1.9.1