Added a test for the AutoParser.

Former-commit-id: a51f3af653

src/parser/DeterministicSparseTransitionParser.cpp

@@ -122,13 +122,6 @@ namespace storm {
 						col = checked_strtol(buf, &buf);
 						val = checked_strtod(buf, &buf);
 
-						// Read probability of this transition.
-						// Check, if the value is a probability, i.e. if it is between 0 and 1.
-						if ((val < 0.0) || (val > 1.0)) {
-							LOG4CPLUS_ERROR(logger, "Expected a positive probability but got \"" << val << "\".");
-							throw storm::exceptions::WrongFormatException();
-						}
-
 						// Test if we moved to a new row.
 						// Handle all incomplete or skipped rows.
 						if (lastRow != row) {

test/functional/parser/AutoParserTest.cpp

@@ -10,6 +10,7 @@
 
 #include "src/parser/AutoParser.h"
 #include "src/exceptions/FileIoException.h"
+#include "src/exceptions/WrongFormatException.h"
 
 TEST(AutoParserTest, NonExistingFile) {
 	// No matter what happens, please do NOT create a file with the name "nonExistingFile.not"!
@@ -17,13 +18,61 @@ TEST(AutoParserTest, NonExistingFile) {
 }
 
 TEST(AutoParserTest, BasicParsing) {
+	// Parse model, which is a Dtmc.
+	std::shared_ptr<storm::models::AbstractModel<double>> modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/dtmc.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab");
 
+	// Test if parsed correctly.
+	ASSERT_EQ(modelPtr->getType(), storm::models::DTMC);
+	ASSERT_EQ(modelPtr->getNumberOfStates(), 12);
+	ASSERT_EQ(modelPtr->getNumberOfTransitions(), 32);
+	ASSERT_EQ(modelPtr->getInitialStates().getNumberOfSetBits(), 1);
+	ASSERT_TRUE(modelPtr->hasAtomicProposition("three"));
+	ASSERT_FALSE(modelPtr->hasStateRewards());
+	ASSERT_FALSE(modelPtr->hasTransitionRewards());
 }
 
 TEST(AutoParserTest, Whitespaces) {
+	// Test different whitespace combinations by comparing the hash of the model parsed from files without whitespaces with the hash of the models parsed from files with whitespaces.
+	uint_fast64_t correctHash = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/dtmc.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab")->getHash();
 
+	ASSERT_EQ(correctHash, storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/dtmcWhitespaces1.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab")->getHash());
+	ASSERT_EQ(correctHash, storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/dtmcWhitespaces2.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab")->getHash());
+}
+
+TEST(AutoParserTest, WrongHint) {
+	// The hint given describes the content but does not conform to the format.
+	ASSERT_THROW(storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/wrongHint.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab"), storm::exceptions::WrongFormatException);
+}
+
+TEST(AutoParserTest, NoHint) {
+	// There is no hint contained in the given file, so the parser cannot decide which kind of model it is.
+	ASSERT_THROW(storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/noHint.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab"), storm::exceptions::WrongFormatException);
 }
 
 TEST(AutoParserTest, Decision) {
+	// Test if the AutoParser recognizes each model kind and correctly parses it.
+
+	// Dtmc
+	std::shared_ptr<storm::models::AbstractModel<double>> modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/dtmc.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab");
+	ASSERT_EQ(modelPtr->getType(), storm::models::DTMC);
+	ASSERT_EQ(modelPtr->getNumberOfStates(), 12);
+	ASSERT_EQ(modelPtr->getNumberOfTransitions(), 32);
+
+	// Ctmc
+	modelPtr.reset();
+	modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/ctmc.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab");
+	ASSERT_EQ(modelPtr->getType(), storm::models::CTMC);
+	ASSERT_EQ(modelPtr->getNumberOfStates(), 12);
+	ASSERT_EQ(modelPtr->getNumberOfTransitions(), 31);
+
+	// Mdp
+	modelPtr.reset();
+	modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/mdp.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab");
+	ASSERT_EQ(modelPtr->getType(), storm::models::MDP);
+	ASSERT_EQ(modelPtr->getNumberOfStates(), 12);
+	ASSERT_EQ(modelPtr->getNumberOfTransitions(), 36);
+
+	// Ctmdp
 
+	// MA
 }