diff --git a/alib2/test-src/alphabet/SymbolTest.cpp b/alib2/test-src/alphabet/SymbolTest.cpp index 763b89fedf96261610dbe06058d6fd2af1858510..d9d8a40cb2bcd173de108bfe7e592c995828957a 100644 --- a/alib2/test-src/alphabet/SymbolTest.cpp +++ b/alib2/test-src/alphabet/SymbolTest.cpp @@ -39,54 +39,43 @@ void SymbolTest::testCopyConstruct() { } void SymbolTest::testEqual() { -/* std::string input = "a+a"; + std::string input = "a"; - string::StringFromStringParser parser(input); - string::String string = parser.parse(); + alphabet::SymbolFromStringParser parser(input); + alphabet::Symbol symbol = parser.parse(); - string::SymbolToStringComposer composer; - std::string output = composer.compose(string); - - string::StringFromStringParser parser2(output); - string::String string2 = parser2.parse(); - - CPPUNIT_ASSERT( string == string2 );*/ + alphabet::SymbolToStringComposer composer; + std::string output = composer.compose(symbol); + + alphabet::SymbolFromStringParser parser2(output); + alphabet::Symbol symbol2 = parser2.parse(); + + CPPUNIT_ASSERT( symbol == symbol2 ); } void SymbolTest::testXMLParser() { -/* - string::String string; - string.setAlphabet({alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("1")))), alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("2")))), alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("3"))))}); - string.setString(string::Alternation( - string::Concatenation( - string::StringSymbol(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("1"))))), - string::StringSymbol(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("2"))))) - ), - string::Iteration( - string::StringSymbol(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("1"))))) - ) - ) - ); + + alphabet::Symbol symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("1")))); { - string::SymbolToXMLComposer composer; - std::list<sax::Token> tokens = composer.compose(string); + alphabet::SymbolToXMLComposer composer; + std::list<sax::Token> tokens = composer.compose(symbol); std::string tmp; sax::SaxComposeInterface::printMemory(tmp, tokens); std::list<sax::Token> tokens2; sax::SaxParseInterface::parseMemory(tmp, tokens2); - string::StringFromXMLParser parser; - string::String string2 = parser.parse(tokens2); + alphabet::SymbolFromXMLParser parser; + alphabet::Symbol symbol2 = parser.parse(tokens2); - CPPUNIT_ASSERT( string == string2 ); + CPPUNIT_ASSERT( symbol == symbol2 ); } { - std::string tmp = string::StringFactory::toString(string); - string::String string2 = string::StringFactory::fromString(tmp); + std::string tmp = alphabet::SymbolFactory::toString(symbol); + alphabet::Symbol symbol2 = alphabet::SymbolFactory::fromString(tmp); - CPPUNIT_ASSERT( string == string2 ); - }*/ + CPPUNIT_ASSERT( symbol == symbol2 ); + } } void SymbolTest::testOrder() {