From b8207504598b03858e70b189fae10ff912318959 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 8 May 2014 12:25:06 +0200
Subject: [PATCH] siplify regexp tests
---
alib2/test-src/regexp/RegExpTest.cpp | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/alib2/test-src/regexp/RegExpTest.cpp b/alib2/test-src/regexp/RegExpTest.cpp
index 3c994467c9..dbc69d0286 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
+}
+
--
GitLab