SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the changed relative path calculation

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-06-27 17:58:20 +02:00
parent 5f5a2c93bc
commit 7d8ea60344
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java
View File

@@ -112,7 +112,7 @@ public class ResourcesFileSource implements FileSource {
try {
UrlResource uri = new UrlResource(resource.getUri());
if (uri.exists()) {
Resource relativeResource = uri.createRelative(name);
Resource relativeResource = new UrlResource(uri.getURI() + "/" + name);
if (relativeResource.exists()) {
return resource.getBinaryFileNamed(name);
}

11
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSourceTest.java
View File

@@ -30,16 +30,16 @@ class ResourcesFileSourceTest {
@DisplayName("find all files in the multiple files directories.")
@Test
void child() {
//given
// given
Resource resource1 = new ClassPathResource("src/test/resources/files_banner");
Resource resource2 = new ClassPathResource("src/test/resources/files_notice");
ResourcesFileSource resourcesFileSource = new ResourcesFileSource(resource1, resource2);
//when
// when
String filesDirName = "__files";
FileSource fileSource = resourcesFileSource.child(filesDirName);
//then
// then
assertThat(fileSource).isInstanceOf(ResourcesFileSource.class);
assertThat(fileSource.listFilesRecursively()).hasSize(4);
}
@@ -47,13 +47,14 @@ class ResourcesFileSourceTest {
@DisplayName("find a mapped response file in multiple directories.")
@Test
void getBinaryFileNamed() {
//given
// given
Resource resource1 = new ClassPathResource("src/test/resources/files_banner/__files");
Resource resource2 = new ClassPathResource("src/test/resources/files_notice/__files");
ResourcesFileSource resourcesFileSource = new ResourcesFileSource(resource1, resource2);
//when & then
// when & then
assertThat(resourcesFileSource.getBinaryFileNamed("response-bannerList-success.json").getStream()).isNotEmpty();
assertThat(resourcesFileSource.getBinaryFileNamed("response-noticeList-success.json").getStream()).isNotEmpty();
}
}