From abb0253ee22f7220c6393e24939f8635c4f26cd3 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Thu, 30 Nov 2023 12:49:07 -0400 Subject: [PATCH] fix bad json error --- src/nanoarrow/nanoarrow_testing.hpp | 3 ++- src/nanoarrow/nanoarrow_testing_test.cc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/nanoarrow/nanoarrow_testing.hpp b/src/nanoarrow/nanoarrow_testing.hpp index 0ce79fa94..b6bb02fcc 100644 --- a/src/nanoarrow/nanoarrow_testing.hpp +++ b/src/nanoarrow/nanoarrow_testing.hpp @@ -714,7 +714,8 @@ class TestingJSONReader { ArrowArrayStreamMove(stream.get(), out); return NANOARROW_OK; } catch (json::exception& e) { - ArrowErrorSet(error, "Exception in TestingJSONReader::ReadBatch(): %s", e.what()); + ArrowErrorSet(error, "Exception in TestingJSONReader::ReadDataFile(): %s", + e.what()); return EINVAL; } } diff --git a/src/nanoarrow/nanoarrow_testing_test.cc b/src/nanoarrow/nanoarrow_testing_test.cc index 91d79f5d4..bf2785eab 100644 --- a/src/nanoarrow/nanoarrow_testing_test.cc +++ b/src/nanoarrow/nanoarrow_testing_test.cc @@ -774,6 +774,9 @@ TEST(NanoarrowTestingTest, NanoarrowTestingTestRoundtripDataFile) { std::stringstream data_file_json_roundtrip; ASSERT_EQ(writer.WriteDataFile(data_file_json_roundtrip, stream.get()), NANOARROW_OK); EXPECT_EQ(data_file_json_roundtrip.str(), data_file_json); + + // Also test error for invalid JSON + ASSERT_EQ(reader.ReadDataFile("{", stream.get()), EINVAL); } TEST(NanoarrowTestingTest, NanoarrowTestingTestReadBatch) {