From 1a21674ab0afb5e6dbc9fcd2903cbb1a7a662e6c Mon Sep 17 00:00:00 2001
From: Tim Quatmann <tim.quatmann@cs.rwth-aachen.de>
Date: Mon, 11 Nov 2019 14:00:02 +0100
Subject: [PATCH] Tests: Silencing some "EXPECT_THROW" test cases since error
messages are expected here.
---
.../prctl/dtmc/ConditionalDtmcPrctlModelCheckerTest.cpp | 4 ++--
.../modelchecker/prctl/dtmc/DtmcPrctlModelCheckerTest.cpp | 4 ++--
.../prctl/dtmc/ExplicitDtmcPrctlModelCheckerTest.cpp | 2 +-
.../prctl/dtmc/LraDtmcPrctlModelCheckerTest.cpp | 4 ++--
.../prctl/mdp/ExplicitMdpPrctlModelCheckerTest.cpp | 2 +-
.../modelchecker/prctl/mdp/LraMdpPrctlModelCheckerTest.cpp | 4 ++--
.../modelchecker/prctl/mdp/MdpPrctlModelCheckerTest.cpp | 6 +++---
src/test/storm/modelchecker/prctl/mdp/QuantileQueryTest.cpp | 4 ++--
.../mdp/SchedulerGenerationMdpPrctlModelCheckerTest.cpp | 4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/test/storm/modelchecker/prctl/dtmc/ConditionalDtmcPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/dtmc/ConditionalDtmcPrctlModelCheckerTest.cpp
index fd124f456..5b8eea78d 100755
--- a/src/test/storm/modelchecker/prctl/dtmc/ConditionalDtmcPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/dtmc/ConditionalDtmcPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "test/storm_gtest.h"
#include "storm-config.h"
@@ -120,7 +120,7 @@ namespace {
NativeWalkerChaeEnvironment
> TestingTypes;
- TYPED_TEST_CASE(ConditionalDtmcPrctlModelCheckerTest, TestingTypes);
+ TYPED_TEST_SUITE(ConditionalDtmcPrctlModelCheckerTest, TestingTypes);
TYPED_TEST(ConditionalDtmcPrctlModelCheckerTest, Conditional) {
diff --git a/src/test/storm/modelchecker/prctl/dtmc/DtmcPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/dtmc/DtmcPrctlModelCheckerTest.cpp
index 6c5f08c86..861b5d67f 100755
--- a/src/test/storm/modelchecker/prctl/dtmc/DtmcPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/dtmc/DtmcPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "test/storm_gtest.h"
#include "storm-config.h"
@@ -566,7 +566,7 @@ namespace {
DdSylvanRationalSearchEnvironment
> TestingTypes;
- TYPED_TEST_CASE(DtmcPrctlModelCheckerTest, TestingTypes);
+ TYPED_TEST_SUITE(DtmcPrctlModelCheckerTest, TestingTypes);
TYPED_TEST(DtmcPrctlModelCheckerTest, Die) {
std::string formulasString = "P=? [F \"one\"]";
diff --git a/src/test/storm/modelchecker/prctl/dtmc/ExplicitDtmcPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/dtmc/ExplicitDtmcPrctlModelCheckerTest.cpp
index 025bc8c45..1ab3c07a7 100755
--- a/src/test/storm/modelchecker/prctl/dtmc/ExplicitDtmcPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/dtmc/ExplicitDtmcPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "storm-config.h"
#include "storm-parsers/parser/FormulaParser.h"
diff --git a/src/test/storm/modelchecker/prctl/dtmc/LraDtmcPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/dtmc/LraDtmcPrctlModelCheckerTest.cpp
index c964628b9..9c7cf76f0 100755
--- a/src/test/storm/modelchecker/prctl/dtmc/LraDtmcPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/dtmc/LraDtmcPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "storm-config.h"
#include "test/storm_gtest.h"
@@ -111,7 +111,7 @@ namespace {
NativeWalkerChaeEnvironment
> TestingTypes;
- TYPED_TEST_CASE(LraDtmcPrctlModelCheckerTest, TestingTypes);
+ TYPED_TEST_SUITE(LraDtmcPrctlModelCheckerTest, TestingTypes);
diff --git a/src/test/storm/modelchecker/prctl/mdp/ExplicitMdpPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/mdp/ExplicitMdpPrctlModelCheckerTest.cpp
index b295c397b..f6502ae54 100755
--- a/src/test/storm/modelchecker/prctl/mdp/ExplicitMdpPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/mdp/ExplicitMdpPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "storm-config.h"
#include "storm-parsers/parser/FormulaParser.h"
diff --git a/src/test/storm/modelchecker/prctl/mdp/LraMdpPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/mdp/LraMdpPrctlModelCheckerTest.cpp
index c0f527bd2..e18f7640e 100755
--- a/src/test/storm/modelchecker/prctl/mdp/LraMdpPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/mdp/LraMdpPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "test/storm_gtest.h"
@@ -106,7 +106,7 @@ namespace {
#endif
> TestingTypes;
- TYPED_TEST_CASE(LraMdpPrctlModelCheckerTest, TestingTypes);
+ TYPED_TEST_SUITE(LraMdpPrctlModelCheckerTest, TestingTypes);
TYPED_TEST(LraMdpPrctlModelCheckerTest, LRA_SingleMec) {
diff --git a/src/test/storm/modelchecker/prctl/mdp/MdpPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/mdp/MdpPrctlModelCheckerTest.cpp
index 939cf4275..ecab40f54 100755
--- a/src/test/storm/modelchecker/prctl/mdp/MdpPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/mdp/MdpPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "storm-config.h"
#include "test/storm_gtest.h"
@@ -434,7 +434,7 @@ namespace {
DdSylvanRationalRationalSearchEnvironment
> TestingTypes;
- TYPED_TEST_CASE(MdpPrctlModelCheckerTest, TestingTypes);
+ TYPED_TEST_SUITE(MdpPrctlModelCheckerTest, TestingTypes);
TYPED_TEST(MdpPrctlModelCheckerTest, Dice) {
@@ -577,7 +577,7 @@ namespace {
// For some methods this requires end-component elimination which is (currently) not supported in the Dd engine
if (TypeParam::engine == MdpEngine::PrismDd && this->env().solver().minMax().getMethod() == storm::solver::MinMaxMethod::RationalSearch) {
- EXPECT_THROW(checker->check(this->env(), tasks[0]), storm::exceptions::UncheckedRequirementException);
+ STORM_SILENT_EXPECT_THROW(checker->check(this->env(), tasks[0]), storm::exceptions::UncheckedRequirementException);
} else {
result = checker->check(this->env(), tasks[0]);
EXPECT_NEAR(this->parseNumber("1"), this->getQuantitativeResultAtInitialState(model, result), this->precision());
diff --git a/src/test/storm/modelchecker/prctl/mdp/QuantileQueryTest.cpp b/src/test/storm/modelchecker/prctl/mdp/QuantileQueryTest.cpp
index c6c718856..cbd67db56 100755
--- a/src/test/storm/modelchecker/prctl/mdp/QuantileQueryTest.cpp
+++ b/src/test/storm/modelchecker/prctl/mdp/QuantileQueryTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "storm-config.h"
#include "test/storm_gtest.h"
@@ -160,7 +160,7 @@ namespace {
ExactEnvironment
> TestingTypes;
- TYPED_TEST_CASE(QuantileQueryTest, TestingTypes);
+ TYPED_TEST_SUITE(QuantileQueryTest, TestingTypes);
TYPED_TEST(QuantileQueryTest, simple_Dtmc) {
diff --git a/src/test/storm/modelchecker/prctl/mdp/SchedulerGenerationMdpPrctlModelCheckerTest.cpp b/src/test/storm/modelchecker/prctl/mdp/SchedulerGenerationMdpPrctlModelCheckerTest.cpp
index 6f82d6a47..52498f641 100755
--- a/src/test/storm/modelchecker/prctl/mdp/SchedulerGenerationMdpPrctlModelCheckerTest.cpp
+++ b/src/test/storm/modelchecker/prctl/mdp/SchedulerGenerationMdpPrctlModelCheckerTest.cpp
@@ -1,4 +1,4 @@
-#include "gtest/gtest.h"
+#include "test/storm_gtest.h"
#include "storm-config.h"
#include "storm-parsers/parser/FormulaParser.h"
@@ -85,7 +85,7 @@ namespace {
//RationalRationalSearchEnvironment
> TestingTypes;
- TYPED_TEST_CASE(SchedulerGenerationMdpPrctlModelCheckerTest, TestingTypes);
+ TYPED_TEST_SUITE(SchedulerGenerationMdpPrctlModelCheckerTest, TestingTypes);
TYPED_TEST(SchedulerGenerationMdpPrctlModelCheckerTest, reachability) {