From 07465f604a0330fb520fbf8a52c234a58f0fc969 Mon Sep 17 00:00:00 2001 From: masawei Date: Mon, 10 Feb 2014 18:26:12 +0100 Subject: [PATCH] Refactored and added to the test for the AtomicPropositionLabelParser. Former-commit-id: 8cae0fd9dfd5e293517d212e012e771f793dbae1 --- .../AtomicPropositionLabelingParser.cpp | 18 ++- test/functional/parser/AutoParserTest.cpp | 29 ++++ test/functional/parser/LabFileParserTest.cpp | 136 ++++++++++++++++++ test/functional/parser/ReadLabFileTest.cpp | 92 ------------ 4 files changed, 179 insertions(+), 96 deletions(-) create mode 100644 test/functional/parser/AutoParserTest.cpp create mode 100644 test/functional/parser/LabFileParserTest.cpp delete mode 100644 test/functional/parser/ReadLabFileTest.cpp diff --git a/src/parser/AtomicPropositionLabelingParser.cpp b/src/parser/AtomicPropositionLabelingParser.cpp index f56cbb025..b77a67af4 100644 --- a/src/parser/AtomicPropositionLabelingParser.cpp +++ b/src/parser/AtomicPropositionLabelingParser.cpp @@ -122,15 +122,19 @@ namespace storm { // We want to skip it. buf += 4; - uint_fast64_t node; + // Now eliminate remaining whitespaces such as empty lines and start parsing. + buf = trimWhitespaces(buf); + + uint_fast64_t state; cnt = 0; // Now parse the assignments of labels to nodes. while (buf[0] != '\0') { - // Parse the node number and iterate over its labels (atomic propositions). + // Parse the state number and iterate over its labels (atomic propositions). // Stop at the end of the line. - node = checked_strtol(buf, &buf); + state = checked_strtol(buf, &buf); + while ((buf[0] != '\r') && (buf[0] != '\n') && (buf[0] != '\0')) { cnt = skipWord(buf) - buf; if (cnt == 0) { @@ -145,7 +149,13 @@ namespace storm { // Copy the label to the buffer, null terminate it and add it to labeling. strncpy(proposition, buf, cnt); proposition[cnt] = '\0'; - labeling.addAtomicPropositionToState(proposition, node); + + // Has the label been declared in the header? + if(!labeling.containsAtomicProposition(proposition)) { + LOG4CPLUS_ERROR(logger, "Wrong file format in (" << filename << "). Atomic proposition" << proposition << " was found but not declared."); + throw storm::exceptions::WrongFormatException(); + } + labeling.addAtomicPropositionToState(proposition, state); buf += cnt; } } diff --git a/test/functional/parser/AutoParserTest.cpp b/test/functional/parser/AutoParserTest.cpp new file mode 100644 index 000000000..d79edd70a --- /dev/null +++ b/test/functional/parser/AutoParserTest.cpp @@ -0,0 +1,29 @@ +/* + * AutoParserTest.cpp + * + * Created on: Feb 10, 2014 + * Author: Manuel Sascha Weiand + */ + +#include "gtest/gtest.h" +#include "storm-config.h" + +#include "src/parser/AutoParser.h" +#include "src/exceptions/FileIoException.h" + +TEST(AutoParserTest, NonExistingFile) { + // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"! + ASSERT_THROW(storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/nonExistingFile.not", STORM_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), storm::exceptions::FileIoException); +} + +TEST(AutoParserTest, BasicParsing) { + +} + +TEST(AutoParserTest, Whitespaces) { + +} + +TEST(AutoParserTest, Decision) { + +} diff --git a/test/functional/parser/LabFileParserTest.cpp b/test/functional/parser/LabFileParserTest.cpp new file mode 100644 index 000000000..fb236682d --- /dev/null +++ b/test/functional/parser/LabFileParserTest.cpp @@ -0,0 +1,136 @@ +/* + * LabFileParserTest.cpp + * + * Created on: 12.09.2012 + * Author: Thomas Heinemann + */ + +#include "gtest/gtest.h" +#include "storm-config.h" +#include "src/models/AtomicPropositionsLabeling.h" +#include "src/parser/AtomicPropositionLabelingParser.h" +#include "src/exceptions/FileIoException.h" +#include "src/exceptions/WrongFormatException.h" +#include "src/exceptions/OutOfRangeException.h" + +#include + +TEST(LabFileParserTest, NonExistingFile) { + // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"! + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(0,STORM_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), storm::exceptions::FileIoException); +} + +TEST(LabFileParserTest, BasicParsing) { + // This test is based on a test case from the original MRMC. + + // Parsing the file + storm::models::AtomicPropositionsLabeling labeling = storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(12, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/pctl_general_input_01.lab"); + + // Checking whether all propositions are in the labelling + + char phi[] = "phi", psi[] = "psi", smth[] = "smth"; + + ASSERT_TRUE(labeling.containsAtomicProposition(phi)); + ASSERT_TRUE(labeling.containsAtomicProposition(psi)); + ASSERT_TRUE(labeling.containsAtomicProposition(smth)); + + // Testing whether all and only the correct nodes are labeled with "phi" + ASSERT_TRUE(labeling.getStateHasAtomicProposition(phi,0)); + ASSERT_TRUE(labeling.getStateHasAtomicProposition(phi,1)); + ASSERT_TRUE(labeling.getStateHasAtomicProposition(phi,2)); + + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,3)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,4)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,5)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,6)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,7)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,8)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,9)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,10)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,11)); + + //Testing whether all and only the correct nodes are labeled with "psi" + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,0)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,1)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,2)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,3)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,4)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,5)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,6)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,7)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,8)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,9)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,10)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,11)); + + //Testing whether all and only the correct nodes are labeled with "smth" + ASSERT_TRUE(labeling.getStateHasAtomicProposition(smth,2)); + + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,0)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,1)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,3)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,4)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,5)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,6)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,7)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,8)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,9)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,10)); + ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,11)); +} + +TEST(LabFileParserTest, NoDeclarationTagHeader) { + // No #DECLARATION tag in file + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/noDeclarationTag.lab"), storm::exceptions::WrongFormatException); +} + +TEST(LabFileParserTest, NoEndTagHeader) { + // No #END tag in file. + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/noEndTag.lab"), storm::exceptions::WrongFormatException); +} + +TEST(LabFileParserTest, MisspelledDeclarationTagHeader) { + // The #DECLARATION tag is misspelled. + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/declarationMisspell.lab"), storm::exceptions::WrongFormatException); +} + +TEST(LabFileParserTest, MisspelledEndTagHeader) { + // The #END tag is misspelled. + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/endMisspell.lab"), storm::exceptions::WrongFormatException); +} + +TEST(LabFileParserTest, NoLabelDeclaredNoneGiven) { + // No label between #DECLARATION and #END and no labels given. + storm::models::AtomicPropositionsLabeling labeling = storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(13, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/noLabelsDecNoneGiven.lab"); + ASSERT_EQ(labeling.getNumberOfAtomicPropositions(), 0); + for(uint_fast64_t i = 0; i < 13; i++) { + ASSERT_TRUE(labeling.getPropositionsForState(i).empty()); + } +} + +TEST(LabFileParserTest, UndeclaredLabelsGiven) { + // Undeclared labels given. + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/undeclaredLabelsGiven.lab"), storm::exceptions::WrongFormatException); +} + +TEST(LabFileParserTest, LabelForNonExistentState) { + // The index of one of the state that are to be labeled is higher than the number of states in the model. + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/labelForNonexistentState.lab"), storm::exceptions::OutOfRangeException); +} + +TEST(LabFileParserTest, WrongProposition) { + // Swapped the state index and the label at one entry. + ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/swappedStateAndProposition.lab"), storm::exceptions::WrongFormatException); +} + +TEST(LabFileParserTest, Whitespaces) { + // Different configurations of allowed whitespaces are tested. + + // First parse the labeling file without added whitespaces and obtain the hash of its parsed representation. + storm::models::AtomicPropositionsLabeling labeling = storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(13, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/withoutWhitespaces.lab"); + uint_fast64_t correctHash = labeling.getHash(); + + // Now parse the labeling file with the added whitespaces and compare the hashes. + labeling = storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(13, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/withWhitespaces.lab"); + ASSERT_EQ(correctHash, labeling.getHash()); +} diff --git a/test/functional/parser/ReadLabFileTest.cpp b/test/functional/parser/ReadLabFileTest.cpp deleted file mode 100644 index 8c0a31b89..000000000 --- a/test/functional/parser/ReadLabFileTest.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * ReadLabFileTest.cpp - * - * Created on: 12.09.2012 - * Author: Thomas Heinemann - */ - -#include "gtest/gtest.h" -#include "storm-config.h" -#include "src/models/AtomicPropositionsLabeling.h" -#include "src/parser/AtomicPropositionLabelingParser.h" -#include "src/exceptions/FileIoException.h" -#include "src/exceptions/WrongFormatException.h" - -#include - -TEST(ReadLabFileTest, NonExistingFileTest) { - // No matter what happens, please do NOT create a file with the name "nonExistingFile.not"! - ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(0,STORM_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), storm::exceptions::FileIoException); -} - -TEST(ReadLabFileTest, ParseTest) { - // This test is based on a test case from the original MRMC. - - // Parsing the file - storm::models::AtomicPropositionsLabeling labeling = storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(12, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/pctl_general_input_01.lab"); - - // Checking whether all propositions are in the labelling - - char phi[] = "phi", psi[] = "psi", smth[] = "smth"; - - ASSERT_TRUE(labeling.containsAtomicProposition(phi)); - ASSERT_TRUE(labeling.containsAtomicProposition(psi)); - ASSERT_TRUE(labeling.containsAtomicProposition(smth)); - - // Testing whether all and only the correct nodes are labeled with "phi" - ASSERT_TRUE(labeling.getStateHasAtomicProposition(phi,0)); - ASSERT_TRUE(labeling.getStateHasAtomicProposition(phi,1)); - ASSERT_TRUE(labeling.getStateHasAtomicProposition(phi,2)); - - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,3)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,4)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,5)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,6)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,7)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,8)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,9)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,10)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(phi,11)); - - //Testing whether all and only the correct nodes are labeled with "psi" - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,0)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,1)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,2)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,3)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,4)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,5)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,6)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,7)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,8)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,9)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,10)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(psi,11)); - - //Testing whether all and only the correct nodes are labeled with "smth" - ASSERT_TRUE(labeling.getStateHasAtomicProposition(smth,2)); - - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,0)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,1)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,3)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,4)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,5)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,6)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,7)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,8)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,9)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,10)); - ASSERT_FALSE(labeling.getStateHasAtomicProposition(smth,11)); -} - -TEST(ReadLabFileTest, WrongHeaderTest1) { - ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/wrong_format_header1.lab"), storm::exceptions::WrongFormatException); -} - -TEST(ReadLabFileTest, WrongHeaderTest2) { - ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/wrong_format_header2.lab"), storm::exceptions::WrongFormatException); -} - -TEST(ReadLabFileTest, WrongPropositionTest) { - ASSERT_THROW(storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(3, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/wrong_format_proposition.lab"), storm::exceptions::WrongFormatException); -} -