refactor: migrate unit tests (on Java) to JUnit 5

Notes:
- only unit tests already written on Java have been migrated. Tests on Spock will be migrated in #1246
- pmd: JUnit4SuitesShouldUseSuiteAnnotation check has been disabled because it's junit3/4 specific
- pmd: JUnitAssertionsShouldIncludeMessage check has been disabled because we use AssertJ assestions

Changelogs:
- https://junit.org/junit5/docs/5.0.0/user-guide/#release-notes
- https://junit.org/junit5/docs/5.1.0/release-notes/index.html
- https://junit.org/junit5/docs/5.2.0/release-notes/index.html
- https://junit.org/junit5/docs/5.3.2/release-notes/index.html

Fix #1160

Author: php-coder

NEWS.txt

@@ -1,4 +1,5 @@
 0.x (upcoming release)
+(infrastructure) migrate to JUnit 5
 
 0.4.5
 (infrastructure) migrate to Spring Boot 2.1

pom.xml

@@ -428,6 +428,27 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>htmlunit-driver</artifactId>
@@ -493,7 +514,7 @@
 
 		<dependency>
 			<groupId>org.togglz</groupId>
-			<artifactId>togglz-junit</artifactId>
+			<artifactId>togglz-junit5</artifactId>
 			<version>${togglz.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -601,6 +622,7 @@
 		<jsoup.version>1.13.1</jsoup.version>
 
 		<!-- Redefine default value from spring-boot-dependencies -->
+		<junit-jupiter.version>5.3.2</junit-jupiter.version>
 		<junit.version>4.13.1</junit.version>
 
 		<license.plugin.version>3.0</license.plugin.version>

src/main/config/pmd.xml

@@ -20,11 +20,11 @@
 	<rule ref="category/java/bestpractices.xml/CheckResultSet" />
 	<rule ref="category/java/bestpractices.xml/ConstantsInInterface" />
 	<rule ref="category/java/bestpractices.xml/DefaultLabelNotLastInSwitchStmt" />
-	<rule ref="category/java/bestpractices.xml/JUnit4SuitesShouldUseSuiteAnnotation" />
+	<!--<rule ref="category/java/bestpractices.xml/JUnit4SuitesShouldUseSuiteAnnotation" />-->
 	<rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseAfterAnnotation" />
 	<rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseBeforeAnnotation" />
 	<rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseTestAnnotation" />
-	<rule ref="category/java/bestpractices.xml/JUnitAssertionsShouldIncludeMessage" />
+	<!--<rule ref="category/java/bestpractices.xml/JUnitAssertionsShouldIncludeMessage" />-->
 	<rule ref="category/java/bestpractices.xml/JUnitTestContainsTooManyAsserts" />
 	<rule ref="category/java/bestpractices.xml/JUnitTestsShouldIncludeAssert" />
 	<rule ref="category/java/bestpractices.xml/JUnitUseExpected" />

src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java

@@ -157,6 +157,7 @@ class ContentSecurityPolicyHeaderWriter implements HeaderWriter {
 	private final String h2ConsolePath;
 
 
+	// @todo #1160 ContentSecurityPolicyHeaderWriter shouldn't depend from Togglz
 	@Override
 	public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
 		String uri = request.getRequestURI();

src/test/java/ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java

@@ -18,14 +18,14 @@
 package ru.mystamps.web.feature.category;
 
 import org.assertj.core.api.WithAssertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.mystamps.web.config.DaoConfig;
 import ru.mystamps.web.tests.Random;
 
@@ -43,7 +43,7 @@
 	},
 	// @todo #1143 Improve a way of importing properties files in the tests
 	locations = "/sql/category_dao_queries.properties")
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 public class JdbcCategoryDaoTest implements WithAssertions {
 
 	@Autowired

src/test/java/ru/mystamps/web/feature/country/JdbcCountryDaoTest.java

@@ -18,14 +18,14 @@
 package ru.mystamps.web.feature.country;
 
 import org.assertj.core.api.WithAssertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.mystamps.web.config.DaoConfig;
 import ru.mystamps.web.tests.Random;
 
@@ -43,7 +43,7 @@
 	},
 	// LATER: find a better way for importing properties files (see #1151)
 	locations = "/sql/country_dao_queries.properties")
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 public class JdbcCountryDaoTest implements WithAssertions {
 
 	@Autowired

src/test/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParserTest.java

@@ -21,8 +21,8 @@
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import ru.mystamps.web.tests.Random;
 import java.util.Locale;
 
@@ -34,7 +34,7 @@ public class JsoupSiteParserTest implements WithAssertions {
 
 	private JsoupSiteParser parser;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		parser = new JsoupSiteParser();
 	}

src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java

@@ -18,11 +18,11 @@
 package ru.mystamps.web.support.spring.security;
 
 import org.assertj.core.api.WithAssertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.togglz.junit.TogglzRule;
+import org.togglz.junit5.AllEnabled;
+import org.togglz.testing.TestFeatureManager;
 import ru.mystamps.web.feature.site.SiteUrl;
 import ru.mystamps.web.support.togglz.Features;
 import ru.mystamps.web.tests.Random;
@@ -41,15 +41,13 @@ public class ContentSecurityPolicyHeaderWriterTest implements WithAssertions {
 	private static final int NUMBER_OF_DIRECTIVES_ON_H2_CONSOLE_PAGE = 7;
 	private static final String H2_CONSOLE_PATH = "/console/";
 
-	@Rule
-	public TogglzRule togglz = TogglzRule.allEnabled(Features.class);
-	
 	//
 	// Tests for writeHeaders()
 	//
 
 	@Test
-	public void writeContentSecurityPolicyHeader() {
+	@AllEnabled(Features.class)
+	public void writeContentSecurityPolicyHeader(TestFeatureManager featureManager) {
 		// given
 		ContentSecurityPolicyHeaderWriter writer = new ContentSecurityPolicyHeaderWriter(
 				bool(),
@@ -68,7 +66,7 @@ public void writeContentSecurityPolicyHeader() {
 		assertThat(header.split(";")).hasSize(NUMBER_OF_DIRECTIVES_ON_STANDARD_PAGES);
 
 		// when
-		togglz.disable(Features.CSP_REPORT_ONLY);
+		featureManager.disable(Features.CSP_REPORT_ONLY);
 		writer.writeHeaders(request, response);
 		// then
 		header = response.getHeader("Content-Security-Policy");