Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relocate duplicated mock implementations to test fixtures

Browse Source 
Closes gh-28659
This commit is contained in:
Stephane Nicoll
2022-06-20 08:54:36 +02:00
parent e49cfb8523
commit 90759fb38f
8 changed files with 108 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,6 @@
package org.springframework.aop.scope;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.function.BiConsumer;
@@ -27,16 +25,13 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.AopInfrastructureBean;
import org.springframework.aot.generate.DefaultGenerationContext;
import org.springframework.aot.generate.GeneratedMethods;
import org.springframework.aot.generate.InMemoryGeneratedFiles;
import org.springframework.aot.generate.MethodGenerator;
import org.springframework.aot.generate.MethodReference;
import org.springframework.aot.test.generator.compile.Compiled;
import org.springframework.aot.test.generator.compile.TestCompiler;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.aot.AotFactoriesLoader;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
import org.springframework.beans.factory.aot.TestBeanRegistrationsAotProcessor;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -44,6 +39,7 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
import org.springframework.beans.testfixture.beans.factory.generator.factory.NumberHolder;
import org.springframework.core.ResolvableType;
import org.springframework.util.ReflectionUtils;
@@ -158,27 +154,4 @@ class ScopedProxyBeanRegistrationAotProcessorTests {
});
}
static class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
private final GeneratedMethods generatedMethods = new GeneratedMethods();
private final List<MethodReference> initializers = new ArrayList<>();
@Override
public MethodGenerator getMethodGenerator() {
return this.generatedMethods;
}
@Override
public void addInitializer(MethodReference methodReference) {
this.initializers.add(methodReference);
}
List<MethodReference> getInitializers() {
return this.initializers;
}
}
}

30
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.beans.factory.annotation;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
@@ -29,7 +27,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.aot.generate.DefaultGenerationContext;
import org.springframework.aot.generate.GenerationContext;
import org.springframework.aot.generate.InMemoryGeneratedFiles;
import org.springframework.aot.generate.MethodGenerator;
import org.springframework.aot.generate.MethodReference;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsPredicates;
@@ -37,13 +34,12 @@ import org.springframework.aot.test.generator.compile.CompileWithTargetClassAcce
import org.springframework.aot.test.generator.compile.Compiled;
import org.springframework.aot.test.generator.compile.TestCompiler;
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
import org.springframework.beans.factory.aot.BeanRegistrationCode;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RegisteredBean;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationCode;
import org.springframework.core.env.Environment;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.javapoet.ClassName;
import org.springframework.javapoet.CodeBlock;
import org.springframework.javapoet.JavaFile;
import org.springframework.javapoet.MethodSpec;
@@ -180,7 +176,7 @@ class AutowiredAnnotationBeanRegistrationAotContributionTests {
}
private JavaFile createJavaFile(Class<?> target) {
MethodReference methodReference = this.beanRegistrationCode.instancePostProcessors
MethodReference methodReference = this.beanRegistrationCode.getInstancePostProcessors()
.get(0);
TypeSpec.Builder builder = TypeSpec.classBuilder("TestPostProcessor");
builder.addModifiers(Modifier.PUBLIC);
@@ -195,26 +191,4 @@ class AutowiredAnnotationBeanRegistrationAotContributionTests {
return JavaFile.builder("__", builder.build()).build();
}
private static class MockBeanRegistrationCode implements BeanRegistrationCode {
private final List<MethodReference> instancePostProcessors = new ArrayList<>();
@Override
public ClassName getClassName() {
return null;
}
@Override
public MethodGenerator getMethodGenerator() {
return null;
}
@Override
public void addInstancePostProcessor(MethodReference methodReference) {
this.instancePostProcessors.add(methodReference);
}
}
}

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

@@ -47,6 +47,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.testfixture.beans.AnnotatedBean;
import org.springframework.beans.testfixture.beans.GenericBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode;
import org.springframework.core.ResolvableType;
import org.springframework.core.mock.MockSpringFactoriesLoader;
import org.springframework.javapoet.ClassName;
@@ -385,7 +386,7 @@ class BeanDefinitionMethodGeneratorTests {
builder.addMethod(MethodSpec.methodBuilder("get").addModifiers(Modifier.PUBLIC)
.returns(BeanDefinition.class)
.addCode("return $L;", method.toInvokeCodeBlock()).build());
this.beanRegistrationsCode.getGeneratedMethods()
this.beanRegistrationsCode.getMethodGenerator()
.doWithMethodSpecs(builder::addMethod);
return JavaFile.builder("__", builder.build()).build();
}

