Use envpp helpers in tests

Author: aobolensk

modules/performance/tests/perf_tests.cpp

@@ -2,9 +2,9 @@
 
 #include <chrono>
 #include <cstdint>
-#include <cstdlib>
 #include <filesystem>
 #include <fstream>
+#include <libenvpp/env.hpp>
 #include <memory>
 #include <ostream>
 #include <stdexcept>
@@ -109,8 +109,7 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
 }
 
 TEST(perf_tests, slow_perf_respects_env_override) {
-  const char* old = std::getenv("PPC_PERF_MAX_TIME");
-  setenv("PPC_PERF_MAX_TIME", "12", 1);
+  env::detail::set_scoped_environment_variable scoped("PPC_PERF_MAX_TIME", "12");
   std::vector<uint8_t> in(128, 1);
   auto test_task = std::make_shared<ppc::test::FakePerfTask<std::vector<uint8_t>, uint8_t>>(in);
   Perf<std::vector<uint8_t>, uint8_t> perf_analyzer(test_task);
@@ -124,11 +123,6 @@ TEST(perf_tests, slow_perf_respects_env_override) {
   };
   perf_analyzer.PipelineRun(perf_attr);
   EXPECT_NO_THROW(perf_analyzer.PrintPerfStatistic("slow_perf_respects_env_override"));
-  if (old) {
-    setenv("PPC_PERF_MAX_TIME", old, 1);
-  } else {
-    unsetenv("PPC_PERF_MAX_TIME");
-  }
 }
 
 TEST(perf_tests, check_perf_task_exception) {

modules/task/tests/task_tests.cpp

@@ -3,9 +3,9 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <cstdlib>
 #include <exception>
 #include <fstream>
+#include <libenvpp/env.hpp>
 #include <memory>
 #include <stdexcept>
 #include <thread>
@@ -74,19 +74,13 @@ TEST(task_tests, check_int32_t_slow) {
 }
 
 TEST(task_tests, slow_task_respects_env_override) {
-  const char* old = std::getenv("PPC_TASK_MAX_TIME");
-  setenv("PPC_TASK_MAX_TIME", "3", 1);
+  env::detail::set_scoped_environment_variable scoped("PPC_TASK_MAX_TIME", "3");
   std::vector<int32_t> in(20, 1);
   ppc::test::FakeSlowTask<std::vector<int32_t>, int32_t> test_task(in);
   ASSERT_EQ(test_task.Validation(), true);
   test_task.PreProcessing();
   test_task.Run();
   EXPECT_NO_THROW(test_task.PostProcessing());
-  if (old) {
-    setenv("PPC_TASK_MAX_TIME", old, 1);
-  } else {
-    unsetenv("PPC_TASK_MAX_TIME");
-  }
 }
 
 TEST(task_tests, check_validate_func) {

modules/util/tests/util.cpp

@@ -2,8 +2,7 @@
 
 #include <gtest/gtest.h>
 
-#include <cstdlib>
-#include <libenvpp/detail/get.hpp>
+#include <libenvpp/env.hpp>
 #include <string>
 
 #include "omp.h"
@@ -78,41 +77,33 @@ TEST(GetNamespaceTest, NoTerminatorCharactersInPrettyFunction) {
 }
 
 TEST(GetTaskMaxTime, ReturnsDefaultWhenUnset) {
-  const char* old = std::getenv("PPC_TASK_MAX_TIME");
-  unsetenv("PPC_TASK_MAX_TIME");
+  const auto old = env::detail::get_environment_variable("PPC_TASK_MAX_TIME");
+  if (old.has_value()) {
+    env::detail::delete_environment_variable("PPC_TASK_MAX_TIME");
+  }
   EXPECT_DOUBLE_EQ(ppc::util::GetTaskMaxTime(), 1.0);
-  if (old) {
-    setenv("PPC_TASK_MAX_TIME", old, 1);
+  if (old.has_value()) {
+    env::detail::set_environment_variable("PPC_TASK_MAX_TIME", *old);
   }
 }
 
 TEST(GetTaskMaxTime, ReadsFromEnvironment) {
-  const char* old = std::getenv("PPC_TASK_MAX_TIME");
-  setenv("PPC_TASK_MAX_TIME", "2.5", 1);
+  env::detail::set_scoped_environment_variable scoped("PPC_TASK_MAX_TIME", "2.5");
   EXPECT_DOUBLE_EQ(ppc::util::GetTaskMaxTime(), 2.5);
-  if (old) {
-    setenv("PPC_TASK_MAX_TIME", old, 1);
-  } else {
-    unsetenv("PPC_TASK_MAX_TIME");
-  }
 }
 
 TEST(GetPerfMaxTime, ReturnsDefaultWhenUnset) {
-  const char* old = std::getenv("PPC_PERF_MAX_TIME");
-  unsetenv("PPC_PERF_MAX_TIME");
+  const auto old = env::detail::get_environment_variable("PPC_PERF_MAX_TIME");
+  if (old.has_value()) {
+    env::detail::delete_environment_variable("PPC_PERF_MAX_TIME");
+  }
   EXPECT_DOUBLE_EQ(ppc::util::GetPerfMaxTime(), 10.0);
-  if (old) {
-    setenv("PPC_PERF_MAX_TIME", old, 1);
+  if (old.has_value()) {
+    env::detail::set_environment_variable("PPC_PERF_MAX_TIME", *old);
   }
 }
 
 TEST(GetPerfMaxTime, ReadsFromEnvironment) {
-  const char* old = std::getenv("PPC_PERF_MAX_TIME");
-  setenv("PPC_PERF_MAX_TIME", "12.5", 1);
+  env::detail::set_scoped_environment_variable scoped("PPC_PERF_MAX_TIME", "12.5");
   EXPECT_DOUBLE_EQ(ppc::util::GetPerfMaxTime(), 12.5);
-  if (old) {
-    setenv("PPC_PERF_MAX_TIME", old, 1);
-  } else {
-    unsetenv("PPC_PERF_MAX_TIME");
-  }
 }