You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2021/11/22 18:46:39 UTC
[ignite-3] 01/02: Fixing NettyServerTest
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-15307
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 4c90e1c60b19b8e1a96c004f708d20b7b327c2a3
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Mon Nov 22 21:44:49 2021 +0300
Fixing NettyServerTest
---
.../ignite/internal/network/netty/NettyServerTest.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java
index 2c93f49..b76199a 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/NettyServerTest.java
@@ -40,7 +40,6 @@ import java.nio.channels.ClosedChannelException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.configuration.schemas.network.NetworkConfiguration;
-import org.apache.ignite.configuration.schemas.network.NetworkView;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.network.handshake.HandshakeAction;
@@ -64,6 +63,9 @@ import org.mockito.verification.VerificationMode;
*/
@ExtendWith(ConfigurationExtension.class)
public class NettyServerTest {
+ /** Bootstrap factory. */
+ private NettyBootstrapFactory bootstrapFactory;
+
/** Server. */
private NettyServer server;
@@ -75,8 +77,9 @@ public class NettyServerTest {
* After each.
*/
@AfterEach
- final void tearDown() {
+ final void tearDown() throws Exception {
server.stop().join();
+ bootstrapFactory.stop();
}
/**
@@ -201,6 +204,9 @@ public class NettyServerTest {
return mock(NetworkMessage.class);
}
});
+
+ bootstrapFactory = new NettyBootstrapFactory(serverCfg.value(), "");
+ bootstrapFactory.start();
server = new NettyServer(
"test",
@@ -211,7 +217,7 @@ public class NettyServerTest {
(socketAddress, message) -> {
},
registry,
- new NettyBootstrapFactory(serverCfg.value(), "")
+ bootstrapFactory
);
server.start().get(3, TimeUnit.SECONDS);
@@ -268,7 +274,8 @@ public class NettyServerTest {
* @return NettyServer.
*/
private NettyServer getServer(ChannelFuture future, boolean shouldStart) {
- var bootstrapFactory = Mockito.spy(new NettyBootstrapFactory(Mockito.mock(NetworkView.class), ""));
+ bootstrapFactory = new NettyBootstrapFactory(serverCfg.value(), "");
+ bootstrapFactory.start();
var server = new NettyServer(
"test",