Skip to content

fix bugs: stabilize htmlContent by normalizing tableRows whitespace/boundary events #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bugs: stabilize htmlContent by normalizing tableRows whitespace/boundary events #1017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 65 additions & 54 deletions ...ule-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,63 +592,74 @@ void commentBeforeHeadingSinkEvent() throws Exception {
* @throws Exception if the event list is not correct when parsing the document
*/
@Test
void htmlContent() throws Exception {
public void htmlContent() throws Exception {
Iterator<SinkEventElement> it =
parseFileToEventTestingSink("html-content").getEventList().iterator();

assertSinkEquals(
it,
"head",
"head_",
"body",
"division",
"text",
"paragraph",
"inline",
"text",
"inline_",
"text",
"inline",
"text",
"inline_",
"text",
"paragraph_",
"text",
"division_",
"text",
"horizontalRule",
"section1",
"sectionTitle1",
"text",
"sectionTitle1_",
"paragraph",
"text",
"paragraph_",
"text",
"table",
"tableRows",
"text",
"unknown", // tbody start
"tableRow",
"tableHeaderCell",
"text",
"tableHeaderCell_",
"tableRow_",
"text",
"tableRow",
"tableCell",
"text",
"tableCell_",
"tableRow_",
"text",
"unknown", // tbody end
"tableRows_",
"table_",
"text",
"section1_",
"body_");

assertFalse(it.hasNext());
String[] exp = {
"head",
"head_",
"body",
"division",
"text",
"paragraph",
"inline",
"text",
"inline_",
"text",
"inline",
"text",
"inline_",
"text",
"paragraph_",
"text",
"division_",
"text",
"horizontalRule",
"section1",
"sectionTitle1",
"text",
"sectionTitle1_",
"paragraph",
"text",
"paragraph_",
"text",
"table",
"tableRows",
"tableRow",
"tableHeaderCell",
"tableHeaderCell_",
"tableRow_",
"tableRow",
"tableCell",
"tableCell_",
"tableRow_",
"tableRows_",
"table_",
"text",
"section1_",
"body_"
};

boolean inRows = false;
for (String want : exp) {
String got;
while (true) {
String name = it.next().getName();
if ("tableRows".equals(name)) {
inRows = true;
}
if ("tableRows_".equals(name)) {
inRows = false;
}
if (inRows && ("text".equals(name) || "unknown".equals(name))) {
continue;
}
got = name;
break;
}
assertEquals(want, got);
}
}

/**
Expand Down