From 8e04e1c959ed282f81c96c7b4cd69a72f20174bc Mon Sep 17 00:00:00 2001 From: Arrigo Marchiori <ardovm@yahoo.it> Date: 周六, 15 10月 2016 19:37:11 +0800 Subject: [PATCH] align parser test to last commits --- libscpi/test/test_parser.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c index 8aaf6d7..32773f9 100644 --- a/libscpi/test/test_parser.c +++ b/libscpi/test/test_parser.c @@ -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