diff --git a/asciidoctor-converter-doxia-module/src/it/maven-site-plugin/src/site/site.xml b/asciidoctor-converter-doxia-module/src/it/maven-site-plugin/src/site/site.xml index 93872048..d23bc776 100644 --- a/asciidoctor-converter-doxia-module/src/it/maven-site-plugin/src/site/site.xml +++ b/asciidoctor-converter-doxia-module/src/it/maven-site-plugin/src/site/site.xml @@ -14,6 +14,6 @@ org.apache.maven.skins maven-fluido-skin - 2.0.0-M6 + 2.0.0-M8 diff --git a/asciidoctor-parser-doxia-module/pom.xml b/asciidoctor-parser-doxia-module/pom.xml index 0858d5c5..d069e3f6 100644 --- a/asciidoctor-parser-doxia-module/pom.xml +++ b/asciidoctor-parser-doxia-module/pom.xml @@ -43,11 +43,6 @@ doxia-core ${doxia.version} - - org.apache.maven.doxia - doxia-module-markdown - ${doxia.version} - org.apache.maven.doxia doxia-site-renderer diff --git a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy index 096af4c7..5db89be3 100644 --- a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy +++ b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy @@ -153,13 +153,13 @@ class HtmlAsserter { void containsSectionTitle(String value, int level) { def found = -1 - def id = value.replaceAll(" ", "_") + def id = value.toLowerCase().replaceAll(" ", "_") if (level == 2) { - found = find("

$value

") + found = find("

$value

") } else if (level == 3) { - found = find("

$value

") + found = find("

$value

") } else if (level == 4) { - found = find("

$value

") + found = find("

$value

") } assertFound("Section Title (level:$level)", value, found) } @@ -185,7 +185,7 @@ class HtmlAsserter { } void containsOrderedList(String... values) { - def found = find("
  1. ${values.join('
  2. ')}
") + def found = find("
  1. ${values.join('
  2. ')}
") assertFound("Ordered list", values.join(','), found) } diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/AsciidoctorAstDoxiaParserTest.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/AsciidoctorAstDoxiaParserTest.java index 6b1ef90e..ce33c1f4 100644 --- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/AsciidoctorAstDoxiaParserTest.java +++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/AsciidoctorAstDoxiaParserTest.java @@ -1,5 +1,11 @@ package org.asciidoctor.maven.site.parser; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.StringReader; +import java.io.StringWriter; + import lombok.SneakyThrows; import org.apache.maven.doxia.parser.AbstractTextParser; import org.apache.maven.doxia.parser.ParseException; @@ -10,8 +16,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import java.io.*; - import static org.asciidoctor.maven.site.parser.AsciidoctorAstDoxiaParserTest.TestMocks.mockAsciidoctorDoxiaParser; import static org.asciidoctor.maven.site.parser.processors.test.ReflectionUtils.extractField; import static org.asciidoctor.maven.site.parser.processors.test.StringTestUtils.clean; @@ -44,39 +48,39 @@ void should_convert_html_without_any_configuration() throws FileNotFoundExceptio String result = parse(parser, srcAsciidoc); assertThat(result) - .isEqualTo("

Document Title

" + - "

Preamble paragraph.

" + - "

Section A

" + - "

Section A paragraph.

" + - "

Section A Subsection

" + - "

Section A 'subsection' paragraph.

" + - "

Section B

" + - "

Section B paragraph.

" + - "
require 'asciidoctor'
"); + .isEqualTo("

Document Title

Preamble paragraph.

" + + "

Section A

" + + "

Section A paragraph.

" + + "

Section A Subsection

" + + "

Section A 'subsection' paragraph.

" + + "

Section B

" + + "

Section B paragraph.

" + + "" + + "
require 'asciidoctor'
"); } @Test void should_convert_html_with_an_attribute() throws ParseException { final String source = "= Document Title\n\n" + - "== Section A\n\n" + - "My attribute value is {custom-attribute}.\n"; + "== Section A\n\n" + + "My attribute value is {custom-attribute}.\n"; AsciidoctorAstDoxiaParser parser = mockAsciidoctorDoxiaParser( - "\n" + - " \n" + - " \n" + - " a_value\n" + - " \n" + - " \n" + - ""); + "\n" + + " \n" + + " \n" + + " a_value\n" + + " \n" + + " \n" + + ""); String result = parse(parser, source); assertThat(result) - .contains("

My attribute value is a_value.

"); + .contains("

My attribute value is a_value.

"); } @Test @@ -84,21 +88,21 @@ void should_process_empty_selfclosing_XML_attributes() throws ParseException { final String source = sectionsSample(); AsciidoctorAstDoxiaParser parser = mockAsciidoctorDoxiaParser( - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - ""); + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + ""); String result = parse(parser, source); assertThat(result) - .contains("1. Section A") - .contains("1.1. Section A Subsection") - .contains("2. Section B") - .contains("2.1. Section B Subsection"); + .contains("1. Section A") + .contains("1.1. Section A Subsection") + .contains("2. Section B") + .contains("2.1. Section B Subsection"); } @Test @@ -106,22 +110,22 @@ void should_process_config_with_sectnumlevels() throws ParseException { final String source = sectionsSample(); AsciidoctorAstDoxiaParser parser = mockAsciidoctorDoxiaParser( - "\n" + - " \n" + - " \n" + - " \n" + - " 1\n" + - " \n" + - " \n" + - ""); + "\n" + + " \n" + + " \n" + + " \n" + + " 1\n" + + " \n" + + " \n" + + ""); String result = parse(parser, source); assertThat(result) - .contains("1. Section A") - .contains("Section A Subsection") - .contains("2. Section B") - .contains("Section B Subsection"); + .contains("1. Section A") + .contains("Section A Subsection") + .contains("2. Section B") + .contains("Section B Subsection"); } @Test @@ -129,58 +133,58 @@ void should_process_empty_value_XML_attributes() throws ParseException { final String source = sectionsSample(); AsciidoctorAstDoxiaParser parser = mockAsciidoctorDoxiaParser( - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - ""); + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + ""); String result = parse(parser, source); assertThat(result) - .contains("1. Section A") - .contains("1.1. Section A Subsection") - .contains("2. Section B") - .contains("2.1. Section B Subsection"); + .contains("1. Section A") + .contains("1.1. Section A Subsection") + .contains("2. Section B") + .contains("2.1. Section B Subsection"); } private static String sectionsSample() { return "= Document Title\n\n" + - "== Section A\n\n" + - "Section A paragraph.\n\n" + - "=== Section A Subsection\n\n" + - "Section A 'subsection' paragraph.\n\n" + - "== Section B\n\n" + - "*Section B* paragraph.\n\n" + - "=== Section B Subsection\n\n" + - "Section B 'subsection' paragraph.\n\n"; + "== Section A\n\n" + + "Section A paragraph.\n\n" + + "=== Section A Subsection\n\n" + + "Section A 'subsection' paragraph.\n\n" + + "== Section B\n\n" + + "*Section B* paragraph.\n\n" + + "=== Section B Subsection\n\n" + + "Section B 'subsection' paragraph.\n\n"; } @Test void should_fail_when_logHandler_failIf_is_WARNING() { final String source = "= My Document\n\n" + - "include::unexistingdoc.adoc[]\n\n" + - "include::unexistingdoc.adoc[]"; + "include::unexistingdoc.adoc[]\n\n" + + "include::unexistingdoc.adoc[]"; AsciidoctorAstDoxiaParser parser = mockAsciidoctorDoxiaParser( - "\n" + - " \n" + - " \n" + - " \n" + - " WARN\n" + - " \n" + - " \n" + - " \n" + - ""); + "\n" + + " \n" + + " \n" + + " \n" + + " WARN\n" + + " \n" + + " \n" + + " \n" + + ""); Throwable throwable = catchThrowable(() -> parser.parse(new StringReader(source), sink)); // 'issues with WARN and ERROR are returned' assertThat(throwable) - .isInstanceOf(ParseException.class) - .hasMessageContaining("Found 2 issue(s) of severity WARN or higher during conversion"); + .isInstanceOf(ParseException.class) + .hasMessageContaining("Found 2 issue(s) of severity WARN or higher during conversion"); } private String parse(AbstractTextParser parser, File source) throws FileNotFoundException, ParseException { @@ -198,9 +202,9 @@ static class TestMocks { static javax.inject.Provider createMavenProjectMock(String configuration) { MavenProject mockProject = Mockito.mock(MavenProject.class); when(mockProject.getBasedir()) - .thenReturn(new File(".")); + .thenReturn(new File(".")); when(mockProject.getGoalConfiguration(anyString(), anyString(), anyString(), anyString())) - .thenReturn(configuration != null ? Xpp3DomBuilder.build(new StringReader(configuration)) : null); + .thenReturn(configuration != null ? Xpp3DomBuilder.build(new StringReader(configuration)) : null); return () -> mockProject; } diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/OrderedListNodeProcessorTest.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/OrderedListNodeProcessorTest.java index e29d9d2a..d0d83167 100644 --- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/OrderedListNodeProcessorTest.java +++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/OrderedListNodeProcessorTest.java @@ -1,5 +1,9 @@ package org.asciidoctor.maven.site.parser.processors; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.Collections; + import org.apache.maven.doxia.sink.Sink; import org.asciidoctor.Asciidoctor; import org.asciidoctor.Options; @@ -9,10 +13,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.StringWriter; -import java.util.Arrays; -import java.util.Collections; - import static org.asciidoctor.maven.site.parser.processors.test.StringTestUtils.clean; import static org.assertj.core.api.Assertions.assertThat; @@ -39,9 +39,9 @@ void should_convert_simple_list() { String html = process(content); assertThat(html) - .isEqualTo("
    " + - "
  1. ordered item 1
  2. " + - "
  3. ordered item 2
"); + .isEqualTo("
    " + + "
  1. ordered item 1
  2. " + + "
  3. ordered item 2
"); } @Test @@ -51,40 +51,40 @@ void should_convert_nested_list() { String html = process(content); assertThat(html) - .isEqualTo("
    " + - "
  1. ordered item 1" + - "
      " + - "
    1. ordered item 1 1
  2. " + - "
  3. ordered item 1 2
  4. " + - "
  5. ordered item 2" + - "
      " + - "
    1. ordered item 2 1" + - "
        " + - "
      1. ordered item 2 1 1
"); + .isEqualTo("
    " + + "
  1. ordered item 1" + + "
      " + + "
    1. ordered item 1 1
  2. " + + "
  3. ordered item 1 2
  4. " + + "
  5. ordered item 2" + + "
      " + + "
    1. ordered item 2 1" + + "
        " + + "
      1. ordered item 2 1 1
"); } private static String buildDocumentWithSimpleList() { return "= Document tile\n\n" - + "== Section\n\n" - + ". ordered item 1\n" - + ". ordered item 2\n"; + + "== Section\n\n" + + ". ordered item 1\n" + + ". ordered item 2\n"; } private static String buildDocumentWithNestedLists() { return "= Document tile\n\n" - + "== Section\n\n" - + ". ordered item 1\n" - + ".. ordered item 1 1\n" - + ". ordered item 1 2\n" - + ". ordered item 2\n" - + ".. ordered item 2 1\n" - + "... ordered item 2 1 1\n"; + + "== Section\n\n" + + ". ordered item 1\n" + + ".. ordered item 1 1\n" + + ". ordered item 1 2\n" + + ". ordered item 2\n" + + ".. ordered item 2 1\n" + + "... ordered item 2 1 1\n"; } private String process(String content) { StructuralNode node = asciidoctor.load(content, Options.builder().build()) - .findBy(Collections.singletonMap("context", ":olist")) - .get(0); + .findBy(Collections.singletonMap("context", ":olist")) + .get(0); nodeProcessor.process(node); diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/SectionNodeProcessorTest.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/SectionNodeProcessorTest.java index 69fb9672..c1072ca7 100644 --- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/SectionNodeProcessorTest.java +++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/SectionNodeProcessorTest.java @@ -1,5 +1,8 @@ package org.asciidoctor.maven.site.parser.processors; +import java.io.StringWriter; +import java.util.Collections; + import org.asciidoctor.Asciidoctor; import org.asciidoctor.Attributes; import org.asciidoctor.Options; @@ -8,9 +11,6 @@ import org.asciidoctor.maven.site.parser.processors.test.NodeProcessorTest; import org.junit.jupiter.api.Test; -import java.io.StringWriter; -import java.util.Collections; - import static org.assertj.core.api.Assertions.assertThat; @NodeProcessorTest(SectionNodeProcessor.class) @@ -28,7 +28,7 @@ void should_convert_document_title() { String html = process(content, 0); assertThat(html) - .isEqualTo("

Document tile

"); + .isEqualTo("

Document tile

"); } @Test @@ -38,7 +38,7 @@ void should_convert_section_level_2() { String html = process(content, 1); assertThat(html) - .isEqualTo("

First section title

"); + .isEqualTo("

First section title

"); } @Test @@ -48,7 +48,7 @@ void should_convert_section_level_3() { String html = process(content, 2); assertThat(html) - .isEqualTo("

Second section title

"); + .isEqualTo("

Second section title

"); } @Test @@ -58,7 +58,7 @@ void should_convert_section_level_4() { String html = process(content, 3); assertThat(html) - .isEqualTo("

Third section title

"); + .isEqualTo("

Third section title

"); } @Test @@ -68,7 +68,7 @@ void should_convert_section_level_5() { String html = process(content, 4); assertThat(html) - .isEqualTo("
Fourth section title
"); + .isEqualTo("
Fourth section title
"); } @Test @@ -78,59 +78,72 @@ void should_convert_section_level_6() { String html = process(content, 5); assertThat(html) - .isEqualTo("
Fifth section title
"); + .isEqualTo("
Fifth section title
"); } @Test void should_convert_section_with_sectionNumbers() { Attributes attributes = Attributes.builder() - .sectionNumbers(true) - .build(); + .sectionNumbers(true) + .build(); String content = documentWithSections(); // With numbering assertThat(process(content, 1, attributes)) - .isEqualTo("

1. First section title

"); + .isEqualTo("

1. First section title

"); assertThat(process(content, 2, attributes)) - .isEqualTo("

1.1. Second section title

"); + .isEqualTo("

1.1. Second section title

"); assertThat(process(content, 3, attributes)) - .isEqualTo("

1.1.1. Third section title

"); + .isEqualTo("

1.1.1. Third section title

"); // Without numbering by default assertThat(process(content, 4, attributes)) - .isEqualTo("
Fourth section title
"); + .isEqualTo("
Fourth section title
"); assertThat(process(content, 5, attributes)) - .isEqualTo("
Fifth section title
"); + .isEqualTo("
Fifth section title
"); } @Test void should_convert_section_with_sectionNumbers_and_sectNumLevels() { Attributes attributes = Attributes.builder() - .sectionNumbers(true) - .sectNumLevels(5) - .build(); + .sectionNumbers(true) + .sectNumLevels(5) + .build(); String content = documentWithSections(); // With numbering assertThat(process(content, 1, attributes)) - .isEqualTo("

1. First section title

"); + .isEqualTo("

1. First section title

"); assertThat(process(content, 2, attributes)) - .isEqualTo("

1.1. Second section title

"); + .isEqualTo("

1.1. Second section title

"); assertThat(process(content, 3, attributes)) - .isEqualTo("

1.1.1. Third section title

"); + .isEqualTo("

1.1.1. Third section title

"); assertThat(process(content, 4, attributes)) - .isEqualTo("
1.1.1.1. Fourth section title
"); + .isEqualTo("
1.1.1.1. Fourth section title
"); assertThat(process(content, 5, attributes)) - .isEqualTo("
1.1.1.1.1. Fifth section title
"); + .isEqualTo("
1.1.1.1.1. Fifth section title
"); + } + + @Test + void should_apply_id_prefix() { + Attributes attributes = Attributes.builder() + .attribute("idprefix", "my_") + .build(); + String content = documentWithSections(); + + String html = process(content, 1, attributes); + + assertThat(html) + .isEqualTo("

First section title

"); } private String documentWithSections() { return "= Document tile\n\n" - + "== First section title\n\nFirst section body\n\n" - + "=== Second section title\n\nSecond section body\n\n" - + "==== Third section title\n\nThird section body\n\n" - + "===== Fourth section title\n\nFourth section body\n\n" - + "====== Fifth section title\n\nFifth section body\n\n"; + + "== First section title\n\nFirst section body\n\n" + + "=== Second section title\n\nSecond section body\n\n" + + "==== Third section title\n\nThird section body\n\n" + + "===== Fourth section title\n\nFourth section body\n\n" + + "====== Fifth section title\n\nFifth section body\n\n"; } private String process(String content, int level) { @@ -139,11 +152,11 @@ private String process(String content, int level) { private String process(String content, int level, Attributes attributes) { StructuralNode node = asciidoctor.load(content, Options.builder().attributes(attributes).build()) - .findBy(Collections.singletonMap("context", ":section")) - .stream() - .filter(n -> n.getLevel() == level) - .findFirst() - .get(); + .findBy(Collections.singletonMap("context", ":section")) + .stream() + .filter(n -> n.getLevel() == level) + .findFirst() + .get(); reset(sinkWriter); nodeProcessor.process(node); diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessorTest.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessorTest.java index 2221a989..26b9202e 100644 --- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessorTest.java +++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessorTest.java @@ -45,16 +45,16 @@ void should_convert_table_with_header() { // Header for now is just first row with class=a assertThat(html) - .isEqualTo("" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "
NameLanguage
JRubyJava
RubiniusRuby
"); + .isEqualTo("" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "
NameLanguage
JRubyJava
RubiniusRuby
"); } @Test @@ -64,13 +64,13 @@ void should_convert_table_without_header() { String html = process(content); assertThat(html) - .isEqualTo(clean("" + - "" + - "" + - "" + - "" + - "" + - "
JRubyJava
RubiniusRuby
")); + .isEqualTo(clean("" + + "" + + "" + + "" + + "" + + "" + + "
JRubyJava
RubiniusRuby
")); } @Test @@ -80,7 +80,7 @@ void should_convert_table_with_text_markup() { String html = process(content); assertThat(html) - .isEqualTo(expectedTableWithoutCaption()); + .isEqualTo(expectedTableWithoutCaption()); } @Test @@ -90,14 +90,13 @@ void should_convert_table_with_label_and_title() { String html = process(content); assertThat(html) - .startsWith("") - .isEqualTo("
Table 1. Table caption…​or title
" + - "" + - "" + - "" + - "" + - "" + - "
Table 1. Table caption…​or title
JRubyJava
RubiniusRuby
"); + .isEqualTo("" + + "" + + "" + + "" + + "" + + "" + + "
Table 1. Table caption…​or title
JRubyJava
RubiniusRuby
"); } @Test @@ -107,8 +106,8 @@ void should_convert_table_with_label_disabled() { String html = process(content); assertThat(html) - .startsWith(expectedNoLabelBeginning()) - .isEqualTo(expectedTableWithoutLabel()); + .startsWith(expectedNoLabelBeginning()) + .isEqualTo(expectedTableWithoutLabel()); } @Test @@ -118,35 +117,35 @@ void should_convert_table_with_labels_disabled_globally() { String html = process(content); assertThat(html) - .startsWith(expectedNoLabelBeginning()) - .isEqualTo(expectedTableWithoutLabel()); + .startsWith(expectedNoLabelBeginning()) + .isEqualTo(expectedTableWithoutLabel()); } private static String expectedNoLabelBeginning() { - return ""; + return "
Table caption…​or title
"; } private static String expectedTableWithoutLabel() { - return "
Table caption…​or title
" + - "" + - "" + - "" + - "" + - "" + - "
Table caption…​or title
JRubyJava
RubiniusRuby
"; + return "" + + "" + + "" + + "" + + "" + + "" + + "
Table caption…​or title
JRubyJava
RubiniusRuby
"; } private static String expectedTableWithoutCaption() { - return "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "
JRubyJava
RubiniusRuby
OpalJavaScript
"; + return "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "
JRubyJava
RubiniusRuby
OpalJavaScript
"; } static class DocumentBuilder { @@ -172,24 +171,24 @@ private CaptionOptions(boolean include, boolean disableForTable, boolean disable static String documentWithTable(boolean includeHeaderRow, CaptionOptions captionOptions, List additionalRow) { return "= Document tile\n" + - (captionOptions.disableGlobally ? ":table-caption!:\n" : "") + - "\n" + - "== Section\n" + - (captionOptions.disableForTable ? "[caption=]\n" : "") + - (captionOptions.include ? ".Table caption...or title\n" : "") + - "|===\n" + - (includeHeaderRow ? "|Name |Language\n\n" : "") + - "|JRuby |Java\n" + - "|Rubinius |Ruby\n" + - (!additionalRow.isEmpty() ? additionalRow.stream().collect(Collectors.joining("|", " |", "")) : "") + - "|==="; + (captionOptions.disableGlobally ? ":table-caption!:\n" : "") + + "\n" + + "== Section\n" + + (captionOptions.disableForTable ? "[caption=]\n" : "") + + (captionOptions.include ? ".Table caption...or title\n" : "") + + "|===\n" + + (includeHeaderRow ? "|Name |Language\n\n" : "") + + "|JRuby |Java\n" + + "|Rubinius |Ruby\n" + + (!additionalRow.isEmpty() ? additionalRow.stream().collect(Collectors.joining("|", " |", "")) : "") + + "|==="; } } private String process(String content) { StructuralNode node = asciidoctor.load(content, Options.builder().build()) - .findBy(Collections.singletonMap("context", ":table")) - .get(0); + .findBy(Collections.singletonMap("context", ":table")) + .get(0); nodeProcessor.process(node); diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/Html.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/Html.java index 68d54f8f..43061dc5 100644 --- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/Html.java +++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/Html.java @@ -2,7 +2,7 @@ public class Html { - public static final String LIST_STYLE_TYPE_DECIMAL = "list-style-type: decimal"; + public static final String LIST_STYLE_TYPE_DECIMAL = "list-style-type: decimal;"; public static String strong(String text) { return htmlElement("strong", text); diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/TestNodeProcessorFactory.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/TestNodeProcessorFactory.java index f94cedf3..d96e4445 100644 --- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/TestNodeProcessorFactory.java +++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/processors/test/TestNodeProcessorFactory.java @@ -5,6 +5,8 @@ import lombok.SneakyThrows; import org.apache.commons.lang3.tuple.Pair; import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.siterenderer.DocumentRenderingContext; +import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.asciidoctor.maven.site.parser.NodeProcessor; import org.mockito.Mockito; @@ -18,6 +20,6 @@ public static Pair create(Class clazz) { } public static Sink createSink() { - return new SiteRendererSink(Mockito.mock(DocumentRendetingContext.class)); + return new SiteRendererSink(Mockito.mock(DocumentRenderingContext.class)); } } diff --git a/pom.xml b/pom.xml index 6f720e99..70b762a5 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ - 2.0.0-M9 + 2.0.0-M8 2.2.0 2.5.11 9.4.5.0