From 24006db953ebc5e672e8b4d14db1d3102670c237 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@gmail.com>
Date: ćšć, 08 10æ 2015 03:02:03 +0800
Subject: [PATCH] integer parser: remove trailing spaces
---
libscpi/test/test_parser.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 161 insertions(+), 3 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 5306caf..3ab2640 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;
}
@@ -95,6 +95,7 @@
memcpy(output_buffer + output_buffer_pos, data, len);
output_buffer_pos += len;
output_buffer[output_buffer_pos] = '\0';
+ return len;
}
scpi_t scpi_context;
@@ -120,6 +121,8 @@
}
static scpi_result_t SCPI_Flush(scpi_t * context) {
+ (void) context;
+
return SCPI_RES_OK;
}
@@ -133,6 +136,8 @@
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;
+
if (SCPI_CTRL_SRQ == ctrl) {
srq_val = val;
} else {
@@ -144,6 +149,8 @@
scpi_bool_t RST_executed = FALSE;
static scpi_result_t SCPI_Reset(scpi_t * context) {
+ (void) context;
+
RST_executed = TRUE;
return SCPI_RES_OK;
}
@@ -444,7 +451,155 @@
}
+#define TEST_NumericListInt(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_parameter_t param; \
+ int32_t val_from, val_to; \
+ scpi_bool_t val_range; \
+ \
+ 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_Parameter(&scpi_context, ¶m, TRUE); \
+ result2 = SCPI_ExprNumericListEntryInt(&scpi_context, ¶m, index, &val_range, &val_from, &val_to);\
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ CU_ASSERT_EQUAL(result2, expected_result); \
+ if (expected_result == SCPI_EXPR_OK) { \
+ CU_ASSERT_EQUAL(val_range, expected_range); \
+ CU_ASSERT_EQUAL(val_from, expected_from); \
+ if (expected_range) { \
+ CU_ASSERT_EQUAL(val_to, expected_to); \
+ } \
+ } \
+ CU_ASSERT_EQUAL(errCode, 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_parameter_t param; \
+ double val_from, val_to; \
+ scpi_bool_t val_range; \
+ \
+ 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_Parameter(&scpi_context, ¶m, TRUE); \
+ result2 = SCPI_ExprNumericListEntryDouble(&scpi_context, ¶m, index, &val_range, &val_from, &val_to);\
+ errCode = SCPI_ErrorPop(&scpi_context); \
+ CU_ASSERT_EQUAL(result2, expected_result); \
+ if (expected_result == SCPI_EXPR_OK) { \
+ CU_ASSERT_EQUAL(val_range, expected_range); \
+ CU_ASSERT_DOUBLE_EQUAL(val_from, expected_from, 0.0001); \
+ if (expected_range) { \
+ CU_ASSERT_DOUBLE_EQUAL(val_to, expected_to, 0.0001); \
+ } \
+ } \
+ CU_ASSERT_EQUAL(errCode, expected_error_code); \
+}
+
+static void testNumericList(void) {
+ TEST_NumericListInt("(1:2,5:6)", 0, TRUE, 1, 2, SCPI_EXPR_OK, 0);
+ TEST_NumericListInt("(1:2,5:6)", 1, TRUE, 5, 6, SCPI_EXPR_OK, 0);
+ TEST_NumericListInt("(1:2,5:6)", 2, FALSE, 0, 0, SCPI_EXPR_NO_MORE, 0);
+
+ TEST_NumericListInt("(12,5:6)", 0, FALSE, 12, 0, SCPI_EXPR_OK, 0);
+ TEST_NumericListInt("(12,5:6)", 1, TRUE, 5, 6, SCPI_EXPR_OK, 0);
+ TEST_NumericListInt("(12,5:6)", 2, FALSE, 0, 0, SCPI_EXPR_NO_MORE, 0);
+
+ TEST_NumericListInt("(12,5:6:3)", 0, FALSE, 12, 0, SCPI_EXPR_OK, 0);
+ TEST_NumericListInt("(12,5:6:3)", 1, TRUE, 5, 6, SCPI_EXPR_OK, 0);
+ TEST_NumericListInt("(12,5:6:3)", 2, FALSE, 0, 0, SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+
+ TEST_NumericListDouble("(1:2,5:6)", 0, TRUE, 1, 2, SCPI_EXPR_OK, 0);
+ TEST_NumericListDouble("(1:2,5:6)", 1, TRUE, 5, 6, SCPI_EXPR_OK, 0);
+ TEST_NumericListDouble("(1:2,5:6)", 2, FALSE, 0, 0, SCPI_EXPR_NO_MORE, 0);
+
+ TEST_NumericListDouble("(12,5:6)", 0, FALSE, 12, 0, SCPI_EXPR_OK, 0);
+ TEST_NumericListDouble("(12,5:6)", 1, TRUE, 5, 6, SCPI_EXPR_OK, 0);
+ TEST_NumericListDouble("(12,5:6)", 2, FALSE, 0, 0, SCPI_EXPR_NO_MORE, 0);
+
+ 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);
+}
+
+#define NOPAREN(...) __VA_ARGS__
+
+#define TEST_ChannelList(data, index, val_len, expected_range, expected_dimensions, _expected_from, _expected_to, expected_result, expected_error_code) \
+{ \
+ scpi_bool_t result; \
+ scpi_expr_result_t result2; \
+ int16_t errCode; \
+ scpi_parameter_t param; \
+ int32_t val_from[val_len], val_to[val_len]; \
+ scpi_bool_t val_range; \
+ int32_t expected_from[] = {NOPAREN _expected_from}; \
+ int32_t expected_to[] = {NOPAREN _expected_to}; \
+ size_t val_dimensions; \
+ \
+ 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_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); \
+ CU_ASSERT_EQUAL(result2, expected_result); \
+ if (expected_result == SCPI_EXPR_OK) { \
+ CU_ASSERT_EQUAL(val_dimensions, expected_dimensions); \
+ CU_ASSERT_EQUAL(val_range, expected_range); \
+ { size_t i; for(i = 0; (i < val_len) && (i < val_dimensions); i++) { \
+ CU_ASSERT_EQUAL(val_from[i], expected_from[i]); \
+ }} \
+ if (expected_range) { \
+ { size_t i; for(i = 0; (i < val_len) && (i < val_dimensions); i++) { \
+ CU_ASSERT_EQUAL(val_to[i], expected_to[i]); \
+ }} \
+ } \
+ } \
+ CU_ASSERT_EQUAL(errCode, expected_error_code); \
+}
+
+static void testChannelList(void) {
+ TEST_ChannelList("(1)", 0, 1, FALSE, 0, (0), (0), SCPI_EXPR_ERROR, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+
+ TEST_ChannelList("(@1)", 0, 1, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
+ TEST_ChannelList("(@1)", 1, 1, FALSE, 0, (0), (0), SCPI_EXPR_NO_MORE, 0);
+
+ TEST_ChannelList("(@1,2)", 0, 1, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
+ TEST_ChannelList("(@1,2)", 1, 1, FALSE, 1, (2), (0), SCPI_EXPR_OK, 0);
+ TEST_ChannelList("(@1,2)", 2, 1, FALSE, 0, (0), (0), SCPI_EXPR_NO_MORE, 0);
+
+ TEST_ChannelList("(@1,2:3)", 0, 1, FALSE, 1, (1), (0), SCPI_EXPR_OK, 0);
+ TEST_ChannelList("(@1,2:3)", 1, 1, TRUE, 1, (2), (3), SCPI_EXPR_OK, 0);
+ 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)", 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);
+ TEST_ChannelList("(@1,2!5:3!6)", 1, 1, TRUE, 2, (2), (3), SCPI_EXPR_OK, 0);
+ TEST_ChannelList("(@1,2!5:3!6)", 2, 1, FALSE, 0, (0), (0), SCPI_EXPR_NO_MORE, 0);
+
+ 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);
+}
+
int main() {
+ unsigned int result;
CU_pSuite pSuite = NULL;
/* Initialize the CUnit test registry */
@@ -466,6 +621,8 @@
|| (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))
+ || (NULL == CU_add_test(pSuite, "Numeric list", testNumericList))
+ || (NULL == CU_add_test(pSuite, "Channel list", testChannelList))
) {
CU_cleanup_registry();
return CU_get_error();
@@ -474,7 +631,8 @@
/* Run all tests using the CUnit Basic interface */
CU_basic_set_mode(CU_BRM_VERBOSE);
CU_basic_run_tests();
+ result = CU_get_number_of_tests_failed();
CU_cleanup_registry();
- return CU_get_error();
+ return result ? result : CU_get_error();
}
--
Gitblit v1.9.1