From be3350c620036306fb5f2db3535cb110f187d5e8 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 24 9月 2014 23:46:36 +0800
Subject: [PATCH] Refactor token_t and token_type_t to have scpi_ prefix
---
libscpi/test/test_scpi_utils.c | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index c576d93..f1b7363 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -165,8 +165,26 @@
CU_ASSERT_FALSE(compareStr("ABCD", 4, "abcd", 3));
}
+void test_compareStrAndNum() {
+
+ 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_FALSE(compareStrAndNum("abcd", 1, "efgh", 1));
+ CU_ASSERT_FALSE(compareStrAndNum("ABCD", 4, "abcd", 3));
+
+ 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));
+
+}
+
void test_matchPattern() {
- bool_t result;
+ scpi_bool_t result;
#define TEST_MATCH_PATTERN(p, s, r) \
do { \
@@ -182,7 +200,7 @@
}
void test_matchCommand() {
- bool_t result;
+ scpi_bool_t result;
#define TEST_MATCH_COMMAND(p, s, r) \
do { \
@@ -289,6 +307,22 @@
TEST_MATCH_COMMAND("*IDN?", ":idn?", FALSE); // common command
TEST_MATCH_COMMAND("*IDN?", ":*idn", FALSE); // common command
TEST_MATCH_COMMAND("*IDN?", ":*idn?", FALSE); // common command
+
+ TEST_MATCH_COMMAND("ABCdef#", "abc", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("ABCdef#", "abc1324", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("ABCdef#", "abcDef1324", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("ABCdef#", "abcDef124b", FALSE); // test numeric parameter
+
+ TEST_MATCH_COMMAND("OUTPut#:MODulation#:FM#", "abc", FALSE); // test numeric parameter
+ TEST_MATCH_COMMAND("OUTPut#:MODulation#:FM#", "outp1:mod10:fm", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("OUTPut#:MODulation#:FM#", "output1:mod10:fm", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("OUTPut#:MODulation#:FM#", "outp1:modulation:fm5", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("OUTPut#:MODulation#:FM#", "output:mod:fm", TRUE); // test numeric parameter
+ TEST_MATCH_COMMAND("OUTPut#:MODulation#:FM#", "outp1:mod10a:fm", FALSE); // test numeric parameter
+ TEST_MATCH_COMMAND("OUTPut#[:MODulation#]:FM#", "outp1:fm", TRUE); // test numeric parameter
+ 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
}
int main() {
@@ -313,6 +347,7 @@
|| (NULL == CU_add_test(pSuite, "strToLong", test_strToLong))
|| (NULL == CU_add_test(pSuite, "strToDouble", test_strToDouble))
|| (NULL == CU_add_test(pSuite, "compareStr", test_compareStr))
+ || (NULL == CU_add_test(pSuite, "compareStrAndNum", test_compareStrAndNum))
|| (NULL == CU_add_test(pSuite, "matchPattern", test_matchPattern))
|| (NULL == CU_add_test(pSuite, "matchCommand", test_matchCommand))
) {
--
Gitblit v1.9.1