ATS-35 : T-Engines: update Docker Transformers to Spring Boot 2.0.x GA

- upgraded to Spring boot 2.0.5
   - added dependency to spring-boot-starter-web (before it was brought in by thymeleaf 1.5.15)
   - removed try-catch since UnsupportedEncodingException is not thrown anymore by HierarchicalUriComponents.encodeUriComponent(..)
   - updated WebApplicationConfig to implement WebMvcConfigurer (WebMvcConfigurerAdapter is deprecated)
   - updated import of LocalServerPort
   - updated tests to use new method from InvocationOnMock
This commit is contained in:
DenisGabriela
2018-10-08 14:38:27 +03:00
parent e112d25ee7
commit 24d44398ab
7 changed files with 24 additions and 26 deletions

View File

@@ -84,14 +84,14 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest
doAnswer((Answer) invocation ->
{
File sourceFile = invocation.getArgumentAt(0, File.class);
File targetFile = invocation.getArgumentAt(1, File.class);
File sourceFile = invocation.getArgument(0);
File targetFile = invocation.getArgument(1);
String actualTargetExtension = StringUtils.getFilenameExtension(targetFile.getAbsolutePath());
assertNotNull(sourceFile);
assertNotNull(targetFile);
Long actualTimeout = invocation.getArgumentAt(2, Long.class);
Long actualTimeout = invocation.getArgument(2);
assertNotNull(actualTimeout);
if (expectedTimeout != null)
{