[llvm] [orc-rt] Use the Error matchers in SimplePackedSerializationTest (PR #228696)

[Lang Hames via llvm-commits]

https://github.com/lhames updated https://github.com/llvm/llvm-project/pull/228696

>From de345a2671611c607c7e527180c124448cfe664c Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Thu, 1 Oct 2026 09:28:44 +1000
Subject: [PATCH] [orc-rt] Use the Error matchers in
 SimplePackedSerializationTest

Use the Error matchers introduced in 4c8a437d0487 to clean up error
checks in SimplePackedSerializationTest.
---
 .../sps/SimplePackedSerializationTest.cpp     | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/orc-rt/test/unit/support/sps/SimplePackedSerializationTest.cpp b/orc-rt/test/unit/support/sps/SimplePackedSerializationTest.cpp
index fd814108abda1f..5bd382f568a41d 100644
--- a/orc-rt/test/unit/support/sps/SimplePackedSerializationTest.cpp
+++ b/orc-rt/test/unit/support/sps/SimplePackedSerializationTest.cpp
@@ -12,6 +12,7 @@
 
 #include "orc-rt/support/sps/SimplePackedSerialization.h"
 
+#include "ErrorMatchers.h"
 #include "SimplePackedSerializationTestUtils.h"
 #include "gtest/gtest.h"
 
@@ -360,8 +361,7 @@ TEST(SimplePackedSerializationTest, SerializeErrorSuccess) {
     return;
   }
 
-  auto E = SE.toError();
-  EXPECT_FALSE(!!E); // Expect non-error, i.e. Error::success().
+  EXPECT_THAT_ERROR(SE.toError(), Succeeded());
 }
 
 TEST(SimplePackedSerializationTest, SerializeErrorFailure) {
@@ -377,7 +377,7 @@ TEST(SimplePackedSerializationTest, SerializeErrorFailure) {
     return;
   }
 
-  EXPECT_EQ(toString(SE.toError()), std::string("test error message"));
+  EXPECT_THAT_ERROR(SE.toError(), FailedWithMessage("test error message"));
 }
 
 TEST(SimplePackedSerializationTest, SerializeExpectedSuccessViaExpected) {
@@ -393,11 +393,7 @@ TEST(SimplePackedSerializationTest, SerializeExpectedSuccessViaExpected) {
     return;
   }
 
-  auto E = SE.toExpected();
-  if (E)
-    EXPECT_EQ(*E, 42U);
-  else
-    ADD_FAILURE() << "Unexpected failure value";
+  EXPECT_THAT_EXPECTED(SE.toExpected(), HasValue(42U));
 }
 
 TEST(SimplePackedSerializationTest, SerializeExpectedSuccessViaValue) {
@@ -413,11 +409,7 @@ TEST(SimplePackedSerializationTest, SerializeExpectedSuccessViaValue) {
     return;
   }
 
-  auto E = SE.toExpected();
-  if (E)
-    EXPECT_EQ(*E, 42U);
-  else
-    ADD_FAILURE() << "Unexpected failure value";
+  EXPECT_THAT_EXPECTED(SE.toExpected(), HasValue(42U));
 }
 
 TEST(SimplePackedSerializationTest, SerializeExpectedFailure) {
@@ -434,9 +426,6 @@ TEST(SimplePackedSerializationTest, SerializeExpectedFailure) {
     return;
   }
 
-  auto E = SE.toExpected();
-  if (E)
-    ADD_FAILURE() << "Unexpected failure value";
-  else
-    EXPECT_EQ(toString(E.takeError()), std::string("test error message"));
+  EXPECT_THAT_EXPECTED(SE.toExpected(),
+                       FailedWithMessage("test error message"));
 }