From b97d4493b3c997477b85a35de0a4ffa15cf742eb Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 23 10月 2013 22:46:57 +0800
Subject: [PATCH] Correct optional command pattern matching
---
libscpi/test/test_lexer_parser.c | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/libscpi/test/test_lexer_parser.c b/libscpi/test/test_lexer_parser.c
index 4b94e13..0e99fe5 100644
--- a/libscpi/test/test_lexer_parser.c
+++ b/libscpi/test/test_lexer_parser.c
@@ -50,6 +50,9 @@
case TokCommonQueryProgramHeader: return "TokCommonQueryProgramHeader";
case TokWhiteSpace: return "TokWhiteSpace";
case TokAllProgramData: return "TokAllProgramData";
+ case TokIncompleteCompoundProgramHeader: return "TokIncompleteCompoundProgramHeader";
+ case TokIncompleteCommonProgramHeader: return "TokIncompleteCommonProgramHeader";
+ case TokInvalid: return "TokInvalid";
default: return "TokUnknown";
}
}
@@ -133,14 +136,16 @@
void testProgramHeader(void) {
TEST_TOKEN("*IDN? ", SCPI_LexProgramHeader, 0, 5, TokCommonQueryProgramHeader);
TEST_TOKEN("*RST ", SCPI_LexProgramHeader, 0, 4, TokCommonProgramHeader);
- TEST_TOKEN("*?; ", SCPI_LexProgramHeader, 0, 0, TokUnknown);
- TEST_TOKEN(":*IDN?; ", SCPI_LexProgramHeader, 0, 0, TokUnknown);
+ TEST_TOKEN("*?; ", SCPI_LexProgramHeader, 0, 1, TokIncompleteCommonProgramHeader);
+ TEST_TOKEN(":*IDN?; ", SCPI_LexProgramHeader, 0, 1, TokIncompleteCompoundProgramHeader);
TEST_TOKEN("MEAS:VOLT:DC? ", SCPI_LexProgramHeader, 0, 13, TokCompoundQueryProgramHeader);
TEST_TOKEN("CONF:VOLT:DC ", SCPI_LexProgramHeader, 0, 12, TokCompoundProgramHeader);
TEST_TOKEN(":MEAS:VOLT:DC? ", SCPI_LexProgramHeader, 0, 14, TokCompoundQueryProgramHeader);
- TEST_TOKEN(":MEAS::VOLT:DC? ", SCPI_LexProgramHeader, 0, 0, TokUnknown);
+ TEST_TOKEN(":MEAS::VOLT:DC? ", SCPI_LexProgramHeader, 0, 6, TokIncompleteCompoundProgramHeader);
TEST_TOKEN("*IDN?", SCPI_LexProgramHeader, 0, 5, TokCommonQueryProgramHeader);
- TEST_TOKEN("*RST", SCPI_LexProgramHeader, 0, 4, TokCommonProgramHeader);
+ TEST_TOKEN("*RST", SCPI_LexProgramHeader, 0, 4, TokCommonProgramHeader);
+ TEST_TOKEN("CONF:VOLT:DC", SCPI_LexProgramHeader, 0, 12, TokCompoundProgramHeader);
+ TEST_TOKEN("]]", SCPI_LexProgramHeader, 0, 0, TokUnknown);
}
void testArbitraryBlock(void) {
@@ -230,36 +235,46 @@
void testAllProgramData(void) {
TEST_ALL_TOKEN("1.5E12 V", SCPI_ParseAllProgramData, 0, 8, TokAllProgramData, 1);
TEST_ALL_TOKEN("1.5E12 V, abc_213as564, 10, #H123fe5A", SCPI_ParseAllProgramData, 0, 37, TokAllProgramData, 4);
- TEST_ALL_TOKEN("1.5E12 V, ", SCPI_ParseAllProgramData, 0, 0, TokUnknown, 1);
+ TEST_ALL_TOKEN("1.5E12 V, ", SCPI_ParseAllProgramData, 0, 0, TokUnknown, -1);
TEST_ALL_TOKEN("#12\r\n, 1.5E12 V", SCPI_ParseAllProgramData, 0, 15, TokAllProgramData, 2);
TEST_ALL_TOKEN(" ( 1 + 2 ) ,#12\r\n, 1.5E12 V", SCPI_ParseAllProgramData, 0, 27, TokAllProgramData, 3);
TEST_ALL_TOKEN("\"ahoj\" , #12AB", SCPI_ParseAllProgramData, 0, 14, TokAllProgramData, 2);
}
-#define TEST_DETECT(s, h, ht, d, dc, t) do { \
+#define TEST_DETECT(s, h, hl, ht, d, dc, t) do { \
const char * str = s; \
- scpi_t context; \
+ scpi_parser_state_t state; \
int result; \
- context.buffer.data = s; \
- context.buffer.length = strlen(s); \
- context.buffer.position = context.buffer.length; \
- result = SCPI_DetectProgramMessageUnit(&context); \
- CU_ASSERT_EQUAL(context.parser_state.programHeader.ptr, str+h); \
- CU_ASSERT_EQUAL(context.parser_state.programHeader.type, ht); \
- CU_ASSERT_EQUAL(context.parser_state.programData.ptr, str+d); \
- CU_ASSERT_EQUAL(context.parser_state.numberOfParameters, dc); \
- CU_ASSERT_EQUAL(context.parser_state.termination, t); \
+ result = SCPI_DetectProgramMessageUnit(&state, str, strlen(str)); \
+ CU_ASSERT_EQUAL(state.programHeader.ptr, str + h); \
+ CU_ASSERT_EQUAL(state.programHeader.len, hl); \
+ CU_ASSERT_EQUAL(state.programHeader.type, ht); \
+ CU_ASSERT_EQUAL(state.programData.ptr, str + d); \
+ CU_ASSERT_EQUAL(state.numberOfParameters, dc); \
+ CU_ASSERT_EQUAL(state.termination, t); \
} while(0)
void testDetectProgramMessageUnit(void) {
- TEST_DETECT("*IDN?\r\n", 0, TokCommonQueryProgramHeader, 5, 0, PmutNewLine);
- TEST_DETECT(" MEAS:VOLT:DC?\r\n", 1, TokCompoundQueryProgramHeader, 14, 0, PmutNewLine);
- TEST_DETECT(" MEAS:VOLT:DC? 1.2 V\r\n", 1, TokCompoundQueryProgramHeader, 15, 1, PmutNewLine);
- TEST_DETECT(" CONF:VOLT:DC 1.2 V, 100mv;", 1, TokCompoundProgramHeader, 14, 2, PmutSemicolon);
- TEST_DETECT(" CONF:VOLT:DC 1.2 V, 100mv", 1, TokCompoundProgramHeader, 14, 2, PmutNone);
- TEST_DETECT(" CONF:VOLT:DC 1.2 V, \r\n", 1, TokCompoundProgramHeader, 14, 1, PmutNewLine);
+ TEST_DETECT("*IDN?\r\n", 0, 5, TokCommonQueryProgramHeader, 5, 0, PmutNewLine);
+ TEST_DETECT(" MEAS:VOLT:DC?\r\n", 1, 13, TokCompoundQueryProgramHeader, 14, 0, PmutNewLine);
+ TEST_DETECT(" MEAS:VOLT:DC? 1.2 V\r\n", 1, 13, TokCompoundQueryProgramHeader, 15, 1, PmutNewLine);
+ TEST_DETECT(" CONF:VOLT:DC 1.2 V, 100mv;", 1, 12, TokCompoundProgramHeader, 14, 2, PmutSemicolon);
+ TEST_DETECT(" CONF:VOLT:DC 1.2 V, 100mv", 1, 12, TokCompoundProgramHeader, 14, 2, PmutNone);
+ TEST_DETECT(" CONF:VOLT:DC 1.2 V, \r\n", 1, 12, TokCompoundProgramHeader, 14, -1, PmutNewLine);
+ TEST_DETECT("[\r\n", 0, 1, TokInvalid, 0, 0, PmutNone);
}
+
+void testBoolParameter(void) {
+ TEST_TOKEN(" 1", SCPI_ParseProgramData, 1, 1, TokDecimalNumericProgramData);
+ TEST_TOKEN(" 0", SCPI_ParseProgramData, 1, 1, TokDecimalNumericProgramData);
+ TEST_TOKEN(" ON", SCPI_ParseProgramData, 1, 2, TokProgramMnemonic);
+ TEST_TOKEN("OFF ", SCPI_ParseProgramData, 0, 3, TokProgramMnemonic);
+
+ // TODO: finish bool test
+}
+
+// TODO: SCPI_Parameter test
int main() {
CU_pSuite pSuite = NULL;
@@ -288,6 +303,7 @@
|| (NULL == CU_add_test(pSuite, "ProgramData", testProgramData))
|| (NULL == CU_add_test(pSuite, "AllProgramData", testAllProgramData))
|| (NULL == CU_add_test(pSuite, "DetectProgramMessageUnit", testDetectProgramMessageUnit))
+ || (NULL == CU_add_test(pSuite, "BoolParameter", testBoolParameter))
) {
CU_cleanup_registry();
return CU_get_error();
--
Gitblit v1.9.1