make spec example renderer base usable by non-flexmark renderers

vsch · vsch · commit 67dc8c35f14c · 2019-10-19T06:19:45.000-04:00
diff --git a/VERSION.md b/VERSION.md
@@ -8,7 +8,8 @@ flexmark-java
 - [To Do](#to-do)
 - [Next 0.60.0](#next-0600)
     - [API Changes](#api-changes)
-- [Next 0.59.17](#next-05917)
+- [Next 0.59.19](#next-05919)
+- [0.59.17](#05917)
 - [0.59.15](#05915)
 - [0.59.13](#05913)
     - [0.59.11](#05911)
@@ -142,7 +143,7 @@ Please give feedback on the upcoming changes if you have concerns about breaking
     * `com.vladsch.flexmark.util.ast.NodeAdaptingVisitHandler`
     * `com.vladsch.flexmark.util.ast.NodeAdaptingVisitor`
 
-Next 0.59.17
+Next 0.59.19
 ------------
 
 * [ ] Fix: Change spec example to variable number of sections
@@ -154,6 +155,14 @@ Next 0.59.17
       spec test and not requiring deep inheritance dependencies. Merge full test spec and
       individual tests. for example see MdNav `LightPlatformCodeInsightSpecTestCase`
 
+0.59.17
+-------
+
+* Fix: make `SpecExampleRendererBase` reusable by moving any references to flexmark parsing
+  rendering specifics to `FlexmarkSpecExampleRenderer` and moving up not related to flexmark
+  parsing, like caching of generated HTML and AST.
+* Fix: consolidate full spec and individual example test case in to one method.
+
 0.59.15
 -------
 
diff --git a/flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterTranslationSpecTestBase.java b/flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterTranslationSpecTestBase.java
@@ -35,6 +35,6 @@ public abstract class FormatterTranslationSpecTestBase extends ComboSpecTestCase
         optionsMap.put("no-tailing-blanks", new MutableDataSet().set(Formatter.MAX_TRAILING_BLANK_LINES, 0));
     }
     public FormatterTranslationSpecTestBase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));
     }
 }
diff --git a/flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/RendererSpecTest.java b/flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/RendererSpecTest.java
@@ -24,7 +24,7 @@ public abstract class RendererSpecTest extends ComboSpecTestCase {
         optionsMap.put("src-pos", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_ATTRIBUTE, "md-pos"));
     }
     public RendererSpecTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));
     }
 
     /**
diff --git a/flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/TranslationFormatterSpecTest.java b/flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/TranslationFormatterSpecTest.java
@@ -6,6 +6,7 @@
 import com.vladsch.flexmark.html.renderer.HeaderIdGenerator;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.test.spec.SpecExample;
+import com.vladsch.flexmark.test.util.ComboSpecTestCase;
 import com.vladsch.flexmark.test.util.FlexmarkSpecExampleRenderer;
 import com.vladsch.flexmark.test.util.SpecExampleRenderer;
 import com.vladsch.flexmark.test.util.TestUtils;
@@ -43,7 +44,7 @@ public abstract class TranslationFormatterSpecTest extends FormatterTranslationS
         optionsMap.put("ast-details", new MutableDataSet().set(AST_DETAILS, true));
     }
     public TranslationFormatterSpecTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));
     }
 
     private Parser getParser(@Nullable DataHolder OPTIONS) {
diff --git a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterSpecTestBase.java b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterSpecTestBase.java
@@ -4,6 +4,7 @@
 import com.vladsch.flexmark.formatter.Formatter;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.test.spec.SpecExample;
+import com.vladsch.flexmark.test.util.ComboSpecTestCase;
 import com.vladsch.flexmark.util.ast.KeepType;
 import com.vladsch.flexmark.util.data.DataHolder;
 import com.vladsch.flexmark.util.data.MutableDataSet;
@@ -63,6 +64,6 @@ public abstract class ComboCoreFormatterSpecTestBase extends FormatterSpecTest {
         optionsMap.put("no-soft-breaks", new MutableDataSet().set(Formatter.KEEP_SOFT_LINE_BREAKS, false));
     }
     public ComboCoreFormatterSpecTestBase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), defaultOptions);
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), defaultOptions);
     }
 }
diff --git a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/renderer/CoreRendererSpecTest.java b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/renderer/CoreRendererSpecTest.java
@@ -4,6 +4,7 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.test.spec.SpecExample;
+import com.vladsch.flexmark.test.util.ComboSpecTestCase;
 import com.vladsch.flexmark.util.ast.KeepType;
 import com.vladsch.flexmark.util.data.DataHolder;
 import com.vladsch.flexmark.util.data.MutableDataSet;
@@ -124,6 +125,6 @@ public abstract class CoreRendererSpecTest extends RendererSpecTest {
         );
     }
     public CoreRendererSpecTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));
     }
 }
diff --git a/flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpecTestBase.java b/flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpecTestBase.java
@@ -103,7 +103,7 @@ public abstract class ComboDocxConverterSpecTestBase extends ComboSpecTestCase {
         optionsMap.put("yellow-missing-hyperlink", new MutableDataSet().set(DocxRenderer.LOCAL_HYPERLINK_MISSING_HIGHLIGHT, "yellow"));
     }
     public ComboDocxConverterSpecTestBase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));
     }
 
     @Override
@@ -123,7 +123,7 @@ public ComboDocxConverterSpecTestBase(@NotNull SpecExample example, @Nullable Ma
     }
 
     @Override
-    final public void testCase(SpecExampleRenderer exampleRenderer, SpecExampleParse exampleParse, DataHolder exampleOptions) {
+    final public void addSpecExample(SpecExampleRenderer exampleRenderer, SpecExampleParse exampleParse, DataHolder exampleOptions) {
         if (!DUMP_TEST_CASE_FILES) return;
         Document document = (Document) ((FlexmarkSpecExampleRenderer) exampleRenderer).getDocument();
 
@@ -164,7 +164,7 @@ final public void testCase(SpecExampleRenderer exampleRenderer, SpecExampleParse
     }
 
     @Override
-    final public void addSpecExample(@NotNull SpecExampleRenderer exampleRenderer, @NotNull SpecExampleParse exampleParse, DataHolder exampleOptions, boolean ignoredTestCase, @NotNull String html, @Nullable String ast) {
+    final public void addFullSpecExample(@NotNull SpecExampleRenderer exampleRenderer, @NotNull SpecExampleParse exampleParse, DataHolder exampleOptions, boolean ignoredTestCase, @NotNull String html, @Nullable String ast) {
         if (!DUMP_ALL_TESTS_FILES) return;
 
         boolean failed = !ignoredTestCase && !exampleRenderer.getHtml().equals(example.getHtml());
diff --git a/flexmark-html2md-converter/src/test/java/com/vladsch/flexmark/html2md/converter/HtmlConverterTest.java b/flexmark-html2md-converter/src/test/java/com/vladsch/flexmark/html2md/converter/HtmlConverterTest.java
@@ -119,7 +119,7 @@ private static Document linkDocument() {
     }
 
     public HtmlConverterTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
-        super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));
+        super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));
     }
 
     @Override
diff --git a/flexmark-integration-test/src/test/java/com/vladsch/flexmark/integration/SpecIntegrationTest.java b/flexmark-integration-test/src/test/java/com/vladsch/flexmark/integration/SpecIntegrationTest.java
@@ -69,12 +69,6 @@ protected boolean wantExampleInfo() {
         return false;
     }
 
-    @Override
-    public void testFullSpec() {
-        // we don't want it because it will not match and we cannot modify the full spec.
-        super.testFullSpec();
-    }
-
     private static Map<String, String> getOverriddenExamples() {
         Map<String, String> m = new HashMap<>();
 
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/ComboSpecTestCase.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/ComboSpecTestCase.java
@@ -26,20 +26,8 @@ public abstract class ComboSpecTestCase extends FullSpecTestCase {
 
     public ComboSpecTestCase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {
         this.example = example;
-        DataHolder combinedOptions = null;
-        if (defaultOptions != null) {
-            for (DataHolder options : defaultOptions) {
-                combinedOptions = combineOptions(combinedOptions, options);
-            }
-        }
-        this.myDefaultOptions = combinedOptions == null ? null : combinedOptions.toImmutable();
-        mergeMaps(optionMap);
-    }
-
-    private void mergeMaps(@Nullable Map<String, DataHolder> overrides) {
-        if (overrides != null) {
-            optionsMap.putAll(overrides);
-        }
+        myDefaultOptions = TestUtils.combineDefaultOptions(defaultOptions,this::combineOptions);
+        if (optionMap != null) optionsMap.putAll(optionMap);
     }
 
     public static @NotNull Map<String, DataHolder> placementAndSortOptions(DataKey<ElementPlacement> placementDataKey, DataKey<ElementPlacementSort> sortDataKey) {
@@ -56,15 +44,12 @@ private void mergeMaps(@Nullable Map<String, DataHolder> overrides) {
 
     @Nullable
     public static Map<String, DataHolder> optionsMaps(@Nullable Map<String, DataHolder> other, @Nullable Map<String, DataHolder> overrides) {
-        if (other != null && overrides != null) {
-            HashMap<String, DataHolder> map = new HashMap<>(other);
-            map.putAll(overrides);
-            return map;
-        } else if (other != null) {
-            return other;
-        } else {
-            return overrides;
-        }
+        return TestUtils.optionsMaps(other, overrides);
+    }
+
+    @Nullable
+    public static DataHolder[] dataHolders(@Nullable DataHolder other, @Nullable DataHolder[] overrides) {
+        return TestUtils.dataHolders(other, overrides);
     }
 
     @Nullable
@@ -74,39 +59,13 @@ final public DataHolder options(String option) {
         return optionsMap.get(option);
     }
 
-    @Nullable
-    public static DataHolder[] dataHolders(@Nullable DataHolder other, @Nullable DataHolder[] overrides) {
-        if (other == null) return overrides;
-        else if (overrides == null || overrides.length == 0) return new DataHolder[] { other };
-
-        DataHolder[] holders = new DataHolder[overrides.length + 1];
-        System.arraycopy(overrides, 0, holders, 1, overrides.length);
-        holders[0] = other;
-        return holders;
-    }
-
-    protected @NotNull ResourceLocation getLocation(@NotNull String resourcePath) {
-        return new ResourceLocation(ComboSpecTestCase.class, resourcePath, TestUtils.DEFAULT_URL_PREFIX);
-    }
-
-    protected @NotNull ResourceLocation getLocation(@NotNull Class<?> resourceClass, @NotNull String resourcePath) {
-        return new ResourceLocation(resourceClass, resourcePath, TestUtils.DEFAULT_URL_PREFIX);
-    }
-
-    protected @NotNull ResourceLocation getLocation(@NotNull Class<?> resourceClass, @NotNull String resourcePath, @NotNull String fileUrlPrefix) {
-        return new ResourceLocation(resourceClass, resourcePath, fileUrlPrefix);
-    }
-
-    @Test
-    public void testHtmlRendering() {
-        if (!example.isSpecExample()) return;
-        assertRendering(example);
-    }
-
     @Test
-    public void testFullSpec() {
-        if (!example.isFullSpecExample()) return;
-        super.testFullSpec();
+    public void testSpecExample() {
+        if (example.isFullSpecExample()) {
+            super.testSpecExample();
+        } else {
+            assertRendering(example);
+        }
     }
 
     protected static @NotNull List<Object[]> getTestData(@NotNull String resourcePath) {
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/DumpSpecReader.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/DumpSpecReader.java
@@ -86,7 +86,7 @@ protected void addSpecExample(@NotNull SpecExample specExample) {
         String ast = example.getAst() == null ? null : (!ignoredTestCase ? exampleRenderer.getAst() : example.getAst());
 
         // allow other formats to accumulate
-        testCase.addSpecExample(exampleRenderer, exampleParse, exampleOptions, ignoredTestCase, html, ast);
+        testCase.addFullSpecExample(exampleRenderer, exampleParse, exampleOptions, ignoredTestCase, html, ast);
         exampleRenderer.finalizeRender();
 
         if (embedTimed) {
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/FlexmarkSpecExampleRenderer.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/FlexmarkSpecExampleRenderer.java
@@ -13,15 +13,17 @@
 public class FlexmarkSpecExampleRenderer extends SpecExampleRendererBase {
     private @Nullable Node myIncludedDocument = null;
     private @Nullable Node myDocument = null;
-    private @Nullable String myRenderedHtml;
-    private @Nullable String myRenderedAst;
+    private @NotNull IParse myParser;
+    private @NotNull IRender myRender;
 
     public FlexmarkSpecExampleRenderer(@NotNull SpecExample example, @Nullable DataHolder options, @NotNull IParse parser, @NotNull IRender render) {
-        super(example, options, parser, render);
+        this(example, options, parser, render, true);
     }
 
     public FlexmarkSpecExampleRenderer(@NotNull SpecExample example, @Nullable DataHolder options, @NotNull IParse parser, @NotNull IRender render, boolean includeExampleCoord) {
-        super(example, options, parser, render, includeExampleCoord);
+        super(example, options, includeExampleCoord);
+        myParser = parser;
+        myRender = render;
     }
 
     @Override
@@ -67,28 +69,13 @@ protected void adjustParserForInclusion() {
         return myDocument;
     }
 
-    @Override
-    final public @NotNull String getHtml() {
-        if (myRenderedHtml == null || !isFinalized()) {
-            myRenderedHtml = renderHtml();
-        }
-        return myRenderedHtml;
-    }
-
-    @Override
-    final public @NotNull String getAst() {
-        if (myRenderedAst == null || !isFinalized()) {
-            myRenderedAst = renderAst();
-        }
-        return myRenderedAst;
-    }
-
     /**
      * Override to customize
      *
      * @return HTML string, will be cached after document is finalized to allow for timing collection iterations,
      */
     @NotNull
