From 361fe25cb1fe4cacb4f7494944c5d4084eb07f61 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 05 3月 2024 17:50:19 +0800
Subject: [PATCH] Version 2.3
---
libscpi/test/test_parser.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 4a46198..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,6 +101,7 @@
{ .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,},
@@ -126,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);
}
@@ -233,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 */
@@ -439,6 +474,13 @@
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");
@@ -459,7 +501,7 @@
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(SCPI_REG_OPER, 1);
+ 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");
--
Gitblit v1.9.1