Switch to JUnit 5.

Issue #2075.

Author: odrotbohm

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/AbstractIntegrationTests.java

@@ -15,28 +15,28 @@
  */
 package org.springframework.data.rest.core;
 
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.core.domain.Person;
 import org.springframework.data.rest.core.domain.PersonRepository;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Base class for integration tests loading {@link RepositoryTestsConfig} and populating the {@link PersonRepository}
  * with a {@link Person}.
  *
  * @author Oliver Gierke
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = RepositoryTestsConfig.class)
 public abstract class AbstractIntegrationTests {
 
 	@Autowired PersonRepository repository;
 
-	@Before
-	public void populateDatabase() {
+	@BeforeEach
+	void populateDatabase() {
 		repository.save(new Person("John", "Doe"));
 	}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/PathUnitTests.java

@@ -17,63 +17,63 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link Path}.
  *
  * @author Oliver Gierke
  */
-public class PathUnitTests {
+class PathUnitTests {
 
 	@Test
-	public void combinesSimplePaths() {
+	void combinesSimplePaths() {
 
 		Path builder = new Path("foo").slash("bar");
 		assertThat(builder.toString()).isEqualTo("/foo/bar");
 	}
 
 	@Test
-	public void removesLeadingAndTrailingSlashes() {
+	void removesLeadingAndTrailingSlashes() {
 
 		Path builder = new Path("foo/").slash("/bar").slash("//foobar///");
 		assertThat(builder.toString()).isEqualTo("/foo/bar/foobar");
 	}
 
 	@Test
-	public void removesWhitespace() {
+	void removesWhitespace() {
 
 		Path builder = new Path("foo/ ").slash("/ b a r").slash("  //foobar///   ");
 		assertThat(builder.toString()).isEqualTo("/foo/bar/foobar");
 	}
 
 	@Test
-	public void matchesWithLeadingSlash() {
+	void matchesWithLeadingSlash() {
 		assertThat(new Path("/foobar").matches("/foobar")).isTrue();
 	}
 
 	@Test
-	public void matchesWithoutLeadingSlash() {
+	void matchesWithoutLeadingSlash() {
 		assertThat(new Path("/foobar").matches("foobar")).isTrue();
 	}
 
 	@Test
-	public void doesNotMatchIfDifferent() {
+	void doesNotMatchIfDifferent() {
 		assertThat(new Path("/foobar").matches("barfoo")).isFalse();
 	}
 
 	@Test
-	public void doesNotPrefixAbsoluteUris() {
+	void doesNotPrefixAbsoluteUris() {
 		assertThat(new Path("http://localhost").toString()).isEqualTo("http://localhost");
 	}
 
 	@Test // DATAREST-222
-	public void doesNotMatchIfReferenceContainsReservedCharacters() {
+	void doesNotMatchIfReferenceContainsReservedCharacters() {
 		assertThat(new Path("/foobar").matches("barfoo{?foo}")).isFalse();
 	}
 
 	@Test // DATAREST-222
-	public void doesNotMatchNullReference() {
+	void doesNotMatchNullReference() {
 		assertThat(new Path("/foobar").matches(null)).isFalse();
 	}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/RepositoryRestConfigurationIntegrationTests.java

@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
@@ -36,13 +36,13 @@
  * @author Oliver Gierke
  */
 @SuppressWarnings("deprecation")
-public class RepositoryRestConfigurationIntegrationTests extends AbstractIntegrationTests {
+class RepositoryRestConfigurationIntegrationTests extends AbstractIntegrationTests {
 
 	@Autowired RepositoryRestConfiguration config;
 	@Autowired Repositories repositories;
 
 	@Test
-	public void shouldProvideResourceMappingForConfiguredRepository() throws Exception {
+	void shouldProvideResourceMappingForConfiguredRepository() throws Exception {
 
 		ResourceMapping mapping = config.getResourceMappingForRepository(ConfiguredPersonRepository.class);
 
@@ -54,7 +54,7 @@ public void shouldProvideResourceMappingForConfiguredRepository() throws Excepti
 
 	@Test // DATAREST-1304
 	@DirtiesContext
-	public void exposesLookupPropertyFromLambda() {
+	void exposesLookupPropertyFromLambda() {
 
 		config.withEntityLookup() //
 				.forRepository(ProfileRepository.class) //

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/RepositoryRestConfigurationUnitTests.java

@@ -18,8 +18,8 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.rest.core.config.EnumTranslationConfiguration;
 import org.springframework.data.rest.core.config.MetadataConfiguration;
 import org.springframework.data.rest.core.config.ProjectionDefinitionConfiguration;
@@ -37,40 +37,40 @@
  * @author Mark Paluch
  * @soundtrack Adam F - Circles (Colors)
  */
-public class RepositoryRestConfigurationUnitTests {
+class RepositoryRestConfigurationUnitTests {
 
 	RepositoryRestConfiguration configuration;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		this.configuration = new RepositoryRestConfiguration(new ProjectionDefinitionConfiguration(),
 				new MetadataConfiguration(), mock(EnumTranslationConfiguration.class));
 	}
 
 	@Test // DATAREST-34
-	public void returnsBodiesIfAcceptHeaderPresentByDefault() {
+	void returnsBodiesIfAcceptHeaderPresentByDefault() {
 
 		assertThat(configuration.returnBodyOnCreate(MediaType.APPLICATION_JSON_VALUE)).isTrue();
 		assertThat(configuration.returnBodyOnUpdate(MediaType.APPLICATION_JSON_VALUE)).isTrue();
 	}
 
 	@Test // DATAREST-34
-	public void doesNotReturnBodiesIfNoAcceptHeaderPresentByDefault() {
+	void doesNotReturnBodiesIfNoAcceptHeaderPresentByDefault() {
 
 		assertThat(configuration.returnBodyOnCreate(null)).isFalse();
 		assertThat(configuration.returnBodyOnUpdate(null)).isFalse();
 	}
 
 	@Test // DATAREST-34
-	public void doesNotReturnBodiesIfEmptyAcceptHeaderPresentByDefault() {
+	void doesNotReturnBodiesIfEmptyAcceptHeaderPresentByDefault() {
 
 		assertThat(configuration.returnBodyOnCreate("")).isFalse();
 		assertThat(configuration.returnBodyOnUpdate("")).isFalse();
 	}
 
 	@Test // DATAREST-34
-	public void doesNotReturnBodyForUpdateIfExplicitlyDeactivated() {
+	void doesNotReturnBodyForUpdateIfExplicitlyDeactivated() {
 
 		configuration.setReturnBodyOnUpdate(false);
 
@@ -80,7 +80,7 @@ public void doesNotReturnBodyForUpdateIfExplicitlyDeactivated() {
 	}
 
 	@Test // DATAREST-34
-	public void doesNotReturnBodyForCreateIfExplicitlyDeactivated() {
+	void doesNotReturnBodyForCreateIfExplicitlyDeactivated() {
 
 		configuration.setReturnBodyOnCreate(false);
 
@@ -90,7 +90,7 @@ public void doesNotReturnBodyForCreateIfExplicitlyDeactivated() {
 	}
 
 	@Test // DATAREST-34
-	public void returnsBodyForUpdateIfExplicitlyActivated() {
+	void returnsBodyForUpdateIfExplicitlyActivated() {
 
 		configuration.setReturnBodyOnUpdate(true);
 
@@ -100,7 +100,7 @@ public void returnsBodyForUpdateIfExplicitlyActivated() {
 	}
 
 	@Test // DATAREST-34
-	public void returnsBodyForCreateIfExplicitlyActivated() {
+	void returnsBodyForCreateIfExplicitlyActivated() {
 
 		configuration.setReturnBodyOnCreate(true);
 
@@ -110,7 +110,7 @@ public void returnsBodyForCreateIfExplicitlyActivated() {
 	}
 
 	@Test // DATAREST-776
-	public void considersDomainTypeOfValueRepositoryLookupTypes() {
+	void considersDomainTypeOfValueRepositoryLookupTypes() {
 
 		configuration.withEntityLookup().forLookupRepository(ProfileRepository.class);
 

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/StringToLdapNameConverterUnitTests.java

@@ -21,33 +21,33 @@
 import javax.naming.Name;
 import javax.naming.ldap.LdapName;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.convert.support.DefaultConversionService;
 
 /**
  * Unit tests for {@link StringToLdapNameConverter}.
  *
  * @author Mark Paluch
  */
-public class StringToLdapNameConverterUnitTests {
+class StringToLdapNameConverterUnitTests {
 
 	@Test // DATAREST-1198
-	public void shouldCreateLdapName() throws InvalidNameException {
+	void shouldCreateLdapName() throws InvalidNameException {
 
 		LdapName converted = StringToLdapNameConverter.INSTANCE.convert("dc=foo");
 
 		assertThat(converted).isEqualTo(new LdapName("dc=foo"));
 	}
 
 	@Test // DATAREST-1198
-	public void failedConversionShouldThrowIAE() {
+	void failedConversionShouldThrowIAE() {
 
 		assertThatThrownBy(() -> StringToLdapNameConverter.INSTANCE.convert("foo"))
 				.isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test // DATAREST-1198
-	public void shouldConvertStringInNameViaConversionService() {
+	void shouldConvertStringInNameViaConversionService() {
 
 		DefaultConversionService conversionService = new DefaultConversionService();
 		conversionService.addConverter(StringToLdapNameConverter.INSTANCE);