[kudu] branch master updated: [util] introduce EXPECT_STR_MATCHES() macro

[alexey]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new ff89b453d [util] introduce EXPECT_STR_MATCHES() macro
ff89b453d is described below

commit ff89b453d453d4899f05132da9f061a1c2c6ebcf
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Wed May 17 14:30:10 2023 -0700

    [util] introduce EXPECT_STR_MATCHES() macro
    
    This patch introduces EXPECT_STR_MATCHES macro and starts using it
    in the TestNegotiation.  The idea is to match the EXPECT-like behavior
    used in verifying the actual test results against the reference ones.
    
    Change-Id: Ibf036bff8ab0aace20d11281d2837cfa6af32db6
    Reviewed-on: http://gerrit.cloudera.org:8080/19900
    Tested-by: Kudu Jenkins
    Reviewed-by: Abhishek Chennaka <achenn...@cloudera.com>
---
 src/kudu/rpc/negotiation-test.cc | 4 ++--
 src/kudu/util/test_macros.h      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/kudu/rpc/negotiation-test.cc b/src/kudu/rpc/negotiation-test.cc
index 9a635d3e8..b4d313844 100644
--- a/src/kudu/rpc/negotiation-test.cc
+++ b/src/kudu/rpc/negotiation-test.cc
@@ -381,8 +381,8 @@ TEST_P(TestNegotiation, TestNegotiation) {
   // Check the negotiation outcome against the expected outcome.
   EXPECT_EQ(desc.client_status.CodeAsString(), client_status.CodeAsString());
   EXPECT_EQ(desc.server_status.CodeAsString(), server_status.CodeAsString());
-  ASSERT_STR_MATCHES(client_status.ToString(), desc.client_status.ToString());
-  ASSERT_STR_MATCHES(server_status.ToString(), desc.server_status.ToString());
+  EXPECT_STR_MATCHES(client_status.ToString(), desc.client_status.ToString());
+  EXPECT_STR_MATCHES(server_status.ToString(), desc.server_status.ToString());
 
   if (client_status.ok()) {
     EXPECT_TRUE(server_status.ok());
diff --git a/src/kudu/util/test_macros.h b/src/kudu/util/test_macros.h
index 28dcb26ab..d96b92368 100644
--- a/src/kudu/util/test_macros.h
+++ b/src/kudu/util/test_macros.h
@@ -78,6 +78,12 @@
 #define ASSERT_STR_NOT_MATCHES(str, pattern) \
   ASSERT_THAT(str, testing::Not(testing::ContainsRegex(pattern)))
 
+#define EXPECT_STR_MATCHES(str, pattern) \
+  EXPECT_THAT(str, testing::ContainsRegex(pattern))
+
+#define EXPECT_STR_NOT_MATCHES(str, pattern) \
+  EXPECT_THAT(str, testing::Not(testing::ContainsRegex(pattern)))
+
 // Batched substring regular expressions in extended regex (POSIX) syntax.
 //
 // All strings must match the pattern.