[llvm] [orc-rt] Use the Error matchers in ConnectionSpecTest (PR #225603)

[Lang Hames via llvm-commits]

https://github.com/lhames created https://github.com/llvm/llvm-project/pull/225603

Use the Error matchers introduced in 72aeee3df1 to clean up error checks in ConnectionSpecTest.

>From 8d27ba075f9dbaf49e757da34542338318ad73d2 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Wed, 23 Sep 2026 15:38:55 +1000
Subject: [PATCH] [orc-rt] Use the Error matchers in ConnectionSpecTest

Use the Error matchers introduced in 72aeee3df1 to clean up error checks
in ConnectionSpecTest.
---
 .../test/unit/bedrock/ConnectionSpecTest.cpp  | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/orc-rt/test/unit/bedrock/ConnectionSpecTest.cpp b/orc-rt/test/unit/bedrock/ConnectionSpecTest.cpp
index 7bea53ee7712e0..55c1ea724ccca9 100644
--- a/orc-rt/test/unit/bedrock/ConnectionSpecTest.cpp
+++ b/orc-rt/test/unit/bedrock/ConnectionSpecTest.cpp
@@ -7,16 +7,20 @@
 //===----------------------------------------------------------------------===//
 
 #include "orc-rt/bedrock/ConnectionSpec.h"
-#include "orc-rt/support/Error.h"
+
+#include "ErrorMatchers.h"
 #include "gtest/gtest.h"
 
 using namespace orc_rt;
+using namespace orc_rt::test;
+
+using ::testing::HasSubstr;
 
 namespace {
 
 TEST(ConnectionSpecTest, TransportActionAndDescriptor) {
   auto CS = ConnectionSpec::parse("tcp:connect=localhost:20000");
-  ASSERT_TRUE(!!CS);
+  ASSERT_THAT_EXPECTED(CS, Succeeded());
   EXPECT_EQ(CS->transport(), "tcp");
   EXPECT_EQ(CS->action(), "connect");
   EXPECT_EQ(CS->descriptor(), "localhost:20000");
@@ -24,7 +28,7 @@ TEST(ConnectionSpecTest, TransportActionAndDescriptor) {
 
 TEST(ConnectionSpecTest, TransportActionAndMultiPartDescriptor) {
   auto CS = ConnectionSpec::parse("pipe:adopt=3,4");
-  ASSERT_TRUE(!!CS);
+  ASSERT_THAT_EXPECTED(CS, Succeeded());
   EXPECT_EQ(CS->transport(), "pipe");
   EXPECT_EQ(CS->action(), "adopt");
   EXPECT_EQ(CS->descriptor(), "3,4");
@@ -34,50 +38,41 @@ TEST(ConnectionSpecTest, EmptyDescriptorIsAllowed) {
   // Whether an empty descriptor means anything is the transport's business, so
   // it isn't a syntax error here.
   auto CS = ConnectionSpec::parse("socket:adopt=");
-  ASSERT_TRUE(!!CS);
+  ASSERT_THAT_EXPECTED(CS, Succeeded());
   EXPECT_EQ(CS->transport(), "socket");
   EXPECT_EQ(CS->descriptor(), "");
 }
 
 TEST(ConnectionSpecTest, DescriptorKeepsColonsAndEquals) {
   auto CS = ConnectionSpec::parse("tcp:listen=[::1]:0");
-  ASSERT_TRUE(!!CS);
+  ASSERT_THAT_EXPECTED(CS, Succeeded());
   EXPECT_EQ(CS->transport(), "tcp");
   EXPECT_EQ(CS->action(), "listen");
   EXPECT_EQ(CS->descriptor(), "[::1]:0");
 
   // Only the first '=' is structural.
   auto Odd = ConnectionSpec::parse("unix:listen=/tmp/a=b.sock");
-  ASSERT_TRUE(!!Odd);
+  ASSERT_THAT_EXPECTED(Odd, Succeeded());
   EXPECT_EQ(Odd->descriptor(), "/tmp/a=b.sock");
 }
 
 TEST(ConnectionSpecTest, MissingEqualsFails) {
-  auto CS = ConnectionSpec::parse("tcp:connect");
-  EXPECT_FALSE(!!CS);
-  consumeError(CS.takeError());
+  EXPECT_THAT_EXPECTED(ConnectionSpec::parse("tcp:connect"), Failed());
 }
 
 TEST(ConnectionSpecTest, EmptyTransportFails) {
-  auto CS = ConnectionSpec::parse("=localhost:20000");
-  EXPECT_FALSE(!!CS);
-  consumeError(CS.takeError());
-
-  auto WithAction = ConnectionSpec::parse(":connect=localhost:20000");
-  EXPECT_FALSE(!!WithAction);
-  consumeError(WithAction.takeError());
+  EXPECT_THAT_EXPECTED(ConnectionSpec::parse("=localhost:20000"), Failed());
+  EXPECT_THAT_EXPECTED(ConnectionSpec::parse(":connect=localhost:20000"),
+                       Failed());
 }
 
 TEST(ConnectionSpecTest, EmptyActionFails) {
-  auto CS = ConnectionSpec::parse("tcp:=localhost:20000");
-  EXPECT_FALSE(!!CS);
-  consumeError(CS.takeError());
+  EXPECT_THAT_EXPECTED(ConnectionSpec::parse("tcp:=localhost:20000"), Failed());
 }
 
 TEST(ConnectionSpecTest, ErrorMessageQuotesTheSpec) {
-  auto CS = ConnectionSpec::parse("tcp:connect");
-  ASSERT_FALSE(!!CS);
-  EXPECT_NE(toString(CS.takeError()).find("'tcp:connect'"), std::string::npos);
+  EXPECT_THAT_EXPECTED(ConnectionSpec::parse("tcp:connect"),
+                       FailedWithMessage(HasSubstr("'tcp:connect'")));
 }
 
 } // namespace