Browse Source

Tests: Silencing some "EXPECT_THROW" test cases since error messages are expected here.

main
Tim Quatmann 5 years ago
parent
commit
1a21674ab0
  1. 4
      src/test/storm/modelchecker/prctl/dtmc/ConditionalDtmcPrctlModelCheckerTest.cpp
  2. 4
      src/test/storm/modelchecker/prctl/dtmc/DtmcPrctlModelCheckerTest.cpp
  3. 2
      src/test/storm/modelchecker/prctl/dtmc/ExplicitDtmcPrctlModelCheckerTest.cpp
  4. 4
      src/test/storm/modelchecker/prctl/dtmc/LraDtmcPrctlModelCheckerTest.cpp
  5. 2
      src/test/storm/modelchecker/prctl/mdp/ExplicitMdpPrctlModelCheckerTest.cpp
  6. 4
      src/test/storm/modelchecker/prctl/mdp/LraMdpPrctlModelCheckerTest.cpp
  7. 6
      src/test/storm/modelchecker/prctl/mdp/MdpPrctlModelCheckerTest.cpp
  8. 4
      src/test/storm/modelchecker/prctl/mdp/QuantileQueryTest.cpp
  9. 4
      src/test/storm/modelchecker/prctl/mdp/SchedulerGenerationMdpPrctlModelCheckerTest.cpp

4
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) {

4
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\"]";

2
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"

4
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);

2
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"

4
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) {

6
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());

4
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) {

4
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) {

Loading…
Cancel
Save