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

Updated code to remove checkstyle issues

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-09-01 12:49:06 +02:00
parent bc6742b67e
commit 847562926a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,9 +123,11 @@ public class ResourcesFileSource implements FileSource {
return resource.getBinaryFileNamed(name); return resource.getBinaryFileNamed(name);
} }
} }
} catch (RuntimeException e) { }
catch (RuntimeException e) {
// Ignore - find next stub file // Ignore - find next stub file
} catch (IOException e) { }
catch (IOException e) {
// Ignore - find next stub file // Ignore - find next stub file
} }
} }

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

@@ -16,25 +16,23 @@
package org.springframework.cloud.contract.wiremock.file; package org.springframework.cloud.contract.wiremock.file;
import com.github.tomakehurst.wiremock.common.BinaryFile;
import com.github.tomakehurst.wiremock.common.ClasspathFileSource;
import com.github.tomakehurst.wiremock.common.FileSource;
import java.io.File; import java.io.File;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import com.github.tomakehurst.wiremock.common.BinaryFile;
import com.github.tomakehurst.wiremock.common.ClasspathFileSource;
import com.github.tomakehurst.wiremock.common.FileSource;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.assertj.core.api.Assertions.assertThat;
@ExtendWith(MockitoExtension.class)
class ResourcesFileSourceTest { class ResourcesFileSourceTest {
@DisplayName("find all files in the multiple files directories.") @DisplayName("find all files in the multiple files directories.")
@@ -80,7 +78,8 @@ class ResourcesFileSourceTest {
ClasspathFileSource classpathFileSource1 = mock(ClasspathFileSource.class); ClasspathFileSource classpathFileSource1 = mock(ClasspathFileSource.class);
when(classpathFileSource1.getUri()).thenReturn(new URI(bannerStubPathInJar)); when(classpathFileSource1.getUri()).thenReturn(new URI(bannerStubPathInJar));
when(classpathFileSource1.exists()).thenReturn(true); when(classpathFileSource1.exists()).thenReturn(true);
when(classpathFileSource1.getBinaryFileNamed(bannerStubFilename)).thenReturn(new BinaryFile(new URI(bannerStubPathInJar + "/response-bannerList-success.json"))); when(classpathFileSource1.getBinaryFileNamed(bannerStubFilename))
.thenReturn(new BinaryFile(new URI(bannerStubPathInJar + "/response-bannerList-success.json")));
ResourcesFileSource resourcesFileSource = new ResourcesFileSource(classpathFileSource1); ResourcesFileSource resourcesFileSource = new ResourcesFileSource(classpathFileSource1);
// when & then // when & then