Using Catch::getResultCapture().getCurrentTestName() (deprecated back in 2015\!) to set up temporary file names local to a test case

Author: jajhall

check/TestBasis.cpp

@@ -5,20 +5,24 @@
 #include "catch.hpp"
 
 const bool dev_run = false;
-const std::string basis_file = "adlittle.bas";
 HighsBasis basis_data;
 
-void testBasisReloadModel(Highs& highs, const bool from_file);
-void testBasisRestart(Highs& highs, const bool from_file);
+void testBasisReloadModel(Highs& highs, const std::string& basis_file, const bool from_file);
+void testBasisRestart(Highs& highs, const std::string& basis_file, const bool from_file);
 
 // No commas in test case name.
 TEST_CASE("Basis-file", "[highs_basis_file]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  const std::string basis_file = test_name + "adlittle.bas";
+  const std::string invalid_basis_file = test_name + "InvalidBasis.bas";
+
   HighsStatus return_status;
   std::string model0_file =
       std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";
   std::string model1_file =
       std::string(HIGHS_DIR) + "/check/instances/avgas.mps";
 
+
   Highs highs;
   if (!dev_run) {
     highs.setOptionValue("output_flag", false);
@@ -38,7 +42,6 @@ TEST_CASE("Basis-file", "[highs_basis_file]") {
   REQUIRE(return_status == HighsStatus::kError);
 
   // Check error return for some invalid basis files
-  std::string invalid_basis_file = "InvalidBasis.bas";
   std::ofstream f;
   // Write and read a file for unsupported HiGHS version
   f.open(invalid_basis_file, std::ios::out);
@@ -64,14 +67,16 @@ TEST_CASE("Basis-file", "[highs_basis_file]") {
   return_status = highs.readBasis(invalid_basis_file);
   REQUIRE(return_status == HighsStatus::kError);
 
-  testBasisRestart(highs, true);
-  testBasisReloadModel(highs, true);
+  testBasisRestart(highs, basis_file, true);
+  testBasisReloadModel(highs, basis_file, true);
 
   std::remove(basis_file.c_str());
   std::remove(invalid_basis_file.c_str());
 }
 
 TEST_CASE("Basis-data", "[highs_basis_data]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  const std::string basis_file = test_name + "adlittle.bas";
   HighsStatus return_status;
   std::string model0_file =
       std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";
@@ -93,8 +98,8 @@ TEST_CASE("Basis-data", "[highs_basis_data]") {
   basis_data = highs.getBasis();
   REQUIRE(return_status == HighsStatus::kOk);
 
-  testBasisRestart(highs, false);
-  testBasisReloadModel(highs, false);
+  testBasisRestart(highs, basis_file, false);
+  testBasisReloadModel(highs, basis_file, false);
 }
 
 TEST_CASE("set-pathological-basis", "[highs_basis_data]") {
@@ -179,7 +184,7 @@ TEST_CASE("Basis-singular", "[highs_basis_data]") {
 }
 
 // No commas in test case name.
-void testBasisReloadModel(Highs& highs, const bool from_file) {
+void testBasisReloadModel(Highs& highs, const std::string& basis_file, const bool from_file) {
   // Checks that no simplex iterations are required if a saved optimal
   // basis is used for the original LP after solving a different LP
   HighsStatus return_status;
@@ -227,7 +232,7 @@ void testBasisReloadModel(Highs& highs, const bool from_file) {
   REQUIRE(highs.getInfo().simplex_iteration_count == 0);
 }
 
-void testBasisRestart(Highs& highs, const bool from_file) {
+void testBasisRestart(Highs& highs, const std::string& basis_file, const bool from_file) {
   // Checks that no simplex iterations are required if a saved optimal
   // basis is used for the original LP after changing a bound, solving
   // - so that the internal basis changes - and then restoring the