This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit dde1623585ff844654cc3321b289ecfb3389c684 Author: liubao <[email protected]> AuthorDate: Fri Nov 15 15:36:09 2019 +0800 [SCB-1592]upgrade vert.x and netty.(3)fixed testing failures and upgrade tcnetty --- .../org/apache/servicecomb/edge/core/TestEdgeInvocation.java | 10 ++++++++++ java-chassis-dependencies/default/pom.xml | 2 +- scripts/travis.sh | 2 +- .../transport/rest/vertx/TestVertxRestDispatcher.java | 10 +++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeInvocation.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeInvocation.java index 8995cbd..177c44c 100644 --- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeInvocation.java +++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeInvocation.java @@ -50,6 +50,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import io.vertx.core.Context; +import io.vertx.core.Vertx; import io.vertx.core.impl.VertxImpl; import io.vertx.ext.web.RoutingContext; import mockit.Deencapsulation; @@ -61,6 +62,8 @@ import mockit.Mocked; public class TestEdgeInvocation { String microserviceName = "ms"; + @Mocked Vertx vertx; + @Mocked RoutingContext routingContext; @@ -87,6 +90,13 @@ public class TestEdgeInvocation { @Before public void setup() { + new Expectations() { + { + Vertx.currentContext(); + result = context; + } + }; + referenceConfig.setMicroserviceVersionRule(microserviceVersionRule); referenceConfig.setTransport("rest"); diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml index 58d06e5..93117ea 100644 --- a/java-chassis-dependencies/default/pom.xml +++ b/java-chassis-dependencies/default/pom.xml @@ -102,7 +102,7 @@ <spring-cloud.version>Edgware.SR3</spring-cloud.version> <!-- Spring Zuul handling of gzip response has bug in version Dalston.SR1 --> <swagger.version>1.5.22</swagger.version> <swagger2markup.version>1.3.3</swagger2markup.version> - <tcnetty.version>2.0.22.Final</tcnetty.version> + <tcnetty.version>2.0.26.Final</tcnetty.version> <tec-zkclient.version>0.10</tec-zkclient.version> <tomakehurst.version>2.6.0</tomakehurst.version> <vertx.version>3.6.3</vertx.version> diff --git a/scripts/travis.sh b/scripts/travis.sh index 3d14395..7ce9978 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -31,7 +31,7 @@ if [ "$1" == "install" ]; then if [ "$TAGGEDCOMMIT" == "true" ]; then echo "Skipping the installation as it is tagged commit" else - mvn apache-rat:check -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Pit,samples,distribution + mvn apache-rat:check -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Pit,distribution if [ $? != 0 ]; then echo "${red}Rat check failed.${reset}" exit 1 diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java index 2d8185c..b6e1861 100644 --- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java +++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java @@ -47,6 +47,7 @@ import io.vertx.core.AsyncResult; import io.vertx.core.Context; import io.vertx.core.Handler; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.Cookie; import io.vertx.core.http.HttpMethod; @@ -278,7 +279,7 @@ public class TestVertxRestDispatcher { } @Test - public void onRequest(@Mocked Context context, @Mocked HttpServerRequest request, + public void onRequest(@Mocked Vertx vertx, @Mocked Context context, @Mocked HttpServerRequest request, @Mocked SocketAddress socketAdrress) { Map<String, Object> map = new HashMap<>(); RoutingContext routingContext = new MockUp<RoutingContext>() { @@ -294,6 +295,13 @@ public class TestVertxRestDispatcher { } }.getMockInstance(); + new Expectations() { + { + Vertx.currentContext(); + result = context; + } + }; + Deencapsulation.invoke(dispatcher, "onRequest", routingContext); Assert.assertEquals(VertxRestInvocation.class, map.get(RestConst.REST_PRODUCER_INVOCATION).getClass());
