From ffcf148667ddd6213d3d31958f10f7f2680374f8 Mon Sep 17 00:00:00 2001 From: Qianqian Fang Date: Sun, 8 May 2022 21:04:48 -0400 Subject: [PATCH] remove platform specific out_of_range error messages --- tests/src/unit-bjdata.cpp | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/tests/src/unit-bjdata.cpp b/tests/src/unit-bjdata.cpp index 5339fdb2f..de9615ea4 100644 --- a/tests/src/unit-bjdata.cpp +++ b/tests/src/unit-bjdata.cpp @@ -2492,36 +2492,21 @@ TEST_CASE("BJData") { std::vector v1 = {'[', '#', 'i', 0xF1}; std::vector v2 = {'[', '$', 'I', '#', 'i', 0xF2}; - std::vector v3 = {'[', '#', '[', 'i', 0xF3, 'i', 0x02, ']'}; - std::vector v4 = {'[', '$', 'I', '#', '[', 'i', 0xF4, 'i', 0x02, ']'}; + std::vector v3 = {'[', '$', 'I', '#', '[', 'i', 0xF4, 'i', 0x02, ']'}; + std::vector v4 = {'[', '$', 0xF6, '#', 'i', 0xF7}; std::vector v5 = {'[', '$', 'I', '#', '[', 'i', 0xF5, 'i', 0xF1, ']'}; - std::vector v6 = {'[', '$', 0xF6, '#', 'i', 0xF7}; + std::vector v6 = {'[', '#', '[', 'i', 0xF3, 'i', 0x02, ']'}; json _; CHECK_THROWS_AS(_ = json::from_bjdata(v1), json::out_of_range&); CHECK_THROWS_AS(_ = json::from_bjdata(v2), json::out_of_range&); + CHECK_THROWS_AS(_ = json::from_bjdata(v3), json::out_of_range&); CHECK_THROWS_AS(_ = json::from_bjdata(v4), json::out_of_range&); - CHECK_THROWS_AS(_ = json::from_bjdata(v6), json::out_of_range&); - - if (sizeof(size_t) == 8) - { - CHECK_THROWS_WITH(_ = json::from_bjdata(v1), "[json.exception.out_of_range.408] excessive array size: 18446744073709551601"); - CHECK_THROWS_WITH(_ = json::from_bjdata(v2), "[json.exception.out_of_range.408] excessive array size: 18446744073709551602"); - CHECK_THROWS_WITH(_ = json::from_bjdata(v4), "[json.exception.out_of_range.408] excessive array size: 18446744073709551592"); - CHECK_THROWS_WITH(_ = json::from_bjdata(v6), "[json.exception.out_of_range.408] excessive array size: 18446744073709551607"); - } - else - { - CHECK_THROWS_WITH(_ = json::from_bjdata(v1), "[json.exception.out_of_range.408] excessive array size: 4294967281"); - CHECK_THROWS_WITH(_ = json::from_bjdata(v2), "[json.exception.out_of_range.408] excessive array size: 4294967282"); - CHECK_THROWS_WITH(_ = json::from_bjdata(v4), "[json.exception.out_of_range.408] excessive array size: 4294967272"); - CHECK_THROWS_WITH(_ = json::from_bjdata(v6), "[json.exception.out_of_range.408] excessive array size: 4294967287"); - } - - CHECK(json::from_bjdata(v3, true, false).is_discarded()); CHECK_THROWS_AS(_ = json::from_bjdata(v5), json::parse_error&); CHECK_THROWS_WITH(_ = json::from_bjdata(v5), "[json.exception.parse_error.110] parse error at byte 11: syntax error while parsing BJData number: unexpected end of input"); + + CHECK(json::from_bjdata(v6, true, false).is_discarded()); } SECTION("do not accept NTFZ markers in ndarray optimized type")