From e7d3092dd149ce455eaa934cc63104b6273302f5 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 22 2月 2016 08:19:09 +0800
Subject: [PATCH] Add all possible units from IEEE488.2 to address some points of #26
---
libscpi/test/test_parser.c | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 350 insertions(+), 42 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 3ae7bf8..580a721 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -8,6 +8,7 @@
#include "CUnit/Basic.h"
#include "scpi/scpi.h"
+#include "../src/fifo_private.h"
/*
* CUnit Test Suite
@@ -41,6 +42,17 @@
SCPI_ResultInt32(context, 20);
+ return SCPI_RES_OK;
+}
+
+static double test_sample_received = NAN;
+
+static scpi_result_t SCPI_Sample(scpi_t * context) {
+ const char * val;
+ size_t len;
+ if (!SCPI_ParamArbitraryBlock(context, &val, &len, TRUE)) return SCPI_RES_ERR;
+ if (len != sizeof(test_sample_received)) return SCPI_RES_ERR;
+ memcpy(&test_sample_received, val, sizeof(test_sample_received));
return SCPI_RES_OK;
}
@@ -79,6 +91,7 @@
{ .pattern = "STUB", .callback = SCPI_Stub,},
{ .pattern = "STUB?", .callback = SCPI_StubQ,},
+ { .pattern = "SAMple", .callback = SCPI_Sample,},
SCPI_CMD_LIST_END
};
@@ -170,25 +183,17 @@
#define SCPI_INPUT_BUFFER_LENGTH 256
static char scpi_input_buffer[SCPI_INPUT_BUFFER_LENGTH];
-static scpi_reg_val_t scpi_regs[SCPI_REG_COUNT];
-
-
-scpi_t scpi_context = {
- .cmdlist = scpi_commands,
- .buffer =
- {
- .length = SCPI_INPUT_BUFFER_LENGTH,
- .data = scpi_input_buffer,
- },
- .interface = &scpi_interface,
- .registers = scpi_regs,
- .units = scpi_units_def,
- .idn =
- {"MA", "IN", NULL, "VER"},
-};
+#define SCPI_ERROR_QUEUE_SIZE 4
+static int16_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];
static int init_suite(void) {
- SCPI_Init(&scpi_context);
+ SCPI_Init(&scpi_context,
+ scpi_commands,
+ &scpi_interface,
+ scpi_units_def,
+ "MA", "IN", NULL, "VER",
+ scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
+ scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);
return 0;
}
@@ -327,6 +332,15 @@
TEST_IEEE4882("*STB?\r\n", "0\r\n"); /* Error queue is now empty */
+ scpi_context.interface->control = NULL;
+ srq_val = 0;
+ TEST_IEEE4882("ABCD\r\n", ""); /* "Undefined header" cause command error */
+ 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 */
+ TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
+ scpi_context.interface->control = SCPI_Control;
+
RST_executed = FALSE;
TEST_IEEE4882("*RST\r\n", "");
CU_ASSERT_EQUAL(RST_executed, TRUE);
@@ -363,6 +377,10 @@
TEST_IEEE4882("STUB\r\n", "");
TEST_IEEE4882("STUB?\r\n", "0\r\n");
+
+ TEST_IEEE4882_REG(SCPI_REG_COUNT + 1, 0);
+ TEST_IEEE4882_REG_SET(SCPI_REG_OPERE, 1);
+ TEST_IEEE4882_REG(SCPI_REG_OPERE, 1);
}
#define TEST_ParamInt32(data, mandatory, expected_value, expected_result, expected_error_code) \
@@ -394,10 +412,10 @@
TEST_ParamInt32("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamInt32("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamInt32("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamInt32("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamInt32("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamInt32("10V", TRUE, 0, FALSE, -138);
+ 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_ParamInt32("2147483647", TRUE, 2147483647, TRUE, 0);
@@ -433,10 +451,10 @@
TEST_ParamUInt32("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamUInt32("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamUInt32("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamUInt32("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamUInt32("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamUInt32("10V", TRUE, 0, FALSE, -138);
+ 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_ParamUInt32("2147483647", TRUE, 2147483647ULL, TRUE, 0);
@@ -472,10 +490,10 @@
TEST_ParamInt64("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamInt64("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamInt64("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamInt64("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamInt64("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamInt64("10V", TRUE, 0, FALSE, -138);
+ 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_ParamInt64("2147483647", TRUE, 2147483647LL, TRUE, 0);
@@ -513,10 +531,10 @@
TEST_ParamUInt64("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamUInt64("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamUInt64("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamUInt64("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamUInt64("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamUInt64("10V", TRUE, 0, FALSE, -138);
+ 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_ParamUInt64("2147483647", TRUE, 2147483647ULL, TRUE, 0);
@@ -556,10 +574,10 @@
TEST_ParamFloat("#Q10", TRUE, 8, TRUE, 0);
TEST_ParamFloat("#HFFFFFF", TRUE, 0xFFFFFFu, TRUE, 0);
- TEST_ParamFloat("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamFloat("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamFloat("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamFloat("10V", TRUE, 0, FALSE, -138);
+ 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);
}
#define TEST_ParamDouble(data, mandatory, expected_value, expected_result, expected_error_code) \
@@ -592,10 +610,10 @@
TEST_ParamDouble("#Q10", TRUE, 8, TRUE, 0);
TEST_ParamDouble("#HFFFFFFFF", TRUE, 0xFFFFFFFFu, TRUE, 0);
- TEST_ParamDouble("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamDouble("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamDouble("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamDouble("10V", TRUE, 0, FALSE, -138);
+ 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);
}
#define TEST_ParamCharacters(data, mandatory, expected_value, expected_result, expected_error_code) \
@@ -626,7 +644,7 @@
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, -151); // invalid Block Data
+ TEST_ParamCharacters("#210ABCD", TRUE, "", FALSE, SCPI_ERROR_INVALID_STRING_DATA); // invalid Block Data
}
@@ -666,6 +684,95 @@
TEST_ParamCopyText("\"\"", FALSE, "", 0, TRUE, 0);
}
+#define TEST_ParamArbitraryBlock(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ const char * value; \
+ size_t value_len; \
+ scpi_bool_t result; \
+ int16_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); \
+ /*printf("%.*s\r\n", (int)value_len, value);*/ \
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ 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); \
+}
+static void testSCPI_ParamArbitraryBlock(void) {
+ TEST_ParamArbitraryBlock("#204ABCD", TRUE, "ABCD", TRUE, 0);
+ TEST_ParamArbitraryBlock("\"ABCD\"", TRUE, "", FALSE, SCPI_ERROR_DATA_TYPE_ERROR);
+}
+
+#define TEST_ParamBool(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ scpi_bool_t value; \
+ scpi_bool_t result; \
+ int16_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); \
+ \
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ CU_ASSERT_EQUAL(result, expected_result); \
+ if (expected_result) { \
+ CU_ASSERT_EQUAL(value, expected_value); \
+ } \
+ CU_ASSERT_EQUAL(errCode, expected_error_code); \
+}
+static void testSCPI_ParamBool(void) {
+ TEST_ParamBool("ON", TRUE, TRUE, TRUE, 0);
+ TEST_ParamBool("1", TRUE, TRUE, TRUE, 0);
+ TEST_ParamBool("100", TRUE, TRUE, TRUE, 0);
+ TEST_ParamBool("OFF", TRUE, FALSE, TRUE, 0);
+ TEST_ParamBool("0", TRUE, FALSE, TRUE, 0);
+ TEST_ParamBool("XYZ", TRUE, FALSE, FALSE, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+}
+
+#define TEST_ParamChoice(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ int32_t value; \
+ scpi_bool_t result; \
+ int16_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_ParamChoice(&scpi_context, test_options, &value, mandatory); \
+ \
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ CU_ASSERT_EQUAL(result, expected_result); \
+ if (expected_result) { \
+ CU_ASSERT_EQUAL(value, expected_value); \
+ } \
+ CU_ASSERT_EQUAL(errCode, expected_error_code); \
+}
+static void testSCPI_ParamChoice(void) {
+ scpi_choice_def_t test_options[] = {
+ {"OPTIONA", 1},
+ {"OPTIONB", 2},
+ {"SOURce", 3},
+ SCPI_CHOICE_LIST_END /* termination of option list */
+ };
+
+ TEST_ParamChoice("ON", TRUE, 0, FALSE, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+ TEST_ParamChoice("OPTIONA", TRUE, 1, TRUE, 0);
+ TEST_ParamChoice("OPTIONB", TRUE, 2, TRUE, 0);
+ TEST_ParamChoice("SOURCE", TRUE, 3, TRUE, 0);
+ TEST_ParamChoice("SOUR", TRUE, 3, TRUE, 0);
+}
#define TEST_NumericListInt(data, index, expected_range, expected_from, expected_to, expected_result, expected_error_code) \
{ \
@@ -747,6 +854,8 @@
TEST_NumericListDouble("(12,5:6:3)", 0, FALSE, 12, 0, SCPI_EXPR_OK, 0);
TEST_NumericListDouble("(12,5:6:3)", 1, TRUE, 5, 6, SCPI_EXPR_OK, 0);
TEST_NumericListDouble("(12,5:6:3)", 2, FALSE, 0, 0, SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+ TEST_NumericListDouble("(12,5:)", 2, FALSE, 0, 0, SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+ TEST_NumericListDouble("aaaa", 2, FALSE, 0, 0, SCPI_EXPR_ERROR, SCPI_ERROR_DATA_TYPE_ERROR);
}
#define NOPAREN(...) __VA_ARGS__
@@ -815,6 +924,10 @@
TEST_ChannelList("(@1, 2)", 0, 1, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
TEST_ChannelList("(@1, 2)", 1, 1, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+
+ TEST_ChannelList("(@1,)", 1, 1, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+ TEST_ChannelList("(@1,2:)", 1, 1, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+ TEST_ChannelList("abcd", 1, 1, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_DATA_TYPE_ERROR);
}
@@ -856,6 +969,7 @@
TEST_ParamNumber("min", TRUE, TRUE, SCPI_NUM_MIN, 0, SCPI_UNIT_NONE, 10, TRUE, 0);
TEST_ParamNumber("infinity", TRUE, TRUE, SCPI_NUM_INF, 0, SCPI_UNIT_NONE, 10, TRUE, 0);
TEST_ParamNumber("minc", TRUE, TRUE, SCPI_NUM_NUMBER, 0, SCPI_UNIT_NONE, 10, FALSE, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+ TEST_ParamNumber("100 xyz", TRUE, FALSE, SCPI_NUM_NUMBER, 100, SCPI_UNIT_NONE, 10, FALSE, SCPI_ERROR_INVALID_SUFFIX);
}
#define TEST_Result(func, value, expected_result) \
@@ -1071,6 +1185,8 @@
#define SCPI_ResultArrayUInt32ASCII(c, a) SCPI_ResultArrayUInt32((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_ASCII)
#define SCPI_ResultArrayInt64ASCII(c, a) SCPI_ResultArrayInt64((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_ASCII)
#define SCPI_ResultArrayUInt64ASCII(c, a) SCPI_ResultArrayUInt64((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_ASCII)
+#define SCPI_ResultArrayFloatASCII(c, a) SCPI_ResultArrayFloat((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_ASCII)
+#define SCPI_ResultArrayDoubleASCII(c, a) SCPI_ResultArrayDouble((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_ASCII)
#define SCPI_ResultArrayInt8NORMAL(c, a) SCPI_ResultArrayInt8((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
#define SCPI_ResultArrayUInt8NORMAL(c, a) SCPI_ResultArrayUInt8((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
@@ -1080,6 +1196,8 @@
#define SCPI_ResultArrayUInt32NORMAL(c, a) SCPI_ResultArrayUInt32((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
#define SCPI_ResultArrayInt64NORMAL(c, a) SCPI_ResultArrayInt64((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
#define SCPI_ResultArrayUInt64NORMAL(c, a) SCPI_ResultArrayUInt64((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
+#define SCPI_ResultArrayFloatNORMAL(c, a) SCPI_ResultArrayFloat((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
+#define SCPI_ResultArrayDoubleNORMAL(c, a) SCPI_ResultArrayDouble((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_NORMAL)
#define SCPI_ResultArrayInt8SWAPPED(c, a) SCPI_ResultArrayInt8((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
#define SCPI_ResultArrayUInt8SWAPPED(c, a) SCPI_ResultArrayUInt8((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
@@ -1089,6 +1207,8 @@
#define SCPI_ResultArrayUInt32SWAPPED(c, a) SCPI_ResultArrayUInt32((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
#define SCPI_ResultArrayInt64SWAPPED(c, a) SCPI_ResultArrayInt64((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
#define SCPI_ResultArrayUInt64SWAPPED(c, a) SCPI_ResultArrayUInt64((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
+#define SCPI_ResultArrayFloatSWAPPED(c, a) SCPI_ResultArrayFloat((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
+#define SCPI_ResultArrayDoubleSWAPPED(c, a) SCPI_ResultArrayDouble((c), (a), sizeof(a)/sizeof(*a), SCPI_FORMAT_SWAPPED)
int8_t int8_arr[] = {-5, 48, 49, 109, 87};
TEST_Result(ArrayInt8ASCII, int8_arr, "-5,48,49,109,87");
@@ -1129,6 +1249,187 @@
TEST_Result(ArrayUInt64ASCII, uint64_arr, "18446744073709551611,3472611983179986487");
TEST_Result(ArrayUInt64NORMAL, uint64_arr, "#216" "\xFF\xFF\xFF\xFF" "\xFF\xFF\xFF\xFB" "01234567");
TEST_Result(ArrayUInt64SWAPPED, uint64_arr, "#216" "\xFB\xFF\xFF\xFF" "\xFF\xFF\xFF\xFF" "76543210");
+
+ float float_arr[] = {0.7549173, 3.0196693};
+ TEST_Result(ArrayFloatASCII, float_arr, "0.754917,3.01967");
+ TEST_Result(ArrayFloatNORMAL, float_arr, "#18" "?ABC" "@ABC");
+ TEST_Result(ArrayFloatSWAPPED, float_arr, "#18" "CBA?" "CBA@");
+
+ double double_arr[] = {76543217654321, 1234567891234567};
+ TEST_Result(ArrayDoubleASCII, double_arr, "76543217654321,1.23456789123457e+15");
+ TEST_Result(ArrayDoubleNORMAL, double_arr, "#216" "\x42\xd1\x67\x66\xd3\x16\x8c\x40" "\x43\x11\x8b\x54\xf2\x6e\xbc\x1c");
+ TEST_Result(ArrayDoubleSWAPPED, double_arr, "#216" "\x40\x8c\x16\xd3\x66\x67\xd1\x42" "\x1c\xbc\x6e\xf2\x54\x8b\x11\x43");
+}
+
+static void testNumberToStr(void) {
+
+#define TEST_SCPI_NumberToStr(_special, _value, _unit, expected_result) do {\
+ scpi_number_t number;\
+ number.base = 10;\
+ number.special = (_special);\
+ number.unit = (_unit);\
+ if (number.special) { number.tag = (int)(_value); } else { number.value = (_value); }\
+ char buffer[100 + 1];\
+ size_t res_len;\
+ res_len = SCPI_NumberToStr(&scpi_context, scpi_special_numbers_def, &number, buffer, 100);\
+ CU_ASSERT_STRING_EQUAL(buffer, expected_result);\
+ CU_ASSERT_EQUAL(res_len, strlen(expected_result));\
+} 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");
+}
+
+static void testErrorQueue(void) {
+ SCPI_ErrorClear(&scpi_context);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
+ SCPI_ErrorPush(&scpi_context, -1);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 1);
+ SCPI_ErrorPush(&scpi_context, -2);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 2);
+ SCPI_ErrorPush(&scpi_context, -3);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 3);
+ SCPI_ErrorPush(&scpi_context, -4);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 4);
+ SCPI_ErrorPush(&scpi_context, -5);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 4);
+ SCPI_ErrorPush(&scpi_context, -6);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 4);
+
+ CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -1);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 3);
+ CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -2);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 2);
+ CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -3);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 1);
+ CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), SCPI_ERROR_QUEUE_OVERFLOW);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
+ CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), 0);
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
+
+ SCPI_ErrorClear(&scpi_context);
+}
+
+#define TEST_INCOMPLETE_ARB(_val, _part_len) do {\
+ double val = _val;\
+ char command_text[] = "SAMple #18[DOUBLE]\r";\
+ char * command = command_text;\
+ size_t command_len = strlen(command);\
+ memcpy(command + 10, &val, sizeof(val));\
+ test_sample_received = NAN;\
+ size_t part_len = _part_len;\
+ SCPI_ErrorClear(&scpi_context);\
+ while (command_len) {\
+ part_len = part_len > command_len ? command_len : part_len;\
+ SCPI_Input(&scpi_context, command, part_len);\
+ command += part_len;\
+ command_len -= part_len;\
+ }\
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);\
+ CU_ASSERT_EQUAL(test_sample_received, val);\
+} while(0)
+
+static void testIncompleteArbitraryParameter(void) {
+ TEST_INCOMPLETE_ARB(0.5, 19);
+ TEST_INCOMPLETE_ARB(0.5, 18);
+ TEST_INCOMPLETE_ARB(0.5, 17);
+ TEST_INCOMPLETE_ARB(0.5, 16);
+ TEST_INCOMPLETE_ARB(0.5, 15);
+ TEST_INCOMPLETE_ARB(0.5, 14);
+ TEST_INCOMPLETE_ARB(0.5, 13);
+ TEST_INCOMPLETE_ARB(0.5, 12);
+ TEST_INCOMPLETE_ARB(0.5, 11);
+ TEST_INCOMPLETE_ARB(0.5, 10);
+ TEST_INCOMPLETE_ARB(0.5, 9);
+ TEST_INCOMPLETE_ARB(0.5, 8);
+ TEST_INCOMPLETE_ARB(0.5, 7);
+ TEST_INCOMPLETE_ARB(0.5, 6);
+ TEST_INCOMPLETE_ARB(0.5, 5);
+ TEST_INCOMPLETE_ARB(0.5, 4);
+ TEST_INCOMPLETE_ARB(0.5, 3);
+ TEST_INCOMPLETE_ARB(0.5, 2);
+ TEST_INCOMPLETE_ARB(0.5, 1);
+
+ TEST_INCOMPLETE_ARB(0.501220703125, 19);
+ TEST_INCOMPLETE_ARB(0.501220703125, 18);
+ TEST_INCOMPLETE_ARB(0.501220703125, 17);
+ TEST_INCOMPLETE_ARB(0.501220703125, 16);
+ TEST_INCOMPLETE_ARB(0.501220703125, 15);
+ TEST_INCOMPLETE_ARB(0.501220703125, 14);
+ TEST_INCOMPLETE_ARB(0.501220703125, 13);
+ TEST_INCOMPLETE_ARB(0.501220703125, 12);
+ TEST_INCOMPLETE_ARB(0.501220703125, 11);
+ TEST_INCOMPLETE_ARB(0.501220703125, 10);
+ TEST_INCOMPLETE_ARB(0.501220703125, 9);
+ TEST_INCOMPLETE_ARB(0.501220703125, 8);
+ TEST_INCOMPLETE_ARB(0.501220703125, 7);
+ TEST_INCOMPLETE_ARB(0.501220703125, 6);
+ TEST_INCOMPLETE_ARB(0.501220703125, 5);
+ TEST_INCOMPLETE_ARB(0.501220703125, 4);
+ TEST_INCOMPLETE_ARB(0.501220703125, 3);
+ TEST_INCOMPLETE_ARB(0.501220703125, 2);
+ TEST_INCOMPLETE_ARB(0.501220703125, 1);
+
+ TEST_INCOMPLETE_ARB(0.500000024214387, 19);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 18);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 17);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 16);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 15);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 14);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 13);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 12);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 11);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 10);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 9);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 8);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 7);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 6);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 5);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 4);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 3);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 2);
+ TEST_INCOMPLETE_ARB(0.500000024214387, 1);
+}
+
+#define TEST_INCOMPLETE_TEXT(_text, _part_len) do {\
+ char command_text[] = "TEXT? \"\", \"" _text "\"\r";\
+ char * command = command_text;\
+ size_t command_len = strlen(command);\
+ output_buffer_clear();\
+ size_t part_len = _part_len;\
+ SCPI_ErrorClear(&scpi_context);\
+ while (command_len) {\
+ part_len = part_len > command_len ? command_len : part_len;\
+ SCPI_Input(&scpi_context, command, part_len);\
+ command += part_len;\
+ command_len -= part_len;\
+ }\
+ CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);\
+ CU_ASSERT_STRING_EQUAL("\"" _text "\"\r\n", output_buffer);\
+} while(0)
+
+static void testIncompleteTextParameter(void) {
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 20);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 19);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 18);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 17);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 16);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 15);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 14);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 13);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 12);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 11);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 10);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 9);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 8);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 7);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 6);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 5);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 4);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 3);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 2);
+ TEST_INCOMPLETE_TEXT("AbcdEfgh", 1);
}
int main() {
@@ -1155,6 +1456,9 @@
|| (NULL == CU_add_test(pSuite, "SCPI_ParamDouble", testSCPI_ParamDouble))
|| (NULL == CU_add_test(pSuite, "SCPI_ParamCharacters", testSCPI_ParamCharacters))
|| (NULL == CU_add_test(pSuite, "SCPI_ParamCopyText", testSCPI_ParamCopyText))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamArbitraryBlock", testSCPI_ParamArbitraryBlock))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamBool", testSCPI_ParamBool))
+ || (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, "IEEE 488.2 Mandatory commands", testIEEE4882))
@@ -1176,6 +1480,10 @@
|| (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_NumberToStr", testNumberToStr))
+ || (NULL == CU_add_test(pSuite, "SCPI_ErrorQueue", testErrorQueue))
+ || (NULL == CU_add_test(pSuite, "Incomplete arbitrary parameter", testIncompleteArbitraryParameter))
+ || (NULL == CU_add_test(pSuite, "Incomplete text parameter", testIncompleteTextParameter))
) {
CU_cleanup_registry();
return CU_get_error();
--
Gitblit v1.9.1