Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2023-07-12 11:50:11 +02:00
parent 2e3fbac9a0 68f2b0ca59
commit 16b9640af2
32 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
View File

@@ -160,7 +160,7 @@ class ApplicationContextExpressionTests {
ValueTestBean tb3 = ac.getBean("tb3", ValueTestBean.class);
assertThat(tb3.name).isEqualTo("XXXmyNameYYY42ZZZ");
assertThat(tb3.age).isEqualTo(42);
assertThat(tb3.ageFactory.getObject().intValue()).isEqualTo(42);
assertThat(tb3.ageFactory.getObject()).isEqualTo(42);
assertThat(tb3.country).isEqualTo("123 UK");
assertThat(tb3.countryFactory.getObject()).isEqualTo("123 UK");
System.getProperties().put("country", "US");

3
spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
View File

@@ -51,8 +51,7 @@ class PropertyPlaceholderConfigurerTests extends AbstractJmxTests {
Integer age = (Integer) getServer().getAttribute(oname, "Age");
assertThat(name).as("Name is incorrect in JMX").isEqualTo("Rob Harrop");
assertThat(age.intValue()).as("Age is incorrect in JMX").isEqualTo(100);
assertThat(age).as("Age is incorrect in JMX").isEqualTo(100);
}
}