some fixes

Author: EfesX

test/memory_results_gtest.cc

@@ -4,8 +4,7 @@
 #include "benchmark/benchmark.h"
 #include "gtest/gtest.h"
 
-#define N_REPETITIONS 100
-#define N_ITERATIONS 1
+namespace {
 
 using benchmark::ClearRegisteredBenchmarks;
 using benchmark::ConsoleReporter;
@@ -15,31 +14,32 @@ using benchmark::RunSpecifiedBenchmarks;
 using benchmark::State;
 using benchmark::internal::Benchmark;
 
-namespace counts {
+constexpr int N_REPETITIONS = 100;
+constexpr int N_ITERATIONS = 1;
+
 int num_allocs = 0;
 int max_bytes_used = 0;
 int total_allocated_bytes = 0;
 int net_heap_growth = 0;
+
 void reset() {
   num_allocs = 0;
   max_bytes_used = 0;
   total_allocated_bytes = 0;
   net_heap_growth = 0;
 }
-}  // namespace counts
-
 class TestMemoryManager : public MemoryManager {
   void Start() override {}
   void Stop(Result& result) override {
-    result.num_allocs = counts::num_allocs;
-    result.net_heap_growth = counts::net_heap_growth;
-    result.max_bytes_used = counts::max_bytes_used;
-    result.total_allocated_bytes = counts::total_allocated_bytes;
-
-    counts::num_allocs += 1;
-    counts::max_bytes_used += 2;
-    counts::net_heap_growth += 4;
-    counts::total_allocated_bytes += 10;
+    result.num_allocs = num_allocs;
+    result.net_heap_growth = net_heap_growth;
+    result.max_bytes_used = max_bytes_used;
+    result.total_allocated_bytes = total_allocated_bytes;
+
+    num_allocs += 1;
+    max_bytes_used += 2;
+    net_heap_growth += 4;
+    total_allocated_bytes += 10;
   }
 };
 
@@ -73,6 +73,7 @@ class MemoryResultsTest : public testing::Test {
     });
     bm->Repetitions(N_REPETITIONS);
     bm->Iterations(N_ITERATIONS);
+    reset();
   }
   void TearDown() override { ClearRegisteredBenchmarks(); }
 };
@@ -83,9 +84,8 @@ TEST_F(MemoryResultsTest, NoMMTest) {
 }
 
 TEST_F(MemoryResultsTest, ResultsTest) {
-  counts::reset();
-  MemoryManager* mm = new TestMemoryManager;
-  RegisterMemoryManager(mm);
+  auto mm = std::make_unique<TestMemoryManager>();
+  RegisterMemoryManager(mm.get());
 
   RunSpecifiedBenchmarks(&reporter);
   EXPECT_EQ(reporter.store.size(), N_REPETITIONS);
@@ -97,6 +97,6 @@ TEST_F(MemoryResultsTest, ResultsTest) {
     EXPECT_EQ(reporter.store[i].total_allocated_bytes,
               static_cast<int64_t>(i) * 10);
   }
-
-  delete mm;
 }
+
+}  // namespace