From ae5cb5e53d25f905f7edc0238c00124ca8561a9c Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu@greentest.com.cn>
Date: 周二, 29 4月 2025 18:23:32 +0800
Subject: [PATCH] 1.每次SCPI_Write刷新缓冲区
---
libscpi/test/test_parser.c | 94 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 61fda2d..1b214c3 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -1,6 +1,29 @@
-/*
- * File: test_parser.c
- * Author: Jan Breuer
+/*-
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2012-2018, Jan Breuer
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdio.h>
@@ -78,8 +101,14 @@
{ .pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
{ .pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
+ { .pattern = "STATus:QUEStionable:CONDition?", .callback = SCPI_StatusQuestionableConditionQ,},
{ .pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
{ .pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
+
+ {.pattern = "STATus:OPERation[:EVENt]?", .callback = SCPI_StatusOperationEventQ, },
+ {.pattern = "STATus:OPERation:CONDition?", .callback = SCPI_StatusOperationConditionQ, },
+ {.pattern = "STATus:OPERation:ENABle", .callback = SCPI_StatusOperationEnable, },
+ {.pattern = "STATus:OPERation:ENABle?", .callback = SCPI_StatusOperationEnableQ, },
{ .pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
@@ -121,7 +150,7 @@
err_buffer_pos = 0;
SCPI_RegClearBits(&scpi_context, SCPI_REG_STB, STB_QMA);
- SCPI_EventClear(&scpi_context);
+ SCPI_RegSet(&scpi_context, SCPI_REG_ESR, 0);
SCPI_ErrorClear(&scpi_context);
}
@@ -228,12 +257,23 @@
TEST_INPUT("*IDN?;*IDN?;*IDN?;*IDN?\r\n", "MA,IN,0,VER;MA,IN,0,VER;MA,IN,0,VER;MA,IN,0,VER\r\n");
output_buffer_clear();
+ TEST_INPUT("*IDN?;STUB\r\n", "MA,IN,0,VER\r\n");
+ output_buffer_clear();
+
TEST_INPUT("*IDN?;*OPC;*IDN?\r\n", "MA,IN,0,VER;MA,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 empty command at the beggining */
+ TEST_INPUT(";*IDN?\r\n", "MA,IN,0,VER\r\n");
+ output_buffer_clear();
+
+ TEST_INPUT(";", "");
+ TEST_INPUT("*IDN?\r\n", "MA,IN,0,VER\r\n");
output_buffer_clear();
/* Test input "timeout" - input with length == 0 */
@@ -350,7 +390,7 @@
}
#define TEST_IEEE4882_REG(reg, expected) { \
- CU_ASSERT_EQUAL(SCPI_RegGet(&scpi_context, reg), expected); \
+ CU_ASSERT_EQUAL(SCPI_RegGet(&scpi_context, (scpi_reg_name_t)(reg)), expected);\
}
@@ -434,11 +474,37 @@
TEST_IEEE4882("STATus:QUEStionable:ENABle 2\r\n", "");
TEST_IEEE4882_REG(SCPI_REG_QUESE, 2);
+ TEST_IEEE4882("STATus:QUEStionable:CONDition?\r\n", "0\r\n");
+ TEST_IEEE4882_REG_SET(SCPI_REG_QUESC, 1);
+ TEST_IEEE4882("STATus:QUEStionable:CONDition?\r\n", "1\r\n");
+ TEST_IEEE4882_REG(SCPI_REG_QUESC, 1);
+ TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "1\r\n");
+ TEST_IEEE4882_REG_SET(SCPI_REG_QUESC, 0);
+ TEST_IEEE4882("STATus:QUEStionable:CONDition?\r\n", "0\r\n");
TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "0\r\n");
TEST_IEEE4882_REG_SET(SCPI_REG_QUES, 1);
TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "1\r\n");
TEST_IEEE4882_REG(SCPI_REG_QUES, 0);
TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "0\r\n");
+
+ TEST_IEEE4882_REG_SET(SCPI_REG_OPERE, 1);
+ TEST_IEEE4882("STATus:OPERation:ENABle?\r\n", "1\r\n");
+ TEST_IEEE4882_REG(SCPI_REG_OPERE, 1);
+ TEST_IEEE4882("STATus:OPERation:ENABle 2\r\n", "");
+ TEST_IEEE4882_REG(SCPI_REG_OPERE, 2);
+
+ TEST_IEEE4882("STATus:OPERation:CONDition?\r\n", "0\r\n");
+ TEST_IEEE4882_REG_SET(SCPI_REG_OPERC, 1);
+ TEST_IEEE4882("STATus:OPERation:CONDition?\r\n", "1\r\n");
+ TEST_IEEE4882_REG(SCPI_REG_OPERC, 1);
+ TEST_IEEE4882("STATus:OPERation:EVENt?\r\n", "1\r\n");
+ TEST_IEEE4882_REG_SET(SCPI_REG_OPERC, 0);
+ TEST_IEEE4882("STATus:OPERation:CONDition?\r\n", "0\r\n");
+ TEST_IEEE4882_REG(SCPI_REG_OPERC, 0);
+ TEST_IEEE4882_REG_SET(SCPI_REG_OPER, 1);
+ TEST_IEEE4882("STATus:OPERation:EVENt?\r\n", "1\r\n");
+ TEST_IEEE4882_REG(SCPI_REG_OPER, 0);
+ TEST_IEEE4882("STATus:OPERation:EVENt?\r\n", "0\r\n");
TEST_IEEE4882("STUB\r\n", "");
TEST_IEEE4882("STUB?\r\n", "0\r\n");
@@ -516,7 +582,7 @@
TEST_ParamUInt32("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamUInt32("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamUInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter *
+ TEST_ParamUInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
TEST_ParamUInt32("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamUInt32("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamUInt32("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
@@ -1013,8 +1079,8 @@
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value.special, expected_special); \
- if (value.special) CU_ASSERT_EQUAL(value.tag, expected_tag); \
- if (!value.special) CU_ASSERT_DOUBLE_EQUAL(value.value, expected_value, 0.000001);\
+ if (value.special) CU_ASSERT_EQUAL(value.content.tag, expected_tag); \
+ if (!value.special) CU_ASSERT_DOUBLE_EQUAL(value.content.value, expected_value, 0.000001);\
CU_ASSERT_EQUAL(value.unit, expected_unit); \
CU_ASSERT_EQUAL(value.base, expected_base); \
} \
@@ -1203,8 +1269,10 @@
TEST_Result(Double, 2147483647, "2147483647");
/* TEST_Result(Double, -2147483648, "-2147483648"); bug in GCC */
TEST_Result(Double, -2147483647, "-2147483647");
- TEST_Result(Double, 9223372036854775807LL, "9.22337203685478e+18");
- TEST_Result(Double, -9223372036854775807LL, "-9.22337203685478e+18");
+ /* TEST_Result(Double, 9223372036854775807LL, "9.22337203685478e+18"); */
+ /* TEST_Result(Double, -9223372036854775807LL, "-9.22337203685478e+18"); */
+ TEST_Result(Double, 9223372036854700000LL, "9.2233720368547e+18");
+ TEST_Result(Double, -9223372036854700000LL, "-9.2233720368547e+18");
TEST_Result(Double, 1.256e-17, "1.256e-17");
TEST_Result(Double, -1.256e-17, "-1.256e-17");
@@ -1417,7 +1485,7 @@
number.base = 10;\
number.special = (_special);\
number.unit = (_unit);\
- if (number.special) { number.tag = (int)(_value); } else { number.value = (_value); }\
+ if (number.special) { number.content.tag = (int)(_value); } else { number.content.value = (_value); }\
char buffer[100 + 1];\
size_t res_len;\
res_len = SCPI_NumberToStr(&scpi_context, scpi_special_numbers_def, &number, buffer, 100);\
@@ -1430,12 +1498,12 @@
number.base = 10;\
number.special = (_special);\
number.unit = (_unit);\
- if (number.special) { number.tag = (int)(_value); } else { number.value = (_value); }\
+ if (number.special) { number.content.tag = (int)(_value); } else { number.content.value = (_value); }\
char buffer[100];\
memset(buffer, 0xaa, 100);\
size_t res_len;\
res_len = SCPI_NumberToStr(&scpi_context, scpi_special_numbers_def, &number, buffer, limit);\
- size_t expected_len = strnlen(expected_result, limit - 1);\
+ size_t expected_len = SCPIDEFINE_strnlen(expected_result, limit - 1);\
CU_ASSERT_NSTRING_EQUAL(buffer, expected_result, expected_len);\
CU_ASSERT_EQUAL(buffer[expected_len], 0);\
CU_ASSERT_EQUAL((unsigned char)buffer[limit], 0xaa);\
--
Gitblit v1.9.1