iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6013 from eugenp/BAEL-1978-v2 

fix spring-core mockito issue
This commit is contained in:
Loredana Crusoveanu 2018-12-29 00:36:14 +02:00 committed by GitHub
parent be9eed4fd7 3220d1b958
commit e6100cdbc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-core/pom.xml
View File

@ -85,6 +85,7 @@
<lombok.version>1.16.12</lombok.version> <lombok.version>1.16.12</lombok.version>
<commons.io.version>2.5</commons.io.version> <commons.io.version>2.5</commons.io.version>
<spring-boot.version>1.5.2.RELEASE</spring-boot.version> <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
<mockito.version>1.10.19</mockito.version>
</properties> </properties>
</project> </project>

3
spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java
View File

@ -108,8 +108,7 @@ public class SpringResourceIntegrationTest {
@Test @Test
public void whenClassPathResourceWithRelativePath_thenReadSuccessful() throws IOException { public void whenClassPathResourceWithRelativePath_thenReadSuccessful() throws IOException {
// final File resource = new ClassPathResource("../../../data/employees.dat", SpringResourceIntegrationTest.class).getFile(); final File resource = new ClassPathResource("../../../data/employees.dat", SpringResourceIntegrationTest.class).getFile();
final File resource = new ClassPathResource("/data/employees.dat", SpringResourceIntegrationTest.class).getFile();
final String employees = new String(Files.readAllBytes(resource.toPath())); final String employees = new String(Files.readAllBytes(resource.toPath()));
assertEquals(EMPLOYEES_EXPECTED, employees); assertEquals(EMPLOYEES_EXPECTED, employees);
} }