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

fix: support multiple stubs files directories (bug fix) (#1801)

Browse Source 
* fix: support multiple stubs files directories (bug fix)

- fix methods
  - ResourcesFileSource - child()
  - ResourcesFileSource - getBinaryFileNamed()
- add test case.
- add test stubs files.

* style: change import order

* style: apply checkstyle and add license header.
This commit is contained in:
huneea
2022-06-20 23:53:43 +09:00
committed by GitHub
parent 6300619f3a
commit 5f5a2c93bc
6 changed files with 111 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import static java.util.Arrays.asList;
/**
* @author Dave Syer
* @author Pei-Tang Huang
* @author Hunhee Jung
*/
public class ResourcesFileSource implements FileSource {
@@ -111,7 +112,10 @@ public class ResourcesFileSource implements FileSource {
try {
UrlResource uri = new UrlResource(resource.getUri());
if (uri.exists()) {
return resource.getBinaryFileNamed(name);
Resource relativeResource = uri.createRelative(name);
if (relativeResource.exists()) {
return resource.getBinaryFileNamed(name);
}
}
}
catch (IOException e) {
@@ -147,8 +151,9 @@ public class ResourcesFileSource implements FileSource {
for (FileSource resource : this.sources) {
try {
UrlResource uri = new UrlResource(resource.child(subDirectoryName).getUri());
if (uri.createRelative(subDirectoryName).exists()) {
childSources.add(resource.child(subDirectoryName));
if (uri.exists()) {
FileSource child = resource.child(subDirectoryName);
childSources.add(child);
}
}
catch (IOException e) {

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

@@ -0,0 +1,59 @@
/*
* Copyright 2013-2020 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.contract.wiremock.file;
import com.github.tomakehurst.wiremock.common.FileSource;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat;
class ResourcesFileSourceTest {
@DisplayName("find all files in the multiple files directories.")
@Test
void child() {
//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
String filesDirName = "__files";
FileSource fileSource = resourcesFileSource.child(filesDirName);
//then
assertThat(fileSource).isInstanceOf(ResourcesFileSource.class);
assertThat(fileSource.listFilesRecursively()).hasSize(4);
}
@DisplayName("find a mapped response file in multiple directories.")
@Test
void getBinaryFileNamed() {
//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
assertThat(resourcesFileSource.getBinaryFileNamed("response-bannerList-success.json").getStream()).isNotEmpty();
assertThat(resourcesFileSource.getBinaryFileNamed("response-noticeList-success.json").getStream()).isNotEmpty();
}
}

5
spring-cloud-contract-wiremock/src/test/resources/files_banner/__files/response-bannerList-error.json Normal file
View File

@@ -0,0 +1,5 @@
{
"successful": false,
"message": "INVALID_PARAMETER",
"result": null
}

17
spring-cloud-contract-wiremock/src/test/resources/files_banner/__files/response-bannerList-success.json Normal file
View File

@@ -0,0 +1,17 @@
{
"results": [
{
"seq": 1,
"title": "1111111111111111111111111",
"content": "1111111111111111111111111111111",
"regDate": "2022/06/17"
},
{
"seq": 2,
"title": "22222222222222222222222222",
"content": "2222222222222222222222222222222",
"regDate": "2022/06/18"
}
]
}

5
spring-cloud-contract-wiremock/src/test/resources/files_notice/__files/response-noticeList-error.json Normal file
View File

@@ -0,0 +1,5 @@
{
"successful": false,
"message": "INVALID_PARAMETER",
"result": null
}

17
spring-cloud-contract-wiremock/src/test/resources/files_notice/__files/response-noticeList-success.json Normal file
View File

@@ -0,0 +1,17 @@
{
"results": [
{
"seq": 1,
"title": "[AAA] BBBBBBBBBBBBBBB",
"content": "CCCCCCCCCCCCCCCCCCCCCCCCC",
"regDate": "2022/06/17"
},
{
"seq": 2,
"title": "[BBB] CCCCCCCCCCCCCCCCCCCCCCC",
"content": "DDDDDDDDDDDDDDDDDDD",
"regDate": "2022/06/18"
}
]
}