+    @Override
     protected String renderHtml() {
         assert myDocument != null;
         return getRenderer().render(myDocument);
@@ -100,6 +87,7 @@ protected String renderHtml() {
      * @return HTML string, will be cached after document is finalized to allow for timing collection iterations,
      */
     @NotNull
+    @Override
     protected String renderAst() {
         assert myDocument != null;
         return TestUtils.ast(myDocument);
@@ -109,4 +97,22 @@ protected String renderAst() {
     public void finalizeRender() {
         super.finalizeRender();
     }
+
+    @NotNull
+    final public IParse getParser() {
+        return myParser;
+    }
+
+    public void setParser(@NotNull IParse parser) {
+        myParser = parser;
+    }
+
+    public void setRender(@NotNull IRender render) {
+        myRender = render;
+    }
+
+    @NotNull
+    final public IRender getRenderer() {
+        return myRender;
+    }
 }
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/FullSpecTestCase.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/FullSpecTestCase.java
@@ -24,7 +24,7 @@ protected void fullTestSpecComplete() {
     }
 
     @Test
-    public void testFullSpec() {
+    public void testSpecExample() {
 
         fullTestSpecStarting();
         ResourceLocation location = getSpecResourceLocation();
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/RenderingTestCase.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/RenderingTestCase.java
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/SpecExampleProcessor.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/SpecExampleProcessor.java
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/SpecExampleRendererBase.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/SpecExampleRendererBase.java
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/TestUtils.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/TestUtils.java

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public abstract class FormatterTranslationSpecTestBase extends ComboSpecTestCase`
`35`	`35`	`optionsMap.put("no-tailing-blanks", new MutableDataSet().set(Formatter.MAX_TRAILING_BLANK_LINES, 0));`
`36`	`36`	`}`
`37`	`37`	`public FormatterTranslationSpecTestBase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {`
`38`		`- super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));`
	`38`	`+ super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public abstract class RendererSpecTest extends ComboSpecTestCase {`
`24`	`24`	`optionsMap.put("src-pos", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_ATTRIBUTE, "md-pos"));`
`25`	`25`	`}`
`26`	`26`	`public RendererSpecTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {`
`27`		`- super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));`
	`27`	`+ super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.vladsch.flexmark.formatter.Formatter;`
`5`	`5`	`import com.vladsch.flexmark.parser.Parser;`
`6`	`6`	`import com.vladsch.flexmark.test.spec.SpecExample;`
	`7`	`+import com.vladsch.flexmark.test.util.ComboSpecTestCase;`
`7`	`8`	`import com.vladsch.flexmark.util.ast.KeepType;`
`8`	`9`	`import com.vladsch.flexmark.util.data.DataHolder;`
`9`	`10`	`import com.vladsch.flexmark.util.data.MutableDataSet;`
`@@ -63,6 +64,6 @@ public abstract class ComboCoreFormatterSpecTestBase extends FormatterSpecTest {`
`63`	`64`	`optionsMap.put("no-soft-breaks", new MutableDataSet().set(Formatter.KEEP_SOFT_LINE_BREAKS, false));`
`64`	`65`	`}`
`65`	`66`	`public ComboCoreFormatterSpecTestBase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {`
`66`		`- super(example, optionsMaps(optionsMap, optionMap), defaultOptions);`
	`67`	`+ super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), defaultOptions);`
`67`	`68`	`}`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.vladsch.flexmark.html.HtmlRenderer;`
`5`	`5`	`import com.vladsch.flexmark.parser.Parser;`
`6`	`6`	`import com.vladsch.flexmark.test.spec.SpecExample;`
	`7`	`+import com.vladsch.flexmark.test.util.ComboSpecTestCase;`
