From 311a22c7a7e5518e06b0efb2ec6eb5aec453aaf2 Mon Sep 17 00:00:00 2001
From: jordan imbert <j.imbert@myotis.fr>
Date: ćšć, 17 12æ 2020 17:39:23 +0800
Subject: [PATCH] Remove always false blocks in parser.c
---
libscpi/test/test_parser.c | 475 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 375 insertions(+), 100 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 580a721..fc33a74 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,},
@@ -184,7 +213,10 @@
static char scpi_input_buffer[SCPI_INPUT_BUFFER_LENGTH];
#define SCPI_ERROR_QUEUE_SIZE 4
-static int16_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];
+static scpi_error_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];
+
+#define SCPI_ERROR_INFO_HEAP_SIZE 16
+static char error_info_heap[SCPI_ERROR_INFO_HEAP_SIZE];
static int init_suite(void) {
SCPI_Init(&scpi_context,
@@ -194,6 +226,10 @@
"MA", "IN", NULL, "VER",
scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+ SCPI_InitHeap(&scpi_context,
+ error_info_heap, SCPI_ERROR_INFO_HEAP_SIZE);
+#endif
return 0;
}
@@ -227,6 +263,14 @@
/* 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 */
@@ -275,14 +319,64 @@
- // 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
+ /* 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
+ */
output_buffer_clear();
error_buffer_clear();
+}
+
+static void testErrorHandlingDeviceDependent(void) {
+#define TEST_CMDERR(output) {\
+ SCPI_Input(&scpi_context, "SYST:ERR:NEXT?\r\n", strlen("SYST:ERR:NEXT?\r\n"));\
+ CU_ASSERT_STRING_EQUAL(output, output_buffer);\
+ output_buffer_clear();\
+}
+
+ output_buffer_clear();
+ error_buffer_clear();
+
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test1", 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, NULL, 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, NULL, 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test4", 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test5", 0);
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ TEST_CMDERR("-101,\"Invalid character;Test1\"\r\n");
+#else /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+#endif /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+ TEST_CMDERR("-350,\"Queue overflow\"\r\n");
+ TEST_CMDERR("0,\"No error\"\r\n");
+
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test6", 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test7", 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test8", 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test9", 0);
+ SCPI_ErrorPushEx(&scpi_context, SCPI_ERROR_INVALID_CHARACTER, "Test10", 0);
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ TEST_CMDERR("-101,\"Invalid character;Test6\"\r\n");
+ TEST_CMDERR("-101,\"Invalid character;Test7\"\r\n");
+#if USE_MEMORY_ALLOCATION_FREE
+ TEST_CMDERR("-101,\"Invalid character;Test8\"\r\n");
+#else /* USE_MEMORY_ALLOCATION_FREE */
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+#endif /* USE_MEMORY_ALLOCATION_FREE */
+#else /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+ TEST_CMDERR("-101,\"Invalid character\"\r\n");
+#endif /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
+ TEST_CMDERR("-350,\"Queue overflow\"\r\n");
+ TEST_CMDERR("0,\"No error\"\r\n");
}
static void testIEEE4882(void) {
@@ -293,7 +387,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);\
}
@@ -327,7 +421,11 @@
TEST_IEEE4882("*ESR?\r\n", "0\r\n");
TEST_IEEE4882("SYST:ERR:COUNT?\r\n", "1\r\n");
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header;ABCD\"\r\n");
+#else /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
+#endif /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "0,\"No error\"\r\n");
TEST_IEEE4882("*STB?\r\n", "0\r\n"); /* Error queue is now empty */
@@ -338,7 +436,11 @@
CU_ASSERT_EQUAL(srq_val, 0); /* no control callback */
TEST_IEEE4882("*STB?\r\n", "100\r\n"); /* Event status register + Service request */
TEST_IEEE4882("*ESR?\r\n", "32\r\n"); /* Command error */
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header;ABCD\"\r\n");
+#else /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
+#endif /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
scpi_context.interface->control = SCPI_Control;
RST_executed = FALSE;
@@ -369,11 +471,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");
@@ -387,7 +515,7 @@
{ \
int32_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -396,28 +524,28 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamInt32(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value, expected_value); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamInt32(void) {
TEST_ParamInt32("10", TRUE, 10, TRUE, 0);
TEST_ParamInt32("", FALSE, 0, FALSE, 0);
- TEST_ParamInt32("10.5", TRUE, 10, TRUE, 0); // TODO: should be FALSE, -104
+ TEST_ParamInt32("10.5", TRUE, 10, TRUE, 0); /* TODO: should be FALSE, -104 */
TEST_ParamInt32("#B101010", TRUE, 42, TRUE, 0);
TEST_ParamInt32("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamInt32("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
- TEST_ParamInt32("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
+ TEST_ParamInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
+ TEST_ParamInt32("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamInt32("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamInt32("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
- // test range
+ /* test range */
TEST_ParamInt32("2147483647", TRUE, 2147483647, TRUE, 0);
TEST_ParamInt32("-2147483647", TRUE, -2147483647, TRUE, 0);
}
@@ -426,7 +554,7 @@
{ \
uint32_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -435,28 +563,28 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamUInt32(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value, expected_value); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamUInt32(void) {
TEST_ParamUInt32("10", TRUE, 10, TRUE, 0);
TEST_ParamUInt32("", FALSE, 0, FALSE, 0);
- TEST_ParamUInt32("10.5", TRUE, 10, TRUE, 0); // TODO: should be FALSE, -104
+ TEST_ParamUInt32("10.5", TRUE, 10, TRUE, 0); /* TODO: should be FALSE, -104 */
TEST_ParamUInt32("#B101010", TRUE, 42, TRUE, 0);
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("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
+ 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);
- // test range
+ /* test range */
TEST_ParamUInt32("2147483647", TRUE, 2147483647ULL, TRUE, 0);
TEST_ParamUInt32("4294967295", TRUE, 4294967295ULL, TRUE, 0);
}
@@ -465,7 +593,7 @@
{ \
int64_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -474,28 +602,28 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamInt64(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value, expected_value); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamInt64(void) {
TEST_ParamInt64("10", TRUE, 10, TRUE, 0);
TEST_ParamInt64("", FALSE, 0, FALSE, 0);
- TEST_ParamInt64("10.5", TRUE, 10, TRUE, 0); // TODO: should be FALSE, -104
+ TEST_ParamInt64("10.5", TRUE, 10, TRUE, 0); /* TODO: should be FALSE, -104 */
TEST_ParamInt64("#B101010", TRUE, 42, TRUE, 0);
TEST_ParamInt64("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamInt64("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamInt64("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
- TEST_ParamInt64("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
+ TEST_ParamInt64("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
+ TEST_ParamInt64("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamInt64("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamInt64("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
- // test range
+ /* test range */
TEST_ParamInt64("2147483647", TRUE, 2147483647LL, TRUE, 0);
TEST_ParamInt64("-2147483647", TRUE, -2147483647LL, TRUE, 0);
TEST_ParamInt64("9223372036854775807", TRUE, 9223372036854775807LL, TRUE, 0);
@@ -506,7 +634,7 @@
{ \
uint64_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -515,28 +643,28 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamUInt64(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value, expected_value); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamUInt64(void) {
TEST_ParamUInt64("10", TRUE, 10, TRUE, 0);
TEST_ParamUInt64("", FALSE, 0, FALSE, 0);
- TEST_ParamUInt64("10.5", TRUE, 10, TRUE, 0); // TODO: should be FALSE, -104
+ TEST_ParamUInt64("10.5", TRUE, 10, TRUE, 0); /* TODO: should be FALSE, -104 */
TEST_ParamUInt64("#B101010", TRUE, 42, TRUE, 0);
TEST_ParamUInt64("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamUInt64("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamUInt64("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
- TEST_ParamUInt64("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
+ TEST_ParamUInt64("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
+ TEST_ParamUInt64("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamUInt64("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamUInt64("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
- // test range
+ /* test range */
TEST_ParamUInt64("2147483647", TRUE, 2147483647ULL, TRUE, 0);
TEST_ParamUInt64("4294967295", TRUE, 4294967295ULL, TRUE, 0);
TEST_ParamUInt64("9223372036854775807", TRUE, 9223372036854775807ULL, TRUE, 0);
@@ -548,7 +676,7 @@
{ \
float value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -557,12 +685,12 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamFloat(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_DOUBLE_EQUAL(value, expected_value, 0.000001); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamFloat(void) {
@@ -574,8 +702,8 @@
TEST_ParamFloat("#Q10", TRUE, 8, TRUE, 0);
TEST_ParamFloat("#HFFFFFF", TRUE, 0xFFFFFFu, TRUE, 0);
- TEST_ParamFloat("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
- TEST_ParamFloat("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
+ TEST_ParamFloat("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
+ TEST_ParamFloat("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamFloat("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamFloat("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
}
@@ -584,7 +712,7 @@
{ \
double value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -593,12 +721,12 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamDouble(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_DOUBLE_EQUAL(value, expected_value, 0.000001); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamDouble(void) {
@@ -610,8 +738,8 @@
TEST_ParamDouble("#Q10", TRUE, 8, TRUE, 0);
TEST_ParamDouble("#HFFFFFFFF", TRUE, 0xFFFFFFFFu, TRUE, 0);
- TEST_ParamDouble("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
- TEST_ParamDouble("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
+ TEST_ParamDouble("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
+ TEST_ParamDouble("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamDouble("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamDouble("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
}
@@ -621,7 +749,7 @@
const char * value; \
size_t value_len; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -630,21 +758,21 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamCharacters(&scpi_context, &value, &value_len, mandatory); \
/*printf("%.*s\r\n", (int)value_len, value);*/ \
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_NSTRING_EQUAL(value, expected_value, value_len); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamCharacters(void) {
TEST_ParamCharacters("10", TRUE, "10", TRUE, 0);
- TEST_ParamCharacters(" ABCD", TRUE, "ABCD", TRUE, 0); // TokProgramMnemonic
- TEST_ParamCharacters("\"ABCD\"", TRUE, "ABCD", TRUE, 0); // TokDoubleQuoteProgramData
- TEST_ParamCharacters("\'ABCD\'", TRUE, "ABCD", TRUE, 0); // TokSingleQuoteProgramData
- TEST_ParamCharacters("#204ABCD", TRUE, "ABCD", TRUE, 0); // TokArbitraryBlockProgramData
- TEST_ParamCharacters("#210ABCD", TRUE, "", FALSE, SCPI_ERROR_INVALID_STRING_DATA); // invalid Block Data
+ TEST_ParamCharacters(" ABCD", TRUE, "ABCD", TRUE, 0); /* TokProgramMnemonic */
+ TEST_ParamCharacters("\"ABCD\"", TRUE, "ABCD", TRUE, 0); /* TokDoubleQuoteProgramData */
+ TEST_ParamCharacters("\'ABCD\'", TRUE, "ABCD", TRUE, 0); /* TokSingleQuoteProgramData */
+ TEST_ParamCharacters("#204ABCD", TRUE, "ABCD", TRUE, 0); /* TokArbitraryBlockProgramData */
+ TEST_ParamCharacters("#210ABCD", TRUE, "", FALSE, SCPI_ERROR_INVALID_STRING_DATA); /* invalid Block Data */
}
@@ -653,7 +781,7 @@
char value[100]; \
size_t value_len; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -662,13 +790,13 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamCopyText(&scpi_context, value, sizeof(value), &value_len, mandatory);\
/*printf("%.*s\r\n", (int)value_len, value);*/ \
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_STRING_EQUAL(value, expected_value); \
CU_ASSERT_EQUAL(value_len, expected_len); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamCopyText(void) {
@@ -689,21 +817,21 @@
const char * value; \
size_t value_len; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
scpi_context.param_list.lex_state.buffer = data; \
scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
- result = SCPI_ParamArbitraryBlock(&scpi_context, &value, &value_len, mandatory); \
+ result = SCPI_ParamArbitraryBlock(&scpi_context, &value, &value_len, mandatory); \
/*printf("%.*s\r\n", (int)value_len, value);*/ \
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_NSTRING_EQUAL(value, expected_value, value_len); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamArbitraryBlock(void) {
TEST_ParamArbitraryBlock("#204ABCD", TRUE, "ABCD", TRUE, 0);
@@ -714,21 +842,21 @@
{ \
scpi_bool_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
scpi_context.param_list.lex_state.buffer = data; \
scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
- result = SCPI_ParamBool(&scpi_context, &value, mandatory); \
+ result = SCPI_ParamBool(&scpi_context, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value, expected_value); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamBool(void) {
TEST_ParamBool("ON", TRUE, TRUE, TRUE, 0);
@@ -743,7 +871,7 @@
{ \
int32_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -752,12 +880,12 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamChoice(&scpi_context, test_options, &value, mandatory); \
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result, expected_result); \
if (expected_result) { \
CU_ASSERT_EQUAL(value, expected_value); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testSCPI_ParamChoice(void) {
scpi_choice_def_t test_options[] = {
@@ -778,7 +906,7 @@
{ \
scpi_bool_t result; \
scpi_expr_result_t result2; \
- int16_t errCode; \
+ scpi_error_t errCode; \
scpi_parameter_t param; \
int32_t val_from, val_to; \
scpi_bool_t val_range; \
@@ -790,7 +918,7 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_Parameter(&scpi_context, ¶m, TRUE); \
result2 = SCPI_ExprNumericListEntryInt(&scpi_context, ¶m, index, &val_range, &val_from, &val_to);\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result2, expected_result); \
if (expected_result == SCPI_EXPR_OK) { \
CU_ASSERT_EQUAL(val_range, expected_range); \
@@ -799,14 +927,14 @@
CU_ASSERT_EQUAL(val_to, expected_to); \
} \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
#define TEST_NumericListDouble(data, index, expected_range, expected_from, expected_to, expected_result, expected_error_code) \
{ \
scpi_bool_t result; \
scpi_expr_result_t result2; \
- int16_t errCode; \
+ scpi_error_t errCode; \
scpi_parameter_t param; \
double val_from, val_to; \
scpi_bool_t val_range; \
@@ -818,7 +946,7 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_Parameter(&scpi_context, ¶m, TRUE); \
result2 = SCPI_ExprNumericListEntryDouble(&scpi_context, ¶m, index, &val_range, &val_from, &val_to);\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result2, expected_result); \
if (expected_result == SCPI_EXPR_OK) { \
CU_ASSERT_EQUAL(val_range, expected_range); \
@@ -827,7 +955,7 @@
CU_ASSERT_DOUBLE_EQUAL(val_to, expected_to, 0.0001); \
} \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testNumericList(void) {
@@ -864,7 +992,7 @@
{ \
scpi_bool_t result; \
scpi_expr_result_t result2; \
- int16_t errCode; \
+ scpi_error_t errCode; \
scpi_parameter_t param; \
int32_t val_from[val_len], val_to[val_len]; \
scpi_bool_t val_range; \
@@ -879,7 +1007,7 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_Parameter(&scpi_context, ¶m, TRUE); \
result2 = SCPI_ExprChannelListEntry(&scpi_context, ¶m, index, &val_range, val_from, val_to, val_len, &val_dimensions);\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
CU_ASSERT_EQUAL(result2, expected_result); \
if (expected_result == SCPI_EXPR_OK) { \
CU_ASSERT_EQUAL(val_dimensions, expected_dimensions); \
@@ -893,7 +1021,7 @@
}} \
} \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testChannelList(void) {
@@ -935,7 +1063,7 @@
{ \
scpi_number_t value; \
scpi_bool_t result; \
- int16_t errCode; \
+ scpi_error_t errCode; \
\
SCPI_CoreCls(&scpi_context); \
scpi_context.input_count = 0; \
@@ -944,16 +1072,16 @@
scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
result = SCPI_ParamNumber(&scpi_context, scpi_special_numbers_def, &value, mandatory);\
\
- errCode = SCPI_ErrorPop(&scpi_context); \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
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); \
} \
- CU_ASSERT_EQUAL(errCode, expected_error_code); \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
}
static void testParamNumber(void) {
@@ -1059,7 +1187,7 @@
TEST_Result(Int32, 10, "10");
TEST_Result(Int32, -10, "-10");
TEST_Result(Int32, 2147483647L, "2147483647");
- //TEST_Result(Int32, -2147483648L, "-2147483648"); // bug in GCC
+ /* TEST_Result(Int32, -2147483648L, "-2147483648"); bug in GCC */
TEST_Result(Int32, -2147483647L, "-2147483647");
}
@@ -1067,7 +1195,7 @@
TEST_Result(UInt32, 10, "10");
TEST_Result(UInt32, -10, "4294967286");
TEST_Result(UInt32, 2147483647L, "2147483647");
- //TEST_Result(UInt32, -2147483648L, "2147483648"); // bug in GCC
+ /* TEST_Result(UInt32, -2147483648L, "2147483648"); bug in GCC */
TEST_Result(UInt32, -2147483647L, "2147483649");
TEST_Result(UInt32, 4294967295UL, "4294967295");
@@ -1084,10 +1212,10 @@
TEST_Result(Int64, 32767, "32767");
TEST_Result(Int64, -32768, "-32768");
TEST_Result(Int64, 2147483647L, "2147483647");
- //TEST_Result(Int64, -2147483648, "-2147483648"); // bug in gcc
+ /* TEST_Result(Int64, -2147483648, "-2147483648"); bug in gcc */
TEST_Result(Int64, -2147483647L, "-2147483647");
TEST_Result(Int64, 9223372036854775807LL, "9223372036854775807");
- //TEST_Result(Int64, -9223372036854775808LL, "-9223372036854775808"); bug in GCC
+ /* TEST_Result(Int64, -9223372036854775808LL, "-9223372036854775808"); bug in GCC */
TEST_Result(Int64, -9223372036854775807LL, "-9223372036854775807");
}
@@ -1099,10 +1227,10 @@
TEST_Result(UInt64, 32767, "32767");
TEST_Result(UInt64, -32768, "18446744073709518848");
TEST_Result(UInt64, 2147483647L, "2147483647");
- //TEST_Result(UInt64, -2147483648L, "18446744071562067968"); // bug in GCC
+ /* TEST_Result(UInt64, -2147483648L, "18446744071562067968"); bug in GCC */
TEST_Result(UInt64, -2147483647L, "18446744071562067969");
TEST_Result(UInt64, 9223372036854775807LL, "9223372036854775807");
- //TEST_Result(Int64, -9223372036854775808LL, "9223372036854775808"); bug in GCC
+ /* TEST_Result(Int64, -9223372036854775808LL, "9223372036854775808"); bug in GCC */
TEST_Result(UInt64, -9223372036854775807LL, "9223372036854775809");
TEST_Result(UInt64, 18446744073709551615ULL, "18446744073709551615");
@@ -1119,7 +1247,7 @@
TEST_Result(Float, 32767, "32767");
TEST_Result(Float, -32768, "-32768");
TEST_Result(Float, 2147483647L, "2.14748e+09");
- //TEST_Result(Float, -2147483648, "-2.14748e+09"); // bug in GCC
+ /* TEST_Result(Float, -2147483648, "-2.14748e+09"); bug in GCC */
TEST_Result(Float, -2147483647L, "-2.14748e+09");
TEST_Result(Float, 9223372036854775807LL, "9.22337e+18");
TEST_Result(Float, -9223372036854775807LL, "-9.22337e+18");
@@ -1136,10 +1264,12 @@
TEST_Result(Double, 32767, "32767");
TEST_Result(Double, -32768, "-32768");
TEST_Result(Double, 2147483647, "2147483647");
- //TEST_Result(Double, -2147483648, "-2147483648"); // bug in GCC
+ /* 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");
@@ -1261,6 +1391,90 @@
TEST_Result(ArrayDoubleSWAPPED, double_arr, "#216" "\x40\x8c\x16\xd3\x66\x67\xd1\x42" "\x1c\xbc\x6e\xf2\x54\x8b\x11\x43");
}
+#define _countof(a) (sizeof(a)/sizeof(*(a)))
+
+#define TEST_ParamArrayDouble(T, func, data, mandatory, _expected_value, expected_result, expected_error_code) \
+{ \
+ T value[10]; \
+ scpi_bool_t result; \
+ scpi_error_t errCode; \
+ T expected_value[] = {NOPAREN _expected_value}; \
+ size_t o_count; \
+ size_t i_count = _countof(expected_value); \
+ \
+ SCPI_CoreCls(&scpi_context); \
+ scpi_context.input_count = 0; \
+ scpi_context.param_list.lex_state.buffer = data; \
+ scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
+ scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
+ result = func(&scpi_context, value, 10, &o_count, SCPI_FORMAT_ASCII, mandatory); \
+ \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
+ CU_ASSERT_EQUAL(result, expected_result); \
+ if (expected_result) { \
+ CU_ASSERT_EQUAL(i_count, o_count); \
+ size_t i; \
+ for(i = 0; i < o_count; i++) { \
+ CU_ASSERT_DOUBLE_EQUAL(value[i], expected_value[i], 0.000001); \
+ } \
+ } \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
+}
+
+#define TEST_ParamArrayInt(T, func, data, mandatory, _expected_value, expected_result, expected_error_code) \
+{ \
+ T value[10]; \
+ scpi_bool_t result; \
+ scpi_error_t errCode; \
+ T expected_value[] = {NOPAREN _expected_value}; \
+ size_t o_count; \
+ size_t i_count = _countof(expected_value); \
+ \
+ SCPI_CoreCls(&scpi_context); \
+ scpi_context.input_count = 0; \
+ scpi_context.param_list.lex_state.buffer = data; \
+ scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
+ scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
+ result = func(&scpi_context, value, 10, &o_count, SCPI_FORMAT_ASCII, mandatory); \
+ \
+ SCPI_ErrorPop(&scpi_context, &errCode); \
+ CU_ASSERT_EQUAL(result, expected_result); \
+ if (expected_result) { \
+ CU_ASSERT_EQUAL(i_count, o_count); \
+ size_t i; \
+ for(i = 0; i < o_count; i++) { \
+ CU_ASSERT_EQUAL(value[i], expected_value[i]); \
+ } \
+ } \
+ CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
+}
+
+static void testParamArray(void) {
+ TEST_ParamArrayDouble(double, SCPI_ParamArrayDouble, "1, 2, 3", TRUE, (1, 2, 3), TRUE, SCPI_ERROR_NO_ERROR);
+ TEST_ParamArrayDouble(double, SCPI_ParamArrayDouble, "", TRUE, (0), FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ParamArrayDouble(double, SCPI_ParamArrayDouble, "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11", TRUE, (1, 2, 3, 4, 5, 6, 7, 8, 9, 10), TRUE, SCPI_ERROR_NO_ERROR);
+
+ TEST_ParamArrayDouble(float, SCPI_ParamArrayFloat, "1, 2, 3", TRUE, (1, 2, 3), TRUE, SCPI_ERROR_NO_ERROR);
+ TEST_ParamArrayDouble(float, SCPI_ParamArrayFloat, "", TRUE, (0), FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ParamArrayDouble(float, SCPI_ParamArrayFloat, "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11", TRUE, (1, 2, 3, 4, 5, 6, 7, 8, 9, 10), TRUE, SCPI_ERROR_NO_ERROR);
+
+ TEST_ParamArrayInt(int32_t, SCPI_ParamArrayInt32, "1, 2, 3", TRUE, (1, 2, 3), TRUE, SCPI_ERROR_NO_ERROR);
+ TEST_ParamArrayInt(int32_t, SCPI_ParamArrayInt32, "", TRUE, (0), FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ParamArrayInt(int32_t, SCPI_ParamArrayInt32, "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11", TRUE, (1, 2, 3, 4, 5, 6, 7, 8, 9, 10), TRUE, SCPI_ERROR_NO_ERROR);
+
+ TEST_ParamArrayInt(uint32_t, SCPI_ParamArrayUInt32, "1, 2, 3", TRUE, (1, 2, 3), TRUE, SCPI_ERROR_NO_ERROR);
+ TEST_ParamArrayInt(uint32_t, SCPI_ParamArrayUInt32, "", TRUE, (0), FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ParamArrayInt(uint32_t, SCPI_ParamArrayUInt32, "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11", TRUE, (1, 2, 3, 4, 5, 6, 7, 8, 9, 10), TRUE, SCPI_ERROR_NO_ERROR);
+
+ TEST_ParamArrayInt(int64_t, SCPI_ParamArrayInt64, "1, 2, 3", TRUE, (1, 2, 3), TRUE, SCPI_ERROR_NO_ERROR);
+ TEST_ParamArrayInt(int64_t, SCPI_ParamArrayInt64, "", TRUE, (0), FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ParamArrayInt(int64_t, SCPI_ParamArrayInt64, "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11", TRUE, (1, 2, 3, 4, 5, 6, 7, 8, 9, 10), TRUE, SCPI_ERROR_NO_ERROR);
+
+ TEST_ParamArrayInt(uint64_t, SCPI_ParamArrayUInt64, "1, 2, 3", TRUE, (1, 2, 3), TRUE, SCPI_ERROR_NO_ERROR);
+ TEST_ParamArrayInt(uint64_t, SCPI_ParamArrayUInt64, "", TRUE, (0), FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ParamArrayInt(uint64_t, SCPI_ParamArrayUInt64, "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11", TRUE, (1, 2, 3, 4, 5, 6, 7, 8, 9, 10), TRUE, SCPI_ERROR_NO_ERROR);
+}
+
static void testNumberToStr(void) {
#define TEST_SCPI_NumberToStr(_special, _value, _unit, expected_result) do {\
@@ -1268,7 +1482,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);\
@@ -1276,12 +1490,66 @@
CU_ASSERT_EQUAL(res_len, strlen(expected_result));\
} while(0)
+#define TEST_SCPI_NumberToStr_limited(_special, _value, _unit, expected_result, limit) do {\
+ scpi_number_t number;\
+ number.base = 10;\
+ number.special = (_special);\
+ number.unit = (_unit);\
+ 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 = 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);\
+ CU_ASSERT_EQUAL(res_len, expected_len);\
+} while(0)
+
TEST_SCPI_NumberToStr(FALSE, 10.5, SCPI_UNIT_NONE, "10.5");
TEST_SCPI_NumberToStr(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V");
TEST_SCPI_NumberToStr(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault");
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 1);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 1);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 1);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 2);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 2);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 2);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 3);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 3);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 3);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 4);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 4);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 4);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 5);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 5);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 5);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 6);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 6);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 6);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 7);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 7);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 7);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 8);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 8);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 8);
+
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_NONE, "10.5", 9);
+ TEST_SCPI_NumberToStr_limited(FALSE, 10.5, SCPI_UNIT_VOLT, "10.5 V", 9);
+ TEST_SCPI_NumberToStr_limited(TRUE, SCPI_NUM_DEF, SCPI_UNIT_NONE, "DEFault", 9);
}
static void testErrorQueue(void) {
+ scpi_error_t val;
SCPI_ErrorClear(&scpi_context);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
SCPI_ErrorPush(&scpi_context, -1);
@@ -1297,15 +1565,20 @@
SCPI_ErrorPush(&scpi_context, -6);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 4);
- CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -1);
+ SCPI_ErrorPop(&scpi_context, &val);
+ CU_ASSERT_EQUAL(val.error_code, -1);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 3);
- CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -2);
+ SCPI_ErrorPop(&scpi_context, &val);
+ CU_ASSERT_EQUAL(val.error_code, -2);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 2);
- CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -3);
+ SCPI_ErrorPop(&scpi_context, &val);
+ CU_ASSERT_EQUAL(val.error_code, -3);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 1);
- CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), SCPI_ERROR_QUEUE_OVERFLOW);
+ SCPI_ErrorPop(&scpi_context, &val);
+ CU_ASSERT_EQUAL(val.error_code, SCPI_ERROR_QUEUE_OVERFLOW);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
- CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), 0);
+ SCPI_ErrorPop(&scpi_context, &val);
+ CU_ASSERT_EQUAL(val.error_code, 0);
CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
SCPI_ErrorClear(&scpi_context);
@@ -1461,6 +1734,7 @@
|| (NULL == CU_add_test(pSuite, "SCPI_ParamChoice", testSCPI_ParamChoice))
|| (NULL == CU_add_test(pSuite, "Commands handling", testCommandsHandling))
|| (NULL == CU_add_test(pSuite, "Error handling", testErrorHandling))
+ || (NULL == CU_add_test(pSuite, "Device dependent error handling", testErrorHandlingDeviceDependent))
|| (NULL == CU_add_test(pSuite, "IEEE 488.2 Mandatory commands", testIEEE4882))
|| (NULL == CU_add_test(pSuite, "Numeric list", testNumericList))
|| (NULL == CU_add_test(pSuite, "Channel list", testChannelList))
@@ -1480,6 +1754,7 @@
|| (NULL == CU_add_test(pSuite, "SCPI_ResultText", testResultText))
|| (NULL == CU_add_test(pSuite, "SCPI_ResultArbitraryBlock", testResultArbitraryBlock))
|| (NULL == CU_add_test(pSuite, "SCPI_ResultArray", testResultArray))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamArray", testParamArray))
|| (NULL == CU_add_test(pSuite, "SCPI_NumberToStr", testNumberToStr))
|| (NULL == CU_add_test(pSuite, "SCPI_ErrorQueue", testErrorQueue))
|| (NULL == CU_add_test(pSuite, "Incomplete arbitrary parameter", testIncompleteArbitraryParameter))
--
Gitblit v1.9.1