This is an automated email from the ASF dual-hosted git repository. yukon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-remoting.git
commit d770d5ffb38ecbaf37032a127eb14b3ce80372e8 Author: yukon <[email protected]> AuthorDate: Thu Jun 6 21:38:42 2019 +0800 Fix epoll unit tests bug --- pom.xml | 16 ---------------- remoting-core/remoting-impl/pom.xml | 11 +++++++++++ .../remoting/impl/netty/EpollRemoteConnectionTest.java | 12 +++--------- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index b7ed367..3d28b24 100644 --- a/pom.xml +++ b/pom.xml @@ -9,16 +9,6 @@ <version>0.1.0-SNAPSHOT</version> <packaging>pom</packaging> - <build> - <extensions> - <extension> - <groupId>kr.motd.maven</groupId> - <artifactId>os-maven-plugin</artifactId> - <version>1.5.0.Final</version> - </extension> - </extensions> - </build> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -82,12 +72,6 @@ <version>4.1.26.Final</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - <version>4.1.26.Final</version> - <classifier>${os.detected.name}-${os.detected.arch}</classifier> - </dependency> - <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> <version>1.2.51</version> diff --git a/remoting-core/remoting-impl/pom.xml b/remoting-core/remoting-impl/pom.xml index a8af63c..0ace69f 100644 --- a/remoting-core/remoting-impl/pom.xml +++ b/remoting-core/remoting-impl/pom.xml @@ -12,6 +12,16 @@ <artifactId>remoting-impl</artifactId> + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + <version>1.5.0.Final</version> + </extension> + </extensions> + </build> + <properties> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> @@ -30,6 +40,7 @@ <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> <version>4.1.26.Final</version> + <classifier>${os.detected.name}-${os.detected.arch}</classifier> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/remoting-core/remoting-impl/src/test/java/org/apache/rocketmq/remoting/impl/netty/EpollRemoteConnectionTest.java b/remoting-core/remoting-impl/src/test/java/org/apache/rocketmq/remoting/impl/netty/EpollRemoteConnectionTest.java index cdf1d18..0f4106f 100644 --- a/remoting-core/remoting-impl/src/test/java/org/apache/rocketmq/remoting/impl/netty/EpollRemoteConnectionTest.java +++ b/remoting-core/remoting-impl/src/test/java/org/apache/rocketmq/remoting/impl/netty/EpollRemoteConnectionTest.java @@ -196,14 +196,11 @@ public class EpollRemoteConnectionTest extends BaseTest { @Test public void invokeOnewayToServer_Success() { - final ObjectFuture<RemotingCommand> requestFuture = newObjectFuture(1, 1000); final ObjectFuture<RemotingCommand> responseFuture = newObjectFuture(1, 1000); Interceptor interceptor = new Interceptor() { @Override public void beforeRequest(final RequestContext context) { - requestFuture.putObject(context.getRequest()); - requestFuture.release(); } @Override @@ -217,21 +214,18 @@ public class EpollRemoteConnectionTest extends BaseTest { remotingEpollServer.registerInterceptor(interceptor); // Client to epoll server - remotingClient.invokeOneWay(remoteEpollAddr, request); + remotingClient.invokeOneWay(remoteEpollAddr, requestCommand()); - assertThat(requestFuture.getObject()).isEqualTo(request); assertThat(new String(responseFuture.getObject().payload())).isEqualTo("Pong"); // Epoll client to server - remotingEpollClient.invokeOneWay(remoteAddr, request); + remotingEpollClient.invokeOneWay(remoteAddr, requestCommand()); - assertThat(requestFuture.getObject()).isEqualTo(request); assertThat(new String(responseFuture.getObject().payload())).isEqualTo("Pong"); // Epoll client to epoll server - remotingEpollClient.invokeOneWay(remoteEpollAddr, request); + remotingEpollClient.invokeOneWay(remoteEpollAddr, requestCommand()); - assertThat(requestFuture.getObject()).isEqualTo(request); assertThat(new String(responseFuture.getObject().payload())).isEqualTo("Pong"); } }
