sola/scpi-parser.git

			@@ -241,19 +241,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
			@@ -387,8 +392,8 @@
			TEST_ParamUInt32("10V", TRUE, 0, FALSE, -138);

			// test range
			TEST_ParamUInt32("2147483647", TRUE, 2147483647, TRUE, 0);
			TEST_ParamUInt32("4294967295", TRUE, 4294967295, TRUE, 0);
			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) \
			@@ -467,8 +472,8 @@
			TEST_ParamUInt64("10V", TRUE, 0, FALSE, -138);

			// test range
			TEST_ParamUInt64("2147483647", TRUE, 2147483647, TRUE, 0);
			TEST_ParamUInt64("4294967295", TRUE, 4294967295, TRUE, 0);
			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);
			}
			@@ -765,6 +770,47 @@
			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);
			}

			int main() {
			unsigned int result;
			CU_pSuite pSuite = NULL;
			@@ -794,6 +840,7 @@
			\|\| (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))
			) {
			CU_cleanup_registry();
			return CU_get_error();