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

Polish contribution

Browse Source 
See gh-31700
This commit is contained in:
Stéphane Nicoll
2023-12-06 14:49:41 +01:00
parent 9704b809b1
commit 25537938d6
5 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2023 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.
@@ -29,9 +29,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
/**
* Tests for {@link ResourceArrayPropertyEditor}.
*
* @author Dave Syer
* @author Juergen Hoeller
* @author Yanming Zhou
* @author Stephane Nicoll
*/
class ResourceArrayPropertyEditorTests {
@@ -87,12 +90,30 @@ class ResourceArrayPropertyEditorTests {
}
@Test
void commaDelimitedResources() {
void commaDelimitedResourcesWithSingleResource() {
PropertyEditor editor = new ResourceArrayPropertyEditor();
editor.setAsText("classpath:org/springframework/core/io/support/ResourceArrayPropertyEditor.class,file:/foo/bar.txt");
editor.setAsText("classpath:org/springframework/core/io/support/ResourceArrayPropertyEditor.class,file:/test.txt");
Resource[] resources = (Resource[]) editor.getValue();
assertThat(resources).isNotNull();
assertThat(resources[0]).isInstanceOf(ClassPathResource.class);
assertThat(resources[1]).isInstanceOf(FileUrlResource.class);
assertThat(resources[0]).isInstanceOfSatisfying(ClassPathResource.class,
resource -> assertThat(resource.exists()).isTrue());
assertThat(resources[1]).isInstanceOfSatisfying(FileUrlResource.class,
resource -> assertThat(resource.getFilename()).isEqualTo("test.txt"));
}
@Test
void commaDelimitedResourcesWithMultipleResources() {
PropertyEditor editor = new ResourceArrayPropertyEditor();
editor.setAsText("file:/test.txt, classpath:org/springframework/core/io/support/test-resources/*.txt");
Resource[] resources = (Resource[]) editor.getValue();
assertThat(resources).isNotNull();
assertThat(resources[0]).isInstanceOfSatisfying(FileUrlResource.class,
resource -> assertThat(resource.getFilename()).isEqualTo("test.txt"));
assertThat(resources).anySatisfy(candidate ->
assertThat(candidate.getFilename()).isEqualTo("resource1.txt"));
assertThat(resources).anySatisfy(candidate ->
assertThat(candidate.getFilename()).isEqualTo("resource2.txt"));
assertThat(resources).hasSize(3);
}
}