From ef5eb19e9cbbda37c03c862cad7f7069c9f2dccc Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 17 Dec 2013 11:57:32 +0100 Subject: [PATCH] Corrected test formulation in case StoRM was built without support for a given LP solver. Former-commit-id: 7ae692f2747bd0068c3acfc1b7c8a0377ff0f340 --- test/functional/solver/GlpkLpSolverTest.cpp | 16 ++++++++-------- test/functional/solver/GurobiLpSolverTest.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/functional/solver/GlpkLpSolverTest.cpp b/test/functional/solver/GlpkLpSolverTest.cpp index b4dfebe57..30c3e10f9 100644 --- a/test/functional/solver/GlpkLpSolverTest.cpp +++ b/test/functional/solver/GlpkLpSolverTest.cpp @@ -36,7 +36,7 @@ TEST(GlpkLpSolver, LPOptimizeMax) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - 14.75), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -71,7 +71,7 @@ TEST(GlpkLpSolver, LPOptimizeMin) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - (-6.7)), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -106,7 +106,7 @@ TEST(GlpkLpSolver, MILPOptimizeMax) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - 14), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -141,7 +141,7 @@ TEST(GlpkLpSolver, MILPOptimizeMin) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - (-6)), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -173,7 +173,7 @@ TEST(GlpkLpSolver, LPInfeasible) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -205,7 +205,7 @@ TEST(GlpkLpSolver, MILPInfeasible) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -235,7 +235,7 @@ TEST(GlpkLpSolver, LPUnbounded) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } @@ -265,6 +265,6 @@ TEST(GlpkLpSolver, MILPUnbounded) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without glpk support."); + ASSERT_TRUE(false) << "StoRM built without glpk support."; #endif } \ No newline at end of file diff --git a/test/functional/solver/GurobiLpSolverTest.cpp b/test/functional/solver/GurobiLpSolverTest.cpp index 06d9bfb33..b8c7fe885 100644 --- a/test/functional/solver/GurobiLpSolverTest.cpp +++ b/test/functional/solver/GurobiLpSolverTest.cpp @@ -36,7 +36,7 @@ TEST(GurobiLpSolver, LPOptimizeMax) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - 14.75), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -71,7 +71,7 @@ TEST(GurobiLpSolver, LPOptimizeMin) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - (-6.7)), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -106,7 +106,7 @@ TEST(GurobiLpSolver, MILPOptimizeMax) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - 14), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -141,7 +141,7 @@ TEST(GurobiLpSolver, MILPOptimizeMin) { ASSERT_NO_THROW(objectiveValue = solver.getObjectiveValue()); ASSERT_LT(std::abs(objectiveValue - (-6)), storm::settings::Settings::getInstance()->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -173,7 +173,7 @@ TEST(GurobiLpSolver, LPInfeasible) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -205,7 +205,7 @@ TEST(GurobiLpSolver, MILPInfeasible) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -235,7 +235,7 @@ TEST(GurobiLpSolver, LPUnbounded) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } @@ -265,6 +265,6 @@ TEST(GurobiLpSolver, MILPUnbounded) { double objectiveValue = 0; ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidStateException); #else - ASSERT_TRUE(false, "StoRM built without Gurobi support."); + ASSERT_TRUE(false) << "StoRM built without Gurobi support."; #endif } \ No newline at end of file