Skip to content

Commit 888c27b

Browse files
jirka.pinkas@gmail.comjirka.pinkas@gmail.com
jirka.pinkas@gmail.com
authored and
jirka.pinkas@gmail.com
committed
move to junit 5
1 parent f8c41ad commit 888c27b

File tree

10 files changed

+147
-123
lines changed

10 files changed

+147
-123
lines changed

‎pom.xml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,15 @@
4242
<optional>true</optional>
4343
</dependency>
4444
<dependency>
45-
<groupId>junit</groupId>
46-
<artifactId>junit</artifactId>
47-
<version>4.12</version>
45+
<groupId>org.junit.jupiter</groupId>
46+
<artifactId>junit-jupiter-api</artifactId>
47+
<version>5.5.2</version>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.junit.jupiter</groupId>
52+
<artifactId>junit-jupiter-engine</artifactId>
53+
<version>5.5.2</version>
4854
<scope>test</scope>
4955
</dependency>
5056
<dependency>
@@ -135,7 +141,11 @@
135141
</archive>
136142
</configuration>
137143
</plugin>
138-
144+
<plugin>
145+
<groupId>org.apache.maven.plugins</groupId>
146+
<artifactId>maven-surefire-plugin</artifactId>
147+
<version>2.22.2</version>
148+
</plugin>
139149
</plugins>
140150
</build>
141151

‎src/test/java/cz/jiripinkas/jsitemapgenerator/AbstractSitemapGeneratorTest.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
package cz.jiripinkas.jsitemapgenerator;
22

33
import cz.jiripinkas.jsitemapgenerator.generator.SitemapIndexGenerator;
4-
import org.junit.Before;
5-
import org.junit.Test;
4+
import org.junit.jupiter.api.BeforeEach;
5+
import org.junit.jupiter.api.Test;
66

77
import java.time.LocalDateTime;
88

9-
import static org.junit.Assert.*;
9+
import static org.junit.jupiter.api.Assertions.*;
1010

