From a5a84c429ac548eafd1d3903225a4ce72104201f Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 03:50:26 +0800
Subject: [PATCH] Support RESPONSE MESSAGE UNIT SEPARATOR, issue #21
---
libscpi/test/test_scpi_utils.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index dad8808..1956d67 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -45,15 +45,15 @@
* CUnit Test Suite
*/
-int init_suite(void) {
+static int init_suite(void) {
return 0;
}
-int clean_suite(void) {
+static int clean_suite(void) {
return 0;
}
-void test_strnpbrk() {
+static void test_strnpbrk() {
char str[] = "ahoj";
CU_ASSERT(strnpbrk(str, 4, "a") == (str + 0));
@@ -68,16 +68,16 @@
-void test_longToStr() {
+static void test_longToStr() {
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');
@@ -85,25 +85,25 @@
CU_ASSERT(str[3] == '0');
CU_ASSERT(str[4] == '\0');
- len = longToStr(10, str, 32, 16);
+ len = SCPI_LongToStr(10, str, 32, 16);
CU_ASSERT(len == 1);
CU_ASSERT(str[0] == 'A');
CU_ASSERT(str[1] == '\0');
- len = longToStr(10, str, 32, 8);
+ 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() {
+static void test_doubleToStr() {
size_t result;
char str[50];
#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) \
@@ -119,7 +119,7 @@
TEST_DOUBLE_TO_STR(-1.3e-30, 8, "-1.3e-30");
}
-void test_strToLong() {
+static void test_strToLong() {
size_t result;
int32_t val;
@@ -144,7 +144,7 @@
TEST_STR_TO_LONG("18", 1, 1, 8); // octal 1, 8 is ignored
}
-void test_strToDouble() {
+static void test_strToDouble() {
double val;
size_t result;
@@ -177,7 +177,7 @@
}
-void test_compareStr() {
+static void test_compareStr() {
CU_ASSERT_TRUE(compareStr("abcd", 1, "afgh", 1));
CU_ASSERT_TRUE(compareStr("ABCD", 4, "abcd", 4));
@@ -188,7 +188,7 @@
CU_ASSERT_FALSE(compareStr("ABCD", 4, "abcd", 3));
}
-void test_compareStrAndNum() {
+static void test_compareStrAndNum() {
CU_ASSERT_TRUE(compareStrAndNum("abcd", 1, "afgh", 1));
CU_ASSERT_TRUE(compareStrAndNum("ABCD", 4, "abcd", 4));
@@ -206,7 +206,7 @@
}
-void test_matchPattern() {
+static void test_matchPattern() {
scpi_bool_t result;
#define TEST_MATCH_PATTERN(p, s, r) \
@@ -222,7 +222,7 @@
TEST_MATCH_PATTERN("AB", "a", FALSE);
}
-void test_matchCommand() {
+static void test_matchCommand() {
scpi_bool_t result;
#define TEST_MATCH_COMMAND(p, s, r) \
--
Gitblit v1.9.1