From a2006d9935f97a233f75942e1a3eab69f27cf4b3 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 17:59:23 +0800
Subject: [PATCH] Update c++ example, make special numbers more correct
---
libscpi/test/test_parser.c | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index f747271..cee918f 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -30,6 +30,20 @@
return SCPI_RES_OK;
}
+scpi_result_t test_treeA(scpi_t* context) {
+
+ SCPI_ResultInt(context, 10);
+
+ return SCPI_RES_OK;
+}
+
+scpi_result_t test_treeB(scpi_t* context) {
+
+ SCPI_ResultInt(context, 20);
+
+ return SCPI_RES_OK;
+}
+
static const scpi_command_t scpi_commands[] = {
/* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
{ .pattern = "*CLS", .callback = SCPI_CoreCls,},
@@ -57,7 +71,10 @@
{ .pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
- { .pattern = "TEXTfunction", .callback = text_function,},
+ { .pattern = "TEXTfunction?", .callback = text_function,},
+
+ { .pattern = "TEST:TREEA?", .callback = test_treeA,},
+ { .pattern = "TEST:TREEB?", .callback = test_treeB,},
SCPI_CMD_LIST_END
};
@@ -193,10 +210,15 @@
TEST_INPUT("", "MA,IN,0,VER\r\n");
output_buffer_clear();
+ /* Test ctree traversal */
+ TEST_INPUT("TEST:TREEA?;TREEB?\r\n", "10\r\n20\r\n");
+ output_buffer_clear();
+
+ TEST_INPUT("TEST:TREEA?;:TEXT? \"PARAM1\", \"PARAM2\"\r\n", "10\r\n\"PARAM2\"\r\n");
+ output_buffer_clear();
+
CU_ASSERT_EQUAL(err_buffer_pos, 0);
error_buffer_clear();
-
- // TODO: Compound commands A:B;C -> A:B; A:C
}
void testErrorHandling(void) {
@@ -215,7 +237,7 @@
TEST_ERROR("IDN?\r\n", "", SCPI_ERROR_UNDEFINED_HEADER);
TEST_ERROR("*ESE\r\n", "", SCPI_ERROR_MISSING_PARAMETER);
TEST_ERROR("*IDN? 12\r\n", "MA,IN,0,VER\r\n", SCPI_ERROR_PARAMETER_NOT_ALLOWED);
- TEST_ERROR("TEXT \"PARAM1\", \"PARAM2\"\r\n", "\"PARAM2\"\r\n", 0);
+ TEST_ERROR("TEXT? \"PARAM1\", \"PARAM2\"\r\n", "\"PARAM2\"\r\n", 0);
// TODO: SCPI_ERROR_INVALID_SEPARATOR
// TODO: SCPI_ERROR_INVALID_SUFFIX
--
Gitblit v1.9.1