From 06b8e466fd5db6f6df344764ac5832587d03c126 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 07 7月 2017 21:03:33 +0800
Subject: [PATCH] Merge pull request #86 from RedPitaya/master
---
libscpi/test/test_parser.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 61fda2d..32773f9 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -350,7 +350,7 @@
}
#define TEST_IEEE4882_REG(reg, expected) { \
- CU_ASSERT_EQUAL(SCPI_RegGet(&scpi_context, reg), expected); \
+ CU_ASSERT_EQUAL(SCPI_RegGet(&scpi_context, (scpi_reg_name_t)(reg)), expected);\
}
@@ -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); \
} \
@@ -1203,8 +1203,10 @@
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, 9223372036854775807LL, "9.22337203685478e+18"); */
+ /* TEST_Result(Double, -9223372036854775807LL, "-9.22337203685478e+18"); */
+ TEST_Result(Double, 9223372036854700000LL, "9.2233720368547e+18");
+ TEST_Result(Double, -9223372036854700000LL, "-9.2233720368547e+18");
TEST_Result(Double, 1.256e-17, "1.256e-17");
TEST_Result(Double, -1.256e-17, "-1.256e-17");
@@ -1417,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);\
@@ -1430,12 +1432,12 @@
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;\
res_len = SCPI_NumberToStr(&scpi_context, scpi_special_numbers_def, &number, buffer, limit);\
- size_t expected_len = strnlen(expected_result, limit - 1);\
+ size_t expected_len = SCPIDEFINE_strnlen(expected_result, limit - 1);\
CU_ASSERT_NSTRING_EQUAL(buffer, expected_result, expected_len);\
CU_ASSERT_EQUAL(buffer[expected_len], 0);\
CU_ASSERT_EQUAL((unsigned char)buffer[limit], 0xaa);\
--
Gitblit v1.9.1