Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies; prepare for release

Browse Source 
* Add `spring-web` test dep for `spring-integration-graphql` module
* Fix `MultipartAsRawByteArrayTests` according to the changes in the
`ByteArrayHttpMessageConverter` where it uses `ReadNBytes()` even for
`0` in `Content-Length` header
* Fix Kafka tests to use `RetryListener` interface with `default`
methods instead of already deprecated `RetryListenerSupport`
This commit is contained in:
abilan
2023-03-22 16:41:03 -04:00
parent 1bec420fd1
commit 79870dc78c
4 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2022 the original author or authors.
* Copyright 2015-2023 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.
@@ -32,6 +32,7 @@ import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -57,9 +58,11 @@ public class MultipartAsRawByteArrayTests {
gw.afterPropertiesSet();
gw.start();
String testData = "test data";
HttpServletRequest request = mock(HttpServletRequest.class);
ServletInputStream sis = mock(ServletInputStream.class);
doReturn("test data".getBytes()).when(sis).readAllBytes();
doReturn(testData.getBytes()).when(sis).readNBytes(anyInt());
when(request.getInputStream()).thenReturn(sis);
when(request.getMethod()).thenReturn("POST");
when(request.getHeaderNames()).thenReturn(mock(Enumeration.class));
@@ -70,7 +73,7 @@ public class MultipartAsRawByteArrayTests {
Message<?> received = requestChannel.receive(10000);
assertThat(received).isNotNull();
assertThat(received.getPayload()).isInstanceOf(byte[].class);
assertThat(new String((byte[]) received.getPayload())).isEqualTo("test data");
assertThat(new String((byte[]) received.getPayload())).isEqualTo(testData);
}
}