38
spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java
View File

@@ -30,10 +30,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.aot.generate.DefaultGenerationContext;
import org.springframework.aot.generate.GeneratedMethods;
import org.springframework.aot.generate.GenerationContext;
import org.springframework.aot.generate.InMemoryGeneratedFiles;
import org.springframework.aot.generate.MethodGenerator;
import org.springframework.aot.generate.MethodReference;
import org.springframework.aot.test.generator.compile.Compiled;
import org.springframework.aot.test.generator.compile.TestCompiler;
@@ -42,6 +40,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RegisteredBean;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
import org.springframework.core.mock.MockSpringFactoriesLoader;
import org.springframework.javapoet.CodeBlock;
import org.springframework.javapoet.JavaFile;
@@ -164,7 +163,7 @@ class BeanRegistrationsAotContributionTests {
}
private JavaFile createJavaFile() {
MethodReference initializer = this.beanFactoryInitializationCode.initializers
MethodReference initializer = this.beanFactoryInitializationCode.getInitializers()
.get(0);
TypeSpec.Builder builder = TypeSpec.classBuilder("BeanFactoryConsumer");
builder.addModifiers(Modifier.PUBLIC);
@@ -177,37 +176,4 @@ class BeanRegistrationsAotContributionTests {
return JavaFile.builder("__", builder.build()).build();
}
class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
private final GeneratedMethods generatedMethods = new GeneratedMethods();
private final List<MethodReference> initializers = new ArrayList<>();
private final String name;
MockBeanFactoryInitializationCode() {
this("");
}
MockBeanFactoryInitializationCode(String name) {
this.name = name;
}
@Override
public String getName() {
return this.name;
}
@Override
public MethodGenerator getMethodGenerator() {
return this.generatedMethods;
}
@Override
public void addInitializer(MethodReference methodReference) {
this.initializers.add(methodReference);
}
}
}

67
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanFactoryInitializationCode.java Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.beans.testfixture.beans.factory.aot;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.aot.generate.GeneratedMethods;
import org.springframework.aot.generate.MethodReference;
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
/**
* Mock {@link BeanFactoryInitializationCode} implementation.
*
* @author Stephane Nicoll
*/
public class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
private final GeneratedMethods generatedMethods = new GeneratedMethods();
private final List<MethodReference> initializers = new ArrayList<>();
private final String name;
public MockBeanFactoryInitializationCode() {
this("");
}
public MockBeanFactoryInitializationCode(String name) {
this.name = name;
}
@Override
public String getName() {
return this.name;
}
@Override
public GeneratedMethods getMethodGenerator() {
return this.generatedMethods;
}
@Override
public void addInitializer(MethodReference methodReference) {
this.initializers.add(methodReference);
}
public List<MethodReference> getInitializers() {
return Collections.unmodifiableList(this.initializers);
}
}

31
spring-beans/src/test/java/org/springframework/beans/factory/aot/MockBeanRegistrationsCode.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationCode.java
View File

