Skip to content

Commit 424591e

Browse files
committed
[Misc] Migrate tests to JUnit5 + fix SonarQube-reported issues + fix some pom typos
1 parent 9eaeaac commit 424591e

File tree

2 files changed

+29
-37
lines changed

2 files changed

+29
-37
lines changed

xwiki-rendering-standalone/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
<groupId>org.slf4j</groupId>
136136
<artifactId>log4j-over-slf4j</artifactId>
137137
</dependency>
138-
139138
<!-- Test Dependencies -->
140139
<dependency>
141140
<groupId>org.xwiki.commons</groupId>
@@ -170,7 +169,7 @@
170169
<goal>test</goal>
171170
</goals>
172171
<configuration>
173-
<!-- Removed modules for which a Legacy module exist and wraps it -->
172+
<!-- Removed modules for which a Legacy module exists and wraps it -->
174173
<classpathDependencyExcludes>
175174
<classpathDependencyExcludes>org.xwiki.commons:xwiki-commons-component-api</classpathDependencyExcludes>
176175
<classpathDependencyExcludes>org.xwiki.commons:xwiki-commons-component-default</classpathDependencyExcludes>

xwiki-rendering-syntaxes/xwiki-rendering-syntax-html5/src/test/java/org/xwiki/rendering/internal/html5/HTML5ChainingRendererTest.java

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
import java.util.HashMap;
2323
import java.util.Map;
2424

25-
import org.junit.Before;
26-
import org.junit.Test;
25+
import org.junit.jupiter.api.BeforeEach;
26+
import org.junit.jupiter.api.Test;
2727
import org.xwiki.rendering.internal.renderer.html5.HTML5ChainingRenderer;
2828
import org.xwiki.rendering.internal.renderer.xhtml.image.XHTMLImageRenderer;
2929
import org.xwiki.rendering.internal.renderer.xhtml.link.XHTMLLinkRenderer;
3030
import org.xwiki.rendering.listener.Format;
3131
import org.xwiki.rendering.listener.chaining.ListenerChain;
3232
import org.xwiki.rendering.renderer.printer.DefaultWikiPrinter;
3333

34-
import static org.junit.Assert.assertEquals;
34+
import static org.junit.jupiter.api.Assertions.assertEquals;
3535
import static org.mockito.Mockito.mock;
3636

3737
/**
@@ -40,58 +40,51 @@
4040
* @version $Id$
4141
* @since 7.1M1
4242
*/
43-
public class HTML5ChainingRendererTest
43+
class HTML5ChainingRendererTest
4444
{
45-
private XHTMLLinkRenderer linkRenderer;
46-
47-
private XHTMLImageRenderer imageRenderer;
48-
49-
private ListenerChain listenerChain;
50-
5145
private HTML5ChainingRenderer chainingRenderer;
52-
46+
5347
private DefaultWikiPrinter printer;
5448

55-
@Before
56-
public void setUp() throws Exception
49+
@BeforeEach
50+
void setUp()
5751
{
58-
linkRenderer = mock(XHTMLLinkRenderer.class);
59-
imageRenderer = mock(XHTMLImageRenderer.class);
60-
listenerChain = new ListenerChain();
61-
chainingRenderer = new HTML5ChainingRenderer(linkRenderer, imageRenderer, null, listenerChain);
62-
printer = new DefaultWikiPrinter();
63-
chainingRenderer.setPrinter(printer);
52+
XHTMLLinkRenderer linkRenderer = mock(XHTMLLinkRenderer.class);
53+
XHTMLImageRenderer imageRenderer = mock(XHTMLImageRenderer.class);
54+
ListenerChain listenerChain = new ListenerChain();
55+
this.chainingRenderer = new HTML5ChainingRenderer(linkRenderer, imageRenderer, null, listenerChain);
56+
this.printer = new DefaultWikiPrinter();
57+
this.chainingRenderer.setPrinter(this.printer);
6458
}
6559

6660
@Test
67-
public void testWithoutMonospace() throws Exception
61+
void withoutMonospace()
6862
{
6963
Map<String, String> parameters = new HashMap<>();
70-
chainingRenderer.beginFormat(Format.BOLD, parameters);
71-
chainingRenderer.onWord("hello");
72-
chainingRenderer.endFormat(Format.BOLD, parameters);
73-
assertEquals("<strong>hello</strong>", printer.toString());
64+
this.chainingRenderer.beginFormat(Format.BOLD, parameters);
65+
this.chainingRenderer.onWord("hello");
66+
this.chainingRenderer.endFormat(Format.BOLD, parameters);
67+
assertEquals("<strong>hello</strong>", this.printer.toString());
7468
}
7569

7670
@Test
77-
public void testWithMonospace() throws Exception
71+
void withMonospace()
7872
{
7973
Map<String, String> parameters = new HashMap<>();
80-
chainingRenderer.beginFormat(Format.MONOSPACE, parameters);
81-
chainingRenderer.onWord("hello");
82-
chainingRenderer.endFormat(Format.MONOSPACE, parameters);
83-
assertEquals("<span class=\"monospace\">hello</span>", printer.toString());
74+
this.chainingRenderer.beginFormat(Format.MONOSPACE, parameters);
75+
this.chainingRenderer.onWord("hello");
76+
this.chainingRenderer.endFormat(Format.MONOSPACE, parameters);
77+
assertEquals("<span class=\"monospace\">hello</span>", this.printer.toString());
8478
}
8579

8680
@Test
87-
public void testWithMonospaceAndParameters() throws Exception
81+
void withMonospaceAndParameters()
8882
{
8983
Map<String, String> parameters = new HashMap<>();
9084
parameters.put("class", "myClass");
91-
chainingRenderer.beginFormat(Format.MONOSPACE, parameters);
92-
chainingRenderer.onWord("hello");
93-
chainingRenderer.endFormat(Format.MONOSPACE, parameters);
94-
assertEquals("<span class=\"monospace myClass\">hello</span>", printer.toString());
85+
this.chainingRenderer.beginFormat(Format.MONOSPACE, parameters);
86+
this.chainingRenderer.onWord("hello");
87+
this.chainingRenderer.endFormat(Format.MONOSPACE, parameters);
88+
assertEquals("<span class=\"monospace myClass\">hello</span>", this.printer.toString());
9589
}
96-
9790
}

0 commit comments

Comments
 (0)