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 2022/05/10 02:38:01 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 transports swagger part 1 (#2830)
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 7d170016c [SCB-2475] migrate to junit5 transports swagger part 1 (#2830)
7d170016c is described below
commit 7d170016c70dbc8de5612aa6ff7b42414e50bc05
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Tue May 10 10:37:56 2022 +0800
[SCB-2475] migrate to junit5 transports swagger part 1 (#2830)
---
.../vertx/http/StandardHttpServletRequestEx.java | 6 ++
swagger/swagger-generator/generator-core/pom.xml | 4 +-
.../core/unittest/UnitTestSwaggerUtils.java | 18 ++--
.../servicecomb/swagger/TestSwaggerUtils.java | 14 +--
.../swagger/extend/TestModelResolverExt.java | 6 +-
.../introspector/JsonPropertyIntrospectorTest.java | 14 ++-
.../swagger/extend/module/EnumModuleExtTest.java | 13 ++-
.../generator/core/TestApiImplicitParams.java | 8 +-
.../swagger/generator/core/TestApiOperation.java | 51 +++++-----
.../swagger/generator/core/TestApiResponse.java | 39 +++----
.../swagger/generator/core/TestArrayType.java | 9 +-
.../swagger/generator/core/TestClassUtils.java | 23 +++--
.../generator/core/TestOperationGenerator.java | 23 ++---
.../generator/core/TestSwaggerDefinition.java | 59 +++++------
.../generator/core/TestSwaggerGenerator.java | 3 +-
.../swagger/generator/core/TestSwaggerUtils.java | 16 +--
.../annotation/ApiOperationProcessorTest.java | 17 ++--
.../processor/annotation/ApiProcessorTest.java | 6 +-
.../annotation/SwaggerDefinitionProcessorTest.java | 25 +++--
.../generator/core/utils/TestMethodUtils.java | 26 ++---
.../RequestPartAnnotationProcessorTest.java | 4 +-
.../org/apache/servicecomb/core/TestException.java | 27 ++---
.../org/apache/servicecomb/core/TestResponse.java | 79 ++++++++-------
.../swagger/engine/TestSwaggerEnvironment.java | 5 +-
.../swagger/invocation/TestSwaggerInvocation.java | 12 +--
.../arguments/consumer/TestJaxrsV1V1.java | 41 ++++----
.../arguments/consumer/TestJaxrsV1V2.java | 47 +++++----
.../arguments/consumer/TestJaxrsV2V1.java | 35 +++----
.../arguments/consumer/TestJaxrsV2V2.java | 45 +++++----
.../arguments/consumer/TestPojoV1V1.java | 48 ++++-----
.../arguments/consumer/TestPojoV1V2.java | 23 ++---
.../arguments/consumer/TestPojoV2V1.java | 24 ++---
.../arguments/consumer/TestPojoV2V2.java | 25 ++---
.../arguments/consumer/TestSpringmvcV1V1.java | 35 +++----
.../arguments/consumer/TestSpringmvcV1V2.java | 45 +++++----
.../arguments/consumer/TestSpringmvcV2V1.java | 35 +++----
.../arguments/consumer/TestSpringmvcV2V2.java | 48 ++++-----
.../invocation/arguments/producer/TestJaxrs.java | 20 ++--
.../invocation/arguments/producer/TestPojo.java | 19 ++--
.../arguments/producer/TestPojoOneArg.java | 8 +-
.../arguments/producer/TestSpringmvc.java | 21 ++--
.../invocation/context/TestContextUtils.java | 8 +-
.../invocation/context/TestInvocationContext.java | 46 ++++-----
.../part/PartListToPartArrayConverterTest.java | 8 +-
.../impl/part/PartListToPartListConverterTest.java | 10 +-
.../impl/part/PartToPartConverterTest.java | 8 +-
.../impl/part/TestBytesToPartConverter.java | 6 +-
.../impl/part/TestFileToPartConverter.java | 8 +-
.../impl/part/TestInputStreamToPartConverter.java | 8 +-
.../impl/part/TestResourceToPartConverter.java | 8 +-
.../invocation/exception/TestExceptionFactory.java | 6 +-
.../TestExceptionToProducerResponseConverters.java | 23 +++--
.../invocation/response/TestResponsesMeta.java | 12 +--
.../TestConsumerResponseMapperFactorys.java | 10 +-
.../response/TestJaxrsConsumerResponseMapper.java | 10 +-
.../response/TestJaxrsProducerResponseMapper.java | 14 +--
.../TestJaxrsProducerResponseMapperFactory.java | 5 +-
.../converter/TestPartToMultipartFile.java | 18 ++--
.../TestSpringmvcConsumerResponseMapper.java | 18 ++--
.../TestSpringmvcProducerResponseMapper.java | 8 +-
...TestSpringmvcProducerResponseMapperFactory.java | 8 +-
.../TestDefaultParameterNameProvider.java | 6 +-
.../tracing/zipkin/ZipkinTracingAdviserTest.java | 5 +-
.../transport/common/TestTransportConfigUtils.java | 20 ++--
.../transport/highway/TestHighwayClient.java | 30 +++---
.../transport/highway/TestHighwayCodec.java | 16 +--
.../transport/highway/TestHighwayConfig.java | 8 +-
.../transport/highway/TestHighwayTransport.java | 10 +-
.../transport/highway/TestHighwayVerticle.java | 24 ++---
.../transport/highway/message/TestHeaders.java | 20 ++--
.../highway/message/TestLoginRequest.java | 8 +-
.../highway/message/TestLoginResponse.java | 8 +-
.../highway/message/TestRequestHeader.java | 12 +--
.../highway/message/TestResponseHeader.java | 6 +-
.../rest/client/TestRestTransportClient.java | 6 +-
.../rest/client/TestTransportClientConfig.java | 28 +++---
.../client/http/TestDefaultHttpClientFilter.java | 54 +++++-----
.../rest/client/http/TestRestClientInvocation.java | 62 ++++++------
.../servlet/TestCseXmlWebApplicationContext.java | 4 +-
.../rest/servlet/TestRestAsyncListener.java | 16 +--
.../transport/rest/servlet/TestRestServlet.java | 6 +-
.../servlet/TestRestServletContextListener.java | 6 +-
.../rest/servlet/TestRestServletInjector.java | 8 +-
.../servlet/TestRestServletProducerInvocation.java | 11 +-
.../transport/rest/servlet/TestServletConfig.java | 8 +-
.../rest/servlet/TestServletRestDispatcher.java | 4 +-
.../rest/servlet/TestServletRestTransport.java | 22 ++--
.../transport/rest/servlet/TestServletUtils.java | 52 +++++-----
.../transport/rest/vertx/RestBodyHandler.java | 6 ++
.../vertx/TestAbstractVertxHttpDispatcher.java | 12 +--
.../rest/vertx/TestRestServerVerticle.java | 20 ++--
.../transport/rest/vertx/TestTransportConfig.java | 112 ++++++++++-----------
.../rest/vertx/TestVertxRestDispatcher.java | 52 +++++-----
.../rest/vertx/TestVertxRestTransport.java | 18 ++--
94 files changed, 984 insertions(+), 964 deletions(-)
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java
index f38d1c6c1..742567439 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java
@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRequestWrapper;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.MediaType;
+import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.NameValuePair;
@@ -66,6 +67,11 @@ public class StandardHttpServletRequestEx extends HttpServletRequestWrapper impl
this.cacheRequest = cacheRequest;
}
+ @VisibleForTesting
+ public boolean isCacheRequest() {
+ return cacheRequest;
+ }
+
@Override
public ServletInputStream getInputStream() throws IOException {
if (this.inputStream == null) {
diff --git a/swagger/swagger-generator/generator-core/pom.xml b/swagger/swagger-generator/generator-core/pom.xml
index ea08d21fc..174cb1fe9 100644
--- a/swagger/swagger-generator/generator-core/pom.xml
+++ b/swagger/swagger-generator/generator-core/pom.xml
@@ -50,8 +50,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
index 840d4bd21..f26513275 100644
--- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
+++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
@@ -24,13 +24,13 @@ import java.util.Objects;
import org.apache.commons.io.IOUtils;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.junit.Assert;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectWriter;
import io.swagger.models.Swagger;
import io.swagger.util.Yaml;
+import org.junit.jupiter.api.Assertions;
public final class UnitTestSwaggerUtils {
private static final ObjectWriter writer = Yaml.pretty();
@@ -83,7 +83,7 @@ public final class UnitTestSwaggerUtils {
}
if (!Objects.equals(expectSchema, schema)) {
- Assert.assertEquals(expectSchema, schema);
+ Assertions.assertEquals(expectSchema, schema);
}
return generator;
@@ -100,26 +100,26 @@ public final class UnitTestSwaggerUtils {
}
// 不允许成功
- Assert.assertEquals("not allowed run to here", "run to here");
+ Assertions.assertEquals("not allowed run to here", "run to here");
return null;
}
public static void testException(String expectMsgLevel1, String expectMsgLevel2, String expectMsgLevel3, Class<?> cls,
String... methods) {
Throwable exception = getException(cls, methods);
- Assert.assertEquals(expectMsgLevel1, exception.getMessage());
- Assert.assertEquals(expectMsgLevel2, exception.getCause().getMessage());
- Assert.assertEquals(expectMsgLevel3, exception.getCause().getCause().getMessage());
+ Assertions.assertEquals(expectMsgLevel1, exception.getMessage());
+ Assertions.assertEquals(expectMsgLevel2, exception.getCause().getMessage());
+ Assertions.assertEquals(expectMsgLevel3, exception.getCause().getCause().getMessage());
}
public static void testException(String expectMsgLevel1, String expectMsgLevel2, Class<?> cls, String... methods) {
Throwable exception = getException(cls, methods);
- Assert.assertEquals(expectMsgLevel1, exception.getMessage());
- Assert.assertEquals(expectMsgLevel2, exception.getCause().getMessage());
+ Assertions.assertEquals(expectMsgLevel1, exception.getMessage());
+ Assertions.assertEquals(expectMsgLevel2, exception.getCause().getMessage());
}
public static void testException(String expectMsg, Class<?> cls, String... methods) {
Throwable exception = getException(cls, methods);
- Assert.assertEquals(expectMsg, exception.getMessage());
+ Assertions.assertEquals(expectMsg, exception.getMessage());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
index 3ac37a252..dc3320e19 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
@@ -44,7 +44,7 @@ public class TestSwaggerUtils {
String content = SwaggerUtils.swaggerToString(swagger);
Swagger newSwagger = SwaggerUtils.parseSwagger(content);
- Assert.assertEquals(swagger, newSwagger);
+ Assertions.assertEquals(swagger, newSwagger);
}
@Test
@@ -72,7 +72,7 @@ public class TestSwaggerUtils {
Swagger swagger = Yaml.mapper().readValue(content, Swagger.class);
Swagger result = SwaggerUtils.parseSwagger(url);
- Assert.assertEquals(swagger, result);
+ Assertions.assertEquals(swagger, result);
}
@Test
@@ -104,7 +104,7 @@ public class TestSwaggerUtils {
operation.addResponse("200", response);
SwaggerUtils.correctResponses(operation);
- Assert.assertEquals("response of 200", response.getDescription());
+ Assertions.assertEquals("response of 200", response.getDescription());
}
@Test
@@ -116,7 +116,7 @@ public class TestSwaggerUtils {
operation.addResponse("200", response);
SwaggerUtils.correctResponses(operation);
- Assert.assertEquals("description", response.getDescription());
+ Assertions.assertEquals("description", response.getDescription());
}
@Test
@@ -127,7 +127,7 @@ public class TestSwaggerUtils {
operation.addResponse("default", response);
SwaggerUtils.correctResponses(operation);
- Assert.assertSame(response, operation.getResponses().get("200"));
+ Assertions.assertSame(response, operation.getResponses().get("200"));
}
@Test
@@ -140,7 +140,7 @@ public class TestSwaggerUtils {
operation.addResponse("301", new Response());
SwaggerUtils.correctResponses(operation);
- Assert.assertSame(response, operation.getResponses().get("200"));
+ Assertions.assertSame(response, operation.getResponses().get("200"));
}
@Test
@@ -166,7 +166,7 @@ public class TestSwaggerUtils {
SwaggerUtils.correctResponses(swagger);
- Assert.assertEquals("response of 200", response.getDescription());
+ Assertions.assertEquals("response of 200", response.getDescription());
}
@Test(expected = ServiceCombException.class)
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/TestModelResolverExt.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/TestModelResolverExt.java
index 4565fb3ac..9e2722c94 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/TestModelResolverExt.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/TestModelResolverExt.java
@@ -21,11 +21,11 @@ import java.util.List;
import java.util.Map;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.junit.Assert;
-import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestModelResolverExt {
static ModelResolverExt resolver = new ModelResolverExt();
@@ -37,6 +37,6 @@ public class TestModelResolverExt {
JavaType type = TypeFactory.defaultInstance().constructCollectionType(List.class, String.class);
resolver.setType(type, vendorExtensions);
- Assert.assertEquals("java.util.List<java.lang.String>", vendorExtensions.get(SwaggerConst.EXT_JAVA_CLASS));
+ Assertions.assertEquals("java.util.List<java.lang.String>", vendorExtensions.get(SwaggerConst.EXT_JAVA_CLASS));
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospectorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospectorTest.java
index e86a178eb..6ab24facd 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospectorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospectorTest.java
@@ -17,11 +17,9 @@
package org.apache.servicecomb.swagger.extend.introspector;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
import com.fasterxml.jackson.annotation.JsonProperty;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class JsonPropertyIntrospectorTest {
@@ -29,10 +27,10 @@ public class JsonPropertyIntrospectorTest {
public void findEnumValue() {
JsonPropertyIntrospector introspector = new JsonPropertyIntrospector();
- assertEquals("AB", introspector.findEnumValue(TestEnum.AB));
- assertEquals("C-D", introspector.findEnumValue(TestEnum.C_D));
- assertEquals("E.F", introspector.findEnumValue(TestEnum.E_F));
- assertEquals("HI", introspector.findEnumValue(TestEnum.HI));
+ Assertions.assertEquals("AB", introspector.findEnumValue(TestEnum.AB));
+ Assertions.assertEquals("C-D", introspector.findEnumValue(TestEnum.C_D));
+ Assertions.assertEquals("E.F", introspector.findEnumValue(TestEnum.E_F));
+ Assertions.assertEquals("HI", introspector.findEnumValue(TestEnum.HI));
}
public enum TestEnum {
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/module/EnumModuleExtTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/module/EnumModuleExtTest.java
index 37a2a63b9..02b57b5cf 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/module/EnumModuleExtTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/module/EnumModuleExtTest.java
@@ -17,16 +17,15 @@
package org.apache.servicecomb.swagger.extend.module;
-import static org.junit.Assert.assertEquals;
-
import org.apache.servicecomb.swagger.extend.introspector.JsonPropertyIntrospectorTest.TestEnum;
-import org.junit.Test;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import io.swagger.util.Json;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class EnumModuleExtTest {
@Test
@@ -35,12 +34,12 @@ public class EnumModuleExtTest {
mapper.registerModule(new SimpleModule());
String serializeValue = mapper.writeValueAsString(TestEnum.AB);
- assertEquals("\"AB\"", serializeValue);
+ Assertions.assertEquals("\"AB\"", serializeValue);
serializeValue = mapper.writeValueAsString(TestEnum.C_D);
- assertEquals("\"C-D\"", serializeValue);
+ Assertions.assertEquals("\"C-D\"", serializeValue);
serializeValue = mapper.writeValueAsString(TestEnum.E_F);
- assertEquals("\"E.F\"", serializeValue);
+ Assertions.assertEquals("\"E.F\"", serializeValue);
serializeValue = mapper.writeValueAsString(TestEnum.HI);
- assertEquals("\"HI\"", serializeValue);
+ Assertions.assertEquals("\"HI\"", serializeValue);
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiImplicitParams.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiImplicitParams.java
index f6572b4c8..c4f216d38 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiImplicitParams.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiImplicitParams.java
@@ -18,8 +18,6 @@
package org.apache.servicecomb.swagger.generator.core;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.junit.Assert;
-import org.junit.Test;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -28,6 +26,8 @@ import io.swagger.models.Path;
import io.swagger.models.RefModel;
import io.swagger.models.Swagger;
import io.swagger.models.parameters.BodyParameter;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestApiImplicitParams {
interface ApiImplicitParamsAnnotation {
@@ -46,7 +46,7 @@ public class TestApiImplicitParams {
Operation operation = path.getOperations().get(0);
BodyParameter parameter = (BodyParameter) operation.getParameters().get(0);
- Assert.assertEquals("body", parameter.getName());
- Assert.assertEquals("User", ((RefModel) parameter.getSchema()).getSimpleRef());
+ Assertions.assertEquals("body", parameter.getName());
+ Assertions.assertEquals("User", ((RefModel) parameter.getSchema()).getSimpleRef());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
index 337cf6d23..ef72d3b9a 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
@@ -43,6 +43,7 @@ import io.swagger.models.Path;
import io.swagger.models.Response;
import io.swagger.models.Scheme;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class TestApiOperation {
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(ApiOperationAnnotation.class);
@@ -112,62 +113,62 @@ public class TestApiOperation {
private void testSet(Path path) {
Operation operation = path.getPost();
Model result200 = operation.getResponses().get("200").getResponseSchema();
- Assert.assertEquals(ArrayModel.class, result200.getClass());
- Assert.assertEquals(true, ((ArrayModel) result200).getUniqueItems());
+ Assertions.assertEquals(ArrayModel.class, result200.getClass());
+ Assertions.assertEquals(true, ((ArrayModel) result200).getUniqueItems());
}
private void testList(Path path) {
Operation operation = path.getPost();
Model result200 = operation.getResponses().get("200").getResponseSchema();
- Assert.assertEquals(ArrayModel.class, result200.getClass());
- Assert.assertEquals(null, ((ArrayModel) result200).getUniqueItems());
+ Assertions.assertEquals(ArrayModel.class, result200.getClass());
+ Assertions.assertEquals(null, ((ArrayModel) result200).getUniqueItems());
}
private void testMap(Path path) {
Operation operation = path.getPost();
Model result200 = operation.getResponses().get("200").getResponseSchema();
- Assert.assertEquals(ModelImpl.class, result200.getClass());
- Assert.assertTrue(((ModelImpl) result200).getAdditionalProperties() != null);
+ Assertions.assertEquals(ModelImpl.class, result200.getClass());
+ Assertions.assertTrue(((ModelImpl) result200).getAdditionalProperties() != null);
}
private void testPrimitive(Path path) {
Operation operation = path.getPost();
- Assert.assertEquals(2, operation.getResponses().size());
+ Assertions.assertEquals(2, operation.getResponses().size());
ModelImpl result200 = (ModelImpl) operation.getResponses().get("200").getResponseSchema();
- Assert.assertEquals("integer", result200.getType());
- Assert.assertEquals("int32", result200.getFormat());
+ Assertions.assertEquals("integer", result200.getType());
+ Assertions.assertEquals("int32", result200.getFormat());
ModelImpl result202 = (ModelImpl) operation.getResponses().get("202").getResponseSchema();
- Assert.assertEquals("string", result202.getType());
- Assert.assertEquals(null, result202.getFormat());
+ Assertions.assertEquals("string", result202.getType());
+ Assertions.assertEquals(null, result202.getFormat());
}
private void testBase(Path path) {
- Assert.assertEquals(1, path.getOperations().size());
+ Assertions.assertEquals(1, path.getOperations().size());
Operation operation = path.getGet();
- Assert.assertEquals("summary", operation.getSummary());
- Assert.assertEquals("notes", operation.getDescription());
- Assert.assertEquals(Arrays.asList("tag1", "tag2"), operation.getTags());
- Assert.assertEquals(Arrays.asList("application/json"), operation.getProduces());
- Assert.assertEquals(Arrays.asList("application/json"), operation.getConsumes());
- Assert.assertEquals(Arrays.asList(Scheme.HTTP, Scheme.HTTPS), operation.getSchemes());
+ Assertions.assertEquals("summary", operation.getSummary());
+ Assertions.assertEquals("notes", operation.getDescription());
+ Assertions.assertEquals(Arrays.asList("tag1", "tag2"), operation.getTags());
+ Assertions.assertEquals(Arrays.asList("application/json"), operation.getProduces());
+ Assertions.assertEquals(Arrays.asList("application/json"), operation.getConsumes());
+ Assertions.assertEquals(Arrays.asList(Scheme.HTTP, Scheme.HTTPS), operation.getSchemes());
Map<String, Response> responseMap = operation.getResponses();
- Assert.assertEquals(2, responseMap.size());
+ Assertions.assertEquals(2, responseMap.size());
Response response = responseMap.get(SwaggerConst.SUCCESS_KEY);
- Assert.assertNotNull(response);
- Assert.assertEquals(null, response.getResponseSchema());
+ Assertions.assertNotNull(response);
+ Assertions.assertEquals(null, response.getResponseSchema());
response = responseMap.get("202");
- Assert.assertNotNull(response);
- Assert.assertEquals(null, response.getResponseSchema());
+ Assertions.assertNotNull(response);
+ Assertions.assertEquals(null, response.getResponseSchema());
- Assert.assertEquals(1, response.getHeaders().size());
- Assert.assertEquals("integer", response.getHeaders().get("h1").getType());
+ Assertions.assertEquals(1, response.getHeaders().size());
+ Assertions.assertEquals("integer", response.getHeaders().get("h1").getType());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
index 6c1a476de..1387d692c 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
@@ -29,6 +29,7 @@ import io.swagger.annotations.ResponseHeader;
import io.swagger.models.ModelImpl;
import io.swagger.models.Response;
import io.swagger.models.properties.Property;
+import org.junit.jupiter.api.Assertions;
public class TestApiResponse {
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(ApiResponseAnnotation.class);
@@ -63,61 +64,61 @@ public class TestApiResponse {
@Test
public void checkResponseHeader() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("testResponseHeader");
- Assert.assertEquals("/testResponseHeader", swaggerOperation.getPath());
+ Assertions.assertEquals("/testResponseHeader", swaggerOperation.getPath());
Response response = swaggerOperation.getOperation().getResponses().get("200");
Property property = response.getHeaders().get("k1");
- Assert.assertEquals("integer", property.getType());
- Assert.assertEquals("int32", property.getFormat());
+ Assertions.assertEquals("integer", property.getType());
+ Assertions.assertEquals("int32", property.getFormat());
}
@Test
public void checkResponseDesc() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("testMulti");
- Assert.assertEquals("/testMulti", swaggerOperation.getPath());
+ Assertions.assertEquals("/testMulti", swaggerOperation.getPath());
Response response1 = swaggerOperation.getOperation().getResponses().get("200");
Response response2 = swaggerOperation.getOperation().getResponses().get("301");
- Assert.assertEquals("msg1", response1.getDescription());
- Assert.assertEquals("msg2", response2.getDescription());
+ Assertions.assertEquals("msg1", response1.getDescription());
+ Assertions.assertEquals("msg2", response2.getDescription());
}
@Test
public void checkApiResponseHeader() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("testApiResponseHeader");
- Assert.assertEquals("/testApiResponseHeader", swaggerOperation.getPath());
+ Assertions.assertEquals("/testApiResponseHeader", swaggerOperation.getPath());
Response response = swaggerOperation.getOperation().getResponses().get("200");
Property property = response.getHeaders().get("k1");
- Assert.assertEquals("integer", property.getType());
- Assert.assertEquals("int32", property.getFormat());
+ Assertions.assertEquals("integer", property.getType());
+ Assertions.assertEquals("int32", property.getFormat());
property = response.getHeaders().get("k2");
- Assert.assertEquals("string", property.getType());
- Assert.assertNull(property.getFormat());
+ Assertions.assertEquals("string", property.getType());
+ Assertions.assertNull(property.getFormat());
}
@Test
public void checkSingle() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("testSingle");
- Assert.assertEquals("/testSingle", swaggerOperation.getPath());
+ Assertions.assertEquals("/testSingle", swaggerOperation.getPath());
Response response = swaggerOperation.getOperation().getResponses().get("200");
- Assert.assertEquals("integer", ((ModelImpl) response.getResponseSchema()).getType());
- Assert.assertEquals("int32", ((ModelImpl) response.getResponseSchema()).getFormat());
+ Assertions.assertEquals("integer", ((ModelImpl) response.getResponseSchema()).getType());
+ Assertions.assertEquals("int32", ((ModelImpl) response.getResponseSchema()).getFormat());
}
@Test
public void checkMulti() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("testMulti");
- Assert.assertEquals("/testMulti", swaggerOperation.getPath());
+ Assertions.assertEquals("/testMulti", swaggerOperation.getPath());
Response response = swaggerOperation.getOperation().getResponses().get("200");
- Assert.assertEquals("integer", ((ModelImpl) response.getResponseSchema()).getType());
- Assert.assertEquals("int32", ((ModelImpl) response.getResponseSchema()).getFormat());
+ Assertions.assertEquals("integer", ((ModelImpl) response.getResponseSchema()).getType());
+ Assertions.assertEquals("int32", ((ModelImpl) response.getResponseSchema()).getFormat());
response = swaggerOperation.getOperation().getResponses().get("301");
- Assert.assertEquals("string", ((ModelImpl) response.getResponseSchema()).getType());
- Assert.assertNull(((ModelImpl) response.getResponseSchema()).getFormat());
+ Assertions.assertEquals("string", ((ModelImpl) response.getResponseSchema()).getType());
+ Assertions.assertNull(((ModelImpl) response.getResponseSchema()).getFormat());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
index 413e6c5fa..3973244ff 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
@@ -26,6 +26,7 @@ import org.junit.Test;
import io.swagger.models.ModelImpl;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.properties.ByteArrayProperty;
+import org.junit.jupiter.api.Assertions;
public class TestArrayType {
@Test
@@ -35,11 +36,11 @@ public class TestArrayType {
BodyParameter bodyParameter = (BodyParameter) swaggerOperation.getOperation().getParameters().get(0);
ModelImpl model = SwaggerUtils.getModelImpl(swaggerOperations.getSwagger(), bodyParameter);
- Assert.assertEquals(ModelImpl.OBJECT, model.getType());
- Assert.assertEquals(1, model.getProperties().size());
+ Assertions.assertEquals(ModelImpl.OBJECT, model.getType());
+ Assertions.assertEquals(1, model.getProperties().size());
ByteArrayProperty byteArrayProperty = (ByteArrayProperty) model.getProperties().get("value");
- Assert.assertEquals("string", byteArrayProperty.getType());
- Assert.assertEquals("byte", byteArrayProperty.getFormat());
+ Assertions.assertEquals("string", byteArrayProperty.getType());
+ Assertions.assertEquals("byte", byteArrayProperty.getFormat());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
index f6177d258..e6945379e 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
@@ -29,36 +29,37 @@ import org.junit.Test;
import io.swagger.annotations.SwaggerDefinition;
import io.swagger.models.parameters.PathParameter;
+import org.junit.jupiter.api.Assertions;
@SwaggerDefinition
public class TestClassUtils {
@Test
public void testHasAnnotation() {
- Assert.assertTrue(SwaggerUtils.hasAnnotation(TestClassUtils.class, SwaggerDefinition.class));
- Assert.assertTrue(SwaggerUtils.hasAnnotation(TestClassUtils.class, Test.class));
+ Assertions.assertTrue(SwaggerUtils.hasAnnotation(TestClassUtils.class, SwaggerDefinition.class));
+ Assertions.assertTrue(SwaggerUtils.hasAnnotation(TestClassUtils.class, Test.class));
- Assert.assertFalse(SwaggerUtils.hasAnnotation(TestClassUtils.class, Path.class));
+ Assertions.assertFalse(SwaggerUtils.hasAnnotation(TestClassUtils.class, Path.class));
}
@Test
public void isRawJsonType() {
PathParameter param = new PathParameter();
- Assert.assertFalse(SwaggerUtils.isRawJsonType(param));
+ Assertions.assertFalse(SwaggerUtils.isRawJsonType(param));
param.setVendorExtension(SwaggerConst.EXT_RAW_JSON_TYPE, Boolean.FALSE);
- Assert.assertFalse(SwaggerUtils.isRawJsonType(param));
+ Assertions.assertFalse(SwaggerUtils.isRawJsonType(param));
param.setVendorExtension(SwaggerConst.EXT_RAW_JSON_TYPE, Boolean.TRUE);
- Assert.assertTrue(SwaggerUtils.isRawJsonType(param));
+ Assertions.assertTrue(SwaggerUtils.isRawJsonType(param));
}
@Test
public void getClassName_noName() {
- Assert.assertNull(SwaggerUtils.getClassName(null));
+ Assertions.assertNull(SwaggerUtils.getClassName(null));
Map<String, Object> vendorExtensions = new HashMap<>();
- Assert.assertNull(SwaggerUtils.getClassName(vendorExtensions));
+ Assertions.assertNull(SwaggerUtils.getClassName(vendorExtensions));
}
@Test
@@ -66,14 +67,14 @@ public class TestClassUtils {
Map<String, Object> vendorExtensions = new HashMap<>();
vendorExtensions.put(SwaggerConst.EXT_JAVA_CLASS, String.class.getName());
- Assert.assertSame(String.class.getName(), SwaggerUtils.getClassName(vendorExtensions));
+ Assertions.assertSame(String.class.getName(), SwaggerUtils.getClassName(vendorExtensions));
}
@Test
public void getInterfaceName_noName() {
Map<String, Object> vendorExtensions = new HashMap<>();
- Assert.assertNull(SwaggerUtils.getInterfaceName(vendorExtensions));
+ Assertions.assertNull(SwaggerUtils.getInterfaceName(vendorExtensions));
}
@Test
@@ -81,6 +82,6 @@ public class TestClassUtils {
Map<String, Object> vendorExtensions = new HashMap<>();
vendorExtensions.put(SwaggerConst.EXT_JAVA_INTF, String.class.getName());
- Assert.assertSame(String.class.getName(), SwaggerUtils.getInterfaceName(vendorExtensions));
+ Assertions.assertSame(String.class.getName(), SwaggerUtils.getInterfaceName(vendorExtensions));
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
index db38dad34..2b5731984 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
@@ -18,8 +18,6 @@
package org.apache.servicecomb.swagger.generator.core;
import static org.hamcrest.Matchers.contains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import java.util.List;
@@ -37,6 +35,7 @@ import io.swagger.annotations.Extension;
import io.swagger.annotations.ExtensionProperty;
import io.swagger.annotations.ResponseHeader;
import io.swagger.models.Response;
+import org.junit.jupiter.api.Assertions;
public class TestOperationGenerator {
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(TestClass.class);
@@ -81,7 +80,7 @@ public class TestOperationGenerator {
SwaggerOperation operation = swaggerOperations.findOperation("apiOperationNoTag");
List<String> tags = operation.getOperation().getTags();
MatcherAssert.assertThat(tags, contains("default0", "default1"));
- assertEquals("value2", operation.getOperation().getSummary());
+ Assertions.assertEquals("value2", operation.getOperation().getSummary());
}
@Test
@@ -89,7 +88,7 @@ public class TestOperationGenerator {
SwaggerOperation operation = swaggerOperations.findOperation("noApiOperation");
List<String> tags = operation.getOperation().getTags();
MatcherAssert.assertThat(tags, contains("default0", "default1"));
- assertNull(operation.getOperation().getSummary());
+ Assertions.assertNull(operation.getOperation().getSummary());
}
@Test
@@ -99,10 +98,10 @@ public class TestOperationGenerator {
MatcherAssert.assertThat(tags, contains("tag1", "tag2"));
Response response = swaggerOperation.getOperation().getResponses().get("200");
- assertEquals("200 is ok............", response.getDescription());
- Assert.assertNotNull(response.getHeaders().get("x-user-domain"));
- Assert.assertNull(response.getHeaders().get("x-user-name"));
- Assert.assertNotNull(swaggerOperation.getOperation().getVendorExtensions().get("x-class-name"));
+ Assertions.assertEquals("200 is ok............", response.getDescription());
+ Assertions.assertNotNull(response.getHeaders().get("x-user-domain"));
+ Assertions.assertNull(response.getHeaders().get("x-user-name"));
+ Assertions.assertNotNull(swaggerOperation.getOperation().getVendorExtensions().get("x-class-name"));
}
@Test
@@ -112,9 +111,9 @@ public class TestOperationGenerator {
MatcherAssert.assertThat(tags, contains("tag1", "tag2"));
Response response = swaggerOperation.getOperation().getResponses().get("200");
- assertEquals("200 is ok............", response.getDescription());
- Assert.assertNull(response.getHeaders().get("x-user-domain"));
- Assert.assertNotNull(response.getHeaders().get("x-user-name"));
- Assert.assertNotNull(swaggerOperation.getOperation().getVendorExtensions().get("x-class-name"));
+ Assertions.assertEquals("200 is ok............", response.getDescription());
+ Assertions.assertNull(response.getHeaders().get("x-user-domain"));
+ Assertions.assertNotNull(response.getHeaders().get("x-user-name"));
+ Assertions.assertNotNull(swaggerOperation.getOperation().getVendorExtensions().get("x-class-name"));
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
index f39488627..10ef36359 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
@@ -34,6 +34,7 @@ import io.swagger.annotations.License;
import io.swagger.annotations.SwaggerDefinition;
import io.swagger.annotations.Tag;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class TestSwaggerDefinition {
@SwaggerDefinition(
@@ -72,53 +73,53 @@ public class TestSwaggerDefinition {
public void testSwaggerDefinition() {
Swagger swagger = SwaggerGenerator.generate(SwaggerAnnotation.class);
- Assert.assertEquals(SwaggerAnnotation.class.getName(),
+ Assertions.assertEquals(SwaggerAnnotation.class.getName(),
swagger.getInfo().getVendorExtensions().get(SwaggerConst.EXT_JAVA_INTF));
- Assert.assertEquals("2.0", swagger.getSwagger());
- Assert.assertEquals("/base", swagger.getBasePath());
- Assert.assertEquals("host", swagger.getHost());
- Assert.assertEquals(Arrays.asList("json", "xml"), swagger.getConsumes());
- Assert.assertEquals(Arrays.asList("abc", "123"), swagger.getProduces());
+ Assertions.assertEquals("2.0", swagger.getSwagger());
+ Assertions.assertEquals("/base", swagger.getBasePath());
+ Assertions.assertEquals("host", swagger.getHost());
+ Assertions.assertEquals(Arrays.asList("json", "xml"), swagger.getConsumes());
+ Assertions.assertEquals(Arrays.asList("abc", "123"), swagger.getProduces());
- Assert.assertEquals(1, swagger.getTags().size());
+ Assertions.assertEquals(1, swagger.getTags().size());
io.swagger.models.Tag tagA = swagger.getTags().get(0);
- Assert.assertEquals("tagA", tagA.getName());
- Assert.assertEquals("desc of tagA", tagA.getDescription());
- Assert.assertEquals("tagA ext docs", tagA.getExternalDocs().getDescription());
- Assert.assertEquals("url of tagA ext docs", tagA.getExternalDocs().getUrl());
- Assert.assertEquals(1, tagA.getVendorExtensions().size());
+ Assertions.assertEquals("tagA", tagA.getName());
+ Assertions.assertEquals("desc of tagA", tagA.getDescription());
+ Assertions.assertEquals("tagA ext docs", tagA.getExternalDocs().getDescription());
+ Assertions.assertEquals("url of tagA ext docs", tagA.getExternalDocs().getUrl());
+ Assertions.assertEquals(1, tagA.getVendorExtensions().size());
Map<String, Object> tagValue = (Map<String, Object>) tagA.getVendorExtensions().get("x-tagA");
- Assert.assertEquals("value of tagAExt", tagValue.get("x-tagAExt"));
+ Assertions.assertEquals("value of tagAExt", tagValue.get("x-tagAExt"));
io.swagger.models.Info info = swagger.getInfo();
- Assert.assertEquals("title of SwaggerAnnotation", info.getTitle());
- Assert.assertEquals("0.1", info.getVersion());
- Assert.assertEquals("termsOfService", info.getTermsOfService());
- Assert.assertEquals("description of info for SwaggerAnnotation", info.getDescription());
+ Assertions.assertEquals("title of SwaggerAnnotation", info.getTitle());
+ Assertions.assertEquals("0.1", info.getVersion());
+ Assertions.assertEquals("termsOfService", info.getTermsOfService());
+ Assertions.assertEquals("description of info for SwaggerAnnotation", info.getDescription());
- Assert.assertEquals("contact", info.getContact().getName());
- Assert.assertEquals("contact@email.com", info.getContact().getEmail());
- Assert.assertEquals("http://contact", info.getContact().getUrl());
+ Assertions.assertEquals("contact", info.getContact().getName());
+ Assertions.assertEquals("contact@email.com", info.getContact().getEmail());
+ Assertions.assertEquals("http://contact", info.getContact().getUrl());
- Assert.assertEquals("license ", info.getLicense().getName());
- Assert.assertEquals("http://license", info.getLicense().getUrl());
+ Assertions.assertEquals("license ", info.getLicense().getName());
+ Assertions.assertEquals("http://license", info.getLicense().getUrl());
- Assert.assertEquals(2, info.getVendorExtensions().size());
+ Assertions.assertEquals(2, info.getVendorExtensions().size());
Map<String, Object> infoValue = (Map<String, Object>) info.getVendorExtensions().get("x-info");
- Assert.assertEquals("value of infoExt", infoValue.get("x-infoExt"));
+ Assertions.assertEquals("value of infoExt", infoValue.get("x-infoExt"));
- Assert.assertEquals("SwaggerAnnotation ext docs", swagger.getExternalDocs().getDescription());
- Assert.assertEquals("url of SwaggerAnnotation ext docs", swagger.getExternalDocs().getUrl());
+ Assertions.assertEquals("SwaggerAnnotation ext docs", swagger.getExternalDocs().getDescription());
+ Assertions.assertEquals("url of SwaggerAnnotation ext docs", swagger.getExternalDocs().getUrl());
}
@Test
public void testFillDefault() {
Swagger swagger = SwaggerGenerator.generate(SwaggerNoAnnotation.class);
- Assert.assertEquals("2.0", swagger.getSwagger());
- Assert.assertEquals("/SwaggerNoAnnotation", swagger.getBasePath());
- Assert.assertEquals("swagger definition for " + SwaggerNoAnnotation.class.getName(),
+ Assertions.assertEquals("2.0", swagger.getSwagger());
+ Assertions.assertEquals("/SwaggerNoAnnotation", swagger.getBasePath());
+ Assertions.assertEquals("swagger definition for " + SwaggerNoAnnotation.class.getName(),
swagger.getInfo().getTitle());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
index 204cbd04d..09912adde 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
@@ -26,6 +26,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestSwaggerGenerator {
@BeforeClass
@@ -45,7 +46,7 @@ public class TestSwaggerGenerator {
PojoSwaggerGenerator swaggerGenerator = new PojoSwaggerGenerator(null);
swaggerGenerator.setBasePath("/a/${var}/b");
- Assert.assertEquals("/a/varValue/b", swaggerGenerator.getSwagger().getBasePath());
+ Assertions.assertEquals("/a/varValue/b", swaggerGenerator.getSwagger().getBasePath());
}
@Test
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
index 4f9255056..77d781808 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
@@ -290,27 +290,27 @@ public class TestSwaggerUtils {
when(param.getVendorExtensions()).thenReturn(extensions);
extensions.put(SwaggerConst.EXT_RAW_JSON_TYPE, true);
- Assert.assertTrue(SwaggerUtils.isRawJsonType(param));
+ Assertions.assertTrue(SwaggerUtils.isRawJsonType(param));
extensions.put(SwaggerConst.EXT_RAW_JSON_TYPE, "test");
- Assert.assertFalse(SwaggerUtils.isRawJsonType(param));
+ Assertions.assertFalse(SwaggerUtils.isRawJsonType(param));
}
@Test
public void isComplexProperty() {
Property property = new RefProperty("ref");
- Assert.assertTrue(SwaggerUtils.isComplexProperty(property));
+ Assertions.assertTrue(SwaggerUtils.isComplexProperty(property));
property = new ObjectProperty();
- Assert.assertTrue(SwaggerUtils.isComplexProperty(property));
+ Assertions.assertTrue(SwaggerUtils.isComplexProperty(property));
property = new MapProperty();
- Assert.assertTrue(SwaggerUtils.isComplexProperty(property));
+ Assertions.assertTrue(SwaggerUtils.isComplexProperty(property));
property = new ArrayProperty(new ObjectProperty());
- Assert.assertTrue(SwaggerUtils.isComplexProperty(property));
+ Assertions.assertTrue(SwaggerUtils.isComplexProperty(property));
property = new ArrayProperty(new StringProperty());
- Assert.assertFalse(SwaggerUtils.isComplexProperty(property));
+ Assertions.assertFalse(SwaggerUtils.isComplexProperty(property));
property = new StringProperty();
- Assert.assertFalse(SwaggerUtils.isComplexProperty(property));
+ Assertions.assertFalse(SwaggerUtils.isComplexProperty(property));
}
private static class AllTypeTest1 {
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
index 41fb06194..c634eb48b 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
@@ -18,9 +18,6 @@
package org.apache.servicecomb.swagger.generator.core.processor.annotation;
import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
@@ -33,9 +30,11 @@ import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.ApiOperation;
+import org.junit.jupiter.api.Assertions;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Map;
@@ -126,7 +125,7 @@ public class ApiOperationProcessorTest {
@Test
public void testConvertTagsOnMethodWithNoTag() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("functionWithNoTag");
- assertNull(swaggerOperation.getOperation().getTags());
+ Assertions.assertNull(swaggerOperation.getOperation().getTags());
}
@Test
@@ -142,8 +141,8 @@ public class ApiOperationProcessorTest {
Matchers.contains(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML));
swaggerOperation = swaggerOperations.findOperation("testBlankMediaType");
- assertNull(swaggerOperation.getOperation().getConsumes());
- assertNull(swaggerOperation.getOperation().getProduces());
+ Assertions.assertNull(swaggerOperation.getOperation().getConsumes());
+ Assertions.assertNull(swaggerOperation.getOperation().getProduces());
swaggerOperation.getOperation().addConsumes(MediaType.TEXT_HTML);
swaggerOperation.getOperation().addProduces(MediaType.TEXT_HTML);
@@ -156,9 +155,9 @@ public class ApiOperationProcessorTest {
public void testBodyParam() {
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("testBodyParam");
Map<String, Property> properties = swaggerOperation.getSwagger().getDefinitions().get("TestBodyBean").getProperties();
- assertTrue("Support NotBlank annotation", properties.get("age").getRequired());
- assertTrue("Support NotEmpty annotation", properties.get("sexes").getRequired());
- assertTrue("Original support NotNull annotation", properties.get("name").getRequired());
+ Assertions.assertTrue(properties.get("age").getRequired(), "Support NotBlank annotation");
+ Assertions.assertTrue(properties.get("sexes").getRequired(), "Support NotEmpty annotation");
+ Assertions.assertTrue(properties.get("name").getRequired(), "Original support NotNull annotation");
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
index 5e0bf8535..6484ce597 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
@@ -18,8 +18,6 @@
package org.apache.servicecomb.swagger.generator.core.processor.annotation;
import static org.hamcrest.Matchers.contains;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
import javax.ws.rs.core.MediaType;
@@ -28,11 +26,13 @@ import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
+import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.Api;
import io.swagger.annotations.SwaggerDefinition;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class ApiProcessorTest {
@Api(tags = {"tag1", "tag2", "", "tag1"})
@@ -81,7 +81,7 @@ public class ApiProcessorTest {
SwaggerOperations swaggerOperations = SwaggerOperations.generate(SwaggerTestTargetWithNoTag.class);
SwaggerOperation swaggerOperation = swaggerOperations.findOperation("op");
- assertNull(swaggerOperation.getOperation().getTags());
+ Assertions.assertNull(swaggerOperation.getOperation().getTags());
MatcherAssert.assertThat(swaggerOperation.getSwagger().getConsumes(), Matchers.contains(MediaType.APPLICATION_JSON));
MatcherAssert.assertThat(swaggerOperation.getSwagger().getProduces(), Matchers.contains(MediaType.APPLICATION_JSON));
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
index d5c6b06e1..ea4e29b6d 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
@@ -18,8 +18,6 @@
package org.apache.servicecomb.swagger.generator.core.processor.annotation;
import static org.hamcrest.Matchers.contains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
import javax.ws.rs.core.MediaType;
@@ -45,6 +43,7 @@ import io.swagger.annotations.SwaggerDefinition;
import io.swagger.annotations.SwaggerDefinition.Scheme;
import io.swagger.annotations.Tag;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class SwaggerDefinitionProcessorTest {
@Api(consumes = MediaType.APPLICATION_XML, produces = MediaType.APPLICATION_XML)
@@ -113,20 +112,20 @@ public class SwaggerDefinitionProcessorTest {
public void testProcess() {
Swagger swagger = SwaggerGenerator.generate(SwaggerTestTarget.class);
- assertEquals(1, swagger.getTags().size());
+ Assertions.assertEquals(1, swagger.getTags().size());
io.swagger.models.Tag tag = swagger.getTags().get(0);
- assertEquals("testTag", tag.getName());
- assertEquals("desc", tag.getDescription());
- assertEquals("testValue", tag.getExternalDocs().getDescription());
- assertEquals("testUrl", tag.getExternalDocs().getUrl());
- assertEquals("127.0.0.1", swagger.getHost());
+ Assertions.assertEquals("testTag", tag.getName());
+ Assertions.assertEquals("desc", tag.getDescription());
+ Assertions.assertEquals("testValue", tag.getExternalDocs().getDescription());
+ Assertions.assertEquals("testUrl", tag.getExternalDocs().getUrl());
+ Assertions.assertEquals("127.0.0.1", swagger.getHost());
MatcherAssert.assertThat(swagger.getSchemes(), contains(io.swagger.models.Scheme.HTTP, io.swagger.models.Scheme.HTTPS));
io.swagger.models.Info info = swagger.getInfo();
- assertEquals("title", info.getTitle());
- assertEquals("version", info.getVersion());
- assertEquals("desc", info.getDescription());
- assertEquals("contactName", info.getContact().getName());
- assertEquals("licenseName", info.getLicense().getName());
+ Assertions.assertEquals("title", info.getTitle());
+ Assertions.assertEquals("version", info.getVersion());
+ Assertions.assertEquals("desc", info.getDescription());
+ Assertions.assertEquals("contactName", info.getContact().getName());
+ Assertions.assertEquals("licenseName", info.getLicense().getName());
MatcherAssert.assertThat(swagger.getConsumes(), Matchers.contains(MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN));
MatcherAssert.assertThat(swagger.getProduces(), Matchers.contains(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML));
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/TestMethodUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/TestMethodUtils.java
index ae1ec1cc7..873b9bb8e 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/TestMethodUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/TestMethodUtils.java
@@ -25,27 +25,27 @@ import org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel.Base
import org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel.Hello2Endpoint;
import org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel.HelloEndpoint;
import org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel.ServiceInterface;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestMethodUtils {
@Test
public void testGetClassMethods() throws Exception {
List<Method> methods = MethodUtils.findSwaggerMethods(Hello2Endpoint.class);
- Assert.assertEquals(3, methods.size());
- Assert.assertEquals(Hello2Endpoint.class, methods.get(0).getDeclaringClass());
- Assert.assertEquals(Hello2Endpoint.class, methods.get(1).getDeclaringClass());
- Assert.assertEquals(Hello2Endpoint.class, methods.get(2).getDeclaringClass());
+ Assertions.assertEquals(3, methods.size());
+ Assertions.assertEquals(Hello2Endpoint.class, methods.get(0).getDeclaringClass());
+ Assertions.assertEquals(Hello2Endpoint.class, methods.get(1).getDeclaringClass());
+ Assertions.assertEquals(Hello2Endpoint.class, methods.get(2).getDeclaringClass());
methods = MethodUtils.findSwaggerMethods(HelloEndpoint.class);
- Assert.assertEquals(2, methods.size());
- Assert.assertEquals(HelloEndpoint.class, methods.get(0).getDeclaringClass()); // get
- Assert.assertEquals(AbstractBaseClass.class, methods.get(1).getDeclaringClass()); // getBase
+ Assertions.assertEquals(2, methods.size());
+ Assertions.assertEquals(HelloEndpoint.class, methods.get(0).getDeclaringClass()); // get
+ Assertions.assertEquals(AbstractBaseClass.class, methods.get(1).getDeclaringClass()); // getBase
methods = MethodUtils.findSwaggerMethods(ServiceInterface.class);
- Assert.assertEquals(3, methods.size());
- Assert.assertEquals(BaseInterface.class, methods.get(0).getDeclaringClass()); // get
- Assert.assertEquals(BaseInterface.class, methods.get(1).getDeclaringClass()); // getArray
- Assert.assertEquals(ServiceInterface.class, methods.get(2).getDeclaringClass()); // getBase
+ Assertions.assertEquals(3, methods.size());
+ Assertions.assertEquals(BaseInterface.class, methods.get(0).getDeclaringClass()); // get
+ Assertions.assertEquals(BaseInterface.class, methods.get(1).getDeclaringClass()); // getArray
+ Assertions.assertEquals(ServiceInterface.class, methods.get(2).getDeclaringClass()); // getBase
}
}
diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java
index c04473a98..36cee10cb 100644
--- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java
+++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java
@@ -24,9 +24,9 @@ import java.util.List;
import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
@@ -51,7 +51,7 @@ public class RequestPartAnnotationProcessorTest {
@Test
public void getProcessType() {
- Assert.assertEquals(requestPartAnnotationProcessor.getProcessType(),
+ Assertions.assertEquals(requestPartAnnotationProcessor.getProcessType(),
RequestPart.class);
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java
index 97028614e..c3d4f072c 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java
@@ -25,45 +25,46 @@ import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestException {
@Test
public void testCommonExceptionData() {
CommonExceptionData oData = new CommonExceptionData();
oData.setMessage("this is Common exception message");
- Assert.assertEquals("this is Common exception message", oData.getMessage());
+ Assertions.assertEquals("this is Common exception message", oData.getMessage());
oData = new CommonExceptionData("this is a test");
- Assert.assertEquals("this is a test", oData.getMessage());
- Assert.assertEquals("CommonExceptionData [message=this is a test]", oData.toString());
+ Assertions.assertEquals("this is a test", oData.getMessage());
+ Assertions.assertEquals("CommonExceptionData [message=this is a test]", oData.toString());
}
@Test
public void testInvocationException() {
InvocationException oExceptionIn = new InvocationException(Status.OK, "I am gone now");
oExceptionIn = ExceptionFactory.convertConsumerException(new Throwable());
- Assert.assertEquals(490, oExceptionIn.getStatusCode());
+ Assertions.assertEquals(490, oExceptionIn.getStatusCode());
oExceptionIn = ExceptionFactory.convertConsumerException(new Throwable(), "abc");
- Assert.assertEquals(490, oExceptionIn.getStatusCode());
- Assert.assertEquals("abc", ((CommonExceptionData) oExceptionIn.getErrorData()).getMessage());
+ Assertions.assertEquals(490, oExceptionIn.getStatusCode());
+ Assertions.assertEquals("abc", ((CommonExceptionData) oExceptionIn.getErrorData()).getMessage());
oExceptionIn = ExceptionFactory.convertProducerException(new Throwable());
- Assert.assertEquals(590, oExceptionIn.getStatusCode());
+ Assertions.assertEquals(590, oExceptionIn.getStatusCode());
oExceptionIn = ExceptionFactory.convertProducerException(new Throwable(), "abcd");
- Assert.assertEquals(590, oExceptionIn.getStatusCode());
- Assert.assertEquals("abcd", ((CommonExceptionData) oExceptionIn.getErrorData()).getMessage());
+ Assertions.assertEquals(590, oExceptionIn.getStatusCode());
+ Assertions.assertEquals("abcd", ((CommonExceptionData) oExceptionIn.getErrorData()).getMessage());
oExceptionIn =
ExceptionFactory.convertConsumerException(new InvocationException(Status.OK, new String("fake-object")));
- Assert.assertEquals(200, oExceptionIn.getStatusCode());
+ Assertions.assertEquals(200, oExceptionIn.getStatusCode());
oExceptionIn = ExceptionFactory.convertConsumerException(new InvocationTargetException(new Throwable()));
- Assert.assertNotEquals("java.lang.Throwable", oExceptionIn.getMessage());
+ Assertions.assertNotEquals("java.lang.Throwable", oExceptionIn.getMessage());
InvocationException oTemp = new InvocationException(Status.OK, new CommonExceptionData("testObject"));
- Assert.assertEquals("OK", oTemp.getReasonPhrase());
- Assert.assertEquals("CommonExceptionData [message=testObject]", (oTemp.getErrorData().toString()));
+ Assertions.assertEquals("OK", oTemp.getReasonPhrase());
+ Assertions.assertEquals("CommonExceptionData [message=testObject]", (oTemp.getErrorData().toString()));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java
index 0cd59d079..f558e4bc5 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java
@@ -27,6 +27,7 @@ import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestResponse {
Response response;
@@ -41,89 +42,89 @@ public class TestResponse {
@Test
public void testAr() {
ar.success(Status.ACCEPTED, 1);
- Assert.assertEquals(true, response.isSucceed());
- Assert.assertEquals(false, response.isFailed());
- Assert.assertEquals(1, (int) response.getResult());
- Assert.assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatusCode());
- Assert.assertEquals(Status.ACCEPTED.getReasonPhrase(), response.getReasonPhrase());
- Assert.assertEquals(Status.ACCEPTED, response.getStatus());
+ Assertions.assertTrue(response.isSucceed());
+ Assertions.assertFalse(response.isFailed());
+ Assertions.assertEquals(1, (int) response.getResult());
+ Assertions.assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatusCode());
+ Assertions.assertEquals(Status.ACCEPTED.getReasonPhrase(), response.getReasonPhrase());
+ Assertions.assertEquals(Status.ACCEPTED, response.getStatus());
ar.success(2);
- Assert.assertEquals(2, (int) response.getResult());
- Assert.assertEquals(Status.OK.getStatusCode(), response.getStatusCode());
+ Assertions.assertEquals(2, (int) response.getResult());
+ Assertions.assertEquals(Status.OK.getStatusCode(), response.getStatusCode());
Response r = Response.succResp(3);
ar.complete(r);
- Assert.assertEquals(r, response);
+ Assertions.assertEquals(r, response);
ar.consumerFail(new RuntimeExceptionWithoutStackTrace("abc"));
CommonExceptionData data = (CommonExceptionData) ((InvocationException) response.getResult()).getErrorData();
- Assert.assertEquals("Unexpected consumer error, please check logs for details", data.getMessage());
- Assert.assertEquals(ExceptionFactory.CONSUMER_INNER_STATUS_CODE, response.getStatusCode());
+ Assertions.assertEquals("Unexpected consumer error, please check logs for details", data.getMessage());
+ Assertions.assertEquals(ExceptionFactory.CONSUMER_INNER_STATUS_CODE, response.getStatusCode());
ar.fail(InvocationType.CONSUMER, new RuntimeExceptionWithoutStackTrace("abc"));
data = (CommonExceptionData) ((InvocationException) response.getResult()).getErrorData();
- Assert.assertEquals("Unexpected consumer error, please check logs for details", data.getMessage());
- Assert.assertEquals(ExceptionFactory.CONSUMER_INNER_STATUS_CODE, response.getStatusCode());
+ Assertions.assertEquals("Unexpected consumer error, please check logs for details", data.getMessage());
+ Assertions.assertEquals(ExceptionFactory.CONSUMER_INNER_STATUS_CODE, response.getStatusCode());
InvocationException consumerException = new InvocationException(300, "abc", "def");
ar.consumerFail(consumerException);
- Assert.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
- Assert.assertEquals(300, response.getStatusCode());
+ Assertions.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
+ Assertions.assertEquals(300, response.getStatusCode());
ar.fail(InvocationType.CONSUMER, consumerException);
- Assert.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
- Assert.assertEquals(300, response.getStatusCode());
+ Assertions.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
+ Assertions.assertEquals(300, response.getStatusCode());
ar.producerFail(new RuntimeExceptionWithoutStackTrace("abc"));
data = (CommonExceptionData) ((InvocationException) response.getResult()).getErrorData();
- Assert.assertEquals("Unexpected producer error, please check logs for details", data.getMessage());
- Assert.assertEquals(ExceptionFactory.PRODUCER_INNER_STATUS_CODE, response.getStatusCode());
+ Assertions.assertEquals("Unexpected producer error, please check logs for details", data.getMessage());
+ Assertions.assertEquals(ExceptionFactory.PRODUCER_INNER_STATUS_CODE, response.getStatusCode());
ar.fail(InvocationType.PRODUCER, new RuntimeExceptionWithoutStackTrace("abc"));
data = (CommonExceptionData) ((InvocationException) response.getResult()).getErrorData();
- Assert.assertEquals("Unexpected producer error, please check logs for details", data.getMessage());
- Assert.assertEquals(ExceptionFactory.PRODUCER_INNER_STATUS_CODE, response.getStatusCode());
+ Assertions.assertEquals("Unexpected producer error, please check logs for details", data.getMessage());
+ Assertions.assertEquals(ExceptionFactory.PRODUCER_INNER_STATUS_CODE, response.getStatusCode());
InvocationException producerException = new InvocationException(500, "abc", "def");
ar.producerFail(producerException);
- Assert.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
- Assert.assertEquals(500, response.getStatusCode());
+ Assertions.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
+ Assertions.assertEquals(500, response.getStatusCode());
ar.fail(InvocationType.PRODUCER, producerException);
- Assert.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
- Assert.assertEquals(500, response.getStatusCode());
+ Assertions.assertEquals("def", ((InvocationException) response.getResult()).getErrorData());
+ Assertions.assertEquals(500, response.getStatusCode());
}
@Test
public void test() {
Response r = Response.create(200, "200", 2);
- Assert.assertEquals(200, r.getStatusCode());
- Assert.assertEquals(2, (int) r.getResult());
+ Assertions.assertEquals(200, r.getStatusCode());
+ Assertions.assertEquals(2, (int) r.getResult());
Response r1 = r.build();
- Assert.assertEquals(r, r1);
+ Assertions.assertEquals(r, r1);
r = Response.create(300, "300", 3);
- Assert.assertEquals(300, r.getStatusCode());
- Assert.assertEquals("300", r.getReasonPhrase());
- Assert.assertEquals(3, ((InvocationException) r.getResult()).getErrorData());
+ Assertions.assertEquals(300, r.getStatusCode());
+ Assertions.assertEquals("300", r.getReasonPhrase());
+ Assertions.assertEquals(3, ((InvocationException) r.getResult()).getErrorData());
r = Response.createSuccess(Status.OK, 2);
- Assert.assertEquals(200, r.getStatusCode());
- Assert.assertEquals(2, (int) r.getResult());
+ Assertions.assertEquals(200, r.getStatusCode());
+ Assertions.assertEquals(2, (int) r.getResult());
r = Response.success(2, Status.OK);
- Assert.assertEquals(200, r.getStatusCode());
- Assert.assertEquals(2, (int) r.getResult());
+ Assertions.assertEquals(200, r.getStatusCode());
+ Assertions.assertEquals(2, (int) r.getResult());
r = Response.createFail(InvocationType.CONSUMER, "abc");
- Assert.assertEquals("CommonExceptionData [message=abc]",
+ Assertions.assertEquals("CommonExceptionData [message=abc]",
((InvocationException) r.getResult()).getErrorData().toString());
- Assert.assertEquals(490, r.getStatusCode());
+ Assertions.assertEquals(490, r.getStatusCode());
r = Response.createFail(InvocationType.PRODUCER, "def");
- Assert.assertEquals("CommonExceptionData [message=def]",
+ Assertions.assertEquals("CommonExceptionData [message=def]",
((InvocationException) r.getResult()).getErrorData().toString());
- Assert.assertEquals(590, r.getStatusCode());
+ Assertions.assertEquals(590, r.getStatusCode());
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java
index f2bdfd0e9..fe030c1d5 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java
@@ -29,6 +29,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class TestSwaggerEnvironment {
private static final SwaggerEnvironment env = new SwaggerEnvironment();
@@ -65,7 +66,7 @@ public class TestSwaggerEnvironment {
Swagger swagger = SwaggerGenerator.generate(ContractIntf.class);
SwaggerConsumer swaggerConsumer = env.createConsumer(ConsumerIntf.class, swagger);
- Assert.assertNotNull(swaggerConsumer.findOperation("exist"));
- Assert.assertNull(swaggerConsumer.findOperation("notExist"));
+ Assertions.assertNotNull(swaggerConsumer.findOperation("exist"));
+ Assertions.assertNull(swaggerConsumer.findOperation("notExist"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/TestSwaggerInvocation.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/TestSwaggerInvocation.java
index 835adc63a..d5533d84c 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/TestSwaggerInvocation.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/TestSwaggerInvocation.java
@@ -18,8 +18,8 @@ package org.apache.servicecomb.swagger.invocation;
import org.apache.servicecomb.swagger.invocation.context.ContextUtils;
import org.apache.servicecomb.swagger.invocation.context.InvocationContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestSwaggerInvocation {
@Test
@@ -31,9 +31,9 @@ public class TestSwaggerInvocation {
try {
SwaggerInvocation invocation = new SwaggerInvocation();
- Assert.assertSame(parentContext, invocation.getParentContext());
- Assert.assertEquals("v", invocation.getContext("k"));
- Assert.assertEquals(1, (int) invocation.getLocalContext("k"));
+ Assertions.assertSame(parentContext, invocation.getParentContext());
+ Assertions.assertEquals("v", invocation.getContext("k"));
+ Assertions.assertEquals(1, (int) invocation.getLocalContext("k"));
} finally {
ContextUtils.removeInvocationContext();
}
@@ -42,6 +42,6 @@ public class TestSwaggerInvocation {
@Test
public void construct_noContext() {
SwaggerInvocation invocation = new SwaggerInvocation();
- Assert.assertNull(invocation.getParentContext());
+ Assertions.assertNull(invocation.getParentContext());
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java
index 21da70a0c..9b2a1cd41 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java
@@ -35,6 +35,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestJaxrsV1V1 {
@@ -53,9 +54,9 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
interface ConsumerAddV1_diff_order {
@@ -77,9 +78,9 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -97,9 +98,9 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -117,11 +118,11 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>)result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -138,9 +139,9 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -157,9 +158,9 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -175,6 +176,6 @@ public class TestJaxrsV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java
index 415a72044..5c00b0937 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.swagger.invocation.arguments.consumer;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.servicecomb.swagger.engine.SwaggerConsumer;
@@ -31,10 +30,10 @@ import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBeanParamV2;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBodyV2;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestJaxrsV1V2 {
@@ -53,10 +52,10 @@ public class TestJaxrsV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -74,10 +73,10 @@ public class TestJaxrsV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null,result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -95,12 +94,12 @@ public class TestJaxrsV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -117,10 +116,10 @@ public class TestJaxrsV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(null, result.get("x-z"));
}
@Test
@@ -137,10 +136,10 @@ public class TestJaxrsV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(null, result.get("x-z"));
}
@Test
@@ -156,6 +155,6 @@ public class TestJaxrsV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java
index 76527c085..9fa3a9dff 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestJaxrsV2V1 {
@@ -53,9 +54,9 @@ public class TestJaxrsV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -74,9 +75,9 @@ public class TestJaxrsV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -95,11 +96,11 @@ public class TestJaxrsV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -116,9 +117,9 @@ public class TestJaxrsV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -135,9 +136,9 @@ public class TestJaxrsV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -153,6 +154,6 @@ public class TestJaxrsV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java
index e5eaf62ef..63df2df08 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestJaxrsV2V2 {
@@ -53,10 +54,10 @@ public class TestJaxrsV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -75,10 +76,10 @@ public class TestJaxrsV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -97,12 +98,12 @@ public class TestJaxrsV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -119,10 +120,10 @@ public class TestJaxrsV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -139,10 +140,10 @@ public class TestJaxrsV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -158,6 +159,6 @@ public class TestJaxrsV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V1.java
index 0372acc07..41d80ceac 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V1.java
@@ -31,10 +31,10 @@ import org.apache.servicecomb.swagger.invocation.schemas.ConsumerAddWithContext;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestPojoV1V1 {
@@ -62,11 +62,11 @@ public class TestPojoV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -84,11 +84,11 @@ public class TestPojoV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -105,7 +105,7 @@ public class TestPojoV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
@Test
@@ -121,12 +121,12 @@ public class TestPojoV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
AddWrapperV1 wrapperV1 = (AddWrapperV1) result.get("addBody");
- Assert.assertEquals(1, wrapperV1.getX());
- Assert.assertEquals(2, wrapperV1.y);
+ Assertions.assertEquals(1, wrapperV1.getX());
+ Assertions.assertEquals(2, wrapperV1.y);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
@Test
@@ -151,18 +151,18 @@ public class TestPojoV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, result.get("x"));
- Assert.assertEquals(2, result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, result.get("x"));
+ Assertions.assertEquals(2, result.get("y"));
- Assert.assertEquals(2, invocation.getContext().size());
- Assert.assertEquals("v1", invocation.getContext().get("k1"));
- Assert.assertEquals("v2", invocation.getContext().get("k2"));
+ Assertions.assertEquals(2, invocation.getContext().size());
+ Assertions.assertEquals("v1", invocation.getContext().get("k1"));
+ Assertions.assertEquals("v2", invocation.getContext().get("k2"));
- Assert.assertEquals(2, invocation.getLocalContext().size());
- Assert.assertEquals("v3", invocation.getLocalContext().get("k3"));
- Assert.assertEquals("v4", invocation.getLocalContext().get("k4"));
+ Assertions.assertEquals(2, invocation.getLocalContext().size());
+ Assertions.assertEquals("v3", invocation.getLocalContext().get("k3"));
+ Assertions.assertEquals("v4", invocation.getLocalContext().get("k4"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V2.java
index 6385d48ef..fd10ab4a4 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV1V2.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.swagger.invocation.arguments.consumer;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.servicecomb.swagger.engine.SwaggerConsumer;
@@ -30,10 +29,10 @@ import org.apache.servicecomb.swagger.invocation.schemas.ConsumerAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddBodyV2;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestPojoV1V2 {
@@ -52,11 +51,11 @@ public class TestPojoV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -74,11 +73,11 @@ public class TestPojoV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -95,7 +94,7 @@ public class TestPojoV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
@Test
@@ -112,6 +111,6 @@ public class TestPojoV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V1.java
index dbd2031e9..79c7ce290 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V1.java
@@ -29,10 +29,10 @@ import org.apache.servicecomb.swagger.invocation.schemas.ConsumerAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2;
-import org.junit.Assert;
-import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
@SuppressWarnings("unchecked")
public class TestPojoV2V1 {
@@ -52,11 +52,11 @@ public class TestPojoV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -75,11 +75,11 @@ public class TestPojoV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -96,7 +96,7 @@ public class TestPojoV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
@Test
@@ -113,6 +113,6 @@ public class TestPojoV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java
index c0fdb8a8f..41f74947c 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestPojoV2V2 {
@@ -53,12 +54,12 @@ public class TestPojoV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -77,12 +78,12 @@ public class TestPojoV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -99,7 +100,7 @@ public class TestPojoV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
@Test
@@ -116,6 +117,6 @@ public class TestPojoV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(arguments.get("addBody"), result.get("addBody"));
+ Assertions.assertSame(arguments.get("addBody"), result.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java
index 0e5ac13b3..c6cde13b3 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestSpringmvcV1V1 {
@@ -52,9 +53,9 @@ public class TestSpringmvcV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -72,9 +73,9 @@ public class TestSpringmvcV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -92,11 +93,11 @@ public class TestSpringmvcV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -113,9 +114,9 @@ public class TestSpringmvcV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -132,9 +133,9 @@ public class TestSpringmvcV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -151,6 +152,6 @@ public class TestSpringmvcV1V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java
index c3bb712e1..3fc226731 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestSpringmvcV1V2 {
@@ -52,10 +53,10 @@ public class TestSpringmvcV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -73,10 +74,10 @@ public class TestSpringmvcV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(null, result.get("x-z"));
}
@Test
@@ -94,12 +95,12 @@ public class TestSpringmvcV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(null, result.get("x-z"));
}
@Test
@@ -116,10 +117,10 @@ public class TestSpringmvcV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(null, result.get("x-z"));
}
@Test
@@ -136,10 +137,10 @@ public class TestSpringmvcV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(null, result.get("x-z"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(null, result.get("x-z"));
}
@Test
@@ -156,6 +157,6 @@ public class TestSpringmvcV1V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java
index 0f0fd2fe0..aefb79612 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java
@@ -35,6 +35,7 @@ import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
@SuppressWarnings("unchecked")
public class TestSpringmvcV2V1 {
@@ -54,9 +55,9 @@ public class TestSpringmvcV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -75,9 +76,9 @@ public class TestSpringmvcV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -96,11 +97,11 @@ public class TestSpringmvcV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -117,9 +118,9 @@ public class TestSpringmvcV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -136,9 +137,9 @@ public class TestSpringmvcV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -155,6 +156,6 @@ public class TestSpringmvcV2V1 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V2.java
index d3ac07312..21b1a7029 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V2.java
@@ -30,10 +30,10 @@ import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddBodyV2;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddWrapperV2;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2;
-import org.junit.Assert;
-import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
@SuppressWarnings("unchecked")
public class TestSpringmvcV2V2 {
@@ -53,10 +53,10 @@ public class TestSpringmvcV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -75,10 +75,10 @@ public class TestSpringmvcV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -97,12 +97,12 @@ public class TestSpringmvcV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("addBody");
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -119,10 +119,10 @@ public class TestSpringmvcV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -139,10 +139,10 @@ public class TestSpringmvcV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
- Assert.assertEquals(3, (int) result.get("x-z"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(3, (int) result.get("x-z"));
}
@Test
@@ -159,6 +159,6 @@ public class TestSpringmvcV2V2 {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertSame(result.get("addBody"), arguments.get("addBody"));
+ Assertions.assertSame(result.get("addBody"), arguments.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestJaxrs.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestJaxrs.java
index e2c7c7aa5..fa9739866 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestJaxrs.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestJaxrs.java
@@ -27,8 +27,8 @@ import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddBeanParamV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestJaxrs {
@Test
@@ -43,9 +43,9 @@ public class TestJaxrs {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -60,10 +60,10 @@ public class TestJaxrs {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
AddBeanParamV1 paramV1 = (AddBeanParamV1) result.get("wrapper");
- Assert.assertEquals(1, paramV1.getX());
- Assert.assertEquals(2, paramV1.y);
+ Assertions.assertEquals(1, paramV1.getX());
+ Assertions.assertEquals(2, paramV1.y);
}
@Test
@@ -78,7 +78,7 @@ public class TestJaxrs {
SwaggerInvocation invocation = new SwaggerInvocation();
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
- Assert.assertSame(addBody, result.get("addBody"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertSame(addBody, result.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java
index 4d805df36..23c17d455 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java
@@ -27,6 +27,7 @@ import org.apache.servicecomb.swagger.invocation.schemas.PojoAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddWithContextV1;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestPojo {
static Map<String, Object> addBody = new HashMap<>();
@@ -47,9 +48,9 @@ public class TestPojo {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -63,8 +64,8 @@ public class TestPojo {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
- Assert.assertSame(addBody, result.get("addBody"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertSame(addBody, result.get("addBody"));
}
@Test
@@ -78,9 +79,9 @@ public class TestPojo {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(3, result.size());
- Assert.assertSame(invocation, result.get("context"));
- Assert.assertEquals(1, result.get("x"));
- Assert.assertEquals(2, result.get("y"));
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertSame(invocation, result.get("context"));
+ Assertions.assertEquals(1, result.get("x"));
+ Assertions.assertEquals(2, result.get("y"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojoOneArg.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojoOneArg.java
index 99eb56a78..843d15a16 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojoOneArg.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojoOneArg.java
@@ -25,15 +25,15 @@ import org.apache.servicecomb.swagger.engine.SwaggerProducer;
import org.apache.servicecomb.swagger.engine.SwaggerProducerOperation;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
import org.apache.servicecomb.swagger.invocation.schemas.PojoOneArg;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestPojoOneArg {
@Test
public void should_mapper_swagger_wrapped_body_field_to_producer_enum() {
SwaggerProducer swaggerProducer = new SwaggerEnvironment().createProducer(new PojoOneArg(), null);
SwaggerProducerOperation swaggerProducerOperation = swaggerProducer.findOperation("enumBody");
- Assert.assertEquals("color",
+ Assertions.assertEquals("color",
swaggerProducerOperation.getSwaggerOperation().getOperation().getParameters().get(0).getName());
ProducerArgumentsMapper mapper = swaggerProducerOperation.getArgumentsMapper();
@@ -46,7 +46,7 @@ public class TestPojoOneArg {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, swaggerArguments);
- Assert.assertEquals(1, result.size());
- Assert.assertSame(Color.BLUE, result.get("color"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertSame(Color.BLUE, result.get("color"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestSpringmvc.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestSpringmvc.java
index bda8ae65b..cc4119aa4 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestSpringmvc.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestSpringmvc.java
@@ -25,10 +25,9 @@ import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddWrapperV1;
-import org.apache.servicecomb.swagger.invocation.schemas.models.AddBeanParamV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestSpringmvc {
@Test
@@ -43,9 +42,9 @@ public class TestSpringmvc {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(1, (int) result.get("x"));
- Assert.assertEquals(2, (int) result.get("y"));
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(1, (int) result.get("x"));
+ Assertions.assertEquals(2, (int) result.get("y"));
}
@Test
@@ -60,10 +59,10 @@ public class TestSpringmvc {
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
AddWrapperV1 paramV1 = (AddWrapperV1) result.get("wrapper");
- Assert.assertEquals(1, paramV1.getX());
- Assert.assertEquals(2, paramV1.y);
+ Assertions.assertEquals(1, paramV1.getX());
+ Assertions.assertEquals(2, paramV1.y);
}
@Test
@@ -78,7 +77,7 @@ public class TestSpringmvc {
SwaggerInvocation invocation = new SwaggerInvocation();
Map<String, Object> result = mapper.swaggerArgumentToInvocationArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
- Assert.assertSame(addBody, result.get("addBody"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertSame(addBody, result.get("addBody"));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestContextUtils.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestContextUtils.java
index c84b4dcde..725114cf5 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestContextUtils.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestContextUtils.java
@@ -18,16 +18,16 @@ package org.apache.servicecomb.swagger.invocation.context;
import java.util.concurrent.CompletableFuture;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestContextUtils {
@Test
public void getFromCompletableFuture() {
- Assert.assertNull(ContextUtils.getFromCompletableFuture(new CompletableFuture<>()));
+ Assertions.assertNull(ContextUtils.getFromCompletableFuture(new CompletableFuture<>()));
InvocationContext context = new InvocationContext();
- Assert
- .assertSame(context, ContextUtils.getFromCompletableFuture(new InvocationContextCompletableFuture<>(context)));
+ Assertions
+ .assertSame(context, ContextUtils.getFromCompletableFuture(new InvocationContextCompletableFuture<>(context)));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java
index 166c2ad0f..6f3244d2f 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java
@@ -21,29 +21,29 @@ import java.util.Map;
import javax.ws.rs.core.Response.Status.Family;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestInvocationContext {
@Test
public void addContext() {
InvocationContext invocationContext = new InvocationContext();
invocationContext.addContext("key1", "value1");
- Assert.assertEquals(1, invocationContext.getContext().size());
- Assert.assertEquals("value1", invocationContext.getContext("key1"));
+ Assertions.assertEquals(1, invocationContext.getContext().size());
+ Assertions.assertEquals("value1", invocationContext.getContext("key1"));
Map<String, String> otherContext = new HashMap<>();
otherContext.put("key2", "value2");
invocationContext.addContext(otherContext);
- Assert.assertEquals(2, invocationContext.getContext().size());
- Assert.assertEquals("value2", invocationContext.getContext("key2"));
+ Assertions.assertEquals(2, invocationContext.getContext().size());
+ Assertions.assertEquals("value2", invocationContext.getContext("key2"));
InvocationContext invocationContext2 = new InvocationContext();
Map<String, String> otherContext2 = new HashMap<>();
otherContext2.put("key3", "value3");
invocationContext2.setContext(otherContext2);
invocationContext.addContext(invocationContext2);
- Assert.assertEquals(3, invocationContext.getContext().size());
+ Assertions.assertEquals(3, invocationContext.getContext().size());
}
@Test
@@ -53,14 +53,14 @@ public class TestInvocationContext {
otherContext.put("key1", "value1");
//otherContext's size is large than old.
invocationContext.mergeContext(otherContext);
- Assert.assertEquals(1, invocationContext.getContext().size());
- Assert.assertEquals("value1", invocationContext.getContext("key1"));
+ Assertions.assertEquals(1, invocationContext.getContext().size());
+ Assertions.assertEquals("value1", invocationContext.getContext("key1"));
otherContext.put("key1", "value2");
//otherContext's size is not large than old.
invocationContext.mergeContext(otherContext);
- Assert.assertEquals(1, invocationContext.getContext().size());
- Assert.assertEquals("value2", invocationContext.getContext("key1"));
+ Assertions.assertEquals(1, invocationContext.getContext().size());
+ Assertions.assertEquals("value2", invocationContext.getContext("key1"));
}
@Test
@@ -71,22 +71,22 @@ public class TestInvocationContext {
InvocationContext context2 = new InvocationContext();
context2.setContext(otherContext);
invocationContext.mergeContext(context2);
- Assert.assertEquals(1, invocationContext.getContext().size());
- Assert.assertEquals("value1", invocationContext.getContext("key1"));
+ Assertions.assertEquals(1, invocationContext.getContext().size());
+ Assertions.assertEquals("value1", invocationContext.getContext("key1"));
}
@Test
public void addLocalContext() {
InvocationContext invocationContext = new InvocationContext();
invocationContext.addLocalContext("key1", "value1");
- Assert.assertEquals(1, invocationContext.getLocalContext().size());
- Assert.assertEquals("value1", invocationContext.getLocalContext("key1"));
+ Assertions.assertEquals(1, invocationContext.getLocalContext().size());
+ Assertions.assertEquals("value1", invocationContext.getLocalContext("key1"));
Map<String, Object> otherContext = new HashMap<>();
otherContext.put("key2", "value2");
invocationContext.addLocalContext(otherContext);
- Assert.assertEquals(2, invocationContext.getLocalContext().size());
- Assert.assertEquals("value2", invocationContext.getLocalContext("key2"));
+ Assertions.assertEquals(2, invocationContext.getLocalContext().size());
+ Assertions.assertEquals("value2", invocationContext.getLocalContext("key2"));
}
@Test
@@ -94,13 +94,13 @@ public class TestInvocationContext {
InvocationContext invocationContext = new InvocationContext();
invocationContext.setStatus(200);
System.out.println(invocationContext.getStatus().getFamily());
- Assert.assertEquals(200, invocationContext.getStatus().getStatusCode());
- Assert.assertEquals("OK", invocationContext.getStatus().getReasonPhrase());
- Assert.assertEquals(Family.SUCCESSFUL, invocationContext.getStatus().getFamily());
+ Assertions.assertEquals(200, invocationContext.getStatus().getStatusCode());
+ Assertions.assertEquals("OK", invocationContext.getStatus().getReasonPhrase());
+ Assertions.assertEquals(Family.SUCCESSFUL, invocationContext.getStatus().getFamily());
invocationContext.setStatus(200, "TEST");
- Assert.assertEquals(200, invocationContext.getStatus().getStatusCode());
- Assert.assertEquals("TEST", invocationContext.getStatus().getReasonPhrase());
- Assert.assertEquals(Family.SUCCESSFUL, invocationContext.getStatus().getFamily());
+ Assertions.assertEquals(200, invocationContext.getStatus().getStatusCode());
+ Assertions.assertEquals("TEST", invocationContext.getStatus().getReasonPhrase());
+ Assertions.assertEquals(Family.SUCCESSFUL, invocationContext.getStatus().getFamily());
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java
index 8b766d391..6ea420501 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java
@@ -23,20 +23,20 @@ import javax.servlet.http.Part;
import org.apache.servicecomb.foundation.common.part.FilePart;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class PartListToPartArrayConverterTest {
PartListToPartArrayConverter converter = new PartListToPartArrayConverter();
@Test
public void getSrcType() {
- Assert.assertEquals("java.util.List<javax.servlet.http.Part>", converter.getSrcType().getTypeName());
+ Assertions.assertEquals("java.util.List<javax.servlet.http.Part>", converter.getSrcType().getTypeName());
}
@Test
public void getTargetType() {
- Assert.assertEquals(Part[].class.getCanonicalName(), converter.getTargetType().getTypeName());
+ Assertions.assertEquals(Part[].class.getCanonicalName(), converter.getTargetType().getTypeName());
}
@Test
@@ -47,6 +47,6 @@ public class PartListToPartArrayConverterTest {
@Test
public void should_got_null_when_convert_null() {
- Assert.assertNull(converter.convert(null));
+ Assertions.assertNull(converter.convert(null));
}
}
\ No newline at end of file
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java
index d0869f53d..11dfb0990 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java
@@ -22,25 +22,25 @@ import java.util.List;
import javax.servlet.http.Part;
import org.apache.servicecomb.foundation.common.part.FilePart;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class PartListToPartListConverterTest {
PartListToPartListConverter converter = new PartListToPartListConverter();
@Test
public void getSrcType() {
- Assert.assertEquals("java.util.List<javax.servlet.http.Part>", converter.getSrcType().getTypeName());
+ Assertions.assertEquals("java.util.List<javax.servlet.http.Part>", converter.getSrcType().getTypeName());
}
@Test
public void getTargetType() {
- Assert.assertEquals("java.util.List<javax.servlet.http.Part>", converter.getTargetType().getTypeName());
+ Assertions.assertEquals("java.util.List<javax.servlet.http.Part>", converter.getTargetType().getTypeName());
}
@Test
public void convert() {
List<Part> parts = Arrays.asList(new FilePart("name", "file"));
- Assert.assertSame(parts, converter.convert(parts));
+ Assertions.assertSame(parts, converter.convert(parts));
}
}
\ No newline at end of file
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java
index 203d27799..d6fc0639c 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java
@@ -19,25 +19,25 @@ package org.apache.servicecomb.swagger.invocation.converter.impl.part;
import javax.servlet.http.Part;
import org.apache.servicecomb.foundation.common.part.FilePart;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class PartToPartConverterTest {
PartToPartConverter converter = new PartToPartConverter();
@Test
public void getSrcType() {
- Assert.assertEquals(Part.class.getName(), converter.getSrcType().getTypeName());
+ Assertions.assertEquals(Part.class.getName(), converter.getSrcType().getTypeName());
}
@Test
public void getTargetType() {
- Assert.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
+ Assertions.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
}
@Test
public void convert() {
Part part = new FilePart("name", "file");
- Assert.assertSame(part, converter.convert(part));
+ Assertions.assertSame(part, converter.convert(part));
}
}
\ No newline at end of file
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java
index c5f52b6f3..03d6d6ad9 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java
@@ -20,20 +20,20 @@ import javax.servlet.http.Part;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestBytesToPartConverter {
BytesToPartConverter converter = new BytesToPartConverter();
@Test
public void getSrcType() {
- Assert.assertSame(byte[].class, converter.getSrcType());
+ Assertions.assertSame(byte[].class, converter.getSrcType());
}
@Test
public void getTargetType() {
- Assert.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
+ Assertions.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
}
@Test
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java
index 73fad719f..527e933dd 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java
@@ -23,20 +23,20 @@ import javax.servlet.http.Part;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestFileToPartConverter {
FileToPartConverter converter = new FileToPartConverter();
@Test
public void getSrcType() {
- Assert.assertEquals(File.class.getName(), converter.getSrcType().getTypeName());
+ Assertions.assertEquals(File.class.getName(), converter.getSrcType().getTypeName());
}
@Test
public void getTargetType() {
- Assert.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
+ Assertions.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
}
@Test
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java
index 852c323eb..9e2021ef9 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java
@@ -24,20 +24,20 @@ import javax.servlet.http.Part;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestInputStreamToPartConverter {
InputStreamToPartConverter converter = new InputStreamToPartConverter();
@Test
public void getSrcType() {
- Assert.assertEquals(InputStream.class.getName(), converter.getSrcType().getTypeName());
+ Assertions.assertEquals(InputStream.class.getName(), converter.getSrcType().getTypeName());
}
@Test
public void getTargetType() {
- Assert.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
+ Assertions.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
}
@Test
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java
index 9ad13eee9..67cf8e4a9 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java
@@ -23,8 +23,8 @@ import javax.servlet.http.Part;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
@@ -33,12 +33,12 @@ public class TestResourceToPartConverter {
@Test
public void getSrcType() {
- Assert.assertEquals(Resource.class.getName(), converter.getSrcType().getTypeName());
+ Assertions.assertEquals(Resource.class.getName(), converter.getSrcType().getTypeName());
}
@Test
public void getTargetType() {
- Assert.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
+ Assertions.assertEquals(Part.class.getName(), converter.getTargetType().getTypeName());
}
@Test
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java
index 76f5458f1..f6ac2a812 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java
@@ -19,8 +19,8 @@ package org.apache.servicecomb.swagger.invocation.exception;
import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestExceptionFactory {
@Test
@@ -28,7 +28,7 @@ public class TestExceptionFactory {
Error error = new Error("test");
Response response = ExceptionFactory.convertExceptionToResponse(null, error);
- Assert.assertSame(Status.OK, response.getStatus());
- Assert.assertEquals("response from error: test", response.getResult());
+ Assertions.assertSame(Status.OK, response.getStatus());
+ Assertions.assertEquals("response from error: test", response.getResult());
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
index 319e41153..dbf391926 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestExceptionToProducerResponseConverters {
@Test
@@ -60,11 +61,11 @@ public class TestExceptionToProducerResponseConverters {
ExceptionToProducerResponseConverters exceptionToProducerResponseConverters = new ExceptionToProducerResponseConverters();
- Assert.assertSame(r1,
+ Assertions.assertSame(r1,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new Throwable()));
- Assert.assertSame(r2,
+ Assertions.assertSame(r2,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new Exception()));
- Assert.assertSame(r2,
+ Assertions.assertSame(r2,
exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new IllegalStateException()));
}
@@ -105,12 +106,12 @@ public class TestExceptionToProducerResponseConverters {
ExceptionToProducerResponseConverters exceptionToProducerResponseConverters = new ExceptionToProducerResponseConverters();
- Assert.assertSame(r2,
+ Assertions.assertSame(r2,
exceptionToProducerResponseConverters
.convertExceptionToResponse(null, new InvocationException(Status.UNAUTHORIZED, "")));
- Assert.assertSame(r1,
+ Assertions.assertSame(r1,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new RuntimeException()));
- Assert.assertSame(rDef,
+ Assertions.assertSame(rDef,
exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new IOException()));
}
@@ -162,16 +163,16 @@ public class TestExceptionToProducerResponseConverters {
ExceptionToProducerResponseConverters exceptionToProducerResponseConverters = new ExceptionToProducerResponseConverters();
- Assert.assertSame(rR0,
+ Assertions.assertSame(rR0,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new RuntimeException0_0()));
- Assert.assertSame(rR0,
+ Assertions.assertSame(rR0,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new RuntimeException0()));
- Assert.assertSame(rR1,
+ Assertions.assertSame(rR1,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new RuntimeException1()));
- Assert.assertSame(rR,
+ Assertions.assertSame(rR,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new RuntimeException()));
// Actually, a Throwable exception converter will act like a default converter, as our implementation expects.
- Assert.assertSame(rT,
+ Assertions.assertSame(rT,
exceptionToProducerResponseConverters.convertExceptionToResponse(null, new IOException()));
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/TestResponsesMeta.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/TestResponsesMeta.java
index 219bb0c20..c73d30885 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/TestResponsesMeta.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/TestResponsesMeta.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.swagger.invocation.response;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -27,6 +26,7 @@ import io.swagger.annotations.ApiResponses;
import io.swagger.annotations.ResponseHeader;
import io.swagger.models.Operation;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class TestResponsesMeta {
class ResponseMetaImpl {
@@ -51,19 +51,19 @@ public class TestResponsesMeta {
meta.init(swagger, operation);
JavaType resp = meta.findResponseType(200);
- Assert.assertEquals(Integer.class, resp.getRawClass());
+ Assertions.assertEquals(Integer.class, resp.getRawClass());
resp = meta.findResponseType(201);
- Assert.assertEquals(Integer.class, resp.getRawClass());
+ Assertions.assertEquals(Integer.class, resp.getRawClass());
resp = meta.findResponseType(400);
- Assert.assertEquals(String.class, resp.getRawClass());
+ Assertions.assertEquals(String.class, resp.getRawClass());
resp = meta.findResponseType(401);
- Assert.assertEquals(Long.class, resp.getRawClass());
+ Assertions.assertEquals(Long.class, resp.getRawClass());
resp = meta.findResponseType(500);
// changed to Object for new version to keep user defined error data not lose and can be parsed.
- Assert.assertEquals(Object.class, resp.getRawClass());
+ Assertions.assertEquals(Object.class, resp.getRawClass());
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java
index d9e64a301..c5004c090 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java
@@ -26,12 +26,12 @@ import org.apache.servicecomb.swagger.engine.SwaggerConsumerOperation;
import org.apache.servicecomb.swagger.engine.SwaggerEnvironment;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import io.swagger.annotations.ApiResponse;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class TestConsumerResponseMapperFactorys {
interface ConsumerResponseForTest {
@@ -66,14 +66,14 @@ public class TestConsumerResponseMapperFactorys {
public void should_mapper_to_normal_string() {
SwaggerConsumerOperation operation = swaggerConsumer.findOperation("normal");
assertThat(operation.getResponseMapper()).isInstanceOf(DefaultConsumerResponseMapper.class);
- Assert.assertEquals(result, operation.getResponseMapper().mapResponse(response));
+ Assertions.assertEquals(result, operation.getResponseMapper().mapResponse(response));
}
@Test
public void should_mapper_to_completableFuture_element_string() {
SwaggerConsumerOperation operation = swaggerConsumer.findOperation("async");
assertThat(operation.getResponseMapper()).isInstanceOf(DefaultConsumerResponseMapper.class);
- Assert.assertEquals(result, operation.getResponseMapper().mapResponse(response));
+ Assertions.assertEquals(result, operation.getResponseMapper().mapResponse(response));
}
@Test
@@ -82,7 +82,7 @@ public class TestConsumerResponseMapperFactorys {
assertThat(operation.getResponseMapper().getClass().getName())
.startsWith(CseResponseConsumerResponseMapperFactory.class.getName());
Response scbResponse = (Response) operation.getResponseMapper().mapResponse(response);
- Assert.assertEquals(result, scbResponse.getResult());
+ Assertions.assertEquals(result, scbResponse.getResult());
}
@Test
@@ -91,6 +91,6 @@ public class TestConsumerResponseMapperFactorys {
assertThat(operation.getResponseMapper()).isInstanceOf(OptionalConsumerResponseMapper.class);
@SuppressWarnings("unchecked")
Optional<String> optional = (Optional<String>) operation.getResponseMapper().mapResponse(response);
- Assert.assertEquals(result, optional.get());
+ Assertions.assertEquals(result, optional.get());
}
}
diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java
index b70c47cee..5125d78af 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java
@@ -26,12 +26,12 @@ import org.apache.servicecomb.swagger.engine.SwaggerEnvironment;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import io.swagger.annotations.ApiResponse;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
public class TestJaxrsConsumerResponseMapper {
@Path("/")
@@ -63,8 +63,8 @@ public class TestJaxrsConsumerResponseMapper {
SwaggerConsumerOperation operation = swaggerConsumer.findOperation("jaxrsResponse");
Response jaxrsResponse = (Response) operation.getResponseMapper().mapResponse(response);
- Assert.assertEquals(result, jaxrsResponse.getEntity());
- Assert.assertTrue(jaxrsResponse.getHeaders().isEmpty());
+ Assertions.assertEquals(result, jaxrsResponse.getEntity());
+ Assertions.assertTrue(jaxrsResponse.getHeaders().isEmpty());
}
@Test
@@ -74,8 +74,8 @@ public class TestJaxrsConsumerResponseMapper {
response.addHeader("h1", null);
Response jaxrsResponse = (Response) operation.getResponseMapper().mapResponse(response);
- Assert.assertEquals(result, jaxrsResponse.getEntity());
- Assert.assertEquals(1, jaxrsResponse.getHeaders().size());
+ Assertions.assertEquals(result, jaxrsResponse.getEntity());
+ Assertions.assertEquals(1, jaxrsResponse.getHeaders().size());
MatcherAssert.assertThat(jaxrsResponse.getHeaders().get("h"), Matchers.contains("v1", "v2"));
}
}
diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java
index 7f64a4940..5b647eae6 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java
@@ -23,11 +23,11 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.swagger.invocation.Response;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestJaxrsProducerResponseMapper {
JaxrsProducerResponseMapper mapper = new JaxrsProducerResponseMapper();
@@ -46,9 +46,9 @@ public class TestJaxrsProducerResponseMapper {
}
};
Response response = mapper.mapResponse(null, jaxrsResponse);
- Assert.assertEquals(Status.OK, response.getStatus());
- Assert.assertEquals("result", response.getResult());
- Assert.assertNull(response.getHeaders());
+ Assertions.assertEquals(Status.OK, response.getStatus());
+ Assertions.assertEquals("result", response.getResult());
+ Assertions.assertNull(response.getHeaders());
}
@Test
@@ -67,9 +67,9 @@ public class TestJaxrsProducerResponseMapper {
}
};
Response response = mapper.mapResponse(null, jaxrsResponse);
- Assert.assertEquals(Status.OK, response.getStatus());
- Assert.assertEquals("result", response.getResult());
- Assert.assertEquals(1, response.getHeaders().size());
+ Assertions.assertEquals(Status.OK, response.getStatus());
+ Assertions.assertEquals("result", response.getResult());
+ Assertions.assertEquals(1, response.getHeaders().size());
MatcherAssert.assertThat(response.getHeaders("h"), Matchers.contains("v"));
}
}
diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
index 43c481ba4..c68b97f13 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
@@ -22,18 +22,19 @@ import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestJaxrsProducerResponseMapperFactory {
JaxrsProducerResponseMapperFactory factory = new JaxrsProducerResponseMapperFactory();
@Test
public void isMatch_true() {
- Assert.assertTrue(factory.isMatch(Response.class));
+ Assertions.assertTrue(factory.isMatch(Response.class));
}
@Test
public void isMatch_false() {
- Assert.assertFalse(factory.isMatch(String.class));
+ Assertions.assertFalse(factory.isMatch(String.class));
}
@Test
diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java
index fe12c8bdc..05fb158cf 100644
--- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java
+++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java
@@ -55,7 +55,7 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertEquals(name, multipartFile.getName());
+ Assertions.assertEquals(name, multipartFile.getName());
}
@Test
@@ -68,7 +68,7 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertEquals(submittedFileName, multipartFile.getOriginalFilename());
+ Assertions.assertEquals(submittedFileName, multipartFile.getOriginalFilename());
}
@Test
@@ -81,7 +81,7 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertEquals(contentType, multipartFile.getContentType());
+ Assertions.assertEquals(contentType, multipartFile.getContentType());
}
@Test
@@ -93,7 +93,7 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertTrue(multipartFile.isEmpty());
+ Assertions.assertTrue(multipartFile.isEmpty());
}
@Test
@@ -105,7 +105,7 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertFalse(multipartFile.isEmpty());
+ Assertions.assertFalse(multipartFile.isEmpty());
}
@Test
@@ -118,7 +118,7 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertEquals(size, multipartFile.getSize());
+ Assertions.assertEquals(size, multipartFile.getSize());
}
class ByteArrayInputStreamForTest extends ByteArrayInputStream {
@@ -145,8 +145,8 @@ public class TestPartToMultipartFile {
}
};
- Assert.assertArrayEquals(bytes, multipartFile.getBytes());
- Assert.assertTrue(is.closed);
+ Assertions.assertArrayEquals(bytes, multipartFile.getBytes());
+ Assertions.assertTrue(is.closed);
}
@Test
@@ -175,6 +175,6 @@ public class TestPartToMultipartFile {
};
multipartFile.transferTo(dest);
- Assert.assertEquals(dest.getPath(), destName.value);
+ Assertions.assertEquals(dest.getPath(), destName.value);
}
}
diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java
index 3cbb9c237..71981bb23 100644
--- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java
+++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java
@@ -25,9 +25,9 @@ import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import org.apache.servicecomb.swagger.invocation.Response;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.ResponseEntity;
import io.swagger.models.Swagger;
@@ -60,8 +60,8 @@ public class TestSpringmvcConsumerResponseMapper {
@SuppressWarnings("unchecked")
ResponseEntity<String> responseEntity = (ResponseEntity<String>) operation.getResponseMapper()
.mapResponse(response);
- Assert.assertEquals(result, responseEntity.getBody());
- Assert.assertTrue(responseEntity.getHeaders().isEmpty());
+ Assertions.assertEquals(result, responseEntity.getBody());
+ Assertions.assertTrue(responseEntity.getHeaders().isEmpty());
}
@Test
@@ -72,8 +72,8 @@ public class TestSpringmvcConsumerResponseMapper {
@SuppressWarnings("unchecked")
ResponseEntity<String> responseEntity = (ResponseEntity<String>) operation.getResponseMapper()
.mapResponse(response);
- Assert.assertEquals(result, responseEntity.getBody());
- Assert.assertEquals(1, responseEntity.getHeaders().size());
+ Assertions.assertEquals(result, responseEntity.getBody());
+ Assertions.assertEquals(1, responseEntity.getHeaders().size());
MatcherAssert.assertThat(responseEntity.getHeaders().get("h"), Matchers.contains("v"));
}
@@ -84,8 +84,8 @@ public class TestSpringmvcConsumerResponseMapper {
@SuppressWarnings("unchecked")
ResponseEntity<String> responseEntity = (ResponseEntity<String>) operation.getResponseMapper()
.mapResponse(response);
- Assert.assertEquals(result, responseEntity.getBody());
- Assert.assertTrue(responseEntity.getHeaders().isEmpty());
+ Assertions.assertEquals(result, responseEntity.getBody());
+ Assertions.assertTrue(responseEntity.getHeaders().isEmpty());
}
@Test
@@ -97,8 +97,8 @@ public class TestSpringmvcConsumerResponseMapper {
@SuppressWarnings("unchecked")
ResponseEntity<String> responseEntity = (ResponseEntity<String>) operation.getResponseMapper()
.mapResponse(response);
- Assert.assertEquals(result, responseEntity.getBody());
- Assert.assertEquals(1, responseEntity.getHeaders().size());
+ Assertions.assertEquals(result, responseEntity.getBody());
+ Assertions.assertEquals(1, responseEntity.getHeaders().size());
MatcherAssert.assertThat(responseEntity.getHeaders().get("h"), Matchers.contains("v1", "v2"));
}
}
diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java
index e6ae3c1ae..15d6ec42f 100644
--- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java
+++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java
@@ -27,9 +27,9 @@ import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
@@ -68,7 +68,7 @@ public class TestSpringmvcProducerResponseMapper {
new ResponseEntity<>(arrResult, org.springframework.http.HttpStatus.OK);
Response response = mapper.mapResponse(null, responseEntity);
MatcherAssert.assertThat((List<String>) response.getResult(), Matchers.contains("a", "b"));
- Assert.assertEquals(Status.OK, response.getStatus());
+ Assertions.assertEquals(Status.OK, response.getStatus());
}
@Test
@@ -76,8 +76,8 @@ public class TestSpringmvcProducerResponseMapper {
ResponseEntity<String[]> responseEntity =
new ResponseEntity<>(arrResult, org.springframework.http.HttpStatus.BAD_REQUEST);
Response response = mapper.mapResponse(null, responseEntity);
- Assert.assertSame(arrResult, response.getResult());
- Assert.assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus().getStatusCode());
+ Assertions.assertSame(arrResult, response.getResult());
+ Assertions.assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus().getStatusCode());
}
@Test
diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
index 198103cdd..5407786ea 100644
--- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
+++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
@@ -26,8 +26,8 @@ import org.apache.servicecomb.swagger.invocation.response.producer.ProducerRespo
import org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -48,18 +48,18 @@ public class TestSpringmvcProducerResponseMapperFactory {
@Test
public void isMatch_true() {
Method method = ReflectUtils.findMethod(this.getClass(), "responseEntity");
- Assert.assertTrue(factory.isMatch(method.getGenericReturnType()));
+ Assertions.assertTrue(factory.isMatch(method.getGenericReturnType()));
}
@Test
public void isMatch_Parameterized_false() {
Method method = ReflectUtils.findMethod(this.getClass(), "list");
- Assert.assertFalse(factory.isMatch(method.getGenericReturnType()));
+ Assertions.assertFalse(factory.isMatch(method.getGenericReturnType()));
}
@Test
public void isMatch_false() {
- Assert.assertFalse(factory.isMatch(String.class));
+ Assertions.assertFalse(factory.isMatch(String.class));
}
@Test
diff --git a/swagger/swagger-invocation/invocation-validator/src/test/java/org/apache/servicecomb/swagger/invocation/validator/TestDefaultParameterNameProvider.java b/swagger/swagger-invocation/invocation-validator/src/test/java/org/apache/servicecomb/swagger/invocation/validator/TestDefaultParameterNameProvider.java
index 3ca5c2bb6..550300871 100644
--- a/swagger/swagger-invocation/invocation-validator/src/test/java/org/apache/servicecomb/swagger/invocation/validator/TestDefaultParameterNameProvider.java
+++ b/swagger/swagger-invocation/invocation-validator/src/test/java/org/apache/servicecomb/swagger/invocation/validator/TestDefaultParameterNameProvider.java
@@ -21,8 +21,8 @@ import java.lang.reflect.Method;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestDefaultParameterNameProvider {
static class ValidatorForTest {
@@ -101,7 +101,7 @@ public class TestDefaultParameterNameProvider {
method = validatorForTest.getMethod("setTest", String.class);
MatcherAssert.assertThat(parameterNameProvider.getParameterNames(method), Matchers.contains("grade"));
method = validatorForTest.getMethod("getNumber");
- Assert.assertTrue(parameterNameProvider.getParameterNames(method).isEmpty());
+ Assertions.assertTrue(parameterNameProvider.getParameterNames(method).isEmpty());
method = validatorForTest.getMethod("setNumber", int.class);
MatcherAssert.assertThat(parameterNameProvider.getParameterNames(method), Matchers.contains("number"));
}
@@ -111,7 +111,7 @@ public class TestDefaultParameterNameProvider {
Constructor<ValidatorForTest> constructor = validatorForTest.getConstructor(String.class, int.class);
MatcherAssert.assertThat(parameterNameProvider.getParameterNames(constructor), Matchers.contains("grade", "number"));
constructor = validatorForTest.getConstructor();
- Assert.assertTrue(parameterNameProvider.getParameterNames(constructor).isEmpty());
+ Assertions.assertTrue(parameterNameProvider.getParameterNames(constructor).isEmpty());
}
}
diff --git a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
index d61b85bb3..f294f3ede 100644
--- a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
+++ b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -24,7 +24,6 @@ import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.fail;
import java.lang.reflect.Array;
import java.util.List;
@@ -41,6 +40,7 @@ import java.util.stream.Collectors;
import org.apache.servicecomb.tracing.zipkin.ZipkinTracingAdviser.ThrowableSupplier;
import org.hamcrest.MatcherAssert;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Test;
import brave.Span;
@@ -48,6 +48,7 @@ import brave.Tracer.SpanInScope;
import brave.Tracing;
import brave.propagation.StrictScopeDecorator;
import brave.propagation.ThreadLocalCurrentTraceContext;
+import org.junit.jupiter.api.Assertions;
public class ZipkinTracingAdviserTest {
private static final int nThreads = 10;
@@ -123,7 +124,7 @@ public class ZipkinTracingAdviserTest {
try (SpanInScope spanInScope = tracing.tracer().withSpanInScope(currentSpan)) {
MatcherAssert.assertThat(tracingAdviser.invoke(spanName, path, supplier), is(expected));
} catch (Throwable throwable) {
- fail(throwable.getMessage());
+ Assertions.fail(throwable.getMessage());
} finally {
currentSpan.finish();
}
diff --git a/transports/transport-common/src/test/java/org/apache/servicecomb/transport/common/TestTransportConfigUtils.java b/transports/transport-common/src/test/java/org/apache/servicecomb/transport/common/TestTransportConfigUtils.java
index 843c9d573..c4873ede0 100644
--- a/transports/transport-common/src/test/java/org/apache/servicecomb/transport/common/TestTransportConfigUtils.java
+++ b/transports/transport-common/src/test/java/org/apache/servicecomb/transport/common/TestTransportConfigUtils.java
@@ -21,12 +21,12 @@ import java.util.concurrent.atomic.AtomicInteger;
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.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class TestTransportConfigUtils {
@Before
@@ -47,7 +47,7 @@ public class TestTransportConfigUtils {
public void readVerticleCount_new_exist() {
ArchaiusUtils.setProperty(key, 10);
- Assert.assertEquals(10, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
+ Assertions.assertEquals(10, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
}
@Test
@@ -55,8 +55,8 @@ public class TestTransportConfigUtils {
ArchaiusUtils.setProperty(deprecatedKey, 10);
LogCollector collector = new LogCollector();
- Assert.assertEquals(10, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
- Assert.assertEquals("thread-count is ambiguous, and deprecated, recommended to use verticle-count.",
+ Assertions.assertEquals(10, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
+ Assertions.assertEquals("thread-count is ambiguous, and deprecated, recommended to use verticle-count.",
collector.getEvents().get(0).getMessage());
collector.teardown();
}
@@ -71,8 +71,8 @@ public class TestTransportConfigUtils {
};
LogCollector collector = new LogCollector();
- Assert.assertEquals(7, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
- Assert.assertEquals("verticle-count not defined, set to 7.",
+ Assertions.assertEquals(7, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
+ Assertions.assertEquals("verticle-count not defined, set to 7.",
collector.getLastEvents().getMessage());
collector.teardown();
}
@@ -88,14 +88,14 @@ public class TestTransportConfigUtils {
};
LogCollector collector = new LogCollector();
- Assert.assertEquals(8, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
- Assert.assertEquals("verticle-count not defined, set to 8.",
+ Assertions.assertEquals(8, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
+ Assertions.assertEquals("verticle-count not defined, set to 8.",
collector.getLastEvents().getMessage());
count.set(9);
collector.clear();
- Assert.assertEquals(8, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
- Assert.assertEquals("verticle-count not defined, set to 8.",
+ Assertions.assertEquals(8, TransportConfigUtils.readVerticleCount(key, deprecatedKey));
+ Assertions.assertEquals("verticle-count not defined, set to 8.",
collector.getLastEvents().getMessage());
collector.teardown();
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java
index ad8a29f06..1e2b30428 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java
@@ -38,9 +38,9 @@ import org.apache.servicecomb.foundation.vertx.client.tcp.TcpResponseCallback;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.AbstractVerticle;
@@ -90,7 +90,7 @@ public class TestHighwayClient {
@Test
public void testLoginTimeout(@Mocked Vertx vertx) {
TcpClientConfig tcpClientConfig = Deencapsulation.invoke(client, "createTcpClientConfig");
- Assert.assertEquals(2000, tcpClientConfig.getMsLoginTimeout());
+ Assertions.assertEquals(2000, tcpClientConfig.getMsLoginTimeout());
}
@Test
@@ -107,7 +107,7 @@ public class TestHighwayClient {
client.init(vertx);
ClientPoolManager<HighwayClientConnectionPool> clientMgr = Deencapsulation.getField(client, "clientMgr");
- Assert.assertSame(vertx, Deencapsulation.getField(clientMgr, "vertx"));
+ Assertions.assertSame(vertx, Deencapsulation.getField(clientMgr, "vertx"));
}
private Object doTestSend(Vertx vertx, HighwayClientConnectionPool pool, HighwayClientConnection tcpClient,
@@ -194,13 +194,13 @@ public class TestHighwayClient {
};
Object result = doTestSend(vertx, pool, tcpClient, Response.ok("ok"));
- Assert.assertEquals("ok", result);
- Assert.assertEquals(nanoTime, invocationStageTrace.getStartClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocationStageTrace.getFinishClientFiltersResponse());
+ Assertions.assertEquals("ok", result);
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getStartClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getFinishClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocationStageTrace.getFinishGetConnection());
- Assert.assertEquals(nanoTime, invocationStageTrace.getFinishWriteToBuffer());
- Assert.assertEquals(nanoTime, invocationStageTrace.getFinishReceiveResponse());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getFinishGetConnection());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getFinishWriteToBuffer());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getFinishReceiveResponse());
}
@Test
@@ -215,9 +215,9 @@ public class TestHighwayClient {
Object result = doTestSend(vertx, pool, tcpClient, new InvocationException(Status.BAD_REQUEST, (Object) "failed"));
- Assert.assertEquals("failed", ((InvocationException) result).getErrorData());
- Assert.assertEquals(nanoTime, invocationStageTrace.getStartClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocationStageTrace.getFinishClientFiltersResponse());
+ Assertions.assertEquals("failed", ((InvocationException) result).getErrorData());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getStartClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getFinishClientFiltersResponse());
}
@Test
@@ -235,8 +235,8 @@ public class TestHighwayClient {
tcpClient,
null);
- Assert.assertEquals("failed", ((InvocationException) result).getErrorData());
- Assert.assertEquals(nanoTime, invocationStageTrace.getStartClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocationStageTrace.getFinishClientFiltersResponse());
+ Assertions.assertEquals("failed", ((InvocationException) result).getErrorData());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getStartClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocationStageTrace.getFinishClientFiltersResponse());
}
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java
index a91b576dc..9de05d4c4 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java
@@ -34,10 +34,10 @@ import org.apache.servicecomb.foundation.vertx.server.TcpParser;
import org.apache.servicecomb.foundation.vertx.tcp.TcpOutputStream;
import org.apache.servicecomb.transport.highway.message.RequestHeader;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.netty.buffer.ByteBuf;
@@ -124,17 +124,17 @@ public class TestHighwayCodec {
Invocation invocation = new Invocation(endpoint, operationMeta, null);
invocation.addContext("X-B3-traceId", "test1");
- Assert.assertEquals("test1", invocation.getContext("X-B3-traceId"));
+ Assertions.assertEquals("test1", invocation.getContext("X-B3-traceId"));
RequestHeader headers = new RequestHeader();
Map<String, String> context = new HashMap<>();
headers.setContext(context);
HighwayCodec.decodeRequest(invocation, headers, operationProtobuf, bodyBuffer);
- Assert.assertEquals("test1", invocation.getContext("X-B3-traceId"));
+ Assertions.assertEquals("test1", invocation.getContext("X-B3-traceId"));
context.put("X-B3-traceId", "test2");
HighwayCodec.decodeRequest(invocation, headers, operationProtobuf, bodyBuffer);
- Assert.assertEquals("test1", invocation.getContext("X-B3-traceId"));
+ Assertions.assertEquals("test1", invocation.getContext("X-B3-traceId"));
}
@Test
@@ -150,7 +150,7 @@ public class TestHighwayCodec {
e.printStackTrace();
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
}
@Test
@@ -162,13 +162,13 @@ public class TestHighwayCodec {
Mockito.when(invocation.getInvocationArguments()).thenReturn(args);
Mockito.when(requestSerializer.serialize(args)).thenReturn(new byte[0]);
TcpOutputStream os = HighwayCodec.encodeRequest(0, invocation, operationProtobuf);
- Assert.assertNotNull(os);
- Assert.assertArrayEquals(TcpParser.TCP_MAGIC, os.getBuffer().getBytes(0, 7));
+ Assertions.assertNotNull(os);
+ Assertions.assertArrayEquals(TcpParser.TCP_MAGIC, os.getBuffer().getBytes(0, 7));
} catch (Exception e) {
e.printStackTrace();
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
}
private void commonMock() {
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java
index 194c26966..89bdd2397 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java
@@ -19,9 +19,9 @@ package org.apache.servicecomb.transport.highway;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestHighwayConfig {
@BeforeClass
@@ -37,17 +37,17 @@ public class TestHighwayConfig {
@Test
public void getServerThreadCount() {
ArchaiusUtils.setProperty("servicecomb.highway.server.verticle-count", 1);
- Assert.assertEquals(HighwayConfig.getServerThreadCount(), 1);
+ Assertions.assertEquals(HighwayConfig.getServerThreadCount(), 1);
}
@Test
public void getClientThreadCount() {
ArchaiusUtils.setProperty("servicecomb.highway.client.verticle-count", 1);
- Assert.assertEquals(HighwayConfig.getClientThreadCount(), 1);
+ Assertions.assertEquals(HighwayConfig.getClientThreadCount(), 1);
}
@Test
public void getAddress() {
- Assert.assertEquals(HighwayConfig.getAddress(), null);
+ Assertions.assertEquals(HighwayConfig.getAddress(), null);
}
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayTransport.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayTransport.java
index e33b201ec..624fc6dd7 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayTransport.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayTransport.java
@@ -27,9 +27,9 @@ import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ public class TestHighwayTransport {
@Test
public void testGetInstance() {
- Assert.assertNotNull(transport);
+ Assertions.assertNotNull(transport);
}
@Test
@@ -68,7 +68,7 @@ public class TestHighwayTransport {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
}
@Test
@@ -85,14 +85,14 @@ public class TestHighwayTransport {
}
};
transport.send(invocation, asyncResp);
- Assert.assertTrue(sended.value);
+ Assertions.assertTrue(sended.value);
}
@Test
public void testHighway() {
Invocation invocation = Mockito.mock(Invocation.class);
commonHighwayMock(invocation);
- Assert.assertEquals("highway", transport.getName());
+ Assertions.assertEquals("highway", transport.getName());
}
private void commonHighwayMock(Invocation invocation) {
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayVerticle.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayVerticle.java
index 6c7ff664b..e17ec8348 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayVerticle.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayVerticle.java
@@ -17,14 +17,12 @@
package org.apache.servicecomb.transport.highway;
-import static org.junit.Assert.assertTrue;
-
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.transport.common.MockUtil;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.Context;
@@ -36,14 +34,14 @@ import mockit.Mocked;
public class TestHighwayVerticle {
@Test
- public void testHighwayVerticle(@Mocked Transport transport, @Mocked Vertx vertx, @Mocked Context context,
- @Mocked JsonObject json) {
- HighwayServerVerticle highwayVerticle = new HighwayServerVerticle();
- URIEndpointObject endpiontObject = new URIEndpointObject("highway://127.0.0.1:9090");
+ public void testHighwayVehicle(@Mocked Transport transport, @Mocked Vertx vertx, @Mocked Context context,
+ @Mocked JsonObject json) {
+ HighwayServerVerticle highwayVehicle = new HighwayServerVerticle();
+ URIEndpointObject endpointObject = new URIEndpointObject("highway://127.0.0.1:9090");
new Expectations() {
{
transport.parseAddress(anyString);
- result = endpiontObject;
+ result = endpointObject;
}
};
@@ -58,16 +56,16 @@ public class TestHighwayVerticle {
}
};
- highwayVerticle.init(vertx, context);
+ highwayVehicle.init(vertx, context);
@SuppressWarnings("unchecked")
Promise<Void> startPromise = Mockito.mock(Promise.class);
- highwayVerticle.startListen(startPromise);
+ highwayVehicle.startListen(startPromise);
MockUtil.getInstance().mockHighwayConfig();
try {
- highwayVerticle.startListen(startPromise);
- assertTrue(true);
+ highwayVehicle.startListen(startPromise);
+ Assertions.assertTrue(true);
} catch (Exception e) {
- Assert.fail();
+ Assertions.fail();
}
}
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestHeaders.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestHeaders.java
index a47f3c114..d51100bae 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestHeaders.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestHeaders.java
@@ -23,15 +23,15 @@ import java.util.Map;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestHeaders {
@Test
public void test1() {
Headers headers = new Headers();
- Assert.assertNull(headers.getFirst("h1"));
- Assert.assertNull(headers.getHeader("h1"));
+ Assertions.assertNull(headers.getFirst("h1"));
+ Assertions.assertNull(headers.getHeader("h1"));
Map<String, List<Object>> headerMap = new HashMap<>();
List<Object> h1Value = Arrays.asList("h1v1", "h1v2");
@@ -40,11 +40,11 @@ public class TestHeaders {
headerMap.put("h3", Arrays.asList());
headers.setHeaderMap(headerMap);
- Assert.assertEquals(headerMap, headers.getHeaderMap());
- Assert.assertEquals("h1v1", headers.getFirst("h1"));
- Assert.assertNull(headers.getFirst("h2"));
- Assert.assertNull(headers.getFirst("h3"));
- Assert.assertEquals(h1Value, headers.getHeader("h1"));
+ Assertions.assertEquals(headerMap, headers.getHeaderMap());
+ Assertions.assertEquals("h1v1", headers.getFirst("h1"));
+ Assertions.assertNull(headers.getFirst("h2"));
+ Assertions.assertNull(headers.getFirst("h3"));
+ Assertions.assertEquals(h1Value, headers.getHeader("h1"));
}
@Test
@@ -53,7 +53,7 @@ public class TestHeaders {
headers.addHeader("h1", "h1v1");
headers.addHeader("h1", "h1v2");
- Assert.assertEquals("h1v1", headers.getFirst("h1"));
+ Assertions.assertEquals("h1v1", headers.getFirst("h1"));
}
@Test
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginRequest.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginRequest.java
index 48f690d70..13b129000 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginRequest.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginRequest.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicecomb.transport.highway.message;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestLoginRequest {
@Test
@@ -26,7 +26,7 @@ public class TestLoginRequest {
req.setProtocol("p");
req.setZipName("z");
- Assert.assertEquals("p", req.getProtocol());
- Assert.assertEquals("z", req.getZipName());
+ Assertions.assertEquals("p", req.getProtocol());
+ Assertions.assertEquals("z", req.getZipName());
}
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginResponse.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginResponse.java
index 464b81958..45132c4dc 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginResponse.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestLoginResponse.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicecomb.transport.highway.message;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestLoginResponse {
@Test
@@ -26,7 +26,7 @@ public class TestLoginResponse {
resp.setProtocol("p");
resp.setZipName("z");
- Assert.assertEquals("p", resp.getProtocol());
- Assert.assertEquals("z", resp.getZipName());
+ Assertions.assertEquals("p", resp.getProtocol());
+ Assertions.assertEquals("z", resp.getZipName());
}
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestRequestHeader.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestRequestHeader.java
index 5b5633919..01be0df79 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestRequestHeader.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestRequestHeader.java
@@ -20,9 +20,9 @@ package org.apache.servicecomb.transport.highway.message;
import java.util.Map;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestRequestHeader {
@@ -43,33 +43,33 @@ public class TestRequestHeader {
Map<String, String> context = null;
requestHeader.setContext(context);
- Assert.assertNull(requestHeader.getContext());
+ Assertions.assertNull(requestHeader.getContext());
}
@Test
public void testDestMicroservice() {
requestHeader.setDestMicroservice("test");
- Assert.assertEquals("test", requestHeader.getDestMicroservice());
+ Assertions.assertEquals("test", requestHeader.getDestMicroservice());
}
@Test
public void testFlags() {
requestHeader.setFlags(1);
- Assert.assertEquals(1, requestHeader.getFlags());
+ Assertions.assertEquals(1, requestHeader.getFlags());
}
@Test
public void testOperationName() {
requestHeader.setOperationName("cse");
- Assert.assertEquals("cse", requestHeader.getOperationName());
+ Assertions.assertEquals("cse", requestHeader.getOperationName());
}
@Test
public void testSchemaId() {
requestHeader.setSchemaId("id");
- Assert.assertEquals("id", requestHeader.getSchemaId());
+ Assertions.assertEquals("id", requestHeader.getSchemaId());
}
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestResponseHeader.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestResponseHeader.java
index 9d9ac5155..f5a6ffef9 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestResponseHeader.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/message/TestResponseHeader.java
@@ -21,9 +21,9 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestResponseHeader {
@@ -45,7 +45,7 @@ public class TestResponseHeader {
public void testSetContext() {
context.put("key1", "v1");
responseHeader.setContext(context);
- Assert.assertNotNull(responseHeader.getContext());
- Assert.assertEquals("v1", responseHeader.getContext().get("key1"));
+ Assertions.assertNotNull(responseHeader.getContext());
+ Assertions.assertEquals("v1", responseHeader.getContext().get("key1"));
}
}
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java
index 7ef39f529..638dc11b1 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java
@@ -22,9 +22,9 @@ import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestRestTransportClient {
@@ -50,7 +50,7 @@ public class TestRestTransportClient {
@Test
public void testGetInstance() {
- Assert.assertNotNull(instance);
+ Assertions.assertNotNull(instance);
}
@@ -64,6 +64,6 @@ public class TestRestTransportClient {
} catch (Exception e) {
status = false;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
}
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
index 5e27e1e89..27fa2b3d6 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
@@ -19,9 +19,9 @@ package org.apache.servicecomb.transport.rest.client;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestTransportClientConfig {
@@ -38,60 +38,60 @@ public class TestTransportClientConfig {
@Test
public void getThreadCount() {
ArchaiusUtils.setProperty("servicecomb.rest.client.verticle-count", 1);
- Assert.assertEquals(1, TransportClientConfig.getThreadCount());
+ Assertions.assertEquals(1, TransportClientConfig.getThreadCount());
}
@Test
public void getConnectionMaxPoolSize() {
- Assert.assertEquals(5, TransportClientConfig.getConnectionMaxPoolSize());
+ Assertions.assertEquals(5, TransportClientConfig.getConnectionMaxPoolSize());
}
@Test
public void getConnectionIdleTimeoutInSeconds() {
- Assert.assertEquals(30, TransportClientConfig.getConnectionIdleTimeoutInSeconds());
+ Assertions.assertEquals(30, TransportClientConfig.getConnectionIdleTimeoutInSeconds());
}
@Test
public void getHttp2MultiplexingLimit() {
- Assert.assertEquals(-1, TransportClientConfig.getHttp2MultiplexingLimit());
+ Assertions.assertEquals(-1, TransportClientConfig.getHttp2MultiplexingLimit());
}
@Test
public void getHttp2ConnectionMaxPoolSize() {
- Assert.assertEquals(1, TransportClientConfig.getHttp2ConnectionMaxPoolSize());
+ Assertions.assertEquals(1, TransportClientConfig.getHttp2ConnectionMaxPoolSize());
}
@Test
public void getHttp2ConnectionIdleTimeoutInSeconds() {
- Assert.assertEquals(0, TransportClientConfig.getHttp2ConnectionIdleTimeoutInSeconds());
+ Assertions.assertEquals(0, TransportClientConfig.getHttp2ConnectionIdleTimeoutInSeconds());
}
@Test
public void getUseAlpnEnabled() {
- Assert.assertTrue(TransportClientConfig.getUseAlpn());
+ Assertions.assertTrue(TransportClientConfig.getUseAlpn());
}
@Test
public void getConnectionKeepAlive() {
- Assert.assertTrue(TransportClientConfig.getConnectionKeepAlive());
+ Assertions.assertTrue(TransportClientConfig.getConnectionKeepAlive());
}
@Test
public void getConnectionCompression() {
- Assert.assertFalse(TransportClientConfig.getConnectionCompression());
+ Assertions.assertFalse(TransportClientConfig.getConnectionCompression());
}
@Test
public void getMaxHeaderSize() {
- Assert.assertEquals(8192, TransportClientConfig.getMaxHeaderSize());
+ Assertions.assertEquals(8192, TransportClientConfig.getMaxHeaderSize());
ArchaiusUtils.setProperty("servicecomb.rest.client.maxHeaderSize", 1024);
- Assert.assertEquals(1024, TransportClientConfig.getMaxHeaderSize());
+ Assertions.assertEquals(1024, TransportClientConfig.getMaxHeaderSize());
}
@Test
public void getMaxWaitQueueSize() {
- Assert.assertEquals(-1, TransportClientConfig.getMaxWaitQueueSize());
+ Assertions.assertEquals(-1, TransportClientConfig.getMaxWaitQueueSize());
ArchaiusUtils.setProperty("servicecomb.rest.client.maxWaitQueueSize", 1024);
- Assert.assertEquals(1024, TransportClientConfig.getMaxWaitQueueSize());
+ Assertions.assertEquals(1024, TransportClientConfig.getMaxWaitQueueSize());
}
}
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
index 27270e289..2e1c18e3b 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
@@ -37,7 +37,6 @@ import org.apache.servicecomb.foundation.vertx.http.ReadStreamPart;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -50,13 +49,14 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestDefaultHttpClientFilter {
private final DefaultHttpClientFilter filter = new DefaultHttpClientFilter();
@Test
public void testOrder() {
- Assert.assertEquals(10000, filter.getOrder());
+ Assertions.assertEquals(10000, filter.getOrder());
}
@Test
@@ -69,7 +69,7 @@ public class TestDefaultHttpClientFilter {
}
};
- Assert.assertNull(filter.findProduceProcessor(restOperation, responseEx));
+ Assertions.assertNull(filter.findProduceProcessor(restOperation, responseEx));
}
@Test
@@ -84,7 +84,7 @@ public class TestDefaultHttpClientFilter {
}
};
- Assert.assertSame(produceProcessor, filter.findProduceProcessor(restOperation, responseEx));
+ Assertions.assertSame(produceProcessor, filter.findProduceProcessor(restOperation, responseEx));
}
@Test
@@ -99,7 +99,7 @@ public class TestDefaultHttpClientFilter {
}
};
- Assert.assertSame(produceProcessor, filter.findProduceProcessor(restOperation, responseEx));
+ Assertions.assertSame(produceProcessor, filter.findProduceProcessor(restOperation, responseEx));
}
@Test
@@ -117,8 +117,8 @@ public class TestDefaultHttpClientFilter {
};
Response response = filter.extractResponse(invocation, responseEx);
- Assert.assertSame(part, response.getResult());
- Assert.assertEquals(Status.OK, response.getStatus());
+ Assertions.assertSame(part, response.getResult());
+ Assertions.assertEquals(Status.OK, response.getStatus());
}
@Test
@@ -151,19 +151,19 @@ public class TestDefaultHttpClientFilter {
};
Response response = filter.extractResponse(invocation, responseEx);
- Assert.assertEquals(400, response.getStatusCode());
- Assert.assertEquals(InvocationException.class, response.<InvocationException>getResult().getClass());
+ Assertions.assertEquals(400, response.getStatusCode());
+ Assertions.assertEquals(InvocationException.class, response.<InvocationException>getResult().getClass());
InvocationException invocationException = response.getResult();
- Assert.assertEquals(
+ Assertions.assertEquals(
"InvocationException: code=400;msg=CommonExceptionData [message=method null, path null, statusCode 400, reasonPhrase null, response content-type null is not supported]",
invocationException.getMessage());
- Assert.assertEquals(
+ Assertions.assertEquals(
"Unrecognized token 'abc': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n"
+ " at [Source: (org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1, column: 4]",
invocationException.getCause().getMessage());
- Assert.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass());
+ Assertions.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass());
CommonExceptionData commonExceptionData = (CommonExceptionData) invocationException.getErrorData();
- Assert.assertEquals(
+ Assertions.assertEquals(
"method null, path null, statusCode 400, reasonPhrase null, response content-type null is not supported",
commonExceptionData.getMessage());
}
@@ -198,19 +198,19 @@ public class TestDefaultHttpClientFilter {
};
Response response = filter.extractResponse(invocation, responseEx);
- Assert.assertEquals(400, response.getStatusCode());
- Assert.assertEquals(InvocationException.class, response.<InvocationException>getResult().getClass());
+ Assertions.assertEquals(400, response.getStatusCode());
+ Assertions.assertEquals(InvocationException.class, response.<InvocationException>getResult().getClass());
InvocationException invocationException = response.getResult();
- Assert.assertEquals(
+ Assertions.assertEquals(
"InvocationException: code=400;msg=CommonExceptionData [message=method null, path null, statusCode 200, reasonPhrase null, response content-type null is not supported]",
invocationException.getMessage());
- Assert.assertEquals(
+ Assertions.assertEquals(
"Unrecognized token 'abc': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n"
+ " at [Source: (org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1, column: 4]",
invocationException.getCause().getMessage());
- Assert.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass());
+ Assertions.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass());
CommonExceptionData commonExceptionData = (CommonExceptionData) invocationException.getErrorData();
- Assert.assertEquals(
+ Assertions.assertEquals(
"method null, path null, statusCode 200, reasonPhrase null, response content-type null is not supported",
commonExceptionData.getMessage());
}
@@ -239,14 +239,14 @@ public class TestDefaultHttpClientFilter {
};
Response response = filter.afterReceiveResponse(invocation, responseEx);
- Assert.assertEquals(403, response.getStatusCode());
- Assert.assertEquals("Forbidden", response.getReasonPhrase());
- Assert.assertEquals(InvocationException.class, response.<InvocationException>getResult().getClass());
+ Assertions.assertEquals(403, response.getStatusCode());
+ Assertions.assertEquals("Forbidden", response.getReasonPhrase());
+ Assertions.assertEquals(InvocationException.class, response.<InvocationException>getResult().getClass());
InvocationException invocationException = response.getResult();
- Assert.assertEquals(
+ Assertions.assertEquals(
403,
invocationException.getStatusCode());
- Assert.assertEquals(
+ Assertions.assertEquals(
"CommonExceptionData [message=abcd]",
invocationException.getErrorData().toString());
}
@@ -286,8 +286,8 @@ public class TestDefaultHttpClientFilter {
};
Response response = filter.afterReceiveResponse(invocation, responseEx);
- Assert.assertSame(decodedResult, response.getResult());
- Assert.assertEquals(1, response.getHeaders().size());
- Assert.assertEquals(response.getHeaders("b"), Arrays.asList("bValue"));
+ Assertions.assertSame(decodedResult, response.getResult());
+ Assertions.assertEquals(1, response.getHeaders().size());
+ Assertions.assertEquals(response.getHeaders("b"), Arrays.asList("bValue"));
}
}
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestRestClientInvocation.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestRestClientInvocation.java
index 3fd1fcfb0..797b4f7f2 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestRestClientInvocation.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestRestClientInvocation.java
@@ -51,10 +51,10 @@ import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -171,13 +171,13 @@ public class TestRestClientInvocation {
when(request.send()).thenReturn(Future.succeededFuture(mock(HttpClientResponse.class)));
restClientInvocation.invoke(invocation, asyncResp);
- Assert.assertSame(resp, response);
+ Assertions.assertSame(resp, response);
MatcherAssert.assertThat(headers.names(),
Matchers.containsInAnyOrder(org.apache.servicecomb.core.Const.TARGET_MICROSERVICE,
org.apache.servicecomb.core.Const.CSE_CONTEXT));
- Assert.assertEquals(TARGET_MICROSERVICE_NAME, headers.get(org.apache.servicecomb.core.Const.TARGET_MICROSERVICE));
- Assert.assertEquals("{}", headers.get(org.apache.servicecomb.core.Const.CSE_CONTEXT));
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
+ Assertions.assertEquals(TARGET_MICROSERVICE_NAME, headers.get(org.apache.servicecomb.core.Const.TARGET_MICROSERVICE));
+ Assertions.assertEquals("{}", headers.get(org.apache.servicecomb.core.Const.CSE_CONTEXT));
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
}
@Test
@@ -191,9 +191,9 @@ public class TestRestClientInvocation {
restClientInvocation.invoke(invocation, asyncResp);
- Assert.assertSame(resp, response);
+ Assertions.assertSame(resp, response);
MatcherAssert.assertThat(headers.names(), Matchers.empty());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
}
@Test
@@ -208,13 +208,13 @@ public class TestRestClientInvocation {
restClientInvocation.invoke(invocation, asyncResp);
- Assert.assertSame(resp, response);
+ Assertions.assertSame(resp, response);
MatcherAssert.assertThat(headers.names(),
Matchers.containsInAnyOrder(org.apache.servicecomb.core.Const.TARGET_MICROSERVICE,
org.apache.servicecomb.core.Const.CSE_CONTEXT));
- Assert.assertEquals(TARGET_MICROSERVICE_NAME, headers.get(org.apache.servicecomb.core.Const.TARGET_MICROSERVICE));
- Assert.assertEquals("{}", headers.get(org.apache.servicecomb.core.Const.CSE_CONTEXT));
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
+ Assertions.assertEquals(TARGET_MICROSERVICE_NAME, headers.get(org.apache.servicecomb.core.Const.TARGET_MICROSERVICE));
+ Assertions.assertEquals("{}", headers.get(org.apache.servicecomb.core.Const.CSE_CONTEXT));
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
operationConfig.setClientRequestHeaderFilterEnabled(true);
}
@@ -225,8 +225,8 @@ public class TestRestClientInvocation {
restClientInvocation.invoke(invocation, asyncResp);
MatcherAssert.assertThat(((InvocationException) response.getResult()).getCause(), Matchers.instanceOf(Error.class));
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
}
@Test
@@ -240,8 +240,8 @@ public class TestRestClientInvocation {
restClientInvocation.invoke(invocation, asyncResp);
MatcherAssert.assertThat(((InvocationException) response.getResult()).getCause(), Matchers.sameInstance(t));
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersRequest());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
}
@Test
@@ -251,7 +251,7 @@ public class TestRestClientInvocation {
restClientInvocation.setCseContext();
- Assert.assertEquals("x-cse-context={\"k\":\"v\"}\n", headers.toString());
+ Assertions.assertEquals("x-cse-context={\"k\":\"v\"}\n", headers.toString());
}
@Test
@@ -268,7 +268,7 @@ public class TestRestClientInvocation {
restClientInvocation.setCseContext();
- Assert.assertEquals(
+ Assertions.assertEquals(
"Failed to encode and set cseContext, message=cause:RuntimeExceptionWithoutStackTrace,message:null.",
logCollector.getEvents().get(0).getMessage());
logCollector.teardown();
@@ -294,7 +294,7 @@ public class TestRestClientInvocation {
restClientInvocation.handleResponse(httpClientResponse);
bodyHandler.handle(buf);
- Assert.assertSame(buf, response.getResult());
+ Assertions.assertSame(buf, response.getResult());
}
@Test
@@ -321,10 +321,10 @@ public class TestRestClientInvocation {
restClientInvocation.processResponseBody(null);
- Assert.assertSame(resp, response);
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishReceiveResponse());
+ Assertions.assertSame(resp, response);
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishReceiveResponse());
}
@SuppressWarnings("unchecked")
@@ -344,10 +344,10 @@ public class TestRestClientInvocation {
restClientInvocation.processResponseBody(null);
MatcherAssert.assertThat(((InvocationException) response.getResult()).getCause(), Matchers.instanceOf(Error.class));
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishReceiveResponse());
- Assert.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishWriteToBuffer());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishClientFiltersResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishReceiveResponse());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishWriteToBuffer());
}
@Test
@@ -357,7 +357,7 @@ public class TestRestClientInvocation {
when(urlPathBuilder.createRequestPath(any())).thenReturn("/path");
String path = restClientInvocation.createRequestPath(swaggerRestOperation);
- Assert.assertEquals("/path", path);
+ Assertions.assertEquals("/path", path);
}
@Test
@@ -366,7 +366,7 @@ public class TestRestClientInvocation {
when(address.getFirst(DefinitionConst.URL_PREFIX)).thenReturn(null);
String path = restClientInvocation.createRequestPath(swaggerRestOperation);
- Assert.assertEquals("/client/path", path);
+ Assertions.assertEquals("/client/path", path);
}
@Test
@@ -376,7 +376,7 @@ public class TestRestClientInvocation {
when(urlPathBuilder.createRequestPath(any())).thenReturn("/path");
String path = restClientInvocation.createRequestPath(swaggerRestOperation);
- Assert.assertEquals("/prefix/path", path);
+ Assertions.assertEquals("/prefix/path", path);
}
@Test
@@ -385,7 +385,7 @@ public class TestRestClientInvocation {
handlerContext.put(RestConst.REST_CLIENT_REQUEST_PATH, "/client/path");
String path = restClientInvocation.createRequestPath(swaggerRestOperation);
- Assert.assertEquals("/prefix/client/path", path);
+ Assertions.assertEquals("/prefix/client/path", path);
}
@Test
@@ -394,6 +394,6 @@ public class TestRestClientInvocation {
handlerContext.put(RestConst.REST_CLIENT_REQUEST_PATH, "/prefix/client/path");
String path = restClientInvocation.createRequestPath(swaggerRestOperation);
- Assert.assertEquals("/prefix/client/path", path);
+ Assertions.assertEquals("/prefix/client/path", path);
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java
index 83cb2cfa2..e80d8bb6d 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java
@@ -24,9 +24,9 @@ import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import mockit.Expectations;
@@ -126,6 +126,6 @@ public class TestCseXmlWebApplicationContext {
context.invokeBeanFactoryPostProcessors(beanFactory);
- Assert.assertTrue(holder.value);
+ Assertions.assertTrue(holder.value);
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java
index a0c73853d..40673418e 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java
@@ -32,13 +32,13 @@ import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.foundation.vertx.http.AbstractHttpServletRequest;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.StandardHttpServletRequestEx;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestRestAsyncListener {
HttpServletRequest request = new AbstractHttpServletRequest() {
@@ -114,8 +114,8 @@ public class TestRestAsyncListener {
committed = true;
listener.onTimeout(event);
- Assert.assertNull(request.getAttribute(RestConst.REST_REQUEST));
- Assert.assertFalse(flushed);
+ Assertions.assertNull(request.getAttribute(RestConst.REST_REQUEST));
+ Assertions.assertFalse(flushed);
}
@Test
@@ -123,10 +123,10 @@ public class TestRestAsyncListener {
committed = false;
listener.onTimeout(event);
- Assert.assertNull(request.getAttribute(RestConst.REST_REQUEST));
- Assert.assertEquals(MediaType.APPLICATION_JSON, contentType);
- Assert.assertEquals(500, statusCode);
- Assert.assertTrue(flushed);
- Assert.assertEquals("{\"message\":\"Timeout when processing the request.\"}", writer.toString());
+ Assertions.assertNull(request.getAttribute(RestConst.REST_REQUEST));
+ Assertions.assertEquals(MediaType.APPLICATION_JSON, contentType);
+ Assertions.assertEquals(500, statusCode);
+ Assertions.assertTrue(flushed);
+ Assertions.assertEquals("{\"message\":\"Timeout when processing the request.\"}", writer.toString());
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java
index a2c965c4e..01855f89f 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java
@@ -27,13 +27,13 @@ import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Deencapsulation;
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class TestRestServlet {
private RestServlet restservlet = null;
@@ -57,7 +57,7 @@ public class TestRestServlet {
@Test
public void testInit() throws ServletException {
restservlet.init();
- Assert.assertTrue(true);
+ Assertions.assertTrue(true);
}
// useless, but for coverage
@@ -73,6 +73,6 @@ public class TestRestServlet {
Deencapsulation.setField(restservlet, "servletRestServer", servletRestServer);
restservlet.service(null, null);
- Assert.assertTrue(holder.value);
+ Assertions.assertTrue(holder.value);
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java
index 14dbe7d2c..75187b0f1 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java
@@ -20,8 +20,8 @@ package org.apache.servicecomb.transport.rest.servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestRestServletContextListener {
@@ -36,7 +36,7 @@ public class TestRestServletContextListener {
} catch (Exception | Error e) {
status = false;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
@Test
@@ -52,6 +52,6 @@ public class TestRestServletContextListener {
} catch (Exception e) {
status = false;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java
index 6134c955d..8c3b5505b 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java
@@ -25,11 +25,11 @@ import java.net.UnknownHostException;
import javax.servlet.ServletContext;
import javax.servlet.ServletRegistration.Dynamic;
-import org.junit.Assert;
import org.junit.Test;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestRestServletInjector {
@Test
@@ -41,7 +41,7 @@ public class TestRestServletInjector {
}
};
- Assert.assertEquals(null, RestServletInjector.defaultInject(servletContext));
+ Assertions.assertEquals(null, RestServletInjector.defaultInject(servletContext));
}
@Test
@@ -60,7 +60,7 @@ public class TestRestServletInjector {
};
}
- Assert.assertEquals(null, RestServletInjector.defaultInject(servletContext));
+ Assertions.assertNull(RestServletInjector.defaultInject(servletContext));
}
@Test
@@ -78,7 +78,7 @@ public class TestRestServletInjector {
}
};
- Assert.assertEquals(dynamic, RestServletInjector.defaultInject(servletContext));
+ Assertions.assertEquals(dynamic, RestServletInjector.defaultInject(servletContext));
}
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java
index 1705792dc..6090a891b 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java
@@ -26,9 +26,7 @@ import org.apache.servicecomb.common.rest.RestProducerInvocation;
import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
import org.apache.servicecomb.common.rest.filter.HttpServerFilter;
import org.apache.servicecomb.core.definition.OperationMeta;
-import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.StandardHttpServletRequestEx;
-import org.junit.Assert;
import org.junit.Test;
import mockit.Deencapsulation;
@@ -36,6 +34,7 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestRestServletProducerInvocation {
@Mocked
@@ -48,7 +47,7 @@ public class TestRestServletProducerInvocation {
@Test
public void findRestOperationCacheTrue(@Mocked HttpServletRequest request, @Mocked HttpServerFilter f1) {
- HttpServletRequestEx requestEx = new StandardHttpServletRequestEx(request);
+ StandardHttpServletRequestEx requestEx = new StandardHttpServletRequestEx(request);
Deencapsulation.setField(restInvocation, "requestEx", requestEx);
new MockUp<RestProducerInvocation>() {
@@ -69,7 +68,7 @@ public class TestRestServletProducerInvocation {
restInvocation.setHttpServerFilters(httpServerFilters);
restInvocation.findRestOperation();
- Assert.assertTrue(Deencapsulation.getField(requestEx, "cacheRequest"));
+ Assertions.assertTrue(requestEx.isCacheRequest());
}
@Test
@@ -83,7 +82,7 @@ public class TestRestServletProducerInvocation {
};
restInvocation.setHttpServerFilters(httpServerFilters);
- Assert.assertTrue(restInvocation.collectCacheRequest(operationMeta));
+ Assertions.assertTrue(restInvocation.collectCacheRequest(operationMeta));
}
@Test
@@ -97,6 +96,6 @@ public class TestRestServletProducerInvocation {
};
restInvocation.setHttpServerFilters(httpServerFilters);
- Assert.assertFalse(restInvocation.collectCacheRequest(operationMeta));
+ Assertions.assertFalse(restInvocation.collectCacheRequest(operationMeta));
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletConfig.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletConfig.java
index 4b0bda906..f269c30e6 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletConfig.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletConfig.java
@@ -20,11 +20,11 @@ package org.apache.servicecomb.transport.rest.servlet;
import org.apache.commons.configuration.Configuration;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import com.netflix.config.DynamicPropertyFactory;
+import org.junit.jupiter.api.Assertions;
public class TestServletConfig {
@BeforeClass
@@ -39,12 +39,12 @@ public class TestServletConfig {
@Test
public void testGetLocalServerAddress() {
- Assert.assertNull(ServletConfig.getLocalServerAddress());
+ Assertions.assertNull(ServletConfig.getLocalServerAddress());
}
@Test
public void testGetServerTimeout() {
- Assert.assertEquals(ServletConfig.DEFAULT_ASYN_SERVLET_TIMEOUT, ServletConfig.getAsyncServletTimeout());
+ Assertions.assertEquals(ServletConfig.DEFAULT_ASYN_SERVLET_TIMEOUT, ServletConfig.getAsyncServletTimeout());
}
@Test
@@ -52,6 +52,6 @@ public class TestServletConfig {
DynamicPropertyFactory.getInstance();
Configuration configuration = (Configuration) DynamicPropertyFactory.getBackingConfigurationSource();
configuration.setProperty(ServletConfig.KEY_SERVLET_URL_PATTERN, "/*");
- Assert.assertEquals("/*", ServletConfig.getServletUrlPattern());
+ Assertions.assertEquals("/*", ServletConfig.getServletUrlPattern());
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java
index 7198365fe..950d211f7 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java
@@ -31,13 +31,13 @@ import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestServletRestDispatcher {
ServletRestDispatcher dispatcher = new ServletRestDispatcher();
@@ -75,6 +75,6 @@ public class TestServletRestDispatcher {
dispatcher.service(request, response);
- Assert.assertTrue(handled.value);
+ Assertions.assertTrue(handled.value);
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestTransport.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestTransport.java
index c9cb00c30..be9aa1fb9 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestTransport.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestTransport.java
@@ -25,13 +25,13 @@ import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.apache.servicecomb.transport.rest.client.RestTransportClient;
import org.apache.servicecomb.transport.rest.client.RestTransportClientManager;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestServletRestTransport {
ServletRestTransport transport = new ServletRestTransport();
@@ -56,8 +56,8 @@ public class TestServletRestTransport {
result = null;
}
};
- Assert.assertTrue(transport.init());
- Assert.assertNull(transport.getPublishEndpoint());
+ Assertions.assertTrue(transport.init());
+ Assertions.assertNull(transport.getPublishEndpoint());
}
@Test
@@ -75,8 +75,8 @@ public class TestServletRestTransport {
result = "1.1.1.1:1234";
}
};
- Assert.assertTrue(transport.init());
- Assert.assertEquals("rest://1.1.1.1:1234", transport.getPublishEndpoint().getEndpoint());
+ Assertions.assertTrue(transport.init());
+ Assertions.assertEquals("rest://1.1.1.1:1234", transport.getPublishEndpoint().getEndpoint());
}
@Test
@@ -97,14 +97,14 @@ public class TestServletRestTransport {
};
ClassLoaderScopeContext.setClassLoaderScopeProperty(DefinitionConst.URL_PREFIX, "/root");
- Assert.assertTrue(transport.init());
- Assert.assertEquals("rest://1.1.1.1:1234?urlPrefix=%2Froot", transport.getPublishEndpoint().getEndpoint());
+ Assertions.assertTrue(transport.init());
+ Assertions.assertEquals("rest://1.1.1.1:1234?urlPrefix=%2Froot", transport.getPublishEndpoint().getEndpoint());
}
@Test
public void testGetOrder() {
ServletRestTransport transport = new ServletRestTransport();
- Assert.assertEquals(0, transport.getOrder());
+ Assertions.assertEquals(0, transport.getOrder());
}
@Test
@@ -117,7 +117,7 @@ public class TestServletRestTransport {
};
ServletRestTransport transport = new ServletRestTransport();
- Assert.assertTrue(transport.canInit());
+ Assertions.assertTrue(transport.canInit());
}
@Test
@@ -133,7 +133,7 @@ public class TestServletRestTransport {
};
ServletRestTransport transport = new ServletRestTransport();
- Assert.assertTrue(transport.canInit());
+ Assertions.assertTrue(transport.canInit());
ss.close();
}
@@ -152,6 +152,6 @@ public class TestServletRestTransport {
};
ServletRestTransport transport = new ServletRestTransport();
- Assert.assertFalse(transport.canInit());
+ Assertions.assertFalse(transport.canInit());
}
}
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java
index 7eb1bc51b..ebd1daa39 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java
@@ -43,7 +43,6 @@ import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -51,6 +50,7 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestServletUtils {
@Before
@@ -76,9 +76,9 @@ public class TestServletUtils {
public void testCheckUrlPatternMiddleWideChar() {
try {
ServletUtils.checkUrlPattern("/abc/*def");
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (ServiceCombException e) {
- Assert.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
+ Assertions.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
}
}
@@ -86,9 +86,9 @@ public class TestServletUtils {
public void testCheckUrlPatternNoWideChar() {
try {
ServletUtils.checkUrlPattern("/abcdef");
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (ServiceCombException e) {
- Assert.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
+ Assertions.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
}
}
@@ -96,9 +96,9 @@ public class TestServletUtils {
public void testCheckUrlPatternNotStartWithSlash() {
try {
ServletUtils.checkUrlPattern("abcdef/*");
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (ServiceCombException e) {
- Assert.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
+ Assertions.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
}
}
@@ -126,9 +126,9 @@ public class TestServletUtils {
Collection<String> urlPatterns = Arrays.asList("/abc");
try {
ServletUtils.filterUrlPatterns(urlPatterns);
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (ServiceCombException e) {
- Assert.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
+ Assertions.assertEquals("only support rule like /* or /path/* or /path1/path2/* and so on.", e.getMessage());
}
}
@@ -180,7 +180,7 @@ public class TestServletUtils {
ServletUtils.saveUrlPrefix(servletContext);
- Assert.assertNull(ClassLoaderScopeContext.getClassLoaderScopeProperty(DefinitionConst.URL_PREFIX));
+ Assertions.assertNull(ClassLoaderScopeContext.getClassLoaderScopeProperty(DefinitionConst.URL_PREFIX));
ClassLoaderScopeContext.clearClassLoaderScopeProperty();
}
@@ -219,17 +219,17 @@ public class TestServletUtils {
};
File expectDir = new File(tempDir, "upload");
- Assert.assertFalse(expectDir.exists());
+ Assertions.assertFalse(expectDir.exists());
File dir = ServletUtils.createUploadDir(servletContext, "upload");
- Assert.assertTrue(expectDir.exists());
- Assert.assertEquals(expectDir.getAbsolutePath(), dir.getAbsolutePath());
+ Assertions.assertTrue(expectDir.exists());
+ Assertions.assertEquals(expectDir.getAbsolutePath(), dir.getAbsolutePath());
dir.delete();
- Assert.assertFalse(expectDir.exists());
+ Assertions.assertFalse(expectDir.exists());
tempDir.delete();
- Assert.assertFalse(tempDir.exists());
+ Assertions.assertFalse(tempDir.exists());
}
@Test
@@ -237,17 +237,17 @@ public class TestServletUtils {
File tempDir = Files.createTempDirectory("temp").toFile();
File expectDir = new File(tempDir, "upload");
- Assert.assertFalse(expectDir.exists());
+ Assertions.assertFalse(expectDir.exists());
File dir = ServletUtils.createUploadDir(servletContext, expectDir.getAbsolutePath());
- Assert.assertTrue(expectDir.exists());
- Assert.assertEquals(expectDir.getAbsolutePath(), dir.getAbsolutePath());
+ Assertions.assertTrue(expectDir.exists());
+ Assertions.assertEquals(expectDir.getAbsolutePath(), dir.getAbsolutePath());
dir.delete();
- Assert.assertFalse(expectDir.exists());
+ Assertions.assertFalse(expectDir.exists());
tempDir.delete();
- Assert.assertFalse(tempDir.exists());
+ Assertions.assertFalse(tempDir.exists());
}
@Test
@@ -287,16 +287,16 @@ public class TestServletUtils {
ServletUtils.setServletParameters(servletContext);
- Assert.assertEquals(1, multipartConfigs.size());
+ Assertions.assertEquals(1, multipartConfigs.size());
MultipartConfigElement multipartConfigElement = multipartConfigs.get(0);
- Assert.assertEquals(uploadDir.getAbsolutePath(), multipartConfigElement.getLocation());
- Assert.assertEquals(-1, multipartConfigElement.getMaxFileSize());
- Assert.assertEquals(-1, multipartConfigElement.getMaxRequestSize());
- Assert.assertEquals(0, multipartConfigElement.getFileSizeThreshold());
+ Assertions.assertEquals(uploadDir.getAbsolutePath(), multipartConfigElement.getLocation());
+ Assertions.assertEquals(-1, multipartConfigElement.getMaxFileSize());
+ Assertions.assertEquals(-1, multipartConfigElement.getMaxRequestSize());
+ Assertions.assertEquals(0, multipartConfigElement.getFileSizeThreshold());
uploadDir.delete();
tempDir.delete();
- Assert.assertFalse(tempDir.exists());
+ Assertions.assertFalse(tempDir.exists());
}
}
diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java
index 32cdbbdfb..8a8563f1b 100644
--- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java
+++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java
@@ -27,6 +27,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import com.google.common.annotations.VisibleForTesting;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.slf4j.Logger;
@@ -90,6 +91,11 @@ public class RestBodyHandler implements BodyHandler {
setUploadsDirectory(uploadDirectory);
}
+ @VisibleForTesting
+ boolean isDeleteUploadedFilesOnEnd() {
+ return deleteUploadedFilesOnEnd;
+ }
+
@Override
public void handle(RoutingContext context) {
HttpServerRequest request = context.request();
diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestAbstractVertxHttpDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestAbstractVertxHttpDispatcher.java
index 909ab369f..6fefb81dd 100644
--- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestAbstractVertxHttpDispatcher.java
+++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestAbstractVertxHttpDispatcher.java
@@ -26,10 +26,10 @@ import org.apache.servicecomb.common.rest.filter.HttpServerFilter;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.junit.runners.MethodSorters;
import com.netflix.config.DynamicPropertyFactory;
@@ -76,7 +76,7 @@ public class TestAbstractVertxHttpDispatcher {
};
AbstractVertxHttpDispatcher dispatcher = new AbstractVertxHttpDispatcherForTest();
- Assert.assertSame(filters, dispatcher.httpServerFilters);
+ Assertions.assertSame(filters, dispatcher.httpServerFilters);
}
@Test
@@ -84,8 +84,8 @@ public class TestAbstractVertxHttpDispatcher {
AbstractVertxHttpDispatcher dispatcher = new AbstractVertxHttpDispatcherForTest();
RestBodyHandler bodyHandler = (RestBodyHandler) dispatcher.createBodyHandler();
- Assert.assertTrue(Deencapsulation.getField(bodyHandler, "deleteUploadedFilesOnEnd"));
- Assert.assertEquals(RestConst.UPLOAD_DEFAULT_DIR, Deencapsulation.getField(bodyHandler, "uploadsDir"));
+ Assertions.assertTrue(bodyHandler.isDeleteUploadedFilesOnEnd());
+ Assertions.assertEquals(RestConst.UPLOAD_DEFAULT_DIR, Deencapsulation.getField(bodyHandler, "uploadsDir"));
}
@Test
@@ -95,7 +95,7 @@ public class TestAbstractVertxHttpDispatcher {
AbstractVertxHttpDispatcher dispatcher = new AbstractVertxHttpDispatcherForTest();
RestBodyHandler bodyHandler = (RestBodyHandler) dispatcher.createBodyHandler();
- Assert.assertTrue(Deencapsulation.getField(bodyHandler, "deleteUploadedFilesOnEnd"));
- Assert.assertEquals("/path", Deencapsulation.getField(bodyHandler, "uploadsDir"));
+ Assertions.assertTrue(bodyHandler.isDeleteUploadedFilesOnEnd());
+ Assertions.assertEquals("/path", Deencapsulation.getField(bodyHandler, "uploadsDir"));
}
}
diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
index 5f155209d..4f2b664d6 100644
--- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
+++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java
@@ -33,9 +33,9 @@ import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.Context;
@@ -161,7 +161,7 @@ public class TestRestServerVerticle {
} catch (Exception e) {
status = true;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
@Test
@@ -172,7 +172,7 @@ public class TestRestServerVerticle {
} catch (Exception ex) {
status = true;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
@Test
@@ -185,7 +185,7 @@ public class TestRestServerVerticle {
} catch (Exception ex) {
status = true;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
@Test
@@ -204,7 +204,7 @@ public class TestRestServerVerticle {
CorsHandler corsHandler = new MockUp<CorsHandler>() {
@Mock
CorsHandler allowCredentials(boolean allow) {
- Assert.assertFalse(allow);
+ Assertions.assertFalse(allow);
counter.incrementAndGet();
return null;
}
@@ -225,7 +225,7 @@ public class TestRestServerVerticle {
@Mock
CorsHandler allowedMethod(HttpMethod method) {
- Assert.assertTrue(methodSet.contains(method));
+ Assertions.assertTrue(methodSet.contains(method));
counter.incrementAndGet();
methodSet.remove(method);
return null;
@@ -233,7 +233,7 @@ public class TestRestServerVerticle {
@Mock
CorsHandler maxAgeSeconds(int maxAgeSeconds) {
- Assert.assertEquals(1, maxAgeSeconds);
+ Assertions.assertEquals(1, maxAgeSeconds);
counter.incrementAndGet();
return null;
}
@@ -242,7 +242,7 @@ public class TestRestServerVerticle {
new MockUp<RestServerVerticle>() {
@Mock
CorsHandler getCorsHandler(String corsAllowedOrigin) {
- Assert.assertEquals("*", corsAllowedOrigin);
+ Assertions.assertEquals("*", corsAllowedOrigin);
return corsHandler;
}
};
@@ -252,7 +252,7 @@ public class TestRestServerVerticle {
RestServerVerticle server = new RestServerVerticle();
Deencapsulation.invoke(server, "mountCorsHandler", router);
- Assert.assertEquals(7, counter.get());
+ Assertions.assertEquals(7, counter.get());
}
@Test
@@ -279,7 +279,7 @@ public class TestRestServerVerticle {
RestServerVerticle restServerVerticle = new RestServerVerticle();
Deencapsulation.invoke(restServerVerticle, "mountGlobalRestFailureHandler", mainRouter);
- Assert.assertNotNull(handlerHolder.value);
+ Assertions.assertNotNull(handlerHolder.value);
RoutingContext routingContext = Mockito.mock(RoutingContext.class);
HttpServerResponse response = Mockito.mock(HttpServerResponse.class);
diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
index 7e10617bc..fd1e88d63 100644
--- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
+++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
@@ -20,35 +20,35 @@ package org.apache.servicecomb.transport.rest.vertx;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestTransportConfig {
- @Before
+ @BeforeEach
public void before() {
ArchaiusUtils.resetConfig();
}
- @After
+ @AfterEach
public void after() {
ArchaiusUtils.resetConfig();
}
@Test
public void testGetAddressNull() {
- Assert.assertNull(TransportConfig.getAddress());
+ Assertions.assertNull(TransportConfig.getAddress());
}
@Test
public void testGetAddressNormal() {
ArchaiusUtils.setProperty("servicecomb.rest.address", "1.1.1.1");
- Assert.assertEquals("1.1.1.1", TransportConfig.getAddress());
+ Assertions.assertEquals("1.1.1.1", TransportConfig.getAddress());
}
@Test
@@ -59,95 +59,95 @@ public class TestTransportConfig {
return 1;
}
};
- Assert.assertEquals(1, TransportConfig.getThreadCount());
+ Assertions.assertEquals(1, TransportConfig.getThreadCount());
}
@Test
public void testGetThreadCountNormal() {
ArchaiusUtils.setProperty("servicecomb.rest.server.thread-count", 10);
- Assert.assertEquals(10, TransportConfig.getThreadCount());
+ Assertions.assertEquals(10, TransportConfig.getThreadCount());
}
@Test
public void testGetCompressedAndHeaderSize() {
ArchaiusUtils.setProperty("servicecomb.rest.server.compression", true);
- Assert.assertTrue(TransportConfig.getCompressed());
+ Assertions.assertTrue(TransportConfig.getCompressed());
ArchaiusUtils.setProperty("servicecomb.rest.server.maxHeaderSize", 2048);
- Assert.assertEquals(2048, TransportConfig.getMaxHeaderSize());
+ Assertions.assertEquals(2048, TransportConfig.getMaxHeaderSize());
}
@Test
public void testGetDecompressed() {
- Assert.assertFalse(TransportConfig.getDecompressionSupported());
+ Assertions.assertFalse(TransportConfig.getDecompressionSupported());
ArchaiusUtils.setProperty("servicecomb.rest.server.decompressionSupported", true);
- Assert.assertTrue(TransportConfig.getDecompressionSupported());
+ Assertions.assertTrue(TransportConfig.getDecompressionSupported());
}
@Test
public void testGetDecoderInitialBufferSize() {
- Assert.assertEquals(128, TransportConfig.getDecoderInitialBufferSize());
+ Assertions.assertEquals(128, TransportConfig.getDecoderInitialBufferSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.decoderInitialBufferSize", 256);
- Assert.assertEquals(256, TransportConfig.getDecoderInitialBufferSize());
+ Assertions.assertEquals(256, TransportConfig.getDecoderInitialBufferSize());
}
@Test
public void testGetHttp2ConnectionWindowSize() {
- Assert.assertEquals(-1, TransportConfig.getHttp2ConnectionWindowSize());
+ Assertions.assertEquals(-1, TransportConfig.getHttp2ConnectionWindowSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2ConnectionWindowSize", 1);
- Assert.assertEquals(1, TransportConfig.getHttp2ConnectionWindowSize());
+ Assertions.assertEquals(1, TransportConfig.getHttp2ConnectionWindowSize());
}
@Test
public void testGetMaxFormAttributeSize() {
- Assert.assertEquals(8192, TransportConfig.getMaxFormAttributeSize());
+ Assertions.assertEquals(8192, TransportConfig.getMaxFormAttributeSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.maxFormAttributeSize", 3072);
- Assert.assertEquals(3072, TransportConfig.getMaxFormAttributeSize());
+ Assertions.assertEquals(3072, TransportConfig.getMaxFormAttributeSize());
}
@Test
public void testGeCompressionLevel() {
- Assert.assertEquals(6, TransportConfig.getCompressionLevel());
+ Assertions.assertEquals(6, TransportConfig.getCompressionLevel());
ArchaiusUtils.setProperty("servicecomb.rest.server.compressionLevel", 8);
- Assert.assertEquals(8, TransportConfig.getCompressionLevel());
+ Assertions.assertEquals(8, TransportConfig.getCompressionLevel());
}
@Test
public void testGetMaxChunkSize() {
- Assert.assertEquals(8192, TransportConfig.getMaxChunkSize());
+ Assertions.assertEquals(8192, TransportConfig.getMaxChunkSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.maxChunkSize", 65536);
- Assert.assertEquals(65536, TransportConfig.getMaxChunkSize());
+ Assertions.assertEquals(65536, TransportConfig.getMaxChunkSize());
}
@Test
public void testIsCorsEnabled() {
- Assert.assertFalse(TransportConfig.isCorsEnabled());
+ Assertions.assertFalse(TransportConfig.isCorsEnabled());
ArchaiusUtils.setProperty("servicecomb.cors.enabled", true);
- Assert.assertTrue(TransportConfig.isCorsEnabled());
+ Assertions.assertTrue(TransportConfig.isCorsEnabled());
ArchaiusUtils.setProperty("servicecomb.cors.enabled", false);
- Assert.assertFalse(TransportConfig.isCorsEnabled());
+ Assertions.assertFalse(TransportConfig.isCorsEnabled());
}
@Test
public void testGetCorsAllowedOrigin() {
- Assert.assertEquals("*", TransportConfig.getCorsAllowedOrigin());
+ Assertions.assertEquals("*", TransportConfig.getCorsAllowedOrigin());
String origin = "http://localhost:8080";
ArchaiusUtils.setProperty("servicecomb.cors.origin", origin);
- Assert.assertEquals(origin, TransportConfig.getCorsAllowedOrigin());
+ Assertions.assertEquals(origin, TransportConfig.getCorsAllowedOrigin());
}
@Test
public void testIsCorsAllowCredentials() {
- Assert.assertFalse(TransportConfig.isCorsAllowCredentials());
+ Assertions.assertFalse(TransportConfig.isCorsAllowCredentials());
ArchaiusUtils.setProperty("servicecomb.cors.allowCredentials", true);
- Assert.assertTrue(TransportConfig.isCorsAllowCredentials());
+ Assertions.assertTrue(TransportConfig.isCorsAllowCredentials());
ArchaiusUtils.setProperty("servicecomb.cors.allowCredentials", false);
- Assert.assertFalse(TransportConfig.isCorsAllowCredentials());
+ Assertions.assertFalse(TransportConfig.isCorsAllowCredentials());
}
@Test
public void testGetCorsAllowedHeaders() {
String configKey = "servicecomb.cors.allowedHeader";
- Assert.assertTrue(TransportConfig.getCorsAllowedHeaders().isEmpty());
+ Assertions.assertTrue(TransportConfig.getCorsAllowedHeaders().isEmpty());
ArchaiusUtils.setProperty(configKey, "abc");
MatcherAssert.assertThat(TransportConfig.getCorsAllowedHeaders(), Matchers.containsInAnyOrder("abc"));
ArchaiusUtils.setProperty(configKey, "abc, def");
@@ -155,13 +155,13 @@ public class TestTransportConfig {
ArchaiusUtils.setProperty(configKey, "abc ,, def");
MatcherAssert.assertThat(TransportConfig.getCorsAllowedHeaders(), Matchers.containsInAnyOrder("abc", "def"));
ArchaiusUtils.setProperty(configKey, "");
- Assert.assertTrue(TransportConfig.getCorsAllowedHeaders().isEmpty());
+ Assertions.assertTrue(TransportConfig.getCorsAllowedHeaders().isEmpty());
}
@Test
public void testGetCorsAllowedMethods() {
String configKey = "servicecomb.cors.allowedMethod";
- Assert.assertTrue(TransportConfig.getCorsAllowedMethods().isEmpty());
+ Assertions.assertTrue(TransportConfig.getCorsAllowedMethods().isEmpty());
ArchaiusUtils.setProperty(configKey, "GET");
MatcherAssert.assertThat(TransportConfig.getCorsAllowedMethods(), Matchers.containsInAnyOrder("GET"));
ArchaiusUtils.setProperty(configKey, "GET, POST");
@@ -169,13 +169,13 @@ public class TestTransportConfig {
ArchaiusUtils.setProperty(configKey, "GET,,POST");
MatcherAssert.assertThat(TransportConfig.getCorsAllowedMethods(), Matchers.containsInAnyOrder("GET", "POST"));
ArchaiusUtils.setProperty(configKey, "");
- Assert.assertTrue(TransportConfig.getCorsAllowedMethods().isEmpty());
+ Assertions.assertTrue(TransportConfig.getCorsAllowedMethods().isEmpty());
}
@Test
public void testGetCorsExposedHeaders() {
String configKey = "servicecomb.cors.exposedHeader";
- Assert.assertTrue(TransportConfig.getCorsExposedHeaders().isEmpty());
+ Assertions.assertTrue(TransportConfig.getCorsExposedHeaders().isEmpty());
ArchaiusUtils.setProperty(configKey, "abc");
MatcherAssert.assertThat(TransportConfig.getCorsExposedHeaders(), Matchers.containsInAnyOrder("abc"));
ArchaiusUtils.setProperty(configKey, "abc, def");
@@ -183,55 +183,55 @@ public class TestTransportConfig {
ArchaiusUtils.setProperty(configKey, "abc ,, def");
MatcherAssert.assertThat(TransportConfig.getCorsExposedHeaders(), Matchers.containsInAnyOrder("abc", "def"));
ArchaiusUtils.setProperty(configKey, "");
- Assert.assertTrue(TransportConfig.getCorsExposedHeaders().isEmpty());
+ Assertions.assertTrue(TransportConfig.getCorsExposedHeaders().isEmpty());
}
@Test
public void testGetCorsMaxAge() {
- Assert.assertEquals(-1, TransportConfig.getCorsMaxAge());
+ Assertions.assertEquals(-1, TransportConfig.getCorsMaxAge());
ArchaiusUtils.setProperty("servicecomb.cors.maxAge", 3600);
- Assert.assertEquals(3600, TransportConfig.getCorsMaxAge());
+ Assertions.assertEquals(3600, TransportConfig.getCorsMaxAge());
}
@Test
public void testHttp2Setting() {
- Assert.assertEquals(100L, TransportConfig.getMaxConcurrentStreams());
+ Assertions.assertEquals(100L, TransportConfig.getMaxConcurrentStreams());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.concurrentStreams", 200L);
- Assert.assertEquals(200L, TransportConfig.getMaxConcurrentStreams());
+ Assertions.assertEquals(200L, TransportConfig.getMaxConcurrentStreams());
- Assert.assertEquals(4096L, TransportConfig.getHttp2HeaderTableSize());
+ Assertions.assertEquals(4096L, TransportConfig.getHttp2HeaderTableSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.HeaderTableSize", 8192L);
- Assert.assertEquals(8192L, TransportConfig.getHttp2HeaderTableSize());
+ Assertions.assertEquals(8192L, TransportConfig.getHttp2HeaderTableSize());
- Assert.assertTrue(TransportConfig.getPushEnabled());
+ Assertions.assertTrue(TransportConfig.getPushEnabled());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.pushEnabled", false);
- Assert.assertFalse(TransportConfig.getPushEnabled());
+ Assertions.assertFalse(TransportConfig.getPushEnabled());
- Assert.assertEquals(65535, TransportConfig.getInitialWindowSize());
+ Assertions.assertEquals(65535, TransportConfig.getInitialWindowSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.initialWindowSize", 2 * 65535);
- Assert.assertEquals(2 * 65535, TransportConfig.getInitialWindowSize());
+ Assertions.assertEquals(2 * 65535, TransportConfig.getInitialWindowSize());
- Assert.assertEquals(16384, TransportConfig.getMaxFrameSize());
+ Assertions.assertEquals(16384, TransportConfig.getMaxFrameSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.maxFrameSize", 65535);
- Assert.assertEquals(65535, TransportConfig.getMaxFrameSize());
+ Assertions.assertEquals(65535, TransportConfig.getMaxFrameSize());
- Assert.assertEquals(8192, TransportConfig.getMaxHeaderListSize());
+ Assertions.assertEquals(8192, TransportConfig.getMaxHeaderListSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.maxHeaderListSize", 65535);
- Assert.assertEquals(65535, TransportConfig.getMaxHeaderListSize());
+ Assertions.assertEquals(65535, TransportConfig.getMaxHeaderListSize());
}
@Test
public void testUseAlpn() {
- Assert.assertTrue(TransportConfig.getUseAlpn());
+ Assertions.assertTrue(TransportConfig.getUseAlpn());
ArchaiusUtils.setProperty("servicecomb.rest.server.http2.useAlpnEnabled", false);
- Assert.assertFalse(TransportConfig.getUseAlpn());
+ Assertions.assertFalse(TransportConfig.getUseAlpn());
}
@Test
public void testGetMaxInitialLineLength() {
- Assert.assertEquals(4096, TransportConfig.getMaxInitialLineLength());
+ Assertions.assertEquals(4096, TransportConfig.getMaxInitialLineLength());
ArchaiusUtils.setProperty("servicecomb.rest.server.maxInitialLineLength", 8000);
- Assert.assertEquals(8000, TransportConfig.getMaxInitialLineLength());
+ Assertions.assertEquals(8000, TransportConfig.getMaxInitialLineLength());
}
}
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 119c0ccb7..08e98a45d 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
@@ -42,7 +42,6 @@ import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -68,6 +67,7 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestVertxRestDispatcher {
@Mocked
@@ -112,7 +112,7 @@ public class TestVertxRestDispatcher {
@Test
public void getOrder() {
- Assert.assertEquals(Integer.MAX_VALUE, dispatcher.getOrder());
+ Assertions.assertEquals(Integer.MAX_VALUE, dispatcher.getOrder());
}
@Test
@@ -134,8 +134,8 @@ public class TestVertxRestDispatcher {
Deencapsulation.invoke(dispatcher, "failureHandler", context);
- Assert.assertSame(e, this.throwable);
- Assert.assertTrue(response.responseClosed);
+ Assertions.assertSame(e, this.throwable);
+ Assertions.assertTrue(response.responseClosed);
}
@Test
@@ -157,8 +157,8 @@ public class TestVertxRestDispatcher {
Deencapsulation.invoke(dispatcher, "failureHandler", context);
- Assert.assertSame(e, this.throwable);
- Assert.assertTrue(response.responseClosed);
+ Assertions.assertSame(e, this.throwable);
+ Assertions.assertTrue(response.responseClosed);
}
@Test
@@ -181,8 +181,8 @@ public class TestVertxRestDispatcher {
Deencapsulation.invoke(dispatcher, "failureHandler", context);
- Assert.assertSame(edde, this.throwable);
- Assert.assertTrue(response.responseClosed);
+ Assertions.assertSame(edde, this.throwable);
+ Assertions.assertTrue(response.responseClosed);
}
@Test
@@ -208,7 +208,7 @@ public class TestVertxRestDispatcher {
MatcherAssert.assertThat(response.responseStatusMessage, Matchers.is(Status.REQUEST_ENTITY_TOO_LARGE.getReasonPhrase()));
MatcherAssert.assertThat(response.responseChunk,
Matchers.is("{\"message\":\"" + Status.REQUEST_ENTITY_TOO_LARGE.getReasonPhrase() + "\"}"));
- Assert.assertTrue(response.responseEnded);
+ Assertions.assertTrue(response.responseEnded);
}
@Test
@@ -233,7 +233,7 @@ public class TestVertxRestDispatcher {
MatcherAssert.assertThat(response.responseStatusCode, Matchers.is(Status.INTERNAL_SERVER_ERROR.getStatusCode()));
MatcherAssert.assertThat(response.responseChunk,
Matchers.is("{\"message\":\"" + exceptionMessage + "\"}"));
- Assert.assertTrue(response.responseEnded);
+ Assertions.assertTrue(response.responseEnded);
}
@Test
@@ -256,7 +256,7 @@ public class TestVertxRestDispatcher {
MatcherAssert.assertThat(response.responseHeader, Matchers.hasEntry(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD));
MatcherAssert.assertThat(response.responseStatusCode, Matchers.is(Status.REQUEST_ENTITY_TOO_LARGE.getStatusCode()));
- Assert.assertTrue(response.responseEnded);
+ Assertions.assertTrue(response.responseEnded);
}
@Test
@@ -282,7 +282,7 @@ public class TestVertxRestDispatcher {
MatcherAssert.assertThat(response.responseStatusMessage, Matchers.is(Status.INTERNAL_SERVER_ERROR.getReasonPhrase()));
MatcherAssert.assertThat(response.responseChunk,
Matchers.is("{\"message\":\"" + Status.INTERNAL_SERVER_ERROR.getReasonPhrase() + "\"}"));
- Assert.assertTrue(response.responseEnded);
+ Assertions.assertTrue(response.responseEnded);
}
@Test
@@ -311,8 +311,8 @@ public class TestVertxRestDispatcher {
Deencapsulation.invoke(dispatcher, "onRequest", routingContext);
- Assert.assertEquals(VertxRestInvocation.class, map.get(RestConst.REST_PRODUCER_INVOCATION).getClass());
- Assert.assertTrue(invoked);
+ Assertions.assertEquals(VertxRestInvocation.class, map.get(RestConst.REST_PRODUCER_INVOCATION).getClass());
+ Assertions.assertTrue(invoked);
}
@Test
@@ -320,33 +320,33 @@ public class TestVertxRestDispatcher {
VertxRestDispatcher vertxRestDispatcher = new VertxRestDispatcher();
String message = "abcd";
String bodyString = vertxRestDispatcher.wrapResponseBody(message);
- Assert.assertNotNull(bodyString);
- Assert.assertEquals("{\"message\":\"abcd\"}", bodyString);
+ Assertions.assertNotNull(bodyString);
+ Assertions.assertEquals("{\"message\":\"abcd\"}", bodyString);
message = "\"abcd\"";
bodyString = vertxRestDispatcher.wrapResponseBody(message);
- Assert.assertNotNull(bodyString);
- Assert.assertEquals("{\"message\":\"\\\"abcd\\\"\"}", bodyString);
+ Assertions.assertNotNull(bodyString);
+ Assertions.assertEquals("{\"message\":\"\\\"abcd\\\"\"}", bodyString);
message = ".01ab\"!@#$%^&*()'\\cd";
bodyString = vertxRestDispatcher.wrapResponseBody(message);
- Assert.assertNotNull(bodyString);
- Assert.assertEquals("{\"message\":\".01ab\\\"!@#$%^&*()'\\\\cd\"}", bodyString);
+ Assertions.assertNotNull(bodyString);
+ Assertions.assertEquals("{\"message\":\".01ab\\\"!@#$%^&*()'\\\\cd\"}", bodyString);
message = new JsonObject().put("key", new JsonObject().put("k2", "value")).toString();
bodyString = vertxRestDispatcher.wrapResponseBody(message);
- Assert.assertNotNull(bodyString);
- Assert.assertEquals("{\"key\":{\"k2\":\"value\"}}", bodyString);
+ Assertions.assertNotNull(bodyString);
+ Assertions.assertEquals("{\"key\":{\"k2\":\"value\"}}", bodyString);
message = "ab\"23\n@!#cd";
bodyString = vertxRestDispatcher.wrapResponseBody(message);
- Assert.assertNotNull(bodyString);
- Assert.assertEquals("{\"message\":\"ab\\\"23\\n@!#cd\"}", bodyString);
+ Assertions.assertNotNull(bodyString);
+ Assertions.assertEquals("{\"message\":\"ab\\\"23\\n@!#cd\"}", bodyString);
message = "ab\"23\r\n@!#cd";
bodyString = vertxRestDispatcher.wrapResponseBody(message);
- Assert.assertNotNull(bodyString);
- Assert.assertEquals("{\"message\":\"ab\\\"23\\r\\n@!#cd\"}", bodyString);
+ Assertions.assertNotNull(bodyString);
+ Assertions.assertEquals("{\"message\":\"ab\\\"23\\r\\n@!#cd\"}", bodyString);
}
}
diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestTransport.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestTransport.java
index 0889a7a56..dbe6cae4e 100644
--- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestTransport.java
+++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestTransport.java
@@ -25,8 +25,8 @@ import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.AbstractVerticle;
@@ -43,12 +43,12 @@ public class TestVertxRestTransport {
@Test
public void testGetInstance() {
- Assert.assertNotNull(instance);
+ Assertions.assertNotNull(instance);
}
@Test
public void testGetName() {
- Assert.assertEquals("rest", instance.getName());
+ Assertions.assertEquals("rest", instance.getName());
}
@Test
@@ -71,7 +71,7 @@ public class TestVertxRestTransport {
} catch (Exception e) {
status = true;
}
- Assert.assertFalse(status);
+ Assertions.assertFalse(status);
}
@Test
@@ -90,13 +90,13 @@ public class TestVertxRestTransport {
validAssert = false;
}
- Assert.assertFalse(validAssert);
+ Assertions.assertFalse(validAssert);
}
@Test
public void testGetOrder() {
VertxRestTransport transport = new VertxRestTransport();
- Assert.assertEquals(-1000, transport.getOrder());
+ Assertions.assertEquals(-1000, transport.getOrder());
}
@Test
@@ -109,7 +109,7 @@ public class TestVertxRestTransport {
};
VertxRestTransport transport = new VertxRestTransport();
- Assert.assertTrue(transport.canInit());
+ Assertions.assertTrue(transport.canInit());
}
@Test
@@ -125,7 +125,7 @@ public class TestVertxRestTransport {
};
VertxRestTransport transport = new VertxRestTransport();
- Assert.assertFalse(transport.canInit());
+ Assertions.assertFalse(transport.canInit());
ss.close();
}
@@ -144,6 +144,6 @@ public class TestVertxRestTransport {
};
VertxRestTransport transport = new VertxRestTransport();
- Assert.assertTrue(transport.canInit());
+ Assertions.assertTrue(transport.canInit());
}
}