Added some use of Catch::getResultCapture().getCurrentTestName() to make temporary files unique to unit test

Author: jajhall

check/TestBasis.cpp

@@ -13,8 +13,8 @@ void testBasisRestart(Highs& highs, const std::string& basis_file, const bool fr
 // 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";
+  const std::string basis_file = test_name + ".bas";
+  const std::string invalid_basis_file = test_name + "-Invalid.bas";
 
   HighsStatus return_status;
   std::string model0_file =

check/TestCheckSolution.cpp

@@ -8,13 +8,14 @@
 
 const bool dev_run = false;
 
-void runWriteReadCheckSolution(Highs& highs, const std::string model,
+void runWriteReadCheckSolution(Highs& highs, const std::string& test_name, const std::string& model,
                                const HighsModelStatus require_model_status,
                                const HighsInt write_solution_style);
 
 void runSetLpSolution(const std::string model);
 
 TEST_CASE("check-solution", "[highs_check_solution]") {
+  std::string test_name = Catch::getResultCapture().getCurrentTestName();
   std::string model = "";
   std::string model_file;
   HighsStatus read_status;
@@ -42,7 +43,8 @@ TEST_CASE("check-solution", "[highs_check_solution]") {
     REQUIRE(read_status == require_read_status);
 
     require_model_status = HighsModelStatus::kOptimal;
-    runWriteReadCheckSolution(highs, model, require_model_status,
+    test_name += "-";
+    runWriteReadCheckSolution(highs, test_name, model, require_model_status,
                               write_solution_style);
     SpecialLps special_lps;
     HighsLp lp;
@@ -51,21 +53,24 @@ TEST_CASE("check-solution", "[highs_check_solution]") {
     model = "distillation";
     special_lps.distillationMip(lp, require_model_status, optimal_objective);
     highs.passModel(lp);
-    runWriteReadCheckSolution(highs, model, require_model_status,
+    test_name += "-";
+    runWriteReadCheckSolution(highs, test_name, model, require_model_status,
                               write_solution_style);
 
     lp.clear();
     model = "primalDualInfeasible1Lp";
     special_lps.primalDualInfeasible1Lp(lp, require_model_status);
     highs.passModel(lp);
-    runWriteReadCheckSolution(highs, model, require_model_status,
+    test_name += "-";
+    runWriteReadCheckSolution(highs, test_name, model, require_model_status,
                               write_solution_style);
     // Second pass uses sparse format
     write_solution_style = kSolutionStyleSparse;
   }
 }
 
 TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
   HighsStatus return_status;
   const std::string model = "flugpl";
   std::string model_file =
@@ -83,7 +88,7 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
   HighsInt scratch_num_nodes = info.mip_node_count;
   if (dev_run) printf("Num nodes = %d\n", int(scratch_num_nodes));
 
-  std::string solution_file = model + ".sol";
+  std::string solution_file = test_name + model + ".sol";
   if (dev_run) return_status = highs.writeSolution("");
   return_status = highs.writeSolution(solution_file);
   REQUIRE(return_status == HighsStatus::kOk);
@@ -354,8 +359,9 @@ TEST_CASE("check-set-rowwise-lp-solution", "[highs_check_solution]") {
 }
 
 TEST_CASE("check-set-mip-solution-extra-row", "[highs_check_solution]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  const std::string solution_file_name = test_name + ".sol";
   Highs highs;
-  const std::string solution_file_name = "temp.sol";
   highs.setOptionValue("output_flag", dev_run);
   highs.addVar(0, 2);
   highs.addVar(0, 2);
@@ -396,6 +402,7 @@ TEST_CASE("check-set-illegal-solution", "[highs_check_solution]") {
 }
 
 TEST_CASE("read-miplib-solution", "[highs_check_solution]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
   HighsLp lp;
   lp.num_col_ = 5;
   lp.num_row_ = 1;
@@ -417,7 +424,7 @@ TEST_CASE("read-miplib-solution", "[highs_check_solution]") {
   REQUIRE(h.run() == HighsStatus::kOk);
   //  REQUIRE(h.writeSolution("", kSolutionStylePretty) == HighsStatus::kOk);
   const std::vector<double>& col_value = h.getSolution().col_value;
-  std::string miplib_sol_file = "miplib.sol";
+  std::string miplib_sol_file = test_name + ".sol";
   FILE* file = fopen(miplib_sol_file.c_str(), "w");
   REQUIRE(file != 0);
   fprintf(file, "=obj= 22\n");
@@ -441,7 +448,8 @@ TEST_CASE("read-miplib-solution", "[highs_check_solution]") {
   std::remove(miplib_sol_file.c_str());
 }
 
-void runWriteReadCheckSolution(Highs& highs, const std::string model,
+void runWriteReadCheckSolution(Highs& highs, const std::string& test_name,
+			       const std::string& model,
                                const HighsModelStatus require_model_status,
                                const HighsInt write_solution_style) {
   HighsStatus run_status;
@@ -455,7 +463,7 @@ void runWriteReadCheckSolution(Highs& highs, const std::string model,
   status = highs.getModelStatus();
   REQUIRE(status == require_model_status);
 
-  solution_file = model + ".sol";
+  solution_file = test_name + model + ".sol";
   if (dev_run)
     printf("Writing solution in style %d to %s\n", int(write_solution_style),
            solution_file.c_str());

check/TestFilereader.cpp

@@ -199,6 +199,7 @@ TEST_CASE("filereader-free-format-parser-lp", "[highs_filereader]") {
 
 // No commas in test case name.
 TEST_CASE("filereader-read-mps-ems-lp", "[highs_filereader]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
   std::string filename;
   filename = std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";
 
@@ -212,14 +213,14 @@ TEST_CASE("filereader-read-mps-ems-lp", "[highs_filereader]") {
   HighsLp lp_mps = highs.getLp();
 
   // Write lp
-  std::string filename_lp = "adlittle.lp";
+  std::string filename_lp = test_name + ".lp";
   status = highs.writeModel(filename_lp);
   REQUIRE(status == HighsStatus::kOk);
 
   /*
   bool are_the_same;
   // Write ems
-  std::string filename_ems = "adlittle.ems";
+  std::string filename_ems = test_name + ".ems";
   status = highs.writeModel(filename_ems);
   REQUIRE(status == HighsStatus::kOk);
 
@@ -357,9 +358,10 @@ TEST_CASE("filereader-dD2e", "[highs_filereader]") {
 // }
 
 TEST_CASE("writeLocalModel", "[highs_filereader]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  std::string write_model_file = test_name + ".mps";
   Highs h;
   h.setOptionValue("output_flag", dev_run);
-  std::string write_model_file = "foo.mps";
   HighsModel model;
   HighsLp& lp = model.lp_;
   ;
@@ -415,7 +417,8 @@ TEST_CASE("writeLocalModel", "[highs_filereader]") {
 }
 
 TEST_CASE("write-MI-bound-model", "[highs_filereader]") {
-  std::string write_model_file = "temp.mps";
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  std::string write_model_file = test_name + ".mps";
   Highs h;
   h.setOptionValue("output_flag", dev_run);
   h.addCol(1, -kHighsInf, 1, 0, nullptr, nullptr);

check/TestInfo.cpp

@@ -9,6 +9,8 @@
 const bool dev_run = false;
 
 TEST_CASE("highs-info", "[highs_info]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  const std::string highs_info_file = test_name + ".info";
   std::string filename;
   filename = std::string(HIGHS_DIR) + "/check/instances/avgas.mps";
   filename = std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";
@@ -62,7 +64,6 @@ TEST_CASE("highs-info", "[highs_info]") {
     REQUIRE(return_status == HighsStatus::kOk);
   }
 
-  std::string highs_info_file = "Highs.info";
   return_status = highs.writeInfo(highs_info_file);
   REQUIRE(return_status == HighsStatus::kOk);
 

check/TestLogging.cpp

@@ -7,14 +7,14 @@
 const bool dev_run = false;
 
 TEST_CASE("logging", "[highs_logging]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  const std::string log_file = test_name + ".log";
   std::string model;
   std::string model_file;
-  std::string log_file;
   HighsStatus return_status;
 
   model = "avgas";
   model_file = std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps";
-  log_file = "temp.log";
 
   Highs highs;
   if (!dev_run) highs.setOptionValue("output_flag", false);