From f2dbd1cc2948f4a52e952f2b10c5ac8bca10dba6 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 19 8月 2014 21:19:22 +0800
Subject: [PATCH] Add support for matching number suffix
---
libscpi/test/test_scpi_utils.c | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index c772b5f..5817f61 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -165,6 +165,24 @@
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_locateText() {
const char * v;
@@ -387,6 +405,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
}
void test_composeCompoundCommand(void) {
@@ -445,6 +479,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, "locateText", test_locateText))
|| (NULL == CU_add_test(pSuite, "locateStr", test_locateStr))
|| (NULL == CU_add_test(pSuite, "matchPattern", test_matchPattern))
--
Gitblit v1.9.1