Remove .status() usages when matching IsOk() with a StatusOr object.

Since the IsOk() matcher can handle StatusOr now, we don't need to call .status() anymore.

NOKEYCHECK

NOKEYCHECK=True
PiperOrigin-RevId: 456467311

2 files changed, 25 insertions, 25 deletions

diff --git a/cc/util/buffer_test.cc b/cc/util/buffer_test.cc
index 19aa46068..045d4b0f2 100644
--- a/cc/util/buffer_test.cc
+++ b/cc/util/buffer_test.cc
@@ -41,7 +41,7 @@ TEST(BufferTest, ExternalMemoryBlock) {
     SCOPED_TRACE(absl::StrCat("buf_size = ", buf_size));
     auto mem_block = absl::make_unique<char[]>(buf_size);
     auto buf_result = Buffer::NewNonOwning(mem_block.get(), buf_size);
-    ASSERT_THAT(buf_result.status(), IsOk());
+    ASSERT_THAT(buf_result, IsOk());
     auto buf = std::move(buf_result.value());
     EXPECT_EQ(buf_size, buf->size());
     EXPECT_EQ(buf_size, buf->allocated_size());
@@ -63,7 +63,7 @@ TEST(BufferTest, InternalMemoryBlock) {
   for (auto buf_size : {1, 10, 100, 1000, 10000, 100000, 1000000}) {
     SCOPED_TRACE(absl::StrCat("buf_size = ", buf_size));
     auto buf_result = Buffer::New(buf_size);
-    ASSERT_THAT(buf_result.status(), IsOk());
+    ASSERT_THAT(buf_result, IsOk());
     auto buf = std::move(buf_result.value());
     EXPECT_EQ(buf_size, buf->size());
     EXPECT_EQ(buf_size, buf->allocated_size());
diff --git a/cc/util/input_stream_util_test.cc b/cc/util/input_stream_util_test.cc
index d88184db9..17005883b 100644
--- a/cc/util/input_stream_util_test.cc
+++ b/cc/util/input_stream_util_test.cc
@@ -42,7 +42,7 @@ TEST(ReadBytesTest, ReadExact) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>(content)};
   auto text_or = ReadBytesFromStream(content.size(), &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text = std::move(text_or).value();
   EXPECT_THAT(text, Eq(content));
 }
@@ -58,7 +58,7 @@ TEST(ReadBytesTest, ReadLess) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdefghijklmnop")};
   auto text_or = ReadBytesFromStream(7, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("0123456"));
 }
 
@@ -66,11 +66,11 @@ TEST(ReadBytesTest, ReadTwice) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdefghijklmnop")};
   auto text_or = ReadBytesFromStream(7, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("0123456"));
 
   text_or = ReadBytesFromStream(5, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("789ab"));
 }
 
@@ -80,11 +80,11 @@ TEST(ReadBytesTest, ReadMoreThanBlockSize) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdefghijklmnop"), 4};
   auto text_or = ReadBytesFromStream(11, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("0123456789a"));
 
   text_or = ReadBytesFromStream(5, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("bcdef"));
 }
 
@@ -92,16 +92,16 @@ TEST(ReadBytesTest, Request0) {
   IstreamInputStream input_stream(
       absl::make_unique<std::stringstream>("012345678"));
   auto text_or = ReadBytesFromStream(4, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("0123"));
   text_or = ReadBytesFromStream(0, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq(""));
   text_or = ReadBytesFromStream(5, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq("45678"));
   text_or = ReadBytesFromStream(0, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq(""));
 }
 
@@ -109,14 +109,14 @@ TEST(ReadBytesTest, RequestNegative) {
   IstreamInputStream input_stream(
       absl::make_unique<std::stringstream>("012345678"));
   auto text_or = ReadBytesFromStream(-1, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq(""));
 }
 
 TEST(ReadBytesTest, EmptyInput) {
   IstreamInputStream input_stream(absl::make_unique<std::stringstream>(""));
   auto text_or = ReadBytesFromStream(0, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   EXPECT_THAT(text_or.value(), Eq(""));
   text_or = ReadBytesFromStream(1, &input_stream);
   EXPECT_THAT(text_or.status(), StatusIs(absl::StatusCode::kOutOfRange));
@@ -127,7 +127,7 @@ TEST(ReadSecretBytesTest, ReadExact) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>(content)};
   auto text_or = ReadSecretBytesFromStream(content.size(), &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq(content));
 }
@@ -143,7 +143,7 @@ TEST(ReadSecretBytesTest, ReadLess) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdefghijklmnop")};
   auto text_or = ReadSecretBytesFromStream(7, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq("0123456"));
 }
@@ -156,7 +156,7 @@ TEST(ReadSecretBytesTest, ReadTwice) {
   EXPECT_THAT(text, Eq("0123456"));
 
   text_or = ReadSecretBytesFromStream(5, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   text = std::string(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq("789ab"));
 }
@@ -167,12 +167,12 @@ TEST(ReadSecretBytesTest, ReadMoreThanBlockSize) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdefghijklmnop"), 4};
   auto text_or = ReadSecretBytesFromStream(11, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq("0123456789a"));
 
   text_or = ReadSecretBytesFromStream(5, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   text = std::string(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq("bcdef"));
 }
@@ -181,19 +181,19 @@ TEST(ReadSecretBytesTest, Request0) {
   IstreamInputStream input_stream(
       absl::make_unique<std::stringstream>("012345678"));
   auto text_or = ReadSecretBytesFromStream(4, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq("0123"));
   text_or = ReadSecretBytesFromStream(0, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   text = std::string(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq(""));
   text_or = ReadSecretBytesFromStream(5, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   text = std::string(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq("45678"));
   text_or = ReadSecretBytesFromStream(0, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   text = std::string(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq(""));
 }
@@ -202,7 +202,7 @@ TEST(ReadSecretBytesTest, RequestNegative) {
   IstreamInputStream input_stream(
       absl::make_unique<std::stringstream>("012345678"));
   auto text_or = ReadSecretBytesFromStream(-1, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq(""));
 }
@@ -211,7 +211,7 @@ TEST(ReadSecretBytesTest, EmptyInput) {
   IstreamInputStream input_stream(
       absl::make_unique<std::stringstream>(""));
   auto text_or = ReadSecretBytesFromStream(0, &input_stream);
-  ASSERT_THAT(text_or.status(), IsOk());
+  ASSERT_THAT(text_or, IsOk());
   std::string text(util::SecretDataAsStringView(std::move(text_or).value()));
   EXPECT_THAT(text, Eq(""));
   text_or = ReadSecretBytesFromStream(1, &input_stream);