diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-03-01 13:52:34 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-03-01 13:52:34 +0100 |
| commit | 4e199ad0d5c5d94955839da2a52967b4f0f34a43 (patch) | |
| tree | 6571d7de3536911ad430ea0f9e1b0f05bb335d44 /test/formats | |
| parent | 31c83c05d257c9a7a336f12342c401f97d380674 (diff) | |
Implemented registration of user-defined tokens, fixed comment handling (do not issue multiple data events if a comment occurs, just skip the comment data like in TeX)
Diffstat (limited to 'test/formats')
| -rw-r--r-- | test/formats/osml/OsmlStreamParserTest.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/test/formats/osml/OsmlStreamParserTest.cpp b/test/formats/osml/OsmlStreamParserTest.cpp index 3e7f4c1..0ea087f 100644 --- a/test/formats/osml/OsmlStreamParserTest.cpp +++ b/test/formats/osml/OsmlStreamParserTest.cpp @@ -363,8 +363,7 @@ TEST(OsmlStreamParser, singleLineComment) CharReader charReader(testString); OsmlStreamParser parser(charReader, logger); - assertTextData(parser, "a", 0, 1, 0, 1, WhitespaceMode::PRESERVE); - assertTextData(parser, "b", 33, 34, 33, 34, WhitespaceMode::PRESERVE); + assertTextData(parser, "ab", 0, 34, 0, 34, WhitespaceMode::PRESERVE); assertEnd(parser, 34, 34); } @@ -376,8 +375,7 @@ TEST(OsmlStreamParser, multilineComment) CharReader charReader(testString); OsmlStreamParser parser(charReader, logger); - assertTextData(parser, "a", 0, 1, 0, 1, WhitespaceMode::PRESERVE); - assertTextData(parser, "b", 40, 41, 40, 41, WhitespaceMode::PRESERVE); + assertTextData(parser, "ab", 0, 41, 0, 41, WhitespaceMode::PRESERVE); assertEnd(parser, 41, 41); } @@ -391,10 +389,10 @@ TEST(OsmlStreamParser, unfinishedMultilineComment) logger.reset(); - assertTextData(parser, "a", 0, 1, 0, 1, WhitespaceMode::PRESERVE); ASSERT_FALSE(logger.hasError()); - assertEnd(parser, 38, 38); + assertTextData(parser, "a", 0, 1, 0, 1, WhitespaceMode::PRESERVE); ASSERT_TRUE(logger.hasError()); + assertEnd(parser, 38, 38); } TEST(OsmlStreamParser, nestedMultilineComment) @@ -405,8 +403,7 @@ TEST(OsmlStreamParser, nestedMultilineComment) CharReader charReader(testString); OsmlStreamParser parser(charReader, logger); - assertTextData(parser, "a", 0, 1, 0, 1, WhitespaceMode::PRESERVE); - assertTextData(parser, "b", 40, 41, 40, 41, WhitespaceMode::PRESERVE); + assertTextData(parser, "ab", 0, 41, 0, 41, WhitespaceMode::PRESERVE); assertEnd(parser, 41, 41); } |