[llvm] [orc-rt] Use the Error matchers in ProxyTest (PR #228799)

[Lang Hames via llvm-commits]

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

Use the Error matchers introduced in 4c8a437d0487 to clean up error tests in ProxyTest.

>From 4355ec20ce7cbaa49400d34726c7cba70ace290c Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Thu, 1 Oct 2026 16:20:55 +1000
Subject: [PATCH] [orc-rt] Use the Error matchers in ProxyTest

Use the Error matchers introduced in 4c8a437d0487 to clean up error
tests in ProxyTest.
---
 orc-rt/test/unit/support/ProxyTest.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/orc-rt/test/unit/support/ProxyTest.cpp b/orc-rt/test/unit/support/ProxyTest.cpp
index f8a39e0211c95..111539892ae47 100644
--- a/orc-rt/test/unit/support/ProxyTest.cpp
+++ b/orc-rt/test/unit/support/ProxyTest.cpp
@@ -14,10 +14,13 @@
 
 #include "gtest/gtest.h"
 
+#include "ErrorMatchers.h"
+
 #include <optional>
 #include <utility>
 
 using namespace orc_rt;
+using namespace orc_rt::test;
 
 // Proxy.h only forward-declares Session and never touches it. We mock it below
 // so that we don't need to link against bedrock.
@@ -66,7 +69,7 @@ TEST(ProxyTest, DispatchReportsVoidResult) {
   bool Completed = false;
   P(
       [&](Error Err) {
-        cantFail(std::move(Err));
+        EXPECT_THAT_ERROR(std::move(Err), Succeeded());
         Completed = true;
       },
       S);
@@ -80,7 +83,12 @@ TEST(ProxyTest, DispatchForwardsArgsAndResult) {
   Proxy<int(int)> P(addOneDispatch, &Tag);
 
   std::optional<int> Result;
-  P([&](Expected<int> R) { Result = cantFail(std::move(R)); }, S, 42);
+  P(
+      [&](Expected<int> R) {
+        ASSERT_THAT_EXPECTED(R, Succeeded());
+        Result = *R;
+      },
+      S, 42);
   ASSERT_TRUE(Result.has_value());
   EXPECT_EQ(*Result, 43);
 }
@@ -92,7 +100,12 @@ TEST(ProxyTest, DispatchForwardsCalleeTag) {
   Proxy<const void *()> P(returnTagDispatch, &Tag);
 
   std::optional<const void *> Result;
-  P([&](Expected<const void *> R) { Result = cantFail(std::move(R)); }, S);
+  P(
+      [&](Expected<const void *> R) {
+        ASSERT_THAT_EXPECTED(R, Succeeded());
+        Result = *R;
+      },
+      S);
   ASSERT_TRUE(Result.has_value());
   EXPECT_EQ(*Result, &Tag);
 }