11-
public class AbstractSitemapGeneratorTest {
11+
12+
class AbstractSitemapGeneratorTest {
1213

1314
private SitemapIndexGenerator sitemapIndexGenerator;
1415

15-
@Before
16-
public void setUp() {
16+
@BeforeEach
17+
void setUp() {
1718
sitemapIndexGenerator = SitemapIndexGenerator.of("http://javalibs.com");
1819
sitemapIndexGenerator.addPage(WebPage.builder().name("sitemap-plugins.xml").lastMod(LocalDateTime.of(2018, 1, 1, 0, 0)).build());
1920
sitemapIndexGenerator.addPage(WebPage.builder().name("sitemap-archetypes.xml").lastMod(LocalDateTime.of(2018, 1, 1, 0, 0)).build());
2021
}
2122

2223
@Test
23-
public void toPrettyString() {
24+
void toPrettyString() {
2425
String actualSitemapIndex = sitemapIndexGenerator.toPrettyString(2);
2526
String expectedSitemapIndex = "<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n" +
2627
" <sitemap>\n" +
@@ -36,19 +37,19 @@ public void toPrettyString() {
3637
}
3738

3839
@Test
39-
public void getAbsoluteUrlRelativeCheck() {
40+
void getAbsoluteUrlRelativeCheck() {
4041
String absoluteUrl = sitemapIndexGenerator.getAbsoluteUrl("relativeUrl");
4142
assertEquals("http://javalibs.com/relativeUrl", absoluteUrl);
4243
}
4344

4445
@Test
45-
public void getAbsoluteUrlAbsoluteCheck() {
46+
void getAbsoluteUrlAbsoluteCheck() {
4647
String absoluteUrl = sitemapIndexGenerator.getAbsoluteUrl("https://cdn.com");
4748
assertEquals("https://cdn.com", absoluteUrl);
4849
}
4950

5051
@Test
51-
public void getAbsoluteUrlBaseUrlCheck() {
52+
void getAbsoluteUrlBaseUrlCheck() {
5253
String absoluteUrl = sitemapIndexGenerator.getAbsoluteUrl(null);
5354
assertEquals("http://javalibs.com/", absoluteUrl);
5455
}

‎src/test/java/cz/jiripinkas/jsitemapgenerator/UrlUtilTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package cz.jiripinkas.jsitemapgenerator;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44

5-
import static org.junit.Assert.*;
5+
import static org.junit.jupiter.api.Assertions.*;
66

7-
public class UrlUtilTest {
7+
class UrlUtilTest {
88

99
@Test
10-
public void connectUrlParts() {
10+
void connectUrlParts() {
1111
assertEquals("https://javalibs.com", UrlUtil.connectUrlParts("https://javalibs.com", null));
1212
assertEquals("https://javalibs.com/page", UrlUtil.connectUrlParts("https://javalibs.com", "page"));
1313
assertEquals("https://javalibs.com/page", UrlUtil.connectUrlParts("https://javalibs.com", "/page"));
1414
}
1515

1616
@Test
17-
public void escapeXmlSpecialCharacters() {
17+
void escapeXmlSpecialCharacters() {
1818
assertEquals("/page?arg1=&apos;test&apos;&amp;arg2=&lt;test&gt;&amp;arg3=&quot;test&quot;", UrlUtil.escapeXmlSpecialCharacters("/page?arg1='test'&arg2=<test>&arg3=\"test\""));
1919
assertNull(UrlUtil.escapeXmlSpecialCharacters(null));
2020
}

‎src/test/java/cz/jiripinkas/jsitemapgenerator/WebPageTest.java

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,70 @@
33
import cz.jiripinkas.jsitemapgenerator.exception.InvalidPriorityException;
44
import cz.jiripinkas.jsitemapgenerator.exception.InvalidUrlException;
55
import cz.jiripinkas.jsitemapgenerator.generator.SitemapGenerator;
6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
import static org.assertj.core.api.Assertions.*;
9-
import static org.junit.Assert.*;
9+
import static org.junit.jupiter.api.Assertions.*;
1010

11-
public class WebPageTest {
11+
class WebPageTest {
1212

13-
@Test(expected = InvalidUrlException.class)
14-
public void testConstruct() {
15-
SitemapGenerator.of("www.javavids.com");
13+
@Test
14+
void testConstruct() {
15+
assertThrows(InvalidUrlException.class, () -> {
16+
SitemapGenerator.of("www.javavids.com");
17+
});
1618
}
1719

18-
@Test(expected = InvalidPriorityException.class)
19-
public void testLowPriority() {
20-
new WebPage().setPriority(-1.0);
20+
@Test
21+
void testLowPriority() {
22+
assertThrows(InvalidPriorityException.class, () -> {
23+
new WebPage().setPriority(-1.0);
24+
});
2125
}
2226

23-
@Test(expected = InvalidPriorityException.class)
24-
public void testHighPriority() {
25-
new WebPage().setPriority(10.0);
27+
@Test
28+
void testHighPriority() {
29+
assertThrows(InvalidPriorityException.class, () -> {
30+
new WebPage().setPriority(10.0);
31+
});
2632
}
2733

2834
@Test
29-
public void testPrefixDirAndSuffix() {
35+
void testPrefixDirAndSuffix() {
3036
WebPage build = WebPage.builder().dir("dir").name("name").extension("html").build();
3137
assertEquals("dir/name.html", build.constructName());
3238
}
3339

3440
@Test
35-
public void testPrefixDirs() {
41+
void testPrefixDirs() {
3642
WebPage build = WebPage.builder().dir("dir1", "dir2", "dir3").name("name").extension("html").build();
3743
assertEquals("dir1/dir2/dir3/name.html", build.constructName());
3844
}
3945

4046
@Test
41-
public void testDirs() {
47+
void testDirs() {
4248
WebPage build = WebPage.builder().name("dir1", "dir2", "dir3", "name").build();
4349
assertEquals("dir1/dir2/dir3/name", build.constructName());
4450
}
4551

4652
@Test
47-
public void testNameRoot() {
53+
void testNameRoot() {
4854
WebPage build = WebPage.builder().nameRoot().build();
4955
assertEquals("", build.constructName());
5056
}
5157

5258
@Test
53-
public void of_name_is_not_null() {
59+
void of_name_is_not_null() {
5460
WebPage webPage = WebPage.of("test");
5561
assertThat(webPage.getName()).isEqualTo("test");
5662
}
5763

58-
@Test(expected = NullPointerException.class)
59-
public void of_name_cannot_be_null() {
60-
String nullString = null;
61-
WebPage webPage = WebPage.of(nullString);
64+
@Test
65+
void of_name_cannot_be_null() {
66+
assertThrows(NullPointerException.class, () -> {
67+
String nullString = null;
68+
WebPage.of(nullString);
69+
});
6270
}
6371

6472
}

‎src/test/java/cz/jiripinkas/jsitemapgenerator/generator/RssGeneratorTest.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import cz.jiripinkas.jsitemapgenerator.WebPage;
44
import cz.jiripinkas.jsitemapgenerator.util.TestUtil;
5-
import org.junit.Before;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.BeforeEach;
6+
import org.junit.jupiter.api.Test;
77
import org.xml.sax.SAXException;
88

99
import java.io.ByteArrayInputStream;
@@ -13,19 +13,19 @@
1313
import java.time.LocalDateTime;
1414
import java.util.Date;
1515

16-
import static org.junit.Assert.*;
16+
import static org.junit.jupiter.api.Assertions.*;
1717

18-
public class RssGeneratorTest {
18+
class RssGeneratorTest {
1919

2020
private RssGenerator rssGenerator;
2121

22-
@Before
23-
public void setUp() {
22+
@BeforeEach
23+
void setUp() {
2424
rssGenerator = RssGenerator.of("http://www.topjavablogs.com", "Top Java Blogs", "News from Java community");
2525
}
2626

2727
@Test
28-
public void testConstructRssEmptyItemsShouldThrowException() {
28+
void testConstructRssEmptyItemsShouldThrowException() {
2929
try {
3030
String rss = rssGenerator.toString();
3131
ByteArrayInputStream xml = new ByteArrayInputStream(rss.getBytes(StandardCharsets.UTF_8));
@@ -36,7 +36,7 @@ public void testConstructRssEmptyItemsShouldThrowException() {
3636
}
3737

3838
@Test
39-
public void testConstructRssWithItems() throws SAXException, IOException {
39+
void testConstructRssWithItems() throws SAXException, IOException {
4040
rssGenerator.addPage(WebPage.rssBuilder()
4141
.title("latest news")
4242
.description("description")
@@ -50,8 +50,8 @@ public void testConstructRssWithItems() throws SAXException, IOException {
5050
}
5151

5252
@Test
53-
public void testConstructRssWithItemsLocalDateTime() {
54-
String rss = RssGenerator.of("http://www.topjavablogs.com", "Top Java Blogs", "News from Java community")
53+
void testConstructRssWithItemsLocalDateTime() {
54+
String actual = RssGenerator.of("http://www.topjavablogs.com", "Top Java Blogs", "News from Java community")
5555
.addPage(WebPage.rssBuilder()
5656
.title("latest news")
5757
.description("description")
@@ -76,12 +76,12 @@ public void testConstructRssWithItemsLocalDateTime() {
7676
"</item>\n" +
7777
"</channel>\n" +
7878
"</rss>\n";
79-
assertEquals(expected, rss);
79+
assertEquals(expected, actual);
8080
}
8181

8282
@Test
83-
public void testConstructRssWithItemsLocalDateTimeWithRedundantSlash() {
84-
String rss = RssGenerator.of("http://www.topjavablogs.com", "Top Java Blogs", "News from Java community")
83+
void testConstructRssWithItemsLocalDateTimeWithRedundantSlash() {
84+
String actual = RssGenerator.of("http://www.topjavablogs.com", "Top Java Blogs", "News from Java community")
8585
.addPage(WebPage.rssBuilder()
8686
.title("latest news")
8787
.description("description")
@@ -106,7 +106,7 @@ public void testConstructRssWithItemsLocalDateTimeWithRedundantSlash() {
106106
"</item>\n" +
107107
"</channel>\n" +
108108
"</rss>\n";
109-
assertEquals(expected, rss);
109+
assertEquals(expected, actual);
110110
}
111111

112112
}

0 commit comments

Comments
 (0)