From 781ef98e5441bf6aa12c50657bf2161953a79858 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 14 4月 2015 05:38:38 +0800
Subject: [PATCH] Add command handling tests, resolve bugs
---
libscpi/test/test_parser.c | 225 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 183 insertions(+), 42 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 33e51f4..5c9b117 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -15,62 +15,99 @@
static const scpi_command_t scpi_commands[] = {
/* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
-// { .pattern = "*CLS", .callback = SCPI_CoreCls,},
-// { .pattern = "*ESE", .callback = SCPI_CoreEse,},
-// { .pattern = "*ESE?", .callback = SCPI_CoreEseQ,},
-// { .pattern = "*ESR?", .callback = SCPI_CoreEsrQ,},
-// { .pattern = "*IDN?", .callback = SCPI_CoreIdnQ,},
-// { .pattern = "*OPC", .callback = SCPI_CoreOpc,},
-// { .pattern = "*OPC?", .callback = SCPI_CoreOpcQ,},
-// { .pattern = "*RST", .callback = SCPI_CoreRst,},
-// { .pattern = "*SRE", .callback = SCPI_CoreSre,},
-// { .pattern = "*SRE?", .callback = SCPI_CoreSreQ,},
-// { .pattern = "*STB?", .callback = SCPI_CoreStbQ,},
-// { .pattern = "*TST?", .callback = SCPI_CoreTstQ,},
-// { .pattern = "*WAI", .callback = SCPI_CoreWai,},
+ { .pattern = "*CLS", .callback = SCPI_CoreCls,},
+ { .pattern = "*ESE", .callback = SCPI_CoreEse,},
+ { .pattern = "*ESE?", .callback = SCPI_CoreEseQ,},
+ { .pattern = "*ESR?", .callback = SCPI_CoreEsrQ,},
+ { .pattern = "*IDN?", .callback = SCPI_CoreIdnQ,},
+ { .pattern = "*OPC", .callback = SCPI_CoreOpc,},
+ { .pattern = "*OPC?", .callback = SCPI_CoreOpcQ,},
+ { .pattern = "*RST", .callback = SCPI_CoreRst,},
+ { .pattern = "*SRE", .callback = SCPI_CoreSre,},
+ { .pattern = "*SRE?", .callback = SCPI_CoreSreQ,},
+ { .pattern = "*STB?", .callback = SCPI_CoreStbQ,},
+ { .pattern = "*TST?", .callback = SCPI_CoreTstQ,},
+ { .pattern = "*WAI", .callback = SCPI_CoreWai,},
/* Required SCPI commands (SCPI std V1999.0 4.2.1) */
-// {.pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
-// {.pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
-// {.pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
+ { .pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
+ { .pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
+ { .pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
-// {.pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
-// {.pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
-// {.pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
+ { .pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
+ { .pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
+ { .pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
-// {.pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
-
+ { .pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
+
SCPI_CMD_LIST_END
};
-size_t SCPI_Write(scpi_t * context, const char * data, size_t len)
-{
- (void)context;
- (void)data;
- (void)len;
+
+char output_buffer[1024];
+size_t output_buffer_pos = 0;
+
+int_fast16_t err_buffer[128];
+size_t err_buffer_pos = 0;
+
+static void output_buffer_clear(void) {
+ output_buffer[0] = '\0';
+ output_buffer_pos = 0;
}
-int SCPI_Error(scpi_t * context, int_fast16_t err)
-{
- (void)context;
- (void)err;
+static size_t output_buffer_write(const char * data, size_t len) {
+ memcpy(output_buffer + output_buffer_pos, data, len);
+ output_buffer_pos += len;
+ output_buffer[output_buffer_pos] = '\0';
}
-scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val)
-{
- (void)context;
- (void)ctrl;
- (void)val;
+scpi_t scpi_context;
+static void error_buffer_clear(void) {
+ err_buffer[0] = '\0';
+ err_buffer_pos = 0;
+
+ SCPI_EventClear(&scpi_context);
+ SCPI_ErrorClear(&scpi_context);
}
-scpi_result_t SCPI_Reset(scpi_t * context)
-{
- (void)context;
+static void error_buffer_add(int_fast16_t err) {
+ err_buffer[err_buffer_pos] = err;
+ err_buffer_pos++;
}
-scpi_result_t SCPI_Flush(scpi_t * context)
-{
- (void)context;
+
+static size_t SCPI_Write(scpi_t * context, const char * data, size_t len) {
+ (void) context;
+ return output_buffer_write(data, len);
+}
+
+static scpi_result_t SCPI_Flush(scpi_t * context) {
+ return SCPI_RES_OK;
+}
+
+static int SCPI_Error(scpi_t * context, int_fast16_t err) {
+ (void) context;
+
+ error_buffer_add(err);
+
+ return 0;
+}
+
+scpi_reg_val_t srq_val = 0;
+static scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
+ if (SCPI_CTRL_SRQ == ctrl) {
+ srq_val = val;
+ } else {
+ fprintf(stderr, "**CTRL %02x: 0x%X (%d)\r\n", ctrl, val, val);
+ }
+ return SCPI_RES_OK;
+}
+
+scpi_bool_t RST_executed = FALSE;
+
+static scpi_result_t SCPI_Reset(scpi_t * context) {
+ RST_executed = TRUE;
+ return SCPI_RES_OK;
}
static scpi_interface_t scpi_interface = {
@@ -96,7 +133,7 @@
.interface = &scpi_interface,
.registers = scpi_regs,
.units = scpi_units_def,
- .idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
+ .idn = {"MA", "IN", NULL, "VER"},
};
int init_suite(void) {
@@ -109,6 +146,107 @@
return 0;
}
+void testCommandsHandling(void) {
+#define TEST_INPUT(data, output) { \
+ SCPI_Input(&scpi_context, data, strlen(data)); \
+ CU_ASSERT_STRING_EQUAL(output, output_buffer); \
+}
+ output_buffer_clear();
+ error_buffer_clear();
+
+ /* Test single command */
+ TEST_INPUT("*IDN?\r\n", "MA,IN,0,VER\r\n");
+ output_buffer_clear();
+
+ /* Test multiple commands in input buffer */
+ TEST_INPUT("*IDN?\r\n*IDN?\r\n*IDN?\r\n*IDN?\r\n", "MA,IN,0,VER\r\nMA,IN,0,VER\r\nMA,IN,0,VER\r\nMA,IN,0,VER\r\n");
+ output_buffer_clear();
+
+ /* Test one command in multiple buffers */
+ TEST_INPUT("*IDN?", "");
+ TEST_INPUT("\r\n", "MA,IN,0,VER\r\n");
+ output_buffer_clear();
+
+ /* Test input "timeout" - input with length == 0 */
+ TEST_INPUT("*IDN?", "");
+ TEST_INPUT("", "MA,IN,0,VER\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) {
+ output_buffer_clear();
+ error_buffer_clear();
+
+#define TEST_ERROR(data, output, err_num) { \
+ SCPI_Input(&scpi_context, data, strlen(data)); \
+ CU_ASSERT_STRING_EQUAL(output, output_buffer); \
+ error_buffer_clear(); \
+}
+
+ TEST_ERROR("*IDN?\r\n", "MA,IN,0,VER\r\n", 0);
+ output_buffer_clear();
+ 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);
+ output_buffer_clear();
+
+ // TODO: SCPI_ERROR_INVALID_SEPARATOR
+ // TODO: SCPI_ERROR_INVALID_SUFFIX
+ // TODO: SCPI_ERROR_SUFFIX_NOT_ALLOWED
+ // TODO: SCPI_ERROR_EXECUTION_ERROR
+ // TODO: SCPI_ERROR_ILLEGAL_PARAMETER_VALUE
+}
+
+void testIEEE4882(void) {
+#define TEST_IEEE4882(data, output) { \
+ SCPI_Input(&scpi_context, data, strlen(data)); \
+ CU_ASSERT_STRING_EQUAL(output, output_buffer); \
+ output_buffer_clear(); \
+}
+
+ output_buffer_clear();
+ error_buffer_clear();
+
+ TEST_IEEE4882("*CLS\r\n", "");
+ TEST_IEEE4882("*ESE #H20\r\n", "");
+ TEST_IEEE4882("*ESE?\r\n", "32\r\n");
+ TEST_IEEE4882("*ESR?\r\n", "0\r\n");
+ TEST_IEEE4882("*IDN?\r\n", "MA,IN,0,VER\r\n");
+ TEST_IEEE4882("*OPC\r\n", "");
+ TEST_IEEE4882("*OPC?\r\n", "1\r\n");
+
+ TEST_IEEE4882("*SRE #HFF\r\n", "");
+ TEST_IEEE4882("*SRE?\r\n", "255\r\n");
+ TEST_IEEE4882("*STB?\r\n", "0\r\n");
+ TEST_IEEE4882("*ESR?\r\n", "1\r\n");
+
+ srq_val = 0;
+ TEST_IEEE4882("ABCD\r\n", ""); /* "Undefined header" cause command error */
+ CU_ASSERT_EQUAL(srq_val, 96); /* value of STB as service request */
+ TEST_IEEE4882("*STB?\r\n", "96\r\n"); /* Event status register + Service request */
+ TEST_IEEE4882("*ESR?\r\n", "32\r\n"); /* Command error */
+
+ TEST_IEEE4882("*STB?\r\n", "0\r\n");
+ TEST_IEEE4882("*ESR?\r\n", "0\r\n");
+
+ TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
+ TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "0,\"No error\"\r\n");
+
+ RST_executed = FALSE;
+ TEST_IEEE4882("*RST\r\n", "");
+ CU_ASSERT_EQUAL(RST_executed, TRUE);
+
+ TEST_IEEE4882("*TST?\r\n", "0\r\n");
+
+ TEST_IEEE4882("*WAI\r\n", "");
+
+ TEST_IEEE4882("SYSTem:VERSion?\r\n", "1999.0\r\n");
+}
#define TEST_ParamInt(data, mandatory, expected_value, expected_result, expected_error_code) \
{ \
@@ -230,6 +368,9 @@
if ((NULL == CU_add_test(pSuite, "SCPI_ParamInt", testSCPI_ParamInt))
|| (NULL == CU_add_test(pSuite, "SCPI_ParamDouble", testSCPI_ParamDouble))
|| (NULL == CU_add_test(pSuite, "SCPI_ParamCharacters", testSCPI_ParamCharacters))
+ || (NULL == CU_add_test(pSuite, "Commands handling", testCommandsHandling))
+ || (NULL == CU_add_test(pSuite, "Error handling", testErrorHandling))
+ || (NULL == CU_add_test(pSuite, "IEEE 488.2 Mandatory commands", testIEEE4882))
) {
CU_cleanup_registry();
return CU_get_error();
--
Gitblit v1.9.1