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

Polish SerializationTestUtils, clean up warnings, etc.

Browse Source
This commit is contained in:
Sam Brannen
2020-06-20 18:17:03 +02:00
parent 9d5881e0ad
commit ab0e651547
43 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java
View File

@@ -164,7 +164,7 @@ public class MessageHeadersTests {
map.put("name", "joe");
map.put("age", 42);
MessageHeaders input = new MessageHeaders(map);
MessageHeaders output = (MessageHeaders) SerializationTestUtils.serializeAndDeserialize(input);
MessageHeaders output = SerializationTestUtils.serializeAndDeserialize(input);
assertThat(output.get("name")).isEqualTo("joe");
assertThat(output.get("age")).isEqualTo(42);
assertThat(input.get("name")).isEqualTo("joe");
@@ -178,7 +178,7 @@ public class MessageHeadersTests {
map.put("name", "joe");
map.put("address", address);
MessageHeaders input = new MessageHeaders(map);
MessageHeaders output = (MessageHeaders) SerializationTestUtils.serializeAndDeserialize(input);
MessageHeaders output = SerializationTestUtils.serializeAndDeserialize(input);
assertThat(output.get("name")).isEqualTo("joe");
assertThat(output.get("address")).isNull();
assertThat(input.get("name")).isEqualTo("joe");

4
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java
View File

@@ -27,8 +27,8 @@ import java.util.function.Function;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import io.rsocket.AbstractRSocket;
import io.rsocket.Payload;
import io.rsocket.RSocket;
import io.rsocket.metadata.WellKnownMimeType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -248,7 +248,7 @@ public class DefaultRSocketRequesterTests {
}
private static class TestRSocket extends AbstractRSocket {
private static class TestRSocket implements RSocket {
private Mono<Payload> payloadMonoToReturn = Mono.empty();
private Flux<Payload> payloadFluxToReturn = Flux.empty();

5
spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java
View File

@@ -23,7 +23,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.util.ReferenceCounted;
import io.rsocket.AbstractRSocket;
import io.rsocket.RSocket;
import io.rsocket.SocketAcceptor;
import io.rsocket.core.RSocketServer;
@@ -240,7 +239,7 @@ class RSocketBufferLeakTests {
* Store all intercepted incoming and outgoing payloads and then use
* {@link #checkForLeaks()} at the end to check reference counts.
*/
private static class PayloadInterceptor extends AbstractRSocket implements RSocketInterceptor {
private static class PayloadInterceptor implements RSocket, RSocketInterceptor {
private final List<PayloadSavingDecorator> rsockets = new CopyOnWriteArrayList<>();
@@ -288,7 +287,7 @@ class RSocketBufferLeakTests {
}
private static class PayloadSavingDecorator extends AbstractRSocket {
private static class PayloadSavingDecorator implements RSocket {
private final RSocket delegate;

2
spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java
View File

@@ -204,7 +204,7 @@ public class RSocketServerToClientIntegrationTests {
Mono.fromRunnable(testEcho)
.doOnError(ex -> result.onError(ex))
.doOnSuccess(o -> result.onComplete())
.subscribeOn(Schedulers.elastic()) // StepVerifier will block
.subscribeOn(Schedulers.boundedElastic()) // StepVerifier will block
.subscribe();
}
}

4
spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-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.
@@ -384,7 +384,7 @@ public class MessageHeaderAccessorTests {
mutableAccessor.setContentType(MimeTypeUtils.TEXT_PLAIN);
message = new GenericMessage<>(message.getPayload(), mutableAccessor.getMessageHeaders());
Message<?> output = (Message<?>) SerializationTestUtils.serializeAndDeserialize(message);
Message<?> output = SerializationTestUtils.serializeAndDeserialize(message);
assertThat(output.getPayload()).isEqualTo("test");
assertThat(output.getHeaders().get("foo")).isEqualTo("bar");
assertThat(output.getHeaders().get(MessageHeaders.CONTENT_TYPE)).isNotNull();