From 7df2e55b562ac7383a83afd47e20531b522ecfac Mon Sep 17 00:00:00 2001 From: currenjin Date: Thu, 13 Mar 2025 09:23:10 +0900 Subject: [PATCH] Refactor: test to use variables for bean names Signed-off-by: currenjin --- .../factory/support/GenericTypeMatchingTests.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/GenericTypeMatchingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/GenericTypeMatchingTests.java index 9678a25f597..9ab7ca29482 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/GenericTypeMatchingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/GenericTypeMatchingTests.java @@ -16,25 +16,26 @@ class ScopedProxyGenericTypeMatchTests { void scopedProxyBeanTypeMatching() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); + String targetBeanName = "scopedTarget.wordBean"; + String proxyBeanName = "wordBean"; + RootBeanDefinition targetDef = new RootBeanDefinition(SomeGenericSupplier.class); targetDef.setScope("request"); - factory.registerBeanDefinition("scopedTarget.wordBean", targetDef); + factory.registerBeanDefinition(targetBeanName, targetDef); RootBeanDefinition proxyDef = new RootBeanDefinition(); proxyDef.setScope("singleton"); proxyDef.setTargetType(ResolvableType.forClassWithGenerics(Supplier.class, String.class)); - proxyDef.setAttribute("targetBeanName", "scopedTarget.wordBean"); - factory.registerBeanDefinition("wordBean", proxyDef); + proxyDef.setAttribute("targetBeanName", targetBeanName); + factory.registerBeanDefinition(proxyBeanName, proxyDef); ResolvableType supplierType = ResolvableType.forClassWithGenerics(Supplier.class, String.class); - boolean isMatch = factory.isTypeMatch("wordBean", supplierType); - - + boolean isMatch = factory.isTypeMatch(proxyBeanName, supplierType); assertThat(isMatch).isTrue(); String[] names = factory.getBeanNamesForType(supplierType); - assertThat(names).contains("wordBean"); + assertThat(names).contains(proxyBeanName); } static class SomeGenericSupplier implements Supplier {