Skip to content

Commit 1a78095

Browse files
committed
[Misc] Migrate XWikiSyntaxBlockRendererTest to junit 5
1 parent 742ac68 commit 1a78095

File tree

1 file changed

+18
-31
lines changed

1 file changed

+18
-31
lines changed

xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki21/src/test/java/org/xwiki/rendering/internal/renderer/xwiki21/XWikiSyntaxBlockRendererTest.java

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,27 @@
1919
*/
2020
package org.xwiki.rendering.internal.renderer.xwiki21;
2121

22-
import java.util.Arrays;
22+
import java.util.List;
2323

24-
import org.junit.Before;
25-
import org.junit.Rule;
26-
import org.junit.Test;
27-
import org.xwiki.component.manager.ComponentLookupException;
24+
import org.junit.jupiter.api.Test;
2825
import org.xwiki.rendering.block.Block;
2926
import org.xwiki.rendering.block.GroupBlock;
3027
import org.xwiki.rendering.block.LinkBlock;
3128
import org.xwiki.rendering.block.WordBlock;
3229
import org.xwiki.rendering.listener.reference.DocumentResourceReference;
33-
import org.xwiki.rendering.renderer.BlockRenderer;
3430
import org.xwiki.rendering.renderer.printer.DefaultWikiPrinter;
35-
import org.xwiki.rendering.syntax.Syntax;
3631
import org.xwiki.test.annotation.AllComponents;
37-
import org.xwiki.test.mockito.MockitoComponentManagerRule;
32+
import org.xwiki.test.junit5.mockito.ComponentTest;
33+
import org.xwiki.test.junit5.mockito.InjectMockComponents;
3834

39-
import static org.junit.Assert.assertEquals;
35+
import static org.junit.jupiter.api.Assertions.assertEquals;
4036

4137
@AllComponents
42-
public class XWikiSyntaxBlockRendererTest
38+
@ComponentTest
39+
class XWikiSyntaxBlockRendererTest
4340
{
44-
@Rule
45-
public MockitoComponentManagerRule componentManager = new MockitoComponentManagerRule();
46-
47-
private BlockRenderer renderer;
48-
49-
@Before
50-
public void before() throws ComponentLookupException
51-
{
52-
this.renderer = this.componentManager.getInstance(BlockRenderer.class, Syntax.XWIKI_2_1.toIdString());
53-
}
41+
@InjectMockComponents
42+
private XWikiSyntaxBlockRenderer renderer;
5443

5544
private String render(Block block)
5645
{
@@ -63,27 +52,25 @@ private String render(Block block)
6352
// Tests
6453

6554
@Test
66-
public void testInline()
55+
void testInline()
6756
{
6857
assertEquals("word", render(new WordBlock("word")));
6958
}
7059

7160
/**
72-
* Proves that a link block with a query string parameter, located inside a Group Block, correctly renders the
73-
* query string parameter.
61+
* Proves that a link block with a query string parameter, located inside a Group Block, correctly renders the query
62+
* string parameter.
7463
*/
7564
@Test
76-
public void renderLinkWithQueryStringParameterInsideGroupBlock()
65+
void renderLinkWithQueryStringParameterInsideGroupBlock()
7766
{
7867
DocumentResourceReference reference = new DocumentResourceReference("reference");
7968
reference.setQueryString("a=b");
80-
Block block = new GroupBlock(Arrays.asList((Block) new LinkBlock(
81-
Arrays.asList((Block) new WordBlock("label")), reference, false)));
82-
83-
String expected = "(((\n"
84-
+ "[[label>>doc:reference||queryString=\"a=b\"]]\n"
85-
+ ")))";
69+
Block block = new GroupBlock(List.of(new LinkBlock(List.of(new WordBlock("label")), reference, false)));
8670

87-
assertEquals(expected, render(block));
71+
assertEquals("""
72+
(((
73+
[[label>>doc:reference||queryString="a=b"]]
74+
)))""", render(block));
8875
}
8976
}

0 commit comments

Comments
 (0)