Skip to content

Commit 0ab392a

Browse files
author
Oleh Dokuka
committed
improves e2e tests for transports
Signed-off-by: Oleh Dokuka <odokuka@vmware.com> Signed-off-by: Oleh Dokuka <oleh.dokuka@icloud.com> Signed-off-by: OlegDokuka <odokuka@vmware.com>
1 parent e0f4bc3 commit 0ab392a

14 files changed

+491
-257
lines changed

‎rsocket-test/src/main/java/io/rsocket/test/TransportTest.java‎

Lines changed: 186 additions & 61 deletions
Large diffs are not rendered by default.

‎rsocket-transport-local/src/test/java/io/rsocket/transport/local/LocalResumableTransportTest.java‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,20 +19,31 @@
1919
import io.rsocket.test.TransportTest;
2020
import java.time.Duration;
2121
import java.util.UUID;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.TestInfo;
2224

2325
final class LocalResumableTransportTest implements TransportTest {
2426

25-
private final TransportPair transportPair =
26-
new TransportPair<>(
27-
() -> "test-" + UUID.randomUUID(),
28-
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
29-
(address, allocator) -> LocalServerTransport.create(address),
30-
false,
31-
true);
27+
private TransportPair transportPair;
28+
29+
@BeforeEach
30+
void createTestPair(TestInfo testInfo) {
31+
transportPair =
32+
new TransportPair<>(
33+
() ->
34+
"LocalResumableTransportTest-"
35+
+ testInfo.getDisplayName()
36+
+ "-"
37+
+ UUID.randomUUID(),
38+
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
39+
(address, allocator) -> LocalServerTransport.create(address),
40+
false,
41+
true);
42+
}
3243

3344
@Override
3445
public Duration getTimeout() {
35-
return Duration.ofSeconds(10);
46+
return Duration.ofMinutes(1);
3647
}
3748

3849
@Override

‎rsocket-transport-local/src/test/java/io/rsocket/transport/local/LocalResumableWithFragmentationTransportTest.java‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,20 +19,31 @@
1919
import io.rsocket.test.TransportTest;
2020
import java.time.Duration;
2121
import java.util.UUID;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.TestInfo;
2224

2325
final class LocalResumableWithFragmentationTransportTest implements TransportTest {
2426

25-
private final TransportPair transportPair =
26-
new TransportPair<>(
27-
() -> "test-" + UUID.randomUUID(),
28-
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
29-
(address, allocator) -> LocalServerTransport.create(address),
30-
true,
31-
true);
27+
private TransportPair transportPair;
28+
29+
@BeforeEach
30+
void createTestPair(TestInfo testInfo) {
31+
transportPair =
32+
new TransportPair<>(
33+
() ->
34+
"LocalResumableWithFragmentationTransportTest-"
35+
+ testInfo.getDisplayName()
36+
+ "-"
37+
+ UUID.randomUUID(),
38+
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
39+
(address, allocator) -> LocalServerTransport.create(address),
40+
true,
41+
true);
42+
}
3243

3344
@Override
3445
public Duration getTimeout() {
35-
return Duration.ofSeconds(10);
46+
return Duration.ofMinutes(1);
3647
}
3748

3849
@Override

‎rsocket-transport-local/src/test/java/io/rsocket/transport/local/LocalTransportTest.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,18 +19,25 @@
1919
import io.rsocket.test.TransportTest;
2020
import java.time.Duration;
2121
import java.util.UUID;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.TestInfo;
2224

2325
final class LocalTransportTest implements TransportTest {
2426

25-
private final TransportPair transportPair =
26-
new TransportPair<>(
27-
() -> "test-" + UUID.randomUUID(),
28-
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
29-
(address, allocator) -> LocalServerTransport.create(address));
27+
private TransportPair transportPair;
28+
29+
@BeforeEach
30+
void createTestPair(TestInfo testInfo) {
31+
transportPair =
32+
new TransportPair<>(
33+
() -> "LocalTransportTest-" + testInfo.getDisplayName() + "-" + UUID.randomUUID(),
34+
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
35+
(address, allocator) -> LocalServerTransport.create(address));
36+
}
3037

3138
@Override
3239
public Duration getTimeout() {
33-
return Duration.ofSeconds(10);
40+
return Duration.ofMinutes(1);
3441
}
3542

3643
@Override

‎rsocket-transport-local/src/test/java/io/rsocket/transport/local/LocalTransportWithFragmentationTest.java‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,19 +19,30 @@
1919
import io.rsocket.test.TransportTest;
2020
import java.time.Duration;
2121
import java.util.UUID;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.TestInfo;
2224

2325
final class LocalTransportWithFragmentationTest implements TransportTest {
2426

25-
private final TransportPair transportPair =
26-
new TransportPair<>(
27-
() -> "test-" + UUID.randomUUID(),
28-
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
29-
(address, allocator) -> LocalServerTransport.create(address),
30-
true);
27+
private TransportPair transportPair;
28+
29+
@BeforeEach
30+
void createTestPair(TestInfo testInfo) {
31+
transportPair =
32+
new TransportPair<>(
33+
() ->
34+
"LocalTransportWithFragmentationTest-"
35+
+ testInfo.getDisplayName()
36+
+ "-"
37+
+ UUID.randomUUID(),
38+
(address, server, allocator) -> LocalClientTransport.create(address, allocator),
39+
(address, allocator) -> LocalServerTransport.create(address),
40+
true);
41+
}
3142

3243
@Override
3344
public Duration getTimeout() {
34-
return Duration.ofSeconds(10);
45+
return Duration.ofMinutes(1);
3546
}
3647

3748
@Override

‎rsocket-transport-netty/src/test/java/io/rsocket/transport/netty/TcpFragmentationTransportTest.java‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,25 +22,31 @@
2222
import io.rsocket.transport.netty.server.TcpServerTransport;
2323
import java.net.InetSocketAddress;
2424
import java.time.Duration;
25+
import org.junit.jupiter.api.BeforeEach;
2526
import reactor.netty.tcp.TcpClient;
2627
import reactor.netty.tcp.TcpServer;
2728

2829
final class TcpFragmentationTransportTest implements TransportTest {
30+
private TransportPair transportPair;
2931

30-
private final TransportPair transportPair =
31-
new TransportPair<>(
32-
() -> InetSocketAddress.createUnresolved("localhost", 0),
33-
(address, server, allocator) ->
34-
TcpClientTransport.create(
35-
TcpClient.create()
36-
.remoteAddress(server::address)
37-
.option(ChannelOption.ALLOCATOR, allocator)),
38-
(address, allocator) ->
39-
TcpServerTransport.create(
32+
@BeforeEach
33+
void createTestPair() {
34+
transportPair =
35+
new TransportPair<>(
36+
() -> InetSocketAddress.createUnresolved("localhost", 0),
37+
(address, server, allocator) ->
38+
TcpClientTransport.create(
39+
TcpClient.create()
40+
.remoteAddress(server::address)
41+
.option(ChannelOption.ALLOCATOR, allocator)),
42+
(address, allocator) -> {
43+
return TcpServerTransport.create(
4044
TcpServer.create()
4145
.bindAddress(() -> address)
42-
.option(ChannelOption.ALLOCATOR, allocator)),
43-
true);
46+
.option(ChannelOption.ALLOCATOR, allocator));
47+
},
48+
true);
49+
}
4450

4551
@Override
4652
public Duration getTimeout() {

‎rsocket-transport-netty/src/test/java/io/rsocket/transport/netty/TcpResumableTransportTest.java‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,26 +22,32 @@
2222
import io.rsocket.transport.netty.server.TcpServerTransport;
2323
import java.net.InetSocketAddress;
2424
import java.time.Duration;
25+
import org.junit.jupiter.api.BeforeEach;
2526
import reactor.netty.tcp.TcpClient;
2627
import reactor.netty.tcp.TcpServer;
2728

2829
final class TcpResumableTransportTest implements TransportTest {
30+
private TransportPair transportPair;
2931

30-
private final TransportPair transportPair =
31-
new TransportPair<>(
32-
() -> InetSocketAddress.createUnresolved("localhost", 0),
33-
(address, server, allocator) ->
34-
TcpClientTransport.create(
35-
TcpClient.create()
36-
.remoteAddress(server::address)
37-
.option(ChannelOption.ALLOCATOR, allocator)),
38-
(address, allocator) ->
39-
TcpServerTransport.create(
32+
@BeforeEach
33+
void createTestPair() {
34+
transportPair =
35+
new TransportPair<>(
36+
() -> InetSocketAddress.createUnresolved("localhost", 0),
37+
(address, server, allocator) ->
38+
TcpClientTransport.create(
39+
TcpClient.create()
40+
.remoteAddress(server::address)
41+
.option(ChannelOption.ALLOCATOR, allocator)),
42+
(address, allocator) -> {
43+
return TcpServerTransport.create(
4044
TcpServer.create()
4145
.bindAddress(() -> address)
42-
.option(ChannelOption.ALLOCATOR, allocator)),
43-
false,
44-
true);
46+
.option(ChannelOption.ALLOCATOR, allocator));
47+
},
48+
false,
49+
true);
50+
}
4551

4652
@Override
4753
public Duration getTimeout() {

‎rsocket-transport-netty/src/test/java/io/rsocket/transport/netty/TcpResumableWithFragmentationTransportTest.java‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,26 +22,32 @@
2222
import io.rsocket.transport.netty.server.TcpServerTransport;
2323
import java.net.InetSocketAddress;
2424
import java.time.Duration;
25+
import org.junit.jupiter.api.BeforeEach;
2526
import reactor.netty.tcp.TcpClient;
2627
import reactor.netty.tcp.TcpServer;
2728

2829
final class TcpResumableWithFragmentationTransportTest implements TransportTest {
30+
private TransportPair transportPair;
2931

30-
private final TransportPair transportPair =
31-
new TransportPair<>(
32-
() -> InetSocketAddress.createUnresolved("localhost", 0),
33-
(address, server, allocator) ->
34-
TcpClientTransport.create(
35-
TcpClient.create()
36-
.remoteAddress(server::address)
37-
.option(ChannelOption.ALLOCATOR, allocator)),
38-
(address, allocator) ->
39-
TcpServerTransport.create(
32+
@BeforeEach
33+
void createTestPair() {
34+
transportPair =
35+
new TransportPair<>(
36+
() -> InetSocketAddress.createUnresolved("localhost", 0),
37+
(address, server, allocator) ->
38+
TcpClientTransport.create(
39+
TcpClient.create()
40+
.remoteAddress(server::address)
41+
.option(ChannelOption.ALLOCATOR, allocator)),
42+
(address, allocator) -> {
43+
return TcpServerTransport.create(
4044
TcpServer.create()
4145
.bindAddress(() -> address)
42-
.option(ChannelOption.ALLOCATOR, allocator)),
43-
true,
44-
true);
46+
.option(ChannelOption.ALLOCATOR, allocator));
47+
},
48+
true,
49+
true);
50+
}
4551

4652
@Override
4753
public Duration getTimeout() {

0 commit comments

Comments
 (0)