Refine BeanRegistryAdapterTests

Closes gh-34557

Author: sdeleuze

spring-beans/src/test/java/org/springframework/beans/factory/support/BeanRegistryAdapterTests.java

@@ -207,29 +207,36 @@ void customSupplier() {
 
 	@Test
 	void customTargetTypeFromResolvableType() {
-		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, TargetTypeBeanRegistrar.class);
+		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, env, TargetTypeBeanRegistrar.class);
 		new TargetTypeBeanRegistrar().register(adapter, env);
 		RootBeanDefinition beanDefinition = (RootBeanDefinition)this.beanFactory.getBeanDefinition("fooSupplierFromResolvableType");
 		assertThat(beanDefinition.getResolvableType().resolveGeneric(0)).isEqualTo(Foo.class);
 	}
 
 	@Test
 	void customTargetTypeFromTypeReference() {
-		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, TargetTypeBeanRegistrar.class);
+		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, env, TargetTypeBeanRegistrar.class);
 		new TargetTypeBeanRegistrar().register(adapter, env);
 		RootBeanDefinition beanDefinition = (RootBeanDefinition)this.beanFactory.getBeanDefinition("fooSupplierFromTypeReference");
 		assertThat(beanDefinition.getResolvableType().resolveGeneric(0)).isEqualTo(Foo.class);
 	}
 
 	@Test
 	void registerViaAnotherRegistrar() {
-		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, this.env, DefaultBeanRegistrar.class);
-		BeanRegistrar registrar = (registry, env) -> registry.register(new DefaultBeanRegistrar());
-		registrar.register(adapter, env);
+		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, this.env, ChainedBeanRegistrar.class);
+		new ChainedBeanRegistrar().register(adapter, env);
 		assertThat(this.beanFactory.getBeanDefinition("foo")).isNotNull();
 	}
 
 
+	private static class ChainedBeanRegistrar implements BeanRegistrar {
+
+		@Override
+		public void register(BeanRegistry registry, Environment env) {
+			registry.register(new DefaultBeanRegistrar());
+		}
+	}
+
 	private static class DefaultBeanRegistrar implements BeanRegistrar {
 
 		@Override