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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2023-08-03 18:10:13 +02:00
parent cba2b6eaf4
commit 4b6fabbd2f
6 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
View File

@@ -226,7 +226,7 @@ public class ClassPathXmlApplicationContextTests {
}
@Test
void childWithProxy() throws Exception {
void childWithProxy() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(CONTEXT_WILDCARD);
ClassPathXmlApplicationContext child = new ClassPathXmlApplicationContext(
new String[] {CHILD_WITH_PROXY_CONTEXT}, ctx);
@@ -337,8 +337,7 @@ public class ClassPathXmlApplicationContextTests {
};
ResourceTestBean resource1 = (ResourceTestBean) ctx.getBean("resource1");
ResourceTestBean resource2 = (ResourceTestBean) ctx.getBean("resource2");
boolean condition = resource1.getResource() instanceof ClassPathResource;
assertThat(condition).isTrue();
assertThat(resource1.getResource()).isInstanceOf(ClassPathResource.class);
StringWriter writer = new StringWriter();
FileCopyUtils.copy(new InputStreamReader(resource1.getResource().getInputStream()), writer);
assertThat(writer.toString()).isEqualTo("contexttest");

2
spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
View File

@@ -118,7 +118,7 @@ class ConversionServiceFactoryBeanTests {
ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext(fileName, getClass());
ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class);
assertThat(resourceClass.isInstance(tb.getResource())).isTrue();
assertThat(tb.getResourceArray()).isNotEmpty();
assertThat(tb.getResourceArray()).hasSize(1);
assertThat(resourceClass.isInstance(tb.getResourceArray()[0])).isTrue();
assertThat(tb.getResourceMap()).hasSize(1);
assertThat(resourceClass.isInstance(tb.getResourceMap().get("key1"))).isTrue();