From 94ccbc305cac38eb9c54384b9f47d3da6527299b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 25 4月 2015 22:29:42 +0800
Subject: [PATCH] Solve #16 Multiple Identical Capabilities
---
libscpi/test/test_scpi_utils.c | 116 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index e357b65..cb705a4 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -46,15 +46,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));
@@ -64,7 +64,7 @@
CU_ASSERT(strnpbrk(str, 4, "xo") == (str + 2));
}
-void test_longToStr() {
+static void test_longToStr() {
char str[32];
size_t len;
@@ -75,7 +75,7 @@
CU_ASSERT(str[2] == '\0');
}
-void test_doubleToStr() {
+static void test_doubleToStr() {
size_t result;
char str[50];
@@ -97,7 +97,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;
@@ -122,7 +122,7 @@
TEST_STR_TO_LONG("018", 2, 1); // octal 1, 8 is ignored
}
-void test_strToDouble() {
+static void test_strToDouble() {
double val;
size_t result;
@@ -155,7 +155,7 @@
}
-void test_compareStr() {
+static void test_compareStr() {
CU_ASSERT_TRUE(compareStr("abcd", 1, "afgh", 1));
CU_ASSERT_TRUE(compareStr("ABCD", 4, "abcd", 4));
@@ -166,25 +166,39 @@
CU_ASSERT_FALSE(compareStr("ABCD", 4, "abcd", 3));
}
-void test_compareStrAndNum() {
+static void test_compareStrAndNum() {
+ int32_t num;
- CU_ASSERT_TRUE(compareStrAndNum("abcd", 1, "afgh", 1));
- CU_ASSERT_TRUE(compareStrAndNum("ABCD", 4, "abcd", 4));
- CU_ASSERT_TRUE(compareStrAndNum("AbCd", 3, "AbCE", 3));
- CU_ASSERT_TRUE(compareStrAndNum("ABCD", 1, "a", 1));
+ CU_ASSERT_TRUE(compareStrAndNum("abcd", 1, "afgh", 1, NULL));
+ CU_ASSERT_TRUE(compareStrAndNum("ABCD", 4, "abcd", 4, NULL));
+ CU_ASSERT_TRUE(compareStrAndNum("AbCd", 3, "AbCE", 3, NULL));
+ CU_ASSERT_TRUE(compareStrAndNum("ABCD", 1, "a", 1, NULL));
- CU_ASSERT_FALSE(compareStrAndNum("abcd", 1, "efgh", 1));
- CU_ASSERT_FALSE(compareStrAndNum("ABCD", 4, "abcd", 3));
+ CU_ASSERT_FALSE(compareStrAndNum("abcd", 1, "efgh", 1, NULL));
+ CU_ASSERT_FALSE(compareStrAndNum("ABCD", 4, "abcd", 3, NULL));
- CU_ASSERT_TRUE(compareStrAndNum("abcd", 4, "abcd1", 5));
- CU_ASSERT_TRUE(compareStrAndNum("abcd", 4, "abcd123", 7));
- CU_ASSERT_FALSE(compareStrAndNum("abcd", 4, "abcd12A", 7));
- CU_ASSERT_FALSE(compareStrAndNum("abcd", 4, "abcdB12", 7));
- CU_ASSERT_FALSE(compareStrAndNum("abdd", 4, "abcd132", 7));
+ CU_ASSERT_TRUE(compareStrAndNum("abcd", 4, "abcd1", 5, NULL));
+ CU_ASSERT_TRUE(compareStrAndNum("abcd", 4, "abcd123", 7, NULL));
+ CU_ASSERT_FALSE(compareStrAndNum("abcd", 4, "abcd12A", 7, NULL));
+ CU_ASSERT_FALSE(compareStrAndNum("abcd", 4, "abcdB12", 7, NULL));
+ CU_ASSERT_FALSE(compareStrAndNum("abdd", 4, "abcd132", 7, NULL));
+#define TEST_COMPARE_STR_AND_NUM(s1, l1, s2, l2, v, r) \
+ do { \
+ num = 0; \
+ CU_ASSERT_EQUAL(compareStrAndNum(s1, l1, s2, l2, &num),r); \
+ CU_ASSERT_EQUAL(num, v); \
+ } while(0); \
+
+ TEST_COMPARE_STR_AND_NUM("abcd", 4, "abcd", 4, 1, TRUE);
+ TEST_COMPARE_STR_AND_NUM("abcd", 4, "abcd1", 5, 1, TRUE);
+ TEST_COMPARE_STR_AND_NUM("abcd", 4, "abcd123", 7, 123, TRUE);
+ TEST_COMPARE_STR_AND_NUM("abcd", 4, "abcd12A", 7, 0, FALSE);
+ TEST_COMPARE_STR_AND_NUM("abcd", 4, "abcdB12", 7, 0, FALSE);
+ TEST_COMPARE_STR_AND_NUM("abdd", 4, "abcd132", 7, 0, FALSE);
}
-void test_locateText() {
+static void test_locateText() {
const char * v;
const char * b;
@@ -234,7 +248,7 @@
TEST_LOCATE_TEXT(" \"a\" , a ", TRUE, 2, 1);
}
-void test_locateStr() {
+static void test_locateStr() {
const char * v;
const char * b;
@@ -282,12 +296,12 @@
TEST_LOCATE_STR(" \"a\" , a ", TRUE, 1, 3);
}
-void test_matchPattern() {
+static void test_matchPattern() {
scpi_bool_t result;
#define TEST_MATCH_PATTERN(p, s, r) \
do { \
- result = matchPattern(p, strlen(p), s, strlen(s)); \
+ result = matchPattern(p, strlen(p), s, strlen(s), NULL);\
CU_ASSERT_EQUAL(result, r); \
} while(0) \
@@ -296,15 +310,34 @@
TEST_MATCH_PATTERN("Ab", "ab", TRUE);
TEST_MATCH_PATTERN("Ab", "aB", TRUE);
TEST_MATCH_PATTERN("AB", "a", FALSE);
+ TEST_MATCH_PATTERN("Ab#", "aB", TRUE);
+ TEST_MATCH_PATTERN("Ab#", "aB10", TRUE);
+ TEST_MATCH_PATTERN("Ab#", "a10", TRUE);
}
-void test_matchCommand() {
+static void test_matchCommand() {
scpi_bool_t result;
-
+ int32_t values[20];
+
#define TEST_MATCH_COMMAND(p, s, r) \
do { \
- result = matchCommand(p, s, strlen(s)); \
+ result = matchCommand(p, s, strlen(s), NULL, 0); \
CU_ASSERT_EQUAL(result, r); \
+ } while(0) \
+
+ #define TEST_MATCH_COMMAND2(p, s, r, ...) \
+ do { \
+ int32_t evalues[] = {__VA_ARGS__}; \
+ unsigned int cnt = (sizeof(evalues)/4); \
+ result = matchCommand(p, s, strlen(s), values, 20); \
+ CU_ASSERT_EQUAL(result, r); \
+ if (cnt > 0) CU_ASSERT_EQUAL(evalues[0], values[0]); \
+ if (cnt > 1) CU_ASSERT_EQUAL(evalues[1], values[1]); \
+ if (cnt > 2) CU_ASSERT_EQUAL(evalues[2], values[2]); \
+ if (cnt > 3) CU_ASSERT_EQUAL(evalues[3], values[3]); \
+ if (cnt > 4) CU_ASSERT_EQUAL(evalues[4], values[4]); \
+ if (cnt > 5) CU_ASSERT_EQUAL(evalues[5], values[5]); \
+ if (cnt > 6) CU_ASSERT_EQUAL(evalues[6], values[6]); \
} while(0) \
TEST_MATCH_COMMAND("A", "a", TRUE);
@@ -422,9 +455,36 @@
TEST_MATCH_COMMAND("OUTPut#[:MODulation#]:FM#", "outp1:mod10:fm", TRUE); // test numeric parameter
TEST_MATCH_COMMAND("OUTPut#[:MODulation#]:FM#", "outp1:fm2", TRUE); // test numeric parameter
TEST_MATCH_COMMAND("OUTPut#[:MODulation#]:FM#", "output:fm", TRUE); // test numeric parameter
+
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM#", "outp3:mod10:fm", TRUE, 3, 10, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM#", "output3:mod10:fm", TRUE, 3, 10, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM#", "outp30:modulation:fm5", TRUE, 30, 1, 5); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM#", "output:mod:fm", TRUE, 1, 1, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM#", "outp3:fm", TRUE, 3, 1, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM#", "outp3:mod10:fm", TRUE, 3, 10, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM#", "outp3:fm2", TRUE, 3, 1, 2); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM#", "output:fm", TRUE, 1, 1, 1); // test numeric parameter
+
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation:FM#", "outp3:mod:fm", TRUE, 3, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation:FM#", "output3:mod:fm", TRUE, 3, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation:FM#", "outp30:modulation:fm5", TRUE, 30, 5); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation:FM#", "output:mod:fm", TRUE, 1, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation]:FM#", "outp3:fm", TRUE, 3, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation]:FM#", "outp3:mod:fm", TRUE, 3, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation]:FM#", "outp3:fm2", TRUE, 3, 2); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation]:FM#", "output:fm", TRUE, 1, 1); // test numeric parameter
+
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM", "outp3:mod10:fm", TRUE, 3, 10); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM", "output3:mod10:fm", TRUE, 3, 10); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM", "outp30:modulation:fm", TRUE, 30, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#:MODulation#:FM", "output:mod:fm", TRUE, 1, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM", "outp3:fm", TRUE, 3, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM", "outp3:mod10:fm", TRUE, 3, 10); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM", "outp3:fm", TRUE, 3, 1); // test numeric parameter
+ TEST_MATCH_COMMAND2("OUTPut#[:MODulation#]:FM", "output:fm", TRUE, 1, 1); // test numeric parameter
}
-void test_composeCompoundCommand(void) {
+static void test_composeCompoundCommand(void) {
#define TEST_COMPOSE_COMMAND(b, c1_len, c2_pos, c2_len, c2_final, r) \
{ \
--
Gitblit v1.9.1