Polishing.

Move tests targeting DefaultAotContext.

Original Pull Request: #3391

Author: christophstrobl

src/test/java/org/springframework/data/aot/AotContextUnitTests.java

@@ -15,26 +15,15 @@
  */
 package org.springframework.data.aot;
 
-import static org.mockito.Mockito.*;
-
 import java.util.function.Consumer;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoSettings;
-
 import org.springframework.aot.generate.GenerationContext;
-import org.springframework.aot.test.generate.TestGenerationContext;
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.env.Environment;
-import org.springframework.data.aot.types.Address;
-import org.springframework.data.aot.types.Customer;
-import org.springframework.data.aot.types.EmptyType1;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.util.StringUtils;
 
@@ -44,67 +33,8 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@MockitoSettings(strictness = org.mockito.quality.Strictness.LENIENT)
 class AotContextUnitTests {
 
-	@Mock BeanFactory beanFactory;
-
-	@Mock AotMappingContext mappingContext;
-
-	MockEnvironment mockEnvironment = new MockEnvironment();
-
-	@Test // GH-2595
-	void shouldContributeAccessorByDefault() {
-
-		contributeAccessor(Address.class);
-		verify(mappingContext).contribute(Address.class);
-	}
-
-	@Test // GH-2595
-	void shouldConsiderDisabledAccessors() {
-
-		mockEnvironment.setProperty("spring.aot.data.accessors.enabled", "false");
-
-		contributeAccessor(Address.class);
-
-		verifyNoInteractions(mappingContext);
-	}
-
-	@Test // GH-2595
-	void shouldApplyExcludeFilters() {
-
-		mockEnvironment.setProperty("spring.aot.data.accessors.exclude",
-				Customer.class.getName() + " , " + EmptyType1.class.getName());
-
-		contributeAccessor(Address.class, Customer.class, EmptyType1.class);
-
-		verify(mappingContext).contribute(Address.class);
-		verifyNoMoreInteractions(mappingContext);
-	}
-
-	@Test // GH-2595
-	void shouldApplyIncludeExcludeFilters() {
-
-		mockEnvironment.setProperty("spring.aot.data.accessors.include", Customer.class.getPackageName() + ".Add*");
-		mockEnvironment.setProperty("spring.aot.data.accessors.exclude", Customer.class.getPackageName() + ".**");
-
-		contributeAccessor(Address.class, Customer.class, EmptyType1.class);
-
-		verify(mappingContext).contribute(Address.class);
-		verifyNoMoreInteractions(mappingContext);
-	}
-
-	private void contributeAccessor(Class<?>... classes) {
-
-		DefaultAotContext context = new DefaultAotContext(beanFactory, mockEnvironment, mappingContext);
-
-		for (Class<?> aClass : classes) {
-			context.typeConfiguration(aClass, AotTypeConfiguration::contributeAccessors);
-		}
-
-		context.contributeTypeConfigurations(new TestGenerationContext());
-	}
-
 	@ParameterizedTest // GH-3322
 	@CsvSource({ //
 			"'spring.aot.repositories.enabled', '', '', '', true", //

src/test/java/org/springframework/data/aot/DefaultAotContextUnitTests.java

@@ -16,6 +16,9 @@
 package org.springframework.data.aot;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection;
 
 import java.util.List;
@@ -27,12 +30,16 @@
 import org.springframework.aot.hint.annotation.Reflective;
 import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.data.aot.types.Address;
+import org.springframework.data.aot.types.Customer;
+import org.springframework.data.aot.types.EmptyType1;
 import org.springframework.mock.env.MockEnvironment;
 
 /**
  * Unit tests targeting {@link DefaultAotContext};
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 @MockitoSettings(strictness = org.mockito.quality.Strictness.LENIENT)
 public class DefaultAotContextUnitTests {
@@ -43,6 +50,47 @@ public class DefaultAotContextUnitTests {
 
 	MockEnvironment mockEnvironment = new MockEnvironment();
 
+	@Test // GH-2595
+	void shouldContributeAccessorByDefault() {
+
+		contributeAccessor(Address.class);
+		verify(mappingContext).contribute(Address.class);
+	}
+
+	@Test // GH-2595
+	void shouldConsiderDisabledAccessors() {
+
+		mockEnvironment.setProperty("spring.aot.data.accessors.enabled", "false");
+
+		contributeAccessor(Address.class);
+
+		verifyNoInteractions(mappingContext);
+	}
+
+	@Test // GH-2595
+	void shouldApplyExcludeFilters() {
+
+		mockEnvironment.setProperty("spring.aot.data.accessors.exclude",
+				Customer.class.getName() + " , " + EmptyType1.class.getName());
+
+		contributeAccessor(Address.class, Customer.class, EmptyType1.class);
+
+		verify(mappingContext).contribute(Address.class);
+		verifyNoMoreInteractions(mappingContext);
+	}
+
+	@Test // GH-2595
+	void shouldApplyIncludeExcludeFilters() {
+
+		mockEnvironment.setProperty("spring.aot.data.accessors.include", Customer.class.getPackageName() + ".Add*");
+		mockEnvironment.setProperty("spring.aot.data.accessors.exclude", Customer.class.getPackageName() + ".**");
+
+		contributeAccessor(Address.class, Customer.class, EmptyType1.class);
+
+		verify(mappingContext).contribute(Address.class);
+		verifyNoMoreInteractions(mappingContext);
+	}
+
 	@Test // GH-3387
 	void doesNotRegisterReflectionWhenThereIsNothingToRegister() {
 
@@ -118,6 +166,17 @@ void registerReflectionIfThereIsAnAtReflectiveAnnotationInTheSuperType() throws
 				.matches(reflection().onMethodInvocation(DummyWithAtReflective.class.getMethod("getValue")).negate());
 	}
 
+	private void contributeAccessor(Class<?>... classes) {
+
+		DefaultAotContext context = new DefaultAotContext(beanFactory, mockEnvironment, mappingContext);
+
+		for (Class<?> aClass : classes) {
+			context.typeConfiguration(aClass, AotTypeConfiguration::contributeAccessors);
+		}
+
+		context.contributeTypeConfigurations(new TestGenerationContext());
+	}
+
 	static class Dummy {
 
 		String value;