diff --git a/alib2/test-src/regexp/RegExpTest.cpp b/alib2/test-src/regexp/RegExpTest.cpp index 3c994467c96c70cd520a8ec54e22f7eb378a9c9b..dbc69d0286aa6690cbc0d2059d0fcb173aad61b9 100644 --- a/alib2/test-src/regexp/RegExpTest.cpp +++ b/alib2/test-src/regexp/RegExpTest.cpp @@ -22,9 +22,7 @@ void RegExpTest::tearDown() { void RegExpTest::testCopyConstruct() { regexp::RegExp regexp; - regexp.addSymbolToAlphabet(alphabet::Symbol("1")); - regexp.addSymbolToAlphabet(alphabet::Symbol("2")); - regexp.addSymbolToAlphabet(alphabet::Symbol("3")); + regexp.setAlphabet({alphabet::Symbol("1"), alphabet::Symbol("2"), alphabet::Symbol("3")}); regexp.setRegExp(regexp::Alternation( regexp::Concatenation( regexp::RegExpSymbol("1"), @@ -63,9 +61,7 @@ void RegExpTest::testEqual() { void RegExpTest::testXMLParser() { regexp::RegExp regexp; - regexp.addSymbolToAlphabet(alphabet::Symbol("1")); - regexp.addSymbolToAlphabet(alphabet::Symbol("2")); - regexp.addSymbolToAlphabet(alphabet::Symbol("3")); + regexp.setAlphabet({alphabet::Symbol("1"), alphabet::Symbol("2"), alphabet::Symbol("3")}); regexp.setRegExp(regexp::Alternation( regexp::Concatenation( regexp::RegExpSymbol("1"), @@ -82,7 +78,7 @@ void RegExpTest::testXMLParser() { std::string tmp; sax::SaxPrintInterface::printMemory(tmp, tokens); - std::list<sax::Token> tokens2 = composer.compose(regexp); + std::list<sax::Token> tokens2; sax::SaxParseInterface::parseMemory(tmp, tokens2); regexp::RegExpFromXMLParser parser; regexp::RegExp regexp2 = parser.parse(tokens2); @@ -525,4 +521,5 @@ void RegExpTest::testOrder2() { CPPUNIT_ASSERT(sym3 > sym1); CPPUNIT_ASSERT(sym3 > sym2); CPPUNIT_ASSERT(sym3 == sym3); -} \ No newline at end of file +} +