You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/03/26 01:43:11 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2240]
upgrade maven-surefire-plugin version to 3.0.0-M5 to support junit5 (#2318)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new e94ac1e [SCB-2240] upgrade maven-surefire-plugin version to 3.0.0-M5 to support junit5 (#2318)
e94ac1e is described below
commit e94ac1e33faf3053f37a3f59cce22b3d58bfcd48
Author: wujimin <wu...@huawei.com>
AuthorDate: Fri Mar 26 09:43:02 2021 +0800
[SCB-2240] upgrade maven-surefire-plugin version to 3.0.0-M5 to support junit5 (#2318)
---
.../common/rest/codec/query/QueryCodecCsvTest.java | 2 +-
.../rest/codec/query/QueryCodecMultiTest.java | 2 +-
.../rest/codec/query/QueryCodecPipesTest.java | 2 +-
.../common/rest/codec/query/QueryCodecSsvTest.java | 2 +-
.../common/rest/codec/query/QueryCodecTsvTest.java | 2 +-
pom.xml | 1 +
.../transport/rest/client/RestClientTestBase.java | 27 ++++++++++++++++++++--
7 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java
index 728ab0b..18e9ba4 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java
@@ -33,7 +33,7 @@ class QueryCodecCsvTest extends QueryCodecTestBase {
class Encode {
@Test
void should_encode_date() throws Exception {
- should_encode("?q=1970-01-01T00%3A00%3A00.000%2B0000", new Date(0));
+ should_encode("?q=1970-01-01T00%3A00%3A00.000%2B00%3A00", new Date(0));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java
index 9f48339..948b831 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java
@@ -33,7 +33,7 @@ class QueryCodecMultiTest extends QueryCodecTestBase {
class Encode {
@Test
void should_encode_date() throws Exception {
- should_encode("?q=1970-01-01T00%3A00%3A00.000%2B0000", new Date(0));
+ should_encode("?q=1970-01-01T00%3A00%3A00.000%2B00%3A00", new Date(0));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java
index 7d73734..aaa0712 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java
@@ -33,7 +33,7 @@ class QueryCodecPipesTest extends QueryCodecTestBase {
class Encode {
@Test
void should_encode_date() throws Exception {
- should_encode("?q=1970-01-01T00%3A00%3A00.000%2B0000", new Date(0));
+ should_encode("?q=1970-01-01T00%3A00%3A00.000%2B00%3A00", new Date(0));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java
index 13542b1..bbbfb55 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java
@@ -33,7 +33,7 @@ class QueryCodecSsvTest extends QueryCodecTestBase {
class Encode {
@Test
void should_encode_date() throws Exception {
- should_encode("?q=1970-01-01T00%3A00%3A00.000%2B0000", new Date(0));
+ should_encode("?q=1970-01-01T00%3A00%3A00.000%2B00%3A00", new Date(0));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java
index e598407..2a83599 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java
@@ -33,7 +33,7 @@ class QueryCodecTsvTest extends QueryCodecTestBase {
class Encode {
@Test
void should_encode_date() throws Exception {
- should_encode("?q=1970-01-01T00%3A00%3A00.000%2B0000", new Date(0));
+ should_encode("?q=1970-01-01T00%3A00%3A00.000%2B00%3A00", new Date(0));
}
@Test
diff --git a/pom.xml b/pom.xml
index f9a1828..6528ee3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
<configuration>
<skip>${maven.test.skip}</skip>
<testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java
index fe2c4ba..2288b26 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java
@@ -18,10 +18,12 @@ package org.apache.servicecomb.transport.rest.client;
import static org.apache.servicecomb.transport.rest.client.RestFeatureController.SCHEMA_ID;
+import java.util.Arrays;
import java.util.Map;
import org.apache.servicecomb.common.rest.definition.RestMetaUtils;
import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
+import org.apache.servicecomb.common.rest.filter.inner.RestServerCodecFilter;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.Endpoint;
@@ -30,6 +32,9 @@ import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.core.definition.OperationMeta;
+import org.apache.servicecomb.core.filter.impl.ProducerOperationFilter;
+import org.apache.servicecomb.core.filter.impl.ScheduleFilter;
+import org.apache.servicecomb.core.filter.impl.SimpleLoadBalanceFilter;
import org.apache.servicecomb.core.invocation.InvocationFactory;
import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
@@ -63,8 +68,26 @@ public class RestClientTestBase {
static void beforeAll() {
ConfigUtil.installDynamicConfig();
scbEngine = SCBBootstrap.createSCBEngineForTest()
- .addProducerMeta(SCHEMA_ID, new RestFeatureController())
- .run();
+ .addProducerMeta(SCHEMA_ID, new RestFeatureController());
+
+ RestClientTransportContextFactory transportContextFactory = new RestClientTransportContextFactory()
+ .setBoundaryFactory(BoundaryFactory.DEFAULT)
+ .setHttpClientRequestFactory(HttpClientRequestFactory.DEFAULT);
+ RestClientCodecFilter restClientCodecFilter = new RestClientCodecFilter()
+ .setTransportContextFactory(transportContextFactory)
+ .setEncoder(new RestClientEncoder())
+ .setDecoder(new RestClientDecoder());
+ scbEngine.getFilterChainsManager()
+ .addFilters(Arrays.asList(
+ new SimpleLoadBalanceFilter(),
+ restClientCodecFilter,
+ new RestClientSenderFilter(),
+ new RestServerCodecFilter(),
+ new ScheduleFilter(),
+ new ProducerOperationFilter()
+ ));
+
+ scbEngine.run();
HttpClients.load();
}