Minor test improvement

XRPLF · Oct 20, 2023 · d88828b · d88828b
1 parent 198e7cd
commit d88828b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 24 deletions.
diff --git a/src/test/json/MultivarJson_test.cpp b/src/test/json/MultivarJson_test.cpp
@@ -103,10 +103,9 @@ struct MultivarJson_test : beast::unit_test::suite
 
             // Tests of requires clause - these are expected to match
             static_assert([](auto&& v) {
-                return requires
-                {
-                    v.select([]() -> std::size_t {});
-                };
+                return requires {
+                           v.select([]() -> std::size_t { return 0; });
+                       };
             }(subject));
             static_assert([](auto&& v) {
                 return requires
@@ -115,10 +114,9 @@ struct MultivarJson_test : beast::unit_test::suite
                 };
             }(subject));
             static_assert([](auto&& v) {
-                return requires
-                {
-                    v.select([]() mutable -> std::size_t {});
-                };
+                return requires {
+                           v.select([]() mutable -> std::size_t { return 0; });
+                       };
             }(subject));
 
             // Tests of requires clause - these are expected NOT to match
@@ -135,10 +133,7 @@ struct MultivarJson_test : beast::unit_test::suite
                 };
             }(subject));
             static_assert([](auto&& v) {
-                return !requires
-                {
-                    v.select([]() -> bool {});
-                };
+                return !requires { v.select([]() -> bool { return false; }); };
             }(subject));
         }
 

diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp
@@ -179,18 +179,16 @@ class TransactionEntry_test : public beast::unit_test::suite
                      memberIt++)
                 {
                     auto const name = memberIt.memberName();
-                    BEAST_EXPECT(resIndex[jss::tx_json].isMember(name));
-                    auto const received = resIndex[jss::tx_json][name];
-                    std::ostringstream ssReceived;
-                    ssReceived << received;
-                    std::ostringstream ssExpected;
-                    ssExpected << *memberIt;
-                    BEAST_EXPECTS(
-                        received == *memberIt,
-                        txhash + " contains \n\"" + name + "\": "  //
-                            + ssReceived.str()                     //
-                            + "but expected "                      //
-                            + ssExpected.str());
+                    if (BEAST_EXPECT(resIndex[jss::tx_json].isMember(name)))
+                    {
+                        auto const received = resIndex[jss::tx_json][name];
+                        BEAST_EXPECTS(
+                            received == *memberIt,
+                            txhash + " contains \n\"" + name + "\": "  //
+                                + to_string(received)                  //
+                                + " but expected "                     //
+                                + to_string(expected));
+                    }
                 }
             }