@@ -14,28 +14,38 @@
* limitations under the License.
*/
package org.springframework.beans.factory.aot;
package org.springframework.beans.testfixture.beans.factory.aot;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.aot.generate.GeneratedMethods;
import org.springframework.aot.generate.MethodGenerator;
import org.springframework.aot.generate.MethodReference;
import org.springframework.beans.factory.aot.BeanRegistrationCode;
import org.springframework.javapoet.ClassName;
/**
* Mock {@link BeanRegistrationsCode} implementation.
* Mock {@link BeanRegistrationCode} implementation.
*
* @author Stephane Nicoll
* @author Phillip Webb
*/
class MockBeanRegistrationsCode implements BeanRegistrationsCode {
public class MockBeanRegistrationCode implements BeanRegistrationCode {
private final ClassName className;
private final GeneratedMethods generatedMethods = new GeneratedMethods();
private final List<MethodReference> instancePostProcessors = new ArrayList<>();
MockBeanRegistrationsCode(ClassName className) {
public MockBeanRegistrationCode(ClassName className) {
this.className = className;
}
public MockBeanRegistrationCode() {
this(ClassName.get("com.example", "Test"));
}
@Override
public ClassName getClassName() {
@@ -43,12 +53,17 @@ class MockBeanRegistrationsCode implements BeanRegistrationsCode {
}
@Override
public MethodGenerator getMethodGenerator() {
public GeneratedMethods getMethodGenerator() {
return this.generatedMethods;
}
GeneratedMethods getGeneratedMethods() {
return this.generatedMethods;
@Override
public void addInstancePostProcessor(MethodReference methodReference) {
this.instancePostProcessors.add(methodReference);
}
public List<MethodReference> getInstancePostProcessors() {
return Collections.unmodifiableList(this.instancePostProcessors);
}
}

18
spring-aop/src/test/java/org/springframework/aop/scope/MockBeanRegistrationsCode.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationsCode.java
View File

@@ -14,10 +14,9 @@
* limitations under the License.
*/
package org.springframework.aop.scope;
package org.springframework.beans.testfixture.beans.factory.aot;
import org.springframework.aot.generate.GeneratedMethods;
import org.springframework.aot.generate.MethodGenerator;
import org.springframework.beans.factory.aot.BeanRegistrationsCode;
import org.springframework.javapoet.ClassName;
@@ -25,18 +24,21 @@ import org.springframework.javapoet.ClassName;
* Mock {@link BeanRegistrationsCode} implementation.
*
* @author Phillip Webb
* @author Stephane Nicoll
*/
class MockBeanRegistrationsCode implements BeanRegistrationsCode {
public class MockBeanRegistrationsCode implements BeanRegistrationsCode {
private final ClassName className;
private final GeneratedMethods generatedMethods = new GeneratedMethods();
MockBeanRegistrationsCode(ClassName className) {
public MockBeanRegistrationsCode(ClassName className) {
this.className = className;
}
public MockBeanRegistrationsCode() {
this(ClassName.get("com.example", "Test"));
}
@Override
public ClassName getClassName() {
@@ -44,11 +46,7 @@ class MockBeanRegistrationsCode implements BeanRegistrationsCode {
}
@Override
public MethodGenerator getMethodGenerator() {
return this.generatedMethods;
}
GeneratedMethods getGeneratedMethods() {
public GeneratedMethods getMethodGenerator() {
return this.generatedMethods;
}

28
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.context.annotation;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@@ -27,17 +25,15 @@ import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import org.springframework.aot.generate.DefaultGenerationContext;
import org.springframework.aot.generate.GeneratedMethods;
import org.springframework.aot.generate.InMemoryGeneratedFiles;
import org.springframework.aot.generate.MethodGenerator;
import org.springframework.aot.generate.MethodReference;
import org.springframework.aot.hint.ResourcePatternHint;
import org.springframework.aot.test.generator.compile.Compiled;
import org.springframework.aot.test.generator.compile.TestCompiler;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
import org.springframework.beans.testfixture.beans.factory.generator.SimpleConfiguration;
import org.springframework.context.testfixture.context.generator.annotation.ImportAwareConfiguration;
import org.springframework.context.testfixture.context.generator.annotation.ImportConfiguration;
@@ -121,7 +117,7 @@ class ConfigurationClassPostProcessorAotContributionTests {
}
private JavaFile createJavaFile() {
MethodReference methodReference = this.beanFactoryInitializationCode.initializers
MethodReference methodReference = this.beanFactoryInitializationCode.getInitializers()
.get(0);
TypeSpec.Builder builder = TypeSpec.classBuilder("TestConsumer");
builder.addModifiers(Modifier.PUBLIC);
@@ -132,7 +128,7 @@ class ConfigurationClassPostProcessorAotContributionTests {
.addStatement(
methodReference.toInvokeCodeBlock(CodeBlock.of("beanFactory")))
.build());
this.beanFactoryInitializationCode.generatedMethods
this.beanFactoryInitializationCode.getMethodGenerator()
.doWithMethodSpecs(builder::addMethod);
return JavaFile.builder("__", builder.build()).build();
}
@@ -144,22 +140,4 @@ class ConfigurationClassPostProcessorAotContributionTests {
.containsExactly(entry(key.getName(), value.getName()));
}
class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
private final GeneratedMethods generatedMethods = new GeneratedMethods();
private final List<MethodReference> initializers = new ArrayList<>();
@Override
public MethodGenerator getMethodGenerator() {
return this.generatedMethods;
}
@Override
public void addInitializer(MethodReference methodReference) {
this.initializers.add(methodReference);
}
}
}