24
24
import java .util .Map ;
25
25
26
26
import org .junit .Test ;
27
- import org .springframework .beans .factory .config .AbstractPropertyPlaceholderConfigurer ;
27
+ import org .springframework .beans .factory .config .PlaceholderConfigurerSupport ;
28
28
import org .springframework .beans .factory .config .PropertyOverrideConfigurer ;
29
29
import org .springframework .beans .factory .config .PropertyPlaceholderConfigurer ;
30
30
import org .springframework .context .ApplicationContext ;
@@ -45,8 +45,8 @@ public class ContextNamespaceHandlerTests {
45
45
public void propertyPlaceholder () throws Exception {
46
46
ApplicationContext applicationContext = new ClassPathXmlApplicationContext (
47
47
"contextNamespaceHandlerTests-replace.xml" , getClass ());
48
- Map <String , AbstractPropertyPlaceholderConfigurer > beans = applicationContext
49
- .getBeansOfType (AbstractPropertyPlaceholderConfigurer .class );
48
+ Map <String , PlaceholderConfigurerSupport > beans = applicationContext
49
+ .getBeansOfType (PlaceholderConfigurerSupport .class );
50
50
assertFalse ("No PropertyPlaceholderConfigurer found" , beans .isEmpty ());
51
51
String s = (String ) applicationContext .getBean ("string" );
52
52
assertEquals ("No properties replaced" , "bar" , s );
@@ -77,8 +77,8 @@ public void propertyPlaceholderEnvironmentProperties() throws Exception {
77
77
applicationContext .setEnvironment (env );
78
78
applicationContext .load (new ClassPathResource ("contextNamespaceHandlerTests-simple.xml" , getClass ()));
79
79
applicationContext .refresh ();
80
- Map <String , AbstractPropertyPlaceholderConfigurer > beans = applicationContext
81
- .getBeansOfType (AbstractPropertyPlaceholderConfigurer .class );
80
+ Map <String , PlaceholderConfigurerSupport > beans = applicationContext
81
+ .getBeansOfType (PlaceholderConfigurerSupport .class );
82
82
assertFalse ("No PropertyPlaceholderConfigurer found" , beans .isEmpty ());
83
83
String s = (String ) applicationContext .getBean ("string" );
84
84
assertEquals ("No properties replaced" , "spam" , s );
@@ -103,8 +103,8 @@ public void propertyPlaceholderLocation() throws Exception {
103
103
public void propertyPlaceholderIgnored () throws Exception {
104
104
ApplicationContext applicationContext = new ClassPathXmlApplicationContext (
105
105
"contextNamespaceHandlerTests-replace-ignore.xml" , getClass ());
106
- Map <String , AbstractPropertyPlaceholderConfigurer > beans = applicationContext
107
- .getBeansOfType (AbstractPropertyPlaceholderConfigurer .class );
106
+ Map <String , PlaceholderConfigurerSupport > beans = applicationContext
107
+ .getBeansOfType (PlaceholderConfigurerSupport .class );
108
108
assertFalse ("No PropertyPlaceholderConfigurer found" , beans .isEmpty ());
109
109
String s = (String ) applicationContext .getBean ("string" );
110
110
assertEquals ("Properties replaced" , "${bar}" , s );
0 commit comments