This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 459aa2b876a2a9a0b7b1566b164f22f5f05ce7b6 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Mon Mar 7 14:50:31 2022 +0100 Make HtmlStringToMarkdownWikiTranslatorTest use a mocked Engine instead of building a TestEngine --- jspwiki-markdown/pom.xml | 12 ++++++++++++ .../HtmlStringToMarkdownWikiTranslatorTest.java | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml index b08aec8..a81ea80 100644 --- a/jspwiki-markdown/pom.xml +++ b/jspwiki-markdown/pom.xml @@ -110,6 +110,18 @@ </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <scope>test</scope> diff --git a/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java b/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java index 69d7fc0..3b51c07 100644 --- a/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java +++ b/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java @@ -18,12 +18,14 @@ */ package org.apache.wiki.htmltowiki.syntax.markdown; -import org.apache.wiki.TestEngine; import org.apache.wiki.api.core.Engine; import org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.Properties; /** @@ -31,11 +33,15 @@ import org.junit.jupiter.api.Test; */ public class HtmlStringToMarkdownWikiTranslatorTest { - static Engine e = TestEngine.build( TestEngine.with( "jspwiki.syntax.decorator", MarkdownSyntaxDecorator.class.getName() ) ); - HtmlStringToWikiTranslator html2wiki; + static Engine e; + static HtmlStringToWikiTranslator html2wiki; - @BeforeEach - public void setUp() { + @BeforeAll + public static void setUp() { + e = Mockito.mock( Engine.class ); + final Properties properties = new Properties(); + properties.put( "jspwiki.syntax.decorator", MarkdownSyntaxDecorator.class.getName() ); + Mockito.doReturn( properties ).when( e ).getWikiProperties(); html2wiki = new HtmlStringToWikiTranslator( e ); }
