DATACMNS-1718 - Migrate tests to JUnit 5.

Author: mp911de

src/test/java/SampleInterface.java

@@ -1,5 +1,3 @@
-import org.springframework.data.web.ProxyingHandlerMethodArgumentResolverUnitTests;
-
 /*
  * Copyright 2017-2020 the original author or authors.
  *
@@ -18,6 +16,6 @@
 
 /**
  * @author Oliver Gierke
- * @see ProxyingHandlerMethodArgumentResolverUnitTests
+ * @see org.springframework.data.web.ProxyingHandlerMethodArgumentResolverUnitTests
  */
 public interface SampleInterface {}

src/test/java/org/springframework/data/DependencyTests.java

@@ -18,7 +18,7 @@
 import static de.schauderhaft.degraph.check.JCheck.*;
 import static org.junit.Assert.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Jens Schauder

src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java

@@ -19,19 +19,19 @@
 
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.util.AnnotatedTypeScanner;
 
 /**
  * Unit tests for {@link TypeAlias}.
  *
  * @author Oliver Gierke
  */
-public class TypeAliasUnitTests {
+class TypeAliasUnitTests {
 
 	@Test // DATACMNS-547
 	@SuppressWarnings("unchecked")
-	public void scanningforAtPersistentFindsTypeAliasAnnotatedTypes() {
+	void scanningforAtPersistentFindsTypeAliasAnnotatedTypes() {
 
 		AnnotatedTypeScanner scanner = new AnnotatedTypeScanner(Persistent.class);
 		Set<Class<?>> types = scanner.findTypes(getClass().getPackage().getName());

src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java

@@ -19,7 +19,7 @@
 
 import java.lang.reflect.Field;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.util.ReflectionUtils;
@@ -31,15 +31,15 @@
  * @author Oliver Gierke
  * @since 1.5
  */
-public class AnnotationAuditingMetadataUnitTests {
+class AnnotationAuditingMetadataUnitTests {
 
 	static final Field createdByField = ReflectionUtils.findField(AnnotatedUser.class, "createdBy");
 	static final Field createdDateField = ReflectionUtils.findField(AnnotatedUser.class, "createdDate");
 	static final Field lastModifiedByField = ReflectionUtils.findField(AnnotatedUser.class, "lastModifiedBy");
 	static final Field lastModifiedDateField = ReflectionUtils.findField(AnnotatedUser.class, "lastModifiedDate");
 
 	@Test
-	public void checkAnnotationDiscovery() {
+	void checkAnnotationDiscovery() {
 
 		AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class);
 
@@ -51,7 +51,7 @@ public void checkAnnotationDiscovery() {
 	}
 
 	@Test
-	public void checkCaching() {
+	void checkCaching() {
 
 		AnnotationAuditingMetadata firstCall = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class);
 		assertThat(firstCall).isNotNull();
@@ -61,7 +61,7 @@ public void checkCaching() {
 	}
 
 	@Test
-	public void checkIsAuditable() {
+	void checkIsAuditable() {
 
 		AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class);
 		assertThat(metadata).isNotNull();
@@ -73,7 +73,7 @@ public void checkIsAuditable() {
 	}
 
 	@Test
-	public void rejectsInvalidDateTypeField() {
+	void rejectsInvalidDateTypeField() {
 
 		class Sample {
 			@CreatedDate String field;

src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java

@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
@@ -39,15 +39,15 @@
  * @since 1.5
  */
 @SuppressWarnings("unchecked")
-public class AuditingHandlerUnitTests {
+class AuditingHandlerUnitTests {
 
 	AuditingHandler handler;
 	AuditorAware<AuditedUser> auditorAware;
 
 	AuditedUser user;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		handler = getHandler();
 		user = new AuditedUser();
@@ -64,7 +64,7 @@ protected AuditingHandler getHandler() {
 	 * Checks that the advice does not set auditor on the target entity if no {@code AuditorAware} was configured.
 	 */
 	@Test
-	public void doesNotSetAuditorIfNotConfigured() {
+	void doesNotSetAuditorIfNotConfigured() {
 
 		handler.markCreated(user);
 
@@ -79,7 +79,7 @@ public void doesNotSetAuditorIfNotConfigured() {
 	 * Checks that the advice sets the auditor on the target entity if an {@code AuditorAware} was configured.
 	 */
 	@Test
-	public void setsAuditorIfConfigured() {
+	void setsAuditorIfConfigured() {
 
 		handler.setAuditorAware(auditorAware);
 
@@ -98,7 +98,7 @@ public void setsAuditorIfConfigured() {
 	 * Checks that the advice does not set modification information on creation if the falg is set to {@code false}.
 	 */
 	@Test
-	public void honoursModifiedOnCreationFlag() {
+	void honoursModifiedOnCreationFlag() {
 
 		handler.setAuditorAware(auditorAware);
 		handler.setModifyOnCreation(false);
@@ -117,7 +117,7 @@ public void honoursModifiedOnCreationFlag() {
 	 * Tests that the advice only sets modification data if a not-new entity is handled.
 	 */
 	@Test
-	public void onlySetsModificationDataOnNotNewEntities() {
+	void onlySetsModificationDataOnNotNewEntities() {
 
 		AuditedUser audited = new AuditedUser();
 		audited.id = 1L;
@@ -135,7 +135,7 @@ public void onlySetsModificationDataOnNotNewEntities() {
 	}
 
 	@Test
-	public void doesNotSetTimeIfConfigured() {
+	void doesNotSetTimeIfConfigured() {
 
 		handler.setDateTimeForNow(false);
 		handler.setAuditorAware(auditorAware);
@@ -149,7 +149,7 @@ public void doesNotSetTimeIfConfigured() {
 	}
 
 	@Test // DATAJPA-9
-	public void usesDateTimeProviderIfConfigured() {
+	void usesDateTimeProviderIfConfigured() {
 
 		DateTimeProvider provider = mock(DateTimeProvider.class);
 		doReturn(Optional.empty()).when(provider).getNow();
@@ -161,7 +161,7 @@ public void usesDateTimeProviderIfConfigured() {
 	}
 
 	@Test
-	public void setsAuditingInfoOnEntityUsingInheritance() {
+	void setsAuditingInfoOnEntityUsingInheritance() {
 
 		AuditingHandler handler = new AuditingHandler(PersistentEntities.of(new SampleMappingContext()));
 		handler.setModifyOnCreation(false);

src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java

@@ -25,7 +25,7 @@
 import java.time.temporal.TemporalAccessor;
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
@@ -40,36 +40,36 @@
  * @author Jens Schauder
  * @since 1.5
  */
-public class DefaultAuditableBeanWrapperFactoryUnitTests {
+class DefaultAuditableBeanWrapperFactoryUnitTests {
 
 	DefaultAuditableBeanWrapperFactory factory = new DefaultAuditableBeanWrapperFactory();
 
 	@Test
-	public void rejectsNullSource() {
+	void rejectsNullSource() {
 		assertThatIllegalArgumentException().isThrownBy(() -> factory.getBeanWrapperFor(null));
 	}
 
 	@Test
-	public void returnsAuditableInterfaceBeanWrapperForAuditable() {
+	void returnsAuditableInterfaceBeanWrapperForAuditable() {
 
 		assertThat(factory.getBeanWrapperFor(new AuditedUser()))
 				.hasValueSatisfying(it -> assertThat(it).isInstanceOf(AuditableInterfaceBeanWrapper.class));
 	}
 
 	@Test
-	public void returnsReflectionAuditingBeanWrapperForNonAuditableButAnnotated() {
+	void returnsReflectionAuditingBeanWrapperForNonAuditableButAnnotated() {
 
 		assertThat(factory.getBeanWrapperFor(new AnnotatedUser()))
 				.hasValueSatisfying(it -> assertThat(it).isInstanceOf(ReflectionAuditingBeanWrapper.class));
 	}
 
 	@Test
-	public void returnsEmptyForNonAuditableType() {
+	void returnsEmptyForNonAuditableType() {
 		assertThat(factory.getBeanWrapperFor(new Object())).isNotPresent();
 	}
 
 	@Test // DATACMNS-643
-	public void setsJsr310AndThreeTenBpTypes() {
+	void setsJsr310AndThreeTenBpTypes() {
 
 		Jsr310ThreeTenBpAuditedUser user = new Jsr310ThreeTenBpAuditedUser();
 		Instant instant = Instant.now();
@@ -87,7 +87,7 @@ public void setsJsr310AndThreeTenBpTypes() {
 	}
 
 	@Test // DATACMNS-867
-	public void errorsWhenUnableToConvertDateViaIntermediateJavaUtilDateConversion() {
+	void errorsWhenUnableToConvertDateViaIntermediateJavaUtilDateConversion() {
 
 		Jsr310ThreeTenBpAuditedUser user = new Jsr310ThreeTenBpAuditedUser();
 		ZonedDateTime zonedDateTime = ZonedDateTime.now();
@@ -101,7 +101,7 @@ public void errorsWhenUnableToConvertDateViaIntermediateJavaUtilDateConversion()
 	}
 
 	@Test // DATACMNS-1259
-	public void lastModifiedDateAsLongIsAvailableViaWrapper() {
+	void lastModifiedDateAsLongIsAvailableViaWrapper() {
 
 		LongBasedAuditable source = new LongBasedAuditable();
 		source.dateModified = 42000L;
@@ -114,7 +114,7 @@ public void lastModifiedDateAsLongIsAvailableViaWrapper() {
 	}
 
 	@Test // DATACMNS-1259
-	public void canSetLastModifiedDateAsInstantViaWrapperOnLongField() {
+	void canSetLastModifiedDateAsInstantViaWrapperOnLongField() {
 
 		LongBasedAuditable source = new LongBasedAuditable();
 
@@ -127,7 +127,7 @@ public void canSetLastModifiedDateAsInstantViaWrapperOnLongField() {
 	}
 
 	@Test // DATACMNS-1259
-	public void canSetLastModifiedDateAsLocalDateTimeViaWrapperOnLongField() {
+	void canSetLastModifiedDateAsLocalDateTimeViaWrapperOnLongField() {
 
 		LongBasedAuditable source = new LongBasedAuditable();
 
@@ -140,7 +140,7 @@ public void canSetLastModifiedDateAsLocalDateTimeViaWrapperOnLongField() {
 	}
 
 	@Test // DATACMNS-1259
-	public void lastModifiedAsLocalDateTimeDateIsAvailableViaWrapperAsLocalDateTime() {
+	void lastModifiedAsLocalDateTimeDateIsAvailableViaWrapperAsLocalDateTime() {
 
 		LocalDateTime now = LocalDateTime.now();
 

src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java

@@ -19,10 +19,12 @@
 
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.context.PersistentEntities;
@@ -34,13 +36,14 @@
  * @author Oliver Gierke
  * @since 1.5
  */
-@RunWith(MockitoJUnitRunner.class)
-public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests {
 
 	SampleMappingContext mappingContext;
 
-	@Before
-	public void init() {
+	@BeforeEach
+	void init() {
 
 		this.mappingContext = new SampleMappingContext();
 		this.mappingContext.getPersistentEntity(AuditedUser.class);
@@ -53,7 +56,7 @@ protected IsNewAwareAuditingHandler getHandler() {
 	}
 
 	@Test
-	public void delegatesToMarkCreatedForNewEntity() {
+	void delegatesToMarkCreatedForNewEntity() {
 
 		AuditedUser user = new AuditedUser();
 
@@ -64,7 +67,7 @@ public void delegatesToMarkCreatedForNewEntity() {
 	}
 
 	@Test
-	public void delegatesToMarkModifiedForNonNewEntity() {
+	void delegatesToMarkModifiedForNonNewEntity() {
 
 		AuditedUser user = new AuditedUser();
 		user.id = 1L;
@@ -76,17 +79,17 @@ public void delegatesToMarkModifiedForNonNewEntity() {
 	}
 
 	@Test // DATACMNS-365
-	public void rejectsNullMappingContext() {
+	void rejectsNullMappingContext() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new IsNewAwareAuditingHandler((PersistentEntities) null));
 	}
 
 	@Test // DATACMNS-365
-	public void setsUpHandlerWithMappingContext() {
+	void setsUpHandlerWithMappingContext() {
 		new IsNewAwareAuditingHandler(PersistentEntities.of());
 	}
 
 	@Test // DATACMNS-638
-	public void handlingOptionalIsANoOp() {
+	void handlingOptionalIsANoOp() {
 
 		IsNewAwareAuditingHandler handler = getHandler();
 
@@ -96,7 +99,7 @@ public void handlingOptionalIsANoOp() {
 	}
 
 	@Test // DATACMNS-957
-	public void skipsEntityWithoutIdentifier() {
+	void skipsEntityWithoutIdentifier() {
 		getHandler().markAudited(Optional.of(new EntityWithoutId()));
 	}
 

src/test/java/org/springframework/data/auditing/Jsr310ThreeTenBpAuditedUser.java

@@ -23,7 +23,7 @@
 /**
  * @author Oliver Gierke
  */
-public class Jsr310ThreeTenBpAuditedUser {
+class Jsr310ThreeTenBpAuditedUser {
 
 	@CreatedDate LocalDateTime createdDate;
 	@LastModifiedDate org.threeten.bp.LocalDateTime lastModifiedDate;