From ad0ddb71d41efdf7527664df04edd1df43190246 Mon Sep 17 00:00:00 2001 From: currenjin Date: Thu, 13 Mar 2025 19:24:49 +0900 Subject: [PATCH] Improve: test with direct assertions and randomized bean names Signed-off-by: currenjin --- .../factory/support/GenericTypeMatchingTests.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 9ab7ca29482..7a7fb7fd380 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 @@ -3,6 +3,7 @@ package org.springframework.beans.factory.support; import org.junit.jupiter.api.Test; import org.springframework.core.ResolvableType; +import java.util.UUID; import java.util.function.Supplier; import static org.assertj.core.api.Assertions.assertThat; @@ -16,8 +17,8 @@ class ScopedProxyGenericTypeMatchTests { void scopedProxyBeanTypeMatching() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); - String targetBeanName = "scopedTarget.wordBean"; - String proxyBeanName = "wordBean"; + String proxyBeanName = "wordBean-" + UUID.randomUUID(); + String targetBeanName = "scopedTarget." + proxyBeanName; RootBeanDefinition targetDef = new RootBeanDefinition(SomeGenericSupplier.class); targetDef.setScope("request"); @@ -31,11 +32,9 @@ class ScopedProxyGenericTypeMatchTests { ResolvableType supplierType = ResolvableType.forClassWithGenerics(Supplier.class, String.class); - boolean isMatch = factory.isTypeMatch(proxyBeanName, supplierType); - assertThat(isMatch).isTrue(); + assertThat(factory.isTypeMatch(proxyBeanName, supplierType)).isTrue(); - String[] names = factory.getBeanNamesForType(supplierType); - assertThat(names).contains(proxyBeanName); + assertThat(factory.getBeanNamesForType(supplierType)).contains(proxyBeanName); } static class SomeGenericSupplier implements Supplier {