[trafficserver] branch 9.2.x updated: change MemArena::make test to remove memory leak (#8352)

[zw...@apache.org]

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

zwoop pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.2.x by this push:
     new 6079434  change MemArena::make test to remove memory leak (#8352)
6079434 is described below

commit 6079434cd7f8e751ee2a59b338045ac959d273b5
Author: Brian Olsen <bn...@gmail.com>
AuthorDate: Mon Sep 27 17:50:10 2021 -0600

    change MemArena::make test to remove memory leak (#8352)
    
    (cherry picked from commit 2a6156fed0e82fd7992567633750f040951a72ab)
---
 src/tscore/unit_tests/test_MemArena.cc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/tscore/unit_tests/test_MemArena.cc b/src/tscore/unit_tests/test_MemArena.cc
index 4084afe..16a6276 100644
--- a/src/tscore/unit_tests/test_MemArena.cc
+++ b/src/tscore/unit_tests/test_MemArena.cc
@@ -118,13 +118,13 @@ TEST_CASE("MemArena helper", "[libts][MemArena]")
 {
   struct Thing {
     int ten{10};
-    std::string name{"name"};
+    std::string_view name{"name"};
 
     Thing() {}
-    Thing(int x) : ten(x) {}
-    Thing(std::string const &s) : name(s) {}
-    Thing(int x, std::string_view s) : ten(x), name(s) {}
-    Thing(std::string const &s, int x) : ten(x), name(s) {}
+    Thing(int const x) : ten(x) {}
+    Thing(std::string_view const sv) : name(sv) {}
+    Thing(int const x, std::string_view const sv) : ten(x), name(sv) {}
+    Thing(std::string_view const sv, int const x) : ten(x), name(sv) {}
   };
 
   ts::MemArena arena{256};
@@ -156,12 +156,14 @@ TEST_CASE("MemArena helper", "[libts][MemArena]")
   REQUIRE(thing_one->ten == 10);
   REQUIRE(thing_one->name == "name");
 
-  thing_one = arena.make<Thing>(17, "bob"sv);
+  std::string_view const bob{"bob"};
+  thing_one = arena.make<Thing>(17, bob);
 
   REQUIRE(thing_one->name == "bob");
   REQUIRE(thing_one->ten == 17);
 
-  thing_one = arena.make<Thing>("Dave", 137);
+  std::string const dave{"Dave"};
+  thing_one = arena.make<Thing>(dave, 137);
 
   REQUIRE(thing_one->name == "Dave");
   REQUIRE(thing_one->ten == 137);
@@ -171,7 +173,8 @@ TEST_CASE("MemArena helper", "[libts][MemArena]")
   REQUIRE(thing_one->ten == 9999);
   REQUIRE(thing_one->name == "name");
 
-  thing_one = arena.make<Thing>("Persia");
+  std::string const persia{"Persia"};
+  thing_one = arena.make<Thing>(persia);
 
   REQUIRE(thing_one->ten == 10);
   REQUIRE(thing_one->name == "Persia");