From b5e8e4dc2bdeca39195a78d8d7f01bd7f099923c Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 13 11月 2015 18:54:29 +0800
Subject: [PATCH] Resolve #65: Cast char to unsigned in isctype functions
---
libscpi/test/test_parser.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 474 insertions(+), 35 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index cbef1af..eefebaf 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -32,14 +32,14 @@
static scpi_result_t test_treeA(scpi_t* context) {
- SCPI_ResultInt(context, 10);
+ SCPI_ResultInt32(context, 10);
return SCPI_RES_OK;
}
static scpi_result_t test_treeB(scpi_t* context) {
- SCPI_ResultInt(context, 20);
+ SCPI_ResultInt32(context, 20);
return SCPI_RES_OK;
}
@@ -70,7 +70,7 @@
{ .pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
{ .pattern = "STATus:PRESet", .callback = SCPI_StatusPreset,},
-
+
{ .pattern = "TEXTfunction?", .callback = text_function,},
{ .pattern = "TEST:TREEA?", .callback = test_treeA,},
@@ -99,6 +99,7 @@
}
scpi_t scpi_context;
+
static void error_buffer_clear(void) {
err_buffer[0] = 0;
err_buffer_pos = 0;
@@ -112,7 +113,6 @@
err_buffer[err_buffer_pos] = err;
err_buffer_pos++;
}
-
static size_t SCPI_Write(scpi_t * context, const char * data, size_t len) {
(void) context;
@@ -135,6 +135,7 @@
}
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) {
(void) context;
@@ -171,16 +172,17 @@
scpi_t scpi_context = {
.cmdlist = scpi_commands,
- .buffer = {
+ .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"},
+ .idn =
+ {"MA", "IN", NULL, "VER"},
};
-
static int init_suite(void) {
SCPI_Init(&scpi_context);
@@ -223,12 +225,16 @@
TEST_INPUT("*IDN?", "");
TEST_INPUT("", "MA,IN,0,VER\r\n");
output_buffer_clear();
-
+
/* Test ctree traversal */
TEST_INPUT("TEST:TREEA?;TREEB?\r\n", "10;20\r\n");
output_buffer_clear();
TEST_INPUT("TEST:TREEA?;:TEXT? \"PARAM1\", \"PARAM2\"\r\n", "10;\"PARAM2\"\r\n");
+ output_buffer_clear();
+
+ /* Test special characters in parameters */
+ TEST_INPUT("TEXT? \"\", \"test\r\n\"\r\n", "\"test\r\n\"\r\n");
output_buffer_clear();
CU_ASSERT_EQUAL(err_buffer_pos, 0);
@@ -239,19 +245,24 @@
output_buffer_clear();
error_buffer_clear();
-#define TEST_ERROR(data, output, err_num) { \
+#define TEST_ERROR(data, output, expected_result, err_num) { \
output_buffer_clear(); \
error_buffer_clear(); \
- SCPI_Input(&scpi_context, data, strlen(data)); \
+ scpi_bool_t result = SCPI_Input(&scpi_context, data, strlen(data)); \
CU_ASSERT_STRING_EQUAL(output, output_buffer); \
- CU_ASSERT_EQUAL(err_buffer[0], err_num) \
+ CU_ASSERT_EQUAL(err_buffer[0], err_num); \
+ CU_ASSERT_EQUAL(result, expected_result); \
}
- TEST_ERROR("*IDN?\r\n", "MA,IN,0,VER\r\n", 0);
- 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);
- TEST_ERROR("TEXT? \"PARAM1\", \"PARAM2\"\r\n", "\"PARAM2\"\r\n", 0);
+ TEST_ERROR("*IDN?\r\n", "MA,IN,0,VER\r\n", TRUE, 0);
+ TEST_ERROR("IDN?\r\n", "", FALSE, SCPI_ERROR_UNDEFINED_HEADER);
+ TEST_ERROR("*ESE\r\n", "", FALSE, SCPI_ERROR_MISSING_PARAMETER);
+ TEST_ERROR("*IDN? 12\r\n", "MA,IN,0,VER\r\n", FALSE, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
+ TEST_ERROR("TEXT? \"PARAM1\", \"PARAM2\"\r\n", "\"PARAM2\"\r\n", TRUE, 0);
+ TEST_ERROR("ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ"
+ "ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ"
+ "ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",
+ "", FALSE, SCPI_ERROR_INPUT_BUFFER_OVERRUN);
// TODO: SCPI_ERROR_INVALID_SEPARATOR
// TODO: SCPI_ERROR_INVALID_SUFFIX
@@ -285,7 +296,7 @@
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, (STB_ESR | STB_SRQ | STB_QMA)); /* value of STB as service request */
@@ -294,24 +305,24 @@
TEST_IEEE4882("*STB?\r\n", "68\r\n"); /* Error queue is still not empty */
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");
TEST_IEEE4882("*STB?\r\n", "0\r\n"); /* Error queue is now empty */
-
+
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) \
+#define TEST_ParamInt32(data, mandatory, expected_value, expected_result, expected_error_code) \
{ \
int32_t value; \
scpi_bool_t result; \
@@ -322,7 +333,7 @@
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_ParamInt(&scpi_context, &value, mandatory); \
+ result = SCPI_ParamInt32(&scpi_context, &value, mandatory); \
\
errCode = SCPI_ErrorPop(&scpi_context); \
CU_ASSERT_EQUAL(result, expected_result); \
@@ -332,18 +343,180 @@
CU_ASSERT_EQUAL(errCode, expected_error_code); \
}
-static void testSCPI_ParamInt(void) {
- TEST_ParamInt("10", TRUE, 10, TRUE, 0);
- TEST_ParamInt("", FALSE, 0, FALSE, 0);
- TEST_ParamInt("10.5", TRUE, 10, TRUE, 0); // TODO: should be FALSE, -104
- TEST_ParamInt("#B101010", TRUE, 42, TRUE, 0);
- TEST_ParamInt("#H101010", TRUE, 1052688, TRUE, 0);
- TEST_ParamInt("#Q10", TRUE, 8, TRUE, 0);
+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("#B101010", TRUE, 42, TRUE, 0);
+ TEST_ParamInt32("#H101010", TRUE, 1052688, TRUE, 0);
+ TEST_ParamInt32("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamInt("", TRUE, 0, FALSE, -109); // missing parameter
- TEST_ParamInt("abcd", TRUE, 0, FALSE, -104); // Data type error
- TEST_ParamInt("10.5V", TRUE, 0, FALSE, -138);
- TEST_ParamInt("10V", TRUE, 0, FALSE, -138);
+ 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 range
+ TEST_ParamInt32("2147483647", TRUE, 2147483647, TRUE, 0);
+ TEST_ParamInt32("-2147483647", TRUE, -2147483647, TRUE, 0);
+}
+
+#define TEST_ParamUInt32(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ uint32_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_ParamUInt32(&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_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("#B101010", TRUE, 42, TRUE, 0);
+ 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 range
+ TEST_ParamUInt32("2147483647", TRUE, 2147483647ULL, TRUE, 0);
+ TEST_ParamUInt32("4294967295", TRUE, 4294967295ULL, TRUE, 0);
+}
+
+#define TEST_ParamInt64(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ int64_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_ParamInt64(&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_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("#B101010", TRUE, 42, TRUE, 0);
+ 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 range
+ TEST_ParamInt64("2147483647", TRUE, 2147483647LL, TRUE, 0);
+ TEST_ParamInt64("-2147483647", TRUE, -2147483647LL, TRUE, 0);
+ TEST_ParamInt64("9223372036854775807", TRUE, 9223372036854775807LL, TRUE, 0);
+ TEST_ParamInt64("-9223372036854775807", TRUE, -9223372036854775807LL, TRUE, 0);
+}
+
+#define TEST_ParamUInt64(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ uint64_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_ParamUInt64(&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_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("#B101010", TRUE, 42, TRUE, 0);
+ 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 range
+ TEST_ParamUInt64("2147483647", TRUE, 2147483647ULL, TRUE, 0);
+ TEST_ParamUInt64("4294967295", TRUE, 4294967295ULL, TRUE, 0);
+ TEST_ParamUInt64("9223372036854775807", TRUE, 9223372036854775807ULL, TRUE, 0);
+ TEST_ParamUInt64("18446744073709551615", TRUE, 18446744073709551615ULL, TRUE, 0);
+}
+
+
+#define TEST_ParamFloat(data, mandatory, expected_value, expected_result, expected_error_code) \
+{ \
+ float 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_ParamFloat(&scpi_context, &value, mandatory); \
+ \
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ 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); \
+}
+
+static void testSCPI_ParamFloat(void) {
+ TEST_ParamFloat("10", TRUE, 10, TRUE, 0);
+ TEST_ParamFloat("", FALSE, 0, FALSE, 0);
+ TEST_ParamFloat("10.5", TRUE, 10.5, TRUE, 0);
+ TEST_ParamFloat("#B101010", TRUE, 42, TRUE, 0);
+ TEST_ParamFloat("#H101010", TRUE, 1052688, TRUE, 0);
+ 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);
}
#define TEST_ParamDouble(data, mandatory, expected_value, expected_result, expected_error_code) \
@@ -586,7 +759,7 @@
TEST_ChannelList("(@1,2:3)", 2, 1, FALSE, 0, (0), (0), SCPI_EXPR_NO_MORE, 0);
TEST_ChannelList("(@1,2!5:3!6)", 0, 2, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
- TEST_ChannelList("(@1,2!5:3!6)", 1, 2, TRUE, 2, (2,5), (3,6), SCPI_EXPR_OK, 0);
+ TEST_ChannelList("(@1,2!5:3!6)", 1, 2, TRUE, 2, (2, 5), (3, 6), SCPI_EXPR_OK, 0);
TEST_ChannelList("(@1,2!5:3!6)", 2, 2, FALSE, 0, (0), (0), SCPI_EXPR_NO_MORE, 0);
TEST_ChannelList("(@1,2!5:3!6)", 0, 1, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
@@ -596,6 +769,253 @@
TEST_ChannelList("(@1,2!5:3!6!7)", 0, 2, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
TEST_ChannelList("(@1,2!5:3!6!7)", 1, 2, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
TEST_ChannelList("(@1,2!5:3!6!7)", 2, 2, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+
+ 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);
+}
+
+
+#define TEST_ParamNumber(data, mandatory, expected_special, expected_tag, expected_value, expected_unit, expected_base, expected_result, expected_error_code) \
+{ \
+ scpi_number_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_ParamNumber(&scpi_context, scpi_special_numbers_def, &value, mandatory);\
+ \
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ 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);\
+ CU_ASSERT_EQUAL(value.unit, expected_unit); \
+ CU_ASSERT_EQUAL(value.base, expected_base); \
+ } \
+ CU_ASSERT_EQUAL(errCode, expected_error_code); \
+}
+
+static void testParamNumber(void) {
+ TEST_ParamNumber("1", TRUE, FALSE, SCPI_NUM_NUMBER, 1, SCPI_UNIT_NONE, 10, TRUE, 0);
+ TEST_ParamNumber("#Q20", TRUE, FALSE, SCPI_NUM_NUMBER, 16, SCPI_UNIT_NONE, 8, TRUE, 0);
+ TEST_ParamNumber("#H20", TRUE, FALSE, SCPI_NUM_NUMBER, 32, SCPI_UNIT_NONE, 16, TRUE, 0);
+ TEST_ParamNumber("#B11", TRUE, FALSE, SCPI_NUM_NUMBER, 3, SCPI_UNIT_NONE, 2, TRUE, 0);
+ TEST_ParamNumber("1.2", TRUE, FALSE, SCPI_NUM_NUMBER, 1.2, SCPI_UNIT_NONE, 10, TRUE, 0);
+ TEST_ParamNumber("1.2e-1", TRUE, FALSE, SCPI_NUM_NUMBER, 0.12, SCPI_UNIT_NONE, 10, TRUE, 0);
+ TEST_ParamNumber("1.2e-1V", TRUE, FALSE, SCPI_NUM_NUMBER, 0.12, SCPI_UNIT_VOLT, 10, TRUE, 0);
+ TEST_ParamNumber("1.2mV", TRUE, FALSE, SCPI_NUM_NUMBER, 0.0012, SCPI_UNIT_VOLT, 10, TRUE, 0);
+ TEST_ParamNumber("100 OHM", TRUE, FALSE, SCPI_NUM_NUMBER, 100, SCPI_UNIT_OHM, 10, TRUE, 0);
+ 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);
+}
+
+#define TEST_Result(func, value, expected_result) \
+{\
+ output_buffer_clear();\
+ scpi_context.output_count = 0;\
+ size_t expected_len = strlen(expected_result);\
+ size_t len = SCPI_Result##func(&scpi_context, (value));\
+ CU_ASSERT_EQUAL(len, expected_len);\
+ CU_ASSERT_EQUAL(output_buffer_pos, expected_len);\
+ CU_ASSERT_EQUAL(memcmp(output_buffer, expected_result, expected_len), 0);\
+}
+
+#define TEST_ResultBase(func, value, base, expected_result) \
+{\
+ output_buffer_clear();\
+ scpi_context.output_count = 0;\
+ size_t expected_len = strlen(expected_result);\
+ size_t len = SCPI_Result##func##Base(&scpi_context, (value), (base));\
+ CU_ASSERT_EQUAL(len, expected_len);\
+ CU_ASSERT_EQUAL(output_buffer_pos, expected_len);\
+ CU_ASSERT_EQUAL(memcmp(output_buffer, expected_result, expected_len), 0);\
+}
+
+static void testResultInt8(void) {
+ TEST_Result(Int8, 10, "10");
+ TEST_Result(Int8, -10, "-10");
+ TEST_Result(Int8, 100, "100");
+ TEST_Result(Int8, -100, "-100");
+ TEST_Result(Int8, 256, "0");
+ TEST_Result(Int8, 1111, "87");
+ TEST_Result(Int8, 127, "127");
+ TEST_Result(Int8, -128, "-128");
+}
+
+static void testResultUInt8(void) {
+ TEST_Result(UInt8, 10, "10");
+ TEST_Result(UInt8, -10, "246");
+ TEST_Result(UInt8, 100, "100");
+ TEST_Result(UInt8, -100, "156");
+ TEST_Result(UInt8, 256, "0");
+ TEST_Result(UInt8, 1111, "87");
+ TEST_Result(UInt8, 127, "127");
+ TEST_Result(UInt8, -128, "128");
+ TEST_Result(UInt8, 0, "0");
+ TEST_Result(UInt8, 255, "255");
+
+ TEST_ResultBase(UInt8, 0xff, 16, "#HFF");
+ TEST_ResultBase(UInt8, 0xff, 8, "#Q377");
+ TEST_ResultBase(UInt8, 0xff, 2, "#B11111111");
+}
+
+static void testResultInt16(void) {
+ TEST_Result(Int16, 10, "10");
+ TEST_Result(Int16, -10, "-10");
+ TEST_Result(Int16, 100, "100");
+ TEST_Result(Int16, -100, "-100");
+ TEST_Result(Int16, 256, "256");
+ TEST_Result(Int16, 1111, "1111");
+ TEST_Result(Int16, 127, "127");
+ TEST_Result(Int16, -128, "-128");
+ TEST_Result(Int16, 111111, "-19961");
+ TEST_Result(Int16, 32767, "32767");
+ TEST_Result(Int16, -32768, "-32768");
+}
+
+static void testResultUInt16(void) {
+ TEST_Result(UInt16, 10, "10");
+ TEST_Result(UInt16, -10, "65526");
+ TEST_Result(UInt16, 100, "100");
+ TEST_Result(UInt16, -100, "65436");
+ TEST_Result(UInt16, 256, "256");
+ TEST_Result(UInt16, 1111, "1111");
+ TEST_Result(UInt16, 127, "127");
+ TEST_Result(UInt16, -128, "65408");
+ TEST_Result(UInt16, 111111, "45575");
+ TEST_Result(UInt16, 32767, "32767");
+ TEST_Result(UInt16, -32768, "32768");
+ TEST_Result(UInt16, 65535, "65535");
+
+ TEST_ResultBase(UInt16, 0xffff, 16, "#HFFFF");
+ TEST_ResultBase(UInt16, 0xffff, 8, "#Q177777");
+ TEST_ResultBase(UInt16, 0xffff, 2, "#B1111111111111111");
+}
+
+static void testResultInt32(void) {
+ 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, -2147483647L, "-2147483647");
+}
+
+static void testResultUInt32(void) {
+ 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, -2147483647L, "2147483649");
+ TEST_Result(UInt32, 4294967295UL, "4294967295");
+
+ TEST_ResultBase(UInt32, 0xffffffff, 16, "#HFFFFFFFF");
+ TEST_ResultBase(UInt32, 0xffffffff, 8, "#Q37777777777");
+ TEST_ResultBase(UInt32, 0xffffffff, 2, "#B11111111111111111111111111111111");
+}
+
+static void testResultInt64(void) {
+ TEST_Result(Int64, 10, "10");
+ TEST_Result(Int64, -10, "-10");
+ TEST_Result(Int64, 127, "127");
+ TEST_Result(Int64, -128, "-128");
+ 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, -2147483647L, "-2147483647");
+ TEST_Result(Int64, 9223372036854775807LL, "9223372036854775807");
+ //TEST_Result(Int64, -9223372036854775808LL, "-9223372036854775808"); bug in GCC
+ TEST_Result(Int64, -9223372036854775807LL, "-9223372036854775807");
+}
+
+static void testResultUInt64(void) {
+ TEST_Result(UInt64, 10, "10");
+ TEST_Result(UInt64, -10, "18446744073709551606");
+ TEST_Result(UInt64, 127, "127");
+ TEST_Result(UInt64, -128, "18446744073709551488");
+ 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, -2147483647L, "18446744071562067969");
+ TEST_Result(UInt64, 9223372036854775807LL, "9223372036854775807");
+ //TEST_Result(Int64, -9223372036854775808LL, "9223372036854775808"); bug in GCC
+ TEST_Result(UInt64, -9223372036854775807LL, "9223372036854775809");
+ TEST_Result(UInt64, 18446744073709551615ULL, "18446744073709551615");
+
+ TEST_ResultBase(UInt64, 0xffffffffffffffffULL, 16, "#HFFFFFFFFFFFFFFFF");
+ TEST_ResultBase(UInt64, 0xffffffffffffffffULL, 8, "#Q1777777777777777777777");
+ TEST_ResultBase(UInt64, 0xffffffffffffffffULL, 2, "#B1111111111111111111111111111111111111111111111111111111111111111");
+}
+
+static void testResultFloat(void) {
+ TEST_Result(Float, 10, "10");
+ TEST_Result(Float, -10, "-10");
+ TEST_Result(Float, 127, "127");
+ TEST_Result(Float, -128, "-128");
+ 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, -2147483647L, "-2.14748e+09");
+ TEST_Result(Float, 9223372036854775807LL, "9.22337e+18");
+ TEST_Result(Float, -9223372036854775807LL, "-9.22337e+18");
+
+ TEST_Result(Float, 1.256e-17, "1.256e-17");
+ TEST_Result(Float, -1.256e-17, "-1.256e-17");
+}
+
+static void testResultDouble(void) {
+ TEST_Result(Double, 10, "10");
+ TEST_Result(Double, -10, "-10");
+ TEST_Result(Double, 127, "127");
+ TEST_Result(Double, -128, "-128");
+ 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, -2147483647, "-2147483647");
+ TEST_Result(Double, 9223372036854775807LL, "9.22337203685478e+18");
+ TEST_Result(Double, -9223372036854775807LL, "-9.22337203685478e+18");
+
+ TEST_Result(Double, 1.256e-17, "1.256e-17");
+ TEST_Result(Double, -1.256e-17, "-1.256e-17");
+}
+
+static void testResultBool(void) {
+ TEST_Result(Bool, TRUE, "1");
+ TEST_Result(Bool, FALSE, "0");
+ TEST_Result(Bool, 1000, "1");
+}
+
+static void testResultMnemonic(void) {
+ TEST_Result(Mnemonic, "a", "a");
+ TEST_Result(Mnemonic, "abcd", "abcd");
+ TEST_Result(Mnemonic, "abcd123", "abcd123");
+}
+
+static void testResultText(void) {
+ TEST_Result(Text, "a", "\"a\"");
+ TEST_Result(Text, "abcd", "\"abcd\"");
+ TEST_Result(Text, "abcd123", "\"abcd123\"");
+ TEST_Result(Text, "abcd\"123", "\"abcd\"\"123\"");
+ TEST_Result(Text, "abcd\"", "\"abcd\"\"\"");
+}
+
+static void testResultArbitraryBlock(void) {
+#define SCPI_ResultArbitraryBlockString(c, s) SCPI_ResultArbitraryBlock((c), (s), strlen(s))
+
+ TEST_Result(ArbitraryBlockString, "a", "#11a");
+ TEST_Result(ArbitraryBlockString, "a\"", "#12a\"");
+ TEST_Result(ArbitraryBlockString, "a\r\n", "#13a\r\n");
+ TEST_Result(ArbitraryBlockString, "X1234567890", "#211X1234567890");
+ TEST_Result(ArbitraryBlockString, "X1234567890\x80x", "#213X1234567890\x80x");
}
int main() {
@@ -614,7 +1034,11 @@
}
/* Add the tests to the suite */
- if ((NULL == CU_add_test(pSuite, "SCPI_ParamInt", testSCPI_ParamInt))
+ if ((NULL == CU_add_test(pSuite, "SCPI_ParamInt32", testSCPI_ParamInt32))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamUInt32", testSCPI_ParamUInt32))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamInt64", testSCPI_ParamInt64))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamUInt64", testSCPI_ParamUInt64))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamFloat", testSCPI_ParamFloat))
|| (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))
@@ -623,6 +1047,21 @@
|| (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))
+ || (NULL == CU_add_test(pSuite, "SCPI_ParamNumber", testParamNumber))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultInt8", testResultInt8))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultUInt8", testResultUInt8))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultInt16", testResultInt16))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultUInt16", testResultUInt16))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultInt32", testResultInt32))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultUInt32", testResultUInt32))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultInt64", testResultInt64))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultUInt64", testResultUInt64))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultFloat", testResultFloat))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultDouble", testResultDouble))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultBool", testResultBool))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultMnemonic", testResultMnemonic))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultText", testResultText))
+ || (NULL == CU_add_test(pSuite, "SCPI_ResultArbitraryBlock", testResultArbitraryBlock))
) {
CU_cleanup_registry();
return CU_get_error();
--
Gitblit v1.9.1