root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-5619

This commit is contained in:
Mark Pollack 2009-07-10 04:02:08 +00:00
parent 69422e771f
commit 0d98baa5c1
2 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
View File

@ -659,29 +659,6 @@ public final class PropertyResourceConfigurerTests {
assertEquals("mytest", tb.getTouchy()); assertEquals("mytest", tb.getTouchy());
} }
@Ignore // this test was breaking after the 3.0 repackaging
@Test
public void testPropertyPlaceholderConfigurerWithAutowireByType() {
// StaticApplicationContext ac = new StaticApplicationContext();
// MutablePropertyValues pvs = new MutablePropertyValues();
// pvs.addPropertyValue("touchy", "${test}");
// ac.registerSingleton("tb", TestBean.class, pvs);
// pvs = new MutablePropertyValues();
// pvs.addPropertyValue("target", new RuntimeBeanReference("tb"));
// // uncomment when fixing this test
// // ac.registerSingleton("tbProxy", org.springframework.aop.framework.ProxyFactoryBean.class, pvs);
// pvs = new MutablePropertyValues();
// Properties props = new Properties();
// props.put("test", "mytest");
// pvs.addPropertyValue("properties", new Properties(props));
// RootBeanDefinition ppcDef = new RootBeanDefinition(PropertyPlaceholderConfigurer.class, pvs);
// ppcDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
// ac.registerBeanDefinition("configurer", ppcDef);
// ac.refresh();
// TestBean tb = (TestBean) ac.getBean("tb");
// assertEquals("mytest", tb.getTouchy());
}
@Test @Test
public void testPropertyPlaceholderConfigurerWithAliases() { public void testPropertyPlaceholderConfigurerWithAliases() {
factory.registerBeanDefinition("tb", factory.registerBeanDefinition("tb",

65
org.springframework.context.support/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright 2002-2009 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
*
* http://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.factory.config;
import static org.junit.Assert.assertEquals;
import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.TestBean;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.context.support.StaticApplicationContext;
/**
* Unit tests for various {@link PropertyResourceConfigurer} implementations including:
* {@link PropertyPlaceholderConfigurer}, {@link PropertyOverrideConfigurer} and
* {@link PreferencesPlaceholderConfigurer}.
*
* @since 02.10.2003
* @author Juergen Hoeller
* @author Chris Beams
*/
public final class PropertyResourceConfigurerTests {
@Ignore
@Test
public void testPropertyPlaceholderConfigurerWithAutowireByType() {
StaticApplicationContext ac = new StaticApplicationContext();
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.addPropertyValue("touchy", "${test}");
ac.registerSingleton("tb", TestBean.class, pvs);
pvs = new MutablePropertyValues();
pvs.addPropertyValue("target", new RuntimeBeanReference("tb"));
ac.registerSingleton("tbProxy", org.springframework.aop.framework.ProxyFactoryBean.class, pvs);
pvs = new MutablePropertyValues();
Properties props = new Properties();
props.put("test", "mytest");
pvs.addPropertyValue("properties", new Properties(props));
RootBeanDefinition ppcDef = new RootBeanDefinition(PropertyPlaceholderConfigurer.class, pvs);
// fails when set to AUTOWIRE_BY_TYPE
ppcDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
ac.registerBeanDefinition("configurer", ppcDef);
ac.refresh();
TestBean tb = (TestBean) ac.getBean("tb");
assertEquals("mytest", tb.getTouchy());
}
}