`7`	`8`	`import com.vladsch.flexmark.util.ast.KeepType;`
`8`	`9`	`import com.vladsch.flexmark.util.data.DataHolder;`
`9`	`10`	`import com.vladsch.flexmark.util.data.MutableDataSet;`
`@@ -124,6 +125,6 @@ public abstract class CoreRendererSpecTest extends RendererSpecTest {`
`124`	`125`	`);`
`125`	`126`	`}`
`126`	`127`	`public CoreRendererSpecTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {`
`127`		`- super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));`
	`128`	`+ super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));`
`128`	`129`	`}`
`129`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public abstract class ComboDocxConverterSpecTestBase extends ComboSpecTestCase {`
`103`	`103`	`optionsMap.put("yellow-missing-hyperlink", new MutableDataSet().set(DocxRenderer.LOCAL_HYPERLINK_MISSING_HIGHLIGHT, "yellow"));`
`104`	`104`	`}`
`105`	`105`	`public ComboDocxConverterSpecTestBase(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {`
`106`		`- super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));`
	`106`	`+ super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@Override`
`@@ -123,7 +123,7 @@ public ComboDocxConverterSpecTestBase(@NotNull SpecExample example, @Nullable Ma`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`
`126`		`- final public void testCase(SpecExampleRenderer exampleRenderer, SpecExampleParse exampleParse, DataHolder exampleOptions) {`
	`126`	`+ final public void addSpecExample(SpecExampleRenderer exampleRenderer, SpecExampleParse exampleParse, DataHolder exampleOptions) {`
`127`	`127`	`if (!DUMP_TEST_CASE_FILES) return;`
`128`	`128`	`Document document = (Document) ((FlexmarkSpecExampleRenderer) exampleRenderer).getDocument();`
`129`	`129`
`@@ -164,7 +164,7 @@ final public void testCase(SpecExampleRenderer exampleRenderer, SpecExampleParse`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`@Override`
`167`		`- final public void addSpecExample(@NotNull SpecExampleRenderer exampleRenderer, @NotNull SpecExampleParse exampleParse, DataHolder exampleOptions, boolean ignoredTestCase, @NotNull String html, @Nullable String ast) {`
	`167`	`+ final public void addFullSpecExample(@NotNull SpecExampleRenderer exampleRenderer, @NotNull SpecExampleParse exampleParse, DataHolder exampleOptions, boolean ignoredTestCase, @NotNull String html, @Nullable String ast) {`
`168`	`168`	`if (!DUMP_ALL_TESTS_FILES) return;`
`169`	`169`
`170`	`170`	`boolean failed = !ignoredTestCase && !exampleRenderer.getHtml().equals(example.getHtml());`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private static Document linkDocument() {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public HtmlConverterTest(@NotNull SpecExample example, @Nullable Map<String, DataHolder> optionMap, @Nullable DataHolder... defaultOptions) {`
`122`		`- super(example, optionsMaps(optionsMap, optionMap), dataHolders(OPTIONS, defaultOptions));`
	`122`	`+ super(example, ComboSpecTestCase.optionsMaps(optionsMap, optionMap), ComboSpecTestCase.dataHolders(OPTIONS, defaultOptions));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`