From 2e303086ba3b72a5f9172aeda31edb075a5f981c Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Wed, 20 Nov 2024 10:31:36 +0100 Subject: [PATCH] Make TestScanner.ScanOrderingFail and AssertOrderNode.SingleColumn[A|De]sc assertions robust --- cpp/src/arrow/acero/assert_order_node_test.cc | 5 +++-- cpp/src/arrow/dataset/scanner_test.cc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cpp/src/arrow/acero/assert_order_node_test.cc b/cpp/src/arrow/acero/assert_order_node_test.cc index 889e4b168b562..c16e06489555a 100644 --- a/cpp/src/arrow/acero/assert_order_node_test.cc +++ b/cpp/src/arrow/acero/assert_order_node_test.cc @@ -78,8 +78,9 @@ void CheckAssert(const std::shared_ptr& array, auto result = DeclarationToTable(plan, query_options); ASSERT_NOT_OK(result); const auto& actual_status = result.status(); - ASSERT_EQ(actual_status.code(), expected_status.code()); - ASSERT_EQ(actual_status.message(), expected_status.message()); + EXPECT_EQ(actual_status.code(), expected_status.code()); + EXPECT_THAT(actual_status.message(), + testing::StartsWith(expected_status.message())); } } } diff --git a/cpp/src/arrow/dataset/scanner_test.cc b/cpp/src/arrow/dataset/scanner_test.cc index 5ab7d16840233..5a159a20cb47b 100644 --- a/cpp/src/arrow/dataset/scanner_test.cc +++ b/cpp/src/arrow/dataset/scanner_test.cc @@ -1036,8 +1036,8 @@ class TestScanner : public DatasetFixtureMixinWithParam { next = it.Next(); } // expect iteration to stop on failure status - ASSERT_NOT_OK(next); - ASSERT_EQ(next.status().message(), "Data is not ordered"); + EXPECT_EQ(next.status().code(), StatusCode::ExecutionError); + EXPECT_THAT(next.status().message(), testing::StartsWith("Data is not ordered")); } } };