Polish tests

Author: snicoll

spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java

@@ -103,8 +103,8 @@ void getBeanRegistrationCodeGeneratorWhenScopedProxyWithoutTargetBeanName() {
 		this.beanFactory.registerBeanDefinition("test", beanDefinition);
 		testCompile((freshBeanFactory,
 				compiled) -> assertThatExceptionOfType(BeanCreationException.class)
-						.isThrownBy(() -> freshBeanFactory.getBean("test"))
-						.withMessageContaining("'targetBeanName' is required"));
+				.isThrownBy(() -> freshBeanFactory.getBean("test"))
+				.withMessageContaining("'targetBeanName' is required"));
 	}
 
 	@Test
@@ -116,8 +116,8 @@ void getBeanRegistrationCodeGeneratorWhenScopedProxyWithInvalidTargetBeanName()
 		this.beanFactory.registerBeanDefinition("test", beanDefinition);
 		testCompile((freshBeanFactory,
 				compiled) -> assertThatExceptionOfType(BeanCreationException.class)
-						.isThrownBy(() -> freshBeanFactory.getBean("test"))
-						.withMessageContaining("No bean named 'testDoesNotExist'"));
+				.isThrownBy(() -> freshBeanFactory.getBean("test"))
+				.withMessageContaining("No bean named 'testDoesNotExist'"));
 	}
 
 	@Test
@@ -144,19 +144,18 @@ private void testCompile(BiConsumer<DefaultListableBeanFactory, Compiled> result
 		assertThat(contribution).isNotNull();
 		contribution.applyTo(this.generationContext, this.beanFactoryInitializationCode);
 		this.generationContext.writeGeneratedContent();
-		TestCompiler.forSystem().withFiles(this.generatedFiles).printFiles(System.out)
-				.compile(compiled -> {
-					MethodReference reference = this.beanFactoryInitializationCode
-							.getInitializers().get(0);
-					Object instance = compiled.getInstance(Object.class,
-							reference.getDeclaringClass().toString());
-					Method method = ReflectionUtils.findMethod(instance.getClass(),
-							reference.getMethodName(), DefaultListableBeanFactory.class);
-					DefaultListableBeanFactory freshBeanFactory = new DefaultListableBeanFactory();
-					freshBeanFactory.setBeanClassLoader(compiled.getClassLoader());
-					ReflectionUtils.invokeMethod(method, instance, freshBeanFactory);
-					result.accept(freshBeanFactory, compiled);
-				});
+		TestCompiler.forSystem().withFiles(this.generatedFiles).compile(compiled -> {
+			MethodReference reference = this.beanFactoryInitializationCode
+					.getInitializers().get(0);
+			Object instance = compiled.getInstance(Object.class,
+					reference.getDeclaringClass().toString());
+			Method method = ReflectionUtils.findMethod(instance.getClass(),
+					reference.getMethodName(), DefaultListableBeanFactory.class);
+			DefaultListableBeanFactory freshBeanFactory = new DefaultListableBeanFactory();
+			freshBeanFactory.setBeanClassLoader(compiled.getClassLoader());
+			ReflectionUtils.invokeMethod(method, instance, freshBeanFactory);
+			result.accept(freshBeanFactory, compiled);
+		});
 	}
 
 

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java

@@ -72,8 +72,6 @@ class BeanDefinitionMethodGeneratorTests {
 
 	private DefaultListableBeanFactory beanFactory;
 
-	private MockSpringFactoriesLoader springFactoriesLoader;
-
 	private MockBeanRegistrationsCode beanRegistrationsCode;
 
 	private BeanDefinitionMethodGeneratorFactory methodGeneratorFactory;
@@ -83,9 +81,8 @@ void setup() {
 		this.generatedFiles = new InMemoryGeneratedFiles();
 		this.generationContext = new DefaultGenerationContext(this.generatedFiles);
 		this.beanFactory = new DefaultListableBeanFactory();
-		this.springFactoriesLoader = new MockSpringFactoriesLoader();
 		this.methodGeneratorFactory = new BeanDefinitionMethodGeneratorFactory(
-				new AotFactoriesLoader(this.beanFactory, this.springFactoriesLoader));
+				new AotFactoriesLoader(this.beanFactory, new MockSpringFactoriesLoader()));
 		this.beanRegistrationsCode = new MockBeanRegistrationsCode(
 				ClassName.get("__", "Registration"));
 	}
@@ -142,7 +139,7 @@ void generateBeanDefinitionMethodWhenHasInstancePostProcessorGeneratesMethod() {
 							.returns(TestBean.class).addCode("return new $T($S);",
 									TestBean.class, "postprocessed"));
 			beanRegistrationCode.addInstancePostProcessor(MethodReference.ofStatic(
-					beanRegistrationCode.getClassName(), method.getName().toString()));
+					beanRegistrationCode.getClassName(), method.getName()));
 		};
 		List<BeanRegistrationAotContribution> aotContributions = Collections
 				.singletonList(aotContribution);
@@ -354,7 +351,7 @@ void generateBeanDefinitionMethodWhenPackagePrivateBean() {
 				Collections.emptyList());
 		MethodReference method = generator.generateBeanDefinitionMethod(
 				this.generationContext, "", this.beanRegistrationsCode);
-		testCompiledResult(method, false, (actual, compiled) -> {
+		testCompiledResult(method, (actual, compiled) -> {
 			DefaultListableBeanFactory freshBeanFactory = new DefaultListableBeanFactory();
 			freshBeanFactory.registerBeanDefinition("test", actual);
 			Object bean = freshBeanFactory.getBean("test");
@@ -367,23 +364,15 @@ void generateBeanDefinitionMethodWhenPackagePrivateBean() {
 	private RegisteredBean registerBean(RootBeanDefinition beanDefinition) {
 		String beanName = "testBean";
 		this.beanFactory.registerBeanDefinition(beanName, beanDefinition);
-		RegisteredBean registeredBean = RegisteredBean.of(this.beanFactory, beanName);
-		return registeredBean;
+		return RegisteredBean.of(this.beanFactory, beanName);
 	}
 
-	@SuppressWarnings("unchecked")
 	private void testCompiledResult(MethodReference method,
 			BiConsumer<RootBeanDefinition, Compiled> result) {
-		testCompiledResult(method, false, result);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void testCompiledResult(MethodReference method, boolean targetClassAccess,
-			BiConsumer<RootBeanDefinition, Compiled> result) {
 		this.generationContext.writeGeneratedContent();
 		JavaFile javaFile = generateJavaFile(method);
-		TestCompiler.forSystem().withFiles(this.generatedFiles).printFiles(System.out)
-				.compile(javaFile::writeTo, compiled -> result.accept(
+		TestCompiler.forSystem().withFiles(this.generatedFiles).compile(
+				javaFile::writeTo, compiled -> result.accept(
 						(RootBeanDefinition) compiled.getInstance(Supplier.class).get(),
 						compiled));
 	}