[SCB-2475] migrate common-rest module to junit5 part 3 (#3193)
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
index ed6d807..94604e2 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java
@@ -43,13 +43,13 @@
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
import io.vertx.core.json.Json;
import io.vertx.ext.web.RoutingContext;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
@@ -57,33 +57,33 @@
public class RestProducerInvocationCreatorTest {
- RoutingContext routingContext = Mockito.mock(RoutingContext.class);
+ final RoutingContext routingContext = Mockito.mock(RoutingContext.class);
- MicroserviceMeta microserviceMeta = Mockito.mock(MicroserviceMeta.class);
+ final MicroserviceMeta microserviceMeta = Mockito.mock(MicroserviceMeta.class);
- ServicePathManager servicePathManager = Mockito.mock(ServicePathManager.class);
+ final ServicePathManager servicePathManager = Mockito.mock(ServicePathManager.class);
- RestOperationMeta restOperationMeta = Mockito.mock(RestOperationMeta.class);
+ final RestOperationMeta restOperationMeta = Mockito.mock(RestOperationMeta.class);
- Endpoint endpoint = Mockito.mock(Endpoint.class);
+ final Endpoint endpoint = Mockito.mock(Endpoint.class);
- HttpServletRequestEx requestEx = Mockito.mock(HttpServletRequestEx.class);
+ final HttpServletRequestEx requestEx = Mockito.mock(HttpServletRequestEx.class);
- HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
+ final HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
- OperationLocator locator = Mockito.mock(OperationLocator.class);
+ final OperationLocator locator = Mockito.mock(OperationLocator.class);
- InvocationRuntimeType invocationRuntimeType = Mockito.mock(InvocationRuntimeType.class);
+ final InvocationRuntimeType invocationRuntimeType = Mockito.mock(InvocationRuntimeType.class);
- OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
+ final OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
- SchemaMeta schemaMeta = Mockito.mock(SchemaMeta.class);
+ final SchemaMeta schemaMeta = Mockito.mock(SchemaMeta.class);
RestProducerInvocationCreator creator;
static SCBEngine engine;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
ArchaiusUtils.resetConfig();
ConfigUtil.installDynamicConfig();
@@ -92,13 +92,13 @@
engine.setStatus(SCBStatus.UP);
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
engine.destroy();
ArchaiusUtils.resetConfig();
}
- @Before
+ @BeforeEach
public void setUp() {
creator = new RestVertxProducerInvocationCreator(routingContext, microserviceMeta, endpoint,
requestEx, responseEx);
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
index 56625c1..0b7734d 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
@@ -73,15 +73,15 @@
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import com.google.common.eventbus.Subscribe;
import io.vertx.core.MultiMap;
import io.vertx.core.buffer.Buffer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
@@ -89,11 +89,11 @@
HttpServletRequestEx requestEx = Mockito.mock(HttpServletRequestEx.class);
- HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
+ final HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
HttpServletResponseEx responseEx;
- ReferenceConfig endpoint = Mockito.mock(ReferenceConfig.class);
+ final ReferenceConfig endpoint = Mockito.mock(ReferenceConfig.class);
Map<String, Object> arguments = new HashMap<>();
@@ -126,7 +126,7 @@
AbstractRestInvocation restInvocation = new AbstractRestInvocationForTest();
- @Before
+ @BeforeEach
public void setup() {
ConfigUtil.installDynamicConfig();
scbEngine = SCBBootstrap.createSCBEngineForTest()
@@ -147,7 +147,7 @@
restInvocation.setHttpServerFilters(httpServerFilters);
}
- @After
+ @AfterEach
public void teardown() {
ArchaiusUtils.resetConfig();
scbEngine.destroy();
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
index 75f0db7..fee6a0e 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
@@ -40,20 +40,20 @@
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
public class TestRestProducerInvocation {
- Transport transport = Mockito.mock(Transport.class);
+ final Transport transport = Mockito.mock(Transport.class);
HttpServletRequestEx requestEx = Mockito.mock(HttpServletRequestEx.class);
- HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
+ final HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
RestProducerInvocation restProducerInvocation;
@@ -61,7 +61,7 @@
boolean scheduleInvocation;
- static List<HttpServerFilter> httpServerFilters = SPIServiceUtils.getSortedService(HttpServerFilter.class);
+ static final List<HttpServerFilter> httpServerFilters = SPIServiceUtils.getSortedService(HttpServerFilter.class);
static SCBEngine scbEngine;
@@ -71,7 +71,7 @@
static MicroserviceMeta microserviceMeta;
- @BeforeClass
+ @BeforeAll
public static void classSetup() {
ConfigUtil.installDynamicConfig();
scbEngine = SCBBootstrap.createSCBEngineForTest()
@@ -82,7 +82,7 @@
microserviceMeta = operationMeta.getMicroserviceMeta();
}
- @AfterClass
+ @AfterAll
public static void classTeardown() {
scbEngine.destroy();
ArchaiusUtils.resetConfig();
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java
index 4216241..a004e74 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java
@@ -19,7 +19,7 @@
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.vertx.http.VertxServerRequestToHttpServletRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import io.vertx.ext.web.RoutingContext;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
index 338b5f7..ae8abc8 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -33,15 +33,15 @@
import org.junit.jupiter.api.Test;
public class TestDoSFix {
- static ObjectMapper mapper = new RestObjectMapper();
+ static final ObjectMapper mapper = new RestObjectMapper();
- static String invalidNum = Strings.repeat("9", 100_0000);
+ static final String invalidNum = Strings.repeat("9", 100_0000);
- static String invalidStr = "\"" + invalidNum + "\"";
+ static final String invalidStr = "\"" + invalidNum + "\"";
- static String invalidArrNum = "[" + invalidNum + "]";
+ static final String invalidArrNum = "[" + invalidNum + "]";
- static String invalidArrStr = "[\"" + invalidNum + "\"]";
+ static final String invalidArrStr = "[\"" + invalidNum + "\"]";
public static class Model {
public Color color;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java
index 04a8b86..0fecdf8 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java
@@ -34,8 +34,6 @@
import org.apache.servicecomb.common.rest.codec.param.BodyProcessorCreator.RawJsonBodyProcessor;
import org.apache.servicecomb.foundation.vertx.stream.BufferInputStream;
import org.junit.jupiter.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -44,22 +42,24 @@
import io.vertx.core.MultiMap;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.impl.headers.HeadersMultiMap;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestBodyProcessor {
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
MultiMap headers;
- RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
+ final RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
ParamValueProcessor processor;
- ByteBuf inputBodyByteBuf = Unpooled.buffer();
+ final ByteBuf inputBodyByteBuf = Unpooled.buffer();
- BufferInputStream inputStream = new BufferInputStream(inputBodyByteBuf);
+ final BufferInputStream inputStream = new BufferInputStream(inputBodyByteBuf);
Buffer outputBodyBuffer;
@@ -92,7 +92,7 @@
initInputStream();
}
- @Before
+ @BeforeEach
public void before() {
headers = new HeadersMultiMap();
value = "value";
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
index 87c6138..ffe1e36 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
@@ -28,23 +28,22 @@
import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory;
import org.apache.servicecomb.common.rest.codec.param.CookieProcessorCreator.CookieProcessor;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.fasterxml.jackson.databind.util.StdDateFormat;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-
public class TestCookieProcessor {
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- Map<String, String> cookies = new HashMap<>();
+ final Map<String, String> cookies = new HashMap<>();
- RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
+ final RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
- String cookieName = "v1";
+ final String cookieName = "v1";
- String cookieValue = "c1v";
+ final String cookieValue = "c1v";
private CookieProcessor createProcessor(String name, Class<?> type) {
return new CookieProcessor(name, TypeFactory.defaultInstance().constructType(type), null, true);
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
index 626391f..2b7e233 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
@@ -32,21 +32,20 @@
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import io.swagger.models.parameters.FormParameter;
import io.swagger.models.properties.ArrayProperty;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-
public class TestFormProcessor {
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- Map<String, Object> forms = new HashMap<>();
+ final Map<String, Object> forms = new HashMap<>();
- RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
+ final RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
private FormProcessor createProcessor(String name, Type type) {
return createProcessor(name, type, null, true);
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
index 55ebf58..c3f07c5 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
@@ -34,7 +34,6 @@
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -42,14 +41,15 @@
import io.swagger.models.parameters.HeaderParameter;
import io.swagger.models.properties.ArrayProperty;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestHeaderProcessor {
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- Map<String, String> headers = new HashMap<>();
+ final Map<String, String> headers = new HashMap<>();
- RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
+ final RestClientRequest clientRequest = Mockito.mock(RestClientRequest.class);
private HeaderProcessor createProcessor(String name, Type type) {
return createProcessor(name, type, null, true);
@@ -69,15 +69,6 @@
return new HeaderProcessor(headerParameter, javaType);
}
- /*private void createClientRequest() {
- clientRequest = new MockUp<RestClientRequest>() {
- @Mock
- void putHeader(String name, String value) {
- headers.put(name, value);
- }
- }.getMockInstance();
- }*/
-
@Test
public void testGetValueNormal() throws Exception {
Mockito.when(request.getHeader("h1")).thenReturn("h1v");
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
index 95a2fc1..39bbb21 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
@@ -25,15 +25,15 @@
import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.common.rest.codec.param.PathProcessorCreator.PathProcessor;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestPathProcessor {
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- Map<String, String> pathVars = new HashMap<>();
+ final Map<String, String> pathVars = new HashMap<>();
ParamValueProcessor processor;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java
index 2d275ac..8683ef1 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java
@@ -23,18 +23,17 @@
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import io.swagger.models.parameters.QueryParameter;
import io.swagger.models.properties.ArrayProperty;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-
public class TestQueryProcessor {
- HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
private ParamValueProcessor createProcessor(String name, Class<?> type, String collectionFormat) {
return createProcessor(name, type, null, true, collectionFormat);
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
index 10fb73d..f7387db 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
@@ -22,7 +22,7 @@
import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -78,5 +78,6 @@
result = (String) processor.convertValue(null, TypeFactory.defaultInstance().constructType(String.class));
result = (String) processor.getValue(request);
Assertions.assertNull(result);
+ ArchaiusUtils.resetConfig();
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java
index 10e197b..7a6ccdf 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java
@@ -47,7 +47,7 @@
public class TestRestClientRequestImpl {
private HttpClientRequest request;
- private Context context = Mockito.mock(Context.class);
+ private final Context context = Mockito.mock(Context.class);
@BeforeEach
public void before() {
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java
index 7dcda4e..db8e71c 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java
@@ -24,18 +24,18 @@
import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
import com.fasterxml.jackson.databind.type.TypeFactory;
import io.vertx.core.buffer.Buffer;
+import org.junit.jupiter.api.Test;
public class TestProduceJsonProcessor {
- ProduceProcessor pp = ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor();
+ final ProduceProcessor pp = ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor();
- JavaType stringType = TypeFactory.defaultInstance().constructType(String.class);
+ final JavaType stringType = TypeFactory.defaultInstance().constructType(String.class);
@Test
public void testEncodeResponseNull() throws Exception {
@@ -48,7 +48,7 @@
}
@Test
- public void testdecodeResponseNull() throws Exception {
+ public void testDecodeResponseNull() throws Exception {
JavaType resultType = TypeFactory.unknownType();
Object result = pp.decodeResponse(Buffer.buffer(), resultType);
Assertions.assertNull(result);
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java
index 36d9780..d7413d9 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java
@@ -32,9 +32,9 @@
import org.junit.jupiter.api.Test;
public class TestProduceTextPlainProcessor {
- ProduceProcessor pp = ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor();
+ final ProduceProcessor pp = ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor();
- JavaType stringType = TypeFactory.defaultInstance().constructType(String.class);
+ final JavaType stringType = TypeFactory.defaultInstance().constructType(String.class);
@Test
public void testEncodeResponseNull() throws Exception {
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java
index f3a4a68..5865a2b 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java
@@ -32,7 +32,7 @@
public class QueryCodecTestBase {
QueryCodec codec;
- String queryName = "q";
+ final String queryName = "q";
void should_encode(String encodedValue, Object... values) throws Exception {
URLPathStringBuilder builder = new URLPathStringBuilder();
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
index eb3bceb..8c1abca 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
@@ -25,23 +25,23 @@
import org.apache.servicecomb.common.rest.definition.path.QueryVarParamWriter;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
import io.swagger.models.parameters.Parameter;
import io.swagger.models.parameters.PathParameter;
import io.swagger.models.parameters.QueryParameter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestPath {
- @Before
+ @BeforeEach
public void setUp() {
}
- @After
+ @AfterEach
public void tearDown() {
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
index afefdaf..30e6279 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
@@ -38,14 +38,14 @@
import org.apache.servicecomb.core.definition.SchemaMeta;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.hamcrest.MatcherAssert;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
-import org.junit.BeforeClass;
-import org.junit.Test;
import com.fasterxml.jackson.annotation.JsonView;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestRestOperationMeta {
@@ -160,7 +160,7 @@
RestOperationMeta operationMeta;
- @BeforeClass
+ @BeforeAll
public static void classSetup() {
ConfigUtil.installDynamicConfig();
scbEngine = SCBBootstrap.createSCBEngineForTest()
@@ -169,7 +169,7 @@
swagger = Mockito.spy(scbEngine.getProducerMicroserviceMeta().ensureFindSchemaMeta("sid1").getSwagger());
}
- @AfterClass
+ @AfterAll
public static void classTeardown() {
scbEngine.destroy();
ArchaiusUtils.resetConfig();
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java
index 5aa4db1..99ef928 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java
@@ -23,7 +23,7 @@
import org.apache.servicecomb.common.rest.definition.RestParam;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class PathVarParamWriterTest {
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
index 4bb0c20..169c2fd 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
@@ -37,9 +37,9 @@
@Mock
HttpServletResponseEx responseEx;
- List<HttpServerFilter> httpServerFilters = new ArrayList<>();
+ final List<HttpServerFilter> httpServerFilters = new ArrayList<>();
- HttpServerFilterBeforeSendResponseExecutor executor =
+ final HttpServerFilterBeforeSendResponseExecutor executor =
new HttpServerFilterBeforeSendResponseExecutor(httpServerFilters, invocation, responseEx);
@BeforeEach
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
index 14e9b8f..cd1279f 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java
@@ -47,43 +47,43 @@
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
import io.vertx.core.MultiMap;
import io.vertx.core.json.Json;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.servlet.http.Part;
public class RestServerCodecFilterTest {
- RestServerCodecFilter codecFilter = new RestServerCodecFilter();
+ final RestServerCodecFilter codecFilter = new RestServerCodecFilter();
Invocation invocation;
- Endpoint endpoint = Mockito.mock(Endpoint.class);
+ final Endpoint endpoint = Mockito.mock(Endpoint.class);
- OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
+ final OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
- SchemaMeta schemaMeta = Mockito.mock(SchemaMeta.class);
+ final SchemaMeta schemaMeta = Mockito.mock(SchemaMeta.class);
- MicroserviceMeta microserviceMeta = Mockito.mock(MicroserviceMeta.class);
+ final MicroserviceMeta microserviceMeta = Mockito.mock(MicroserviceMeta.class);
- InvocationRuntimeType invocationRuntimeType = Mockito.mock(InvocationRuntimeType.class);
+ final InvocationRuntimeType invocationRuntimeType = Mockito.mock(InvocationRuntimeType.class);
- RestOperationMeta restOperationMeta = Mockito.mock(RestOperationMeta.class);
+ final RestOperationMeta restOperationMeta = Mockito.mock(RestOperationMeta.class);
- HttpTransportContext transportContext = Mockito.mock(HttpTransportContext.class);
+ final HttpTransportContext transportContext = Mockito.mock(HttpTransportContext.class);
- HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
+ final HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
- MultiMap headers = MultiMap.caseInsensitiveMultiMap();
+ final MultiMap headers = MultiMap.caseInsensitiveMultiMap();
- FilterNode nextNode = new FilterNode((invocation, next) -> {
+ final FilterNode nextNode = new FilterNode((invocation, next) -> {
Response response = Response.ok("ok");
response.setHeaders(headers);
return CompletableFuture.completedFuture(response);
@@ -91,7 +91,7 @@
static SCBEngine engine;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
ArchaiusUtils.resetConfig();
ConfigUtil.installDynamicConfig();
@@ -100,13 +100,13 @@
engine.setStatus(SCBStatus.UP);
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
engine.destroy();
ArchaiusUtils.resetConfig();
}
- @Before
+ @BeforeEach
public void setUp() {
Mockito.when(operationMeta.getSchemaMeta()).thenReturn(schemaMeta);
Mockito.when(schemaMeta.getMicroserviceMeta()).thenReturn(microserviceMeta);
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java
index 2a190a0..b1cef1a 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java
@@ -25,25 +25,25 @@
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.response.ResponsesMeta;
import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestServerRestArgsFilter {
- Invocation invocation = Mockito.mock(Invocation.class);
+ final Invocation invocation = Mockito.mock(Invocation.class);
- HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
+ final HttpServletResponseEx responseEx = Mockito.mock(HttpServletResponseEx.class);
- Response response = Mockito.mock(Response.class);
+ final Response response = Mockito.mock(Response.class);
- Part part = Mockito.mock(Part.class);
+ final Part part = Mockito.mock(Part.class);
boolean invokedSendPart;
- ServerRestArgsFilter filter = new ServerRestArgsFilter();
+ final ServerRestArgsFilter filter = new ServerRestArgsFilter();
@Test
public void asyncBeforeSendResponse_part() {
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
index 2a0b664..6192bf7 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
@@ -24,10 +24,10 @@
import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestMicroservicePaths {
@@ -35,7 +35,7 @@
static MicroservicePaths paths;
- @BeforeClass
+ @BeforeAll
public static void setup() {
ConfigUtil.installDynamicConfig();
scbEngine = SCBBootstrap.createSCBEngineForTest()
@@ -46,7 +46,7 @@
paths = spm.producerPaths;
}
- @AfterClass
+ @AfterAll
public static void teardown() {
scbEngine.destroy();
ArchaiusUtils.resetConfig();
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java
index 144b67c..a48aa29 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java
@@ -31,14 +31,14 @@
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.jupiter.api.Assertions;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestClassPathStaticResourceHandler {
static ClassPathStaticResourceHandler handler = new ClassPathStaticResourceHandler();
- @BeforeClass
+ @BeforeAll
public static void setup() {
handler.setWebRoot("web-root/");
}
