Make TestScanner.ScanOrderingFail and AssertOrderNode.SingleColumn[A|…

…De]sc assertions robust
apache · Nov 20, 2024 · 7750094 · 7750094
1 parent 937695d
commit 7750094
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cpp/src/arrow/acero/assert_order_node_test.cc b/cpp/src/arrow/acero/assert_order_node_test.cc
@@ -78,8 +78,8 @@ void CheckAssert(const std::shared_ptr<ChunkedArray>& 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
@@ -1036,8 +1036,8 @@ class TestScanner : public DatasetFixtureMixinWithParam<TestScannerParams> {
         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"));
     }
   }
 };