From bb127603ffa3c2604e6c2e46b3c16b3cd440e367 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Mon, 22 Nov 2021 14:40:51 -0500 Subject: [PATCH] Use platform::unlink in unittests --- unittest/force-styles/test_angle_style.cpp | 12 ++++-------- unittest/force-styles/test_bond_style.cpp | 12 ++++-------- unittest/force-styles/test_dihedral_style.cpp | 12 ++++-------- unittest/force-styles/test_fix_timestep.cpp | 8 +------- unittest/force-styles/test_improper_style.cpp | 12 ++++-------- unittest/force-styles/test_pair_style.cpp | 13 ++++--------- 6 files changed, 21 insertions(+), 48 deletions(-) diff --git a/unittest/force-styles/test_angle_style.cpp b/unittest/force-styles/test_angle_style.cpp index b4300218b7..368ccb19ff 100644 --- a/unittest/force-styles/test_angle_style.cpp +++ b/unittest/force-styles/test_angle_style.cpp @@ -33,6 +33,7 @@ #include "lammps.h" #include "modify.h" #include "universe.h" +#include "platform.h" #include #include @@ -50,16 +51,11 @@ using ::testing::StartsWith; using namespace LAMMPS_NS; -static void delete_file(const std::string &filename) -{ - remove(filename.c_str()); -}; - void cleanup_lammps(LAMMPS *lmp, const TestConfig &cfg) { - delete_file(cfg.basename + ".restart"); - delete_file(cfg.basename + ".data"); - delete_file(cfg.basename + "-coeffs.in"); + platform::unlink(cfg.basename + ".restart"); + platform::unlink(cfg.basename + ".data"); + platform::unlink(cfg.basename + "-coeffs.in"); delete lmp; } diff --git a/unittest/force-styles/test_bond_style.cpp b/unittest/force-styles/test_bond_style.cpp index f4c151a394..6eed92082b 100644 --- a/unittest/force-styles/test_bond_style.cpp +++ b/unittest/force-styles/test_bond_style.cpp @@ -33,6 +33,7 @@ #include "lammps.h" #include "modify.h" #include "universe.h" +#include "platform.h" #include #include @@ -50,16 +51,11 @@ using ::testing::StartsWith; using namespace LAMMPS_NS; -static void delete_file(const std::string &filename) -{ - remove(filename.c_str()); -}; - void cleanup_lammps(LAMMPS *lmp, const TestConfig &cfg) { - delete_file(cfg.basename + ".restart"); - delete_file(cfg.basename + ".data"); - delete_file(cfg.basename + "-coeffs.in"); + platform::unlink(cfg.basename + ".restart"); + platform::unlink(cfg.basename + ".data"); + platform::unlink(cfg.basename + "-coeffs.in"); delete lmp; } diff --git a/unittest/force-styles/test_dihedral_style.cpp b/unittest/force-styles/test_dihedral_style.cpp index 8cae5d5f7c..a009f5f9a6 100644 --- a/unittest/force-styles/test_dihedral_style.cpp +++ b/unittest/force-styles/test_dihedral_style.cpp @@ -33,6 +33,7 @@ #include "lammps.h" #include "modify.h" #include "universe.h" +#include "platform.h" #include #include @@ -50,16 +51,11 @@ using ::testing::StartsWith; using namespace LAMMPS_NS; -static void delete_file(const std::string &filename) -{ - remove(filename.c_str()); -}; - void cleanup_lammps(LAMMPS *lmp, const TestConfig &cfg) { - delete_file(cfg.basename + ".restart"); - delete_file(cfg.basename + ".data"); - delete_file(cfg.basename + "-coeffs.in"); + platform::unlink(cfg.basename + ".restart"); + platform::unlink(cfg.basename + ".data"); + platform::unlink(cfg.basename + "-coeffs.in"); delete lmp; } diff --git a/unittest/force-styles/test_fix_timestep.cpp b/unittest/force-styles/test_fix_timestep.cpp index ac83ff9573..27ad3ce203 100644 --- a/unittest/force-styles/test_fix_timestep.cpp +++ b/unittest/force-styles/test_fix_timestep.cpp @@ -54,16 +54,10 @@ using ::testing::StartsWith; using namespace LAMMPS_NS; -static void delete_file(const std::string &filename) -{ - remove(filename.c_str()); -}; - void cleanup_lammps(LAMMPS *lmp, const TestConfig &cfg) { - delete_file(cfg.basename + ".restart"); + platform::unlink(cfg.basename + ".restart"); delete lmp; - lmp = nullptr; } LAMMPS *init_lammps(int argc, char **argv, const TestConfig &cfg, const bool use_respa = false) diff --git a/unittest/force-styles/test_improper_style.cpp b/unittest/force-styles/test_improper_style.cpp index b6d6b9a06b..4eebe8013e 100644 --- a/unittest/force-styles/test_improper_style.cpp +++ b/unittest/force-styles/test_improper_style.cpp @@ -33,6 +33,7 @@ #include "lammps.h" #include "modify.h" #include "universe.h" +#include "platform.h" #include #include @@ -50,16 +51,11 @@ using ::testing::StartsWith; using namespace LAMMPS_NS; -static void delete_file(const std::string &filename) -{ - remove(filename.c_str()); -}; - void cleanup_lammps(LAMMPS *lmp, const TestConfig &cfg) { - delete_file(cfg.basename + ".restart"); - delete_file(cfg.basename + ".data"); - delete_file(cfg.basename + "-coeffs.in"); + platform::unlink(cfg.basename + ".restart"); + platform::unlink(cfg.basename + ".data"); + platform::unlink(cfg.basename + "-coeffs.in"); delete lmp; } diff --git a/unittest/force-styles/test_pair_style.cpp b/unittest/force-styles/test_pair_style.cpp index bbea62c9c7..6e4a22152e 100644 --- a/unittest/force-styles/test_pair_style.cpp +++ b/unittest/force-styles/test_pair_style.cpp @@ -34,6 +34,7 @@ #include "pair.h" #include "universe.h" #include "utils.h" +#include "platform.h" #include #include @@ -51,18 +52,12 @@ using ::testing::StartsWith; using namespace LAMMPS_NS; -static void delete_file(const std::string &filename) -{ - remove(filename.c_str()); -}; - void cleanup_lammps(LAMMPS *lmp, const TestConfig &cfg) { - delete_file(cfg.basename + ".restart"); - delete_file(cfg.basename + ".data"); - delete_file(cfg.basename + "-coeffs.in"); + platform::unlink(cfg.basename + ".restart"); + platform::unlink(cfg.basename + ".data"); + platform::unlink(cfg.basename + "-coeffs.in"); delete lmp; - lmp = nullptr; } LAMMPS *init_lammps(int argc, char **argv, const TestConfig &cfg, const bool newton = true)