More uses of std::make_unique.

[simgrid.git] / src / mc / sosp / PageStore_test.cpp

diff --git a/src/mc/sosp/PageStore_test.cpp b/src/mc/sosp/PageStore_test.cpp
index ba1e490..99ff03a 100644 (file)
--- a/src/mc/sosp/PageStore_test.cpp
+++ b/src/mc/sosp/PageStore_test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -16,10 +16,6 @@
 
 #include "src/mc/sosp/PageStore.hpp"
 
-#define BOOST_CHECK_MESSAGE(a, b)                                                                                      \
-  INFO(b);                                                                                                             \
-  REQUIRE(a);
-
 using simgrid::mc::PageStore;
 
 /***********************************/
@@ -40,10 +36,10 @@ public:
   static void unref_pages();
   static void reallocate_page();
 
-  static void new_content(void* data, std::size_t size);
+  static void new_content(void* buf, std::size_t size);
 };
 
-// static member datat initialization
+// static member data initialization
 std::size_t helper_tests::pagesize             = 0;
 std::unique_ptr<PageStore> helper_tests::store = nullptr;
 void* helper_tests::data                       = nullptr;
@@ -53,9 +49,9 @@ int helper_tests::value                        = 0;
 void helper_tests::Init()
 {
   pagesize = (size_t)getpagesize();
-  store    = std::unique_ptr<PageStore>(new simgrid::mc::PageStore(50));
+  store    = std::make_unique<simgrid::mc::PageStore>(50);
   data     = mmap(nullptr, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-  BOOST_CHECK_MESSAGE(store->size() == 0, "Bad size");
+  REQUIRE(store->size() == 0);
 }
 
 void helper_tests::store_page_once()
@@ -64,14 +60,14 @@ void helper_tests::store_page_once()
   pageno[0] = store->store_page(data);
   REQUIRE(store->get_ref(pageno[0]) == 1);
   const void* copy = store->get_page(pageno[0]);
-  BOOST_CHECK_MESSAGE(::memcmp(data, copy, pagesize) == 0, "Page data should be the same");
+  REQUIRE(::memcmp(data, copy, pagesize) == 0); // The page data should be the same
   REQUIRE(store->size() == 1);
 }
 
 void helper_tests::store_same_page()
 {
   pageno[1] = store->store_page(data);
-  BOOST_CHECK_MESSAGE(pageno[0] == pageno[1], "Page should be the same");
+  REQUIRE(pageno[0] == pageno[1]); // Page should be the same
   REQUIRE(store->get_ref(pageno[0]) == 2);
   REQUIRE(store->size() == 1);
 }
@@ -80,15 +76,16 @@ void helper_tests::store_new_page()
 {
   new_content(data, pagesize);
   pageno[2] = store->store_page(data);
-  BOOST_CHECK_MESSAGE(pageno[0] != pageno[2], "New page should be different");
+  REQUIRE(pageno[0] != pageno[2]); // The new page should be different
   REQUIRE(store->size() == 2);
 }
 
 void helper_tests::unref_pages()
 {
   store->unref_page(pageno[0]);
-  BOOST_CHECK_MESSAGE(store->get_ref(pageno[0]) == 1, "Bad refcount");
+  REQUIRE(store->get_ref(pageno[0]) == 1);
   REQUIRE(store->size() == 2);
+
   store->unref_page(pageno[1]);
   REQUIRE(store->size() == 1);
 }
@@ -97,15 +94,15 @@ void helper_tests::reallocate_page()
 {
   new_content(data, pagesize);
   pageno[3] = store->store_page(data);
-  BOOST_CHECK_MESSAGE(pageno[0] == pageno[3], "Page was not reused");
+  REQUIRE(pageno[0] == pageno[3]); // The old page should be reused
   REQUIRE(store->get_ref(pageno[3]) == 1);
   REQUIRE(store->size() == 2);
 }
 
-void helper_tests::new_content(void* data, std::size_t size)
+void helper_tests::new_content(void* buf, std::size_t size)
 {
   value++;
-  ::memset(data, value, size);
+  ::memset(buf, value, size);
 }
 
 TEST_CASE("MC page store, used during checkpoint", "MC::PageStore")