From a10c464ba98e980b21185bf084789f6c8df22473 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@gmail.com>
Date: 周三, 19 7月 2017 21:03:37 +0800
Subject: [PATCH] moving bool choice definition (ON, OFF) to units.c, so it could be used by various applications
---
libscpi/test/test_parser.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 94ec818..32773f9 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -516,7 +516,7 @@
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("", 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);
@@ -1013,8 +1013,8 @@
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); \
} \
@@ -1419,7 +1419,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);\
@@ -1432,7 +1432,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];\
memset(buffer, 0xaa, 100);\
size_t res_len;\
--
Gitblit v1.9.1