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/09 02:25:32 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 clients common part 1 (#2828)
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 52ee4ee64 [SCB-2475] migrate to junit5 clients common part 1 (#2828)
52ee4ee64 is described below
commit 52ee4ee6470e73f8ae0e8e36f25f3087b97f6b7f
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Mon May 9 10:25:28 2022 +0800
[SCB-2475] migrate to junit5 clients common part 1 (#2828)
---
.../common/accessLog/core/AccessLogConfigTest.java | 16 +-
.../accessLog/core/AccessLogGeneratorTest.java | 23 ++-
.../core/element/impl/CookieItemTest.java | 18 +-
.../element/impl/DurationMillisecondItemTest.java | 6 +-
.../core/element/impl/DurationSecondItemTest.java | 14 +-
.../element/impl/FirstLineOfRequestItemTest.java | 6 +-
.../core/element/impl/HttpMethodItemTest.java | 14 +-
.../core/element/impl/HttpStatusItemTest.java | 12 +-
.../element/impl/InvocationContextItemTest.java | 2 +-
.../core/element/impl/LocalHostItemTest.java | 25 ++-
.../core/element/impl/LocalPortItemTest.java | 14 +-
.../core/element/impl/PlainTextItemTest.java | 7 +-
.../core/element/impl/QueryStringItemTest.java | 18 +-
.../core/element/impl/RemoteHostItemTest.java | 22 +--
.../core/element/impl/RequestHeaderItemTest.java | 14 +-
.../core/element/impl/RequestProtocolItemTest.java | 16 +-
.../core/element/impl/ResponseHeaderItemTest.java | 22 +--
.../core/element/impl/ResponseSizeItemTest.java | 10 +-
.../core/element/impl/TransportItemTest.java | 14 +-
.../core/element/impl/UrlPathItemTest.java | 16 +-
.../element/impl/UrlPathWithQueryItemTest.java | 18 +-
.../impl/VertxRestAccessLogPatternParserTest.java | 209 ++++++++++-----------
.../definition/TestResponseRootDeserializer.java | 22 +--
.../converter/TestProtoToStringGenerator.java | 4 +-
.../internal/converter/TestSchemaMetaCodec.java | 118 ++++++------
.../converter/TestSchemaMetaCodecRestTemplate.java | 58 +++---
.../converter/TestSwaggerToProtoGenerator.java | 20 +-
.../common/rest/TestAbstractRestInvocation.java | 97 +++++-----
.../servicecomb/common/rest/TestDefPath.java | 16 +-
.../common/rest/TestRestEngineSchemaListener.java | 6 +-
.../common/rest/TestRestProducerInvocation.java | 12 +-
.../servicecomb/common/rest/TestUploadConfig.java | 34 ++--
.../common/rest/codec/TestRestCodec.java | 18 +-
.../common/rest/codec/TestRestObjectMapper.java | 26 ++-
.../common/rest/codec/fix/TestDoSFix.java | 28 +--
.../common/rest/codec/param/TestBodyProcessor.java | 50 +++--
.../rest/codec/param/TestBodyProcessorCreator.java | 6 +-
.../rest/codec/param/TestCookieProcessor.java | 28 +--
.../codec/param/TestCookieProcessorCreator.java | 4 +-
.../common/rest/codec/param/TestFormProcessor.java | 20 +-
.../rest/codec/param/TestFormProcessorCreator.java | 4 +-
.../rest/codec/param/TestHeaderProcessor.java | 24 +--
.../codec/param/TestHeaderProcessorCreator.java | 4 +-
.../common/rest/codec/param/TestPathProcessor.java | 18 +-
.../rest/codec/param/TestPathProcessorCreator.java | 4 +-
.../rest/codec/param/TestQueryProcessor.java | 12 +-
.../codec/param/TestQueryProcessorCreator.java | 18 +-
.../codec/param/TestRestClientRequestImpl.java | 18 +-
.../codec/produce/TestProduceJsonProcessor.java | 26 +--
.../codec/produce/TestProduceProcessorManager.java | 4 +-
.../produce/TestProduceTextPlainProcessor.java | 24 +--
.../common/rest/definition/TestPath.java | 50 +++--
.../definition/TestRestOperationComparator.java | 14 +-
.../rest/definition/TestRestOperationMeta.java | 102 +++++-----
.../definition/path/PathVarParamWriterTest.java | 12 +-
.../definition/path/QueryVarParamWriterTest.java | 86 ++++-----
.../rest/definition/path/URLPathBuilderTest.java | 22 +--
.../definition/path/URLPathStringBuilderTest.java | 19 +-
.../common/rest/filter/TestHttpServerFilter.java | 4 +-
...HttpServerFilterBeforeSendResponseExecutor.java | 4 +-
.../filter/inner/TestServerRestArgsFilter.java | 6 +-
.../common/rest/locator/TestMicroservicePaths.java | 12 +-
.../rest/locator/TestServicePathManager.java | 4 +-
.../TestClassPathStaticResourceHandler.java | 36 ++--
64 files changed, 797 insertions(+), 813 deletions(-)
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogConfigTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogConfigTest.java
index 245b9393f..964cc6d0e 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogConfigTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogConfigTest.java
@@ -17,11 +17,9 @@
package org.apache.servicecomb.common.accessLog.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
import org.apache.servicecomb.common.accessLog.AccessLogConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class AccessLogConfigTest {
@@ -29,16 +27,16 @@ public class AccessLogConfigTest {
public void getAccessLogEnabled() {
boolean serverEnabled = AccessLogConfig.INSTANCE.isServerLogEnabled();
boolean clientEnabled = AccessLogConfig.INSTANCE.isClientLogEnabled();
- assertFalse(serverEnabled);
- assertFalse(clientEnabled);
+ Assertions.assertFalse(serverEnabled);
+ Assertions.assertFalse(clientEnabled);
}
@Test
- public void getAccesslogPattern() {
+ public void getAccessLogPattern() {
String clientLogPattern = AccessLogConfig.INSTANCE.getClientLogPattern();
String serverLogPattern = AccessLogConfig.INSTANCE.getServerLogPattern();
- assertEquals("%h - - %t %r %s %B %D", serverLogPattern);
- assertEquals("%h %SCB-transport - - %t %r %s %D", clientLogPattern);
+ Assertions.assertEquals("%h - - %t %r %s %B %D", serverLogPattern);
+ Assertions.assertEquals("%h %SCB-transport - - %t %r %s %D", clientLogPattern);
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java
index bd0e880de..34d9e0d1f 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.text.SimpleDateFormat;
@@ -34,7 +33,7 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.core.invocation.InvocationStageTrace;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import org.mockito.Mockito;
@@ -53,10 +52,10 @@ public class AccessLogGeneratorTest {
@Test
public void testConstructor() {
AccessLogItem<RoutingContext>[] elements = Deencapsulation.getField(LOG_GENERATOR, "accessLogItems");
- assertEquals(3, elements.length);
- assertEquals(HttpMethodAccessItem.class, elements[0].getClass());
- assertEquals(PlainTextAccessItem.class, elements[1].getClass());
- assertEquals(ConfigurableDatetimeAccessItem.class, elements[2].getClass());
+ Assertions.assertEquals(3, elements.length);
+ Assertions.assertEquals(HttpMethodAccessItem.class, elements[0].getClass());
+ Assertions.assertEquals(PlainTextAccessItem.class, elements[1].getClass());
+ Assertions.assertEquals(ConfigurableDatetimeAccessItem.class, elements[2].getClass());
}
@Test
@@ -74,7 +73,7 @@ public class AccessLogGeneratorTest {
when(request.method()).thenReturn(HttpMethod.DELETE);
String log = LOG_GENERATOR.generateServerLog(serverAccessLogEvent);
- Assert.assertEquals("DELETE" + " - " + simpleDateFormat.format(startMillisecond), log);
+ Assertions.assertEquals("DELETE" + " - " + simpleDateFormat.format(startMillisecond), log);
}
@Test
@@ -96,15 +95,15 @@ public class AccessLogGeneratorTest {
simpleDateFormat.setTimeZone(TimeZone.getDefault());
when(operationMeta.getHttpMethod()).thenReturn(HttpMethod.DELETE.toString());
String log = LOG_GENERATOR.generateClientLog(finishEvent);
- Assert.assertEquals("DELETE" + " - " + simpleDateFormat.format(startMillisecond), log);
+ Assertions.assertEquals("DELETE" + " - " + simpleDateFormat.format(startMillisecond), log);
}
@Test
public void testUserDefinedLogGenerator() {
AccessLogItem<RoutingContext>[] elements = Deencapsulation.getField(USER_DEFINED_LOG_GENERATOR, "accessLogItems");
- assertEquals(3, elements.length);
- assertEquals(RemoteHostAccessItem.class, elements[0].getClass());
- assertEquals(PlainTextAccessItem.class, elements[1].getClass());
- assertEquals(UserDefinedAccessLogItem.class, elements[2].getClass());
+ Assertions.assertEquals(3, elements.length);
+ Assertions.assertEquals(RemoteHostAccessItem.class, elements[0].getClass());
+ Assertions.assertEquals(PlainTextAccessItem.class, elements[1].getClass());
+ Assertions.assertEquals(UserDefinedAccessLogItem.class, elements[2].getClass());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieItemTest.java
index 8ea0a9478..d999607b8 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieItemTest.java
@@ -29,7 +29,7 @@ import org.apache.servicecomb.common.rest.codec.param.RestClientRequestImpl;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -83,7 +83,7 @@ public class CookieItemTest {
accessLogEvent.setRoutingContext(mockContext);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals(COOKIE_VALUE, strBuilder.toString());
+ Assertions.assertEquals(COOKIE_VALUE, strBuilder.toString());
}
@Test
@@ -99,7 +99,7 @@ public class CookieItemTest {
when(restClientRequest.getCookieMap()).thenReturn(cookieMap);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals(COOKIE_VALUE, strBuilder.toString());
+ Assertions.assertEquals(COOKIE_VALUE, strBuilder.toString());
}
@Test
@@ -110,7 +110,7 @@ public class CookieItemTest {
accessLogEvent.setRoutingContext(mockContext);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -124,7 +124,7 @@ public class CookieItemTest {
when(restClientRequest.getCookieMap()).thenReturn(cookieMap);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@@ -135,7 +135,7 @@ public class CookieItemTest {
accessLogEvent.setRoutingContext(mockContext);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -148,7 +148,7 @@ public class CookieItemTest {
when(restClientRequest.getCookieMap()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@@ -162,7 +162,7 @@ public class CookieItemTest {
accessLogEvent.setRoutingContext(mockContext);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -177,6 +177,6 @@ public class CookieItemTest {
when(restClientRequest.getCookieMap()).thenReturn(cookieMap);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationMillisecondItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationMillisecondItemTest.java
index 1c4e3c2d4..d1fc665a5 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationMillisecondItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationMillisecondItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.core.Invocation;
@@ -26,6 +25,7 @@ import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.core.invocation.InvocationStageTrace;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class DurationMillisecondItemTest {
@@ -62,10 +62,10 @@ public class DurationMillisecondItemTest {
@Test
public void testAppendFormattedElement() {
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("1", strBuilder.toString());
+ Assertions.assertEquals("1", strBuilder.toString());
strBuilder = new StringBuilder();
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("1", strBuilder.toString());
+ Assertions.assertEquals("1", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationSecondItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationSecondItemTest.java
index 37f84bbd9..58f49c979 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationSecondItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/DurationSecondItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.core.Invocation;
@@ -26,6 +25,7 @@ import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.core.invocation.InvocationStageTrace;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class DurationSecondItemTest {
@@ -61,41 +61,41 @@ public class DurationSecondItemTest {
public void serverFormattedElementOn999ms() {
accessLogEvent.setMilliEndTime(1000L);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("0", strBuilder.toString());
+ Assertions.assertEquals("0", strBuilder.toString());
}
@Test
public void clientFormattedElementOn999ms() {
when(invocationStageTrace.getFinish()).thenReturn(1000_000_000L);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("0", strBuilder.toString());
+ Assertions.assertEquals("0", strBuilder.toString());
}
@Test
public void serverFormattedElementOn1000ms() {
accessLogEvent.setMilliEndTime(1001L);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("1", strBuilder.toString());
+ Assertions.assertEquals("1", strBuilder.toString());
}
@Test
public void clientFormattedElementOn1000ms() {
when(invocationStageTrace.getFinish()).thenReturn(1001_000_000L);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("1", strBuilder.toString());
+ Assertions.assertEquals("1", strBuilder.toString());
}
@Test
public void serverFormattedElementOn1001ms() {
accessLogEvent.setMilliEndTime(1002L);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("1", strBuilder.toString());
+ Assertions.assertEquals("1", strBuilder.toString());
}
@Test
public void clientFormattedElementOn1001ms() {
when(invocationStageTrace.getFinish()).thenReturn(1002_000_000L);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("1", strBuilder.toString());
+ Assertions.assertEquals("1", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/FirstLineOfRequestItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/FirstLineOfRequestItemTest.java
index 8d0960d43..19febcaff 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/FirstLineOfRequestItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/FirstLineOfRequestItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.HashMap;
@@ -32,6 +31,7 @@ import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpClientRequest;
@@ -94,7 +94,7 @@ public class FirstLineOfRequestItemTest {
when(request.version()).thenReturn(HttpVersion.HTTP_1_1);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("\"DELETE " + uri + " HTTP/1.1\"", strBuilder.toString());
+ Assertions.assertEquals("\"DELETE " + uri + " HTTP/1.1\"", strBuilder.toString());
}
@Test
@@ -105,6 +105,6 @@ public class FirstLineOfRequestItemTest {
when(urlEndpoint.isHttp2Enabled()).thenReturn(true);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("\"DELETE " + uri + " HTTP/2.0\"", strBuilder.toString());
+ Assertions.assertEquals("\"DELETE " + uri + " HTTP/2.0\"", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpMethodItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpMethodItemTest.java
index 4b8261aab..5c5aed3de 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpMethodItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpMethodItemTest.java
@@ -29,7 +29,7 @@ import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -87,7 +87,7 @@ public class HttpMethodItemTest {
Mockito.when(request.method()).thenReturn(HttpMethod.DELETE);
accessLogEvent.setRoutingContext(routingContext);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("DELETE", strBuilder.toString());
+ Assertions.assertEquals("DELETE", strBuilder.toString());
}
@Test
@@ -95,7 +95,7 @@ public class HttpMethodItemTest {
when(restClientRequest.getRequest()).thenReturn(clientRequest);
when(clientRequest.getMethod()).thenReturn(HttpMethod.DELETE);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("DELETE", strBuilder.toString());
+ Assertions.assertEquals("DELETE", strBuilder.toString());
}
@Test
@@ -103,14 +103,14 @@ public class HttpMethodItemTest {
accessLogEvent.setRoutingContext(routingContext);
Mockito.when(routingContext.request()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void clientFormattedElementOnRequestIsNull() {
when(restClientRequest.getRequest()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@@ -122,13 +122,13 @@ public class HttpMethodItemTest {
Mockito.when(routingContext.request()).thenReturn(request);
Mockito.when(request.method()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void clientFormattedElementOnMethodIsNull() {
when(clientRequest.getMethod()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpStatusItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpStatusItemTest.java
index 496c0f4a2..fc0566c55 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpStatusItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/HttpStatusItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
@@ -25,6 +24,7 @@ import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.swagger.invocation.Response;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpServerResponse;
@@ -65,7 +65,7 @@ public class HttpStatusItemTest {
when(serverResponse.getStatusCode()).thenReturn(statusCode);
STATUS_ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("200", strBuilder.toString());
+ Assertions.assertEquals("200", strBuilder.toString());
}
@Test
@@ -75,14 +75,14 @@ public class HttpStatusItemTest {
when(response.getStatusCode()).thenReturn(statusCode);
STATUS_ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("200", strBuilder.toString());
+ Assertions.assertEquals("200", strBuilder.toString());
}
@Test
public void serverFormattedElementOnResponseIsNull() {
Mockito.when(routingContext.response()).thenReturn(null);
STATUS_ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
Mockito.when(routingContext.response()).thenReturn(serverResponse);
Mockito.when(serverResponse.closed()).thenReturn(true);
@@ -90,13 +90,13 @@ public class HttpStatusItemTest {
strBuilder = new StringBuilder();
STATUS_ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void clientFormattedElementOnResponseIsNull() {
when(finishEvent.getResponse()).thenReturn(null);
STATUS_ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java
index b18a02aff..db4963e14 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java
@@ -28,7 +28,7 @@ import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalHostItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalHostItemTest.java
index 9e780a084..b844d470f 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalHostItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalHostItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.HashMap;
@@ -28,7 +27,7 @@ import org.apache.servicecomb.common.rest.codec.param.RestClientRequestImpl;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -89,7 +88,7 @@ public class LocalHostItemTest {
when(connection.localAddress()).thenReturn(socketAddress);
when(socketAddress.host()).thenReturn(localAddress);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals(localAddress, strBuilder.toString());
+ Assertions.assertEquals(localAddress, strBuilder.toString());
}
@Test
@@ -97,7 +96,7 @@ public class LocalHostItemTest {
String localAddress = "192.168.0.1";
accessLogEvent.setLocalAddress(localAddress);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals(localAddress, strBuilder.toString());
+ Assertions.assertEquals(localAddress, strBuilder.toString());
}
@Test
@@ -108,21 +107,21 @@ public class LocalHostItemTest {
Mockito.when(socketAddress.host()).thenReturn(localHost);
String result = LocalHostAccessItem.getLocalAddress(routingContext);
- assertEquals(localHost, result);
+ Assertions.assertEquals(localHost, result);
}
@Test
public void serverLocalAddressOnRequestIsNull() {
Mockito.when(routingContext.request()).thenReturn(null);
String result = LocalHostAccessItem.getLocalAddress(routingContext);
- assertEquals("-", result);
+ Assertions.assertEquals("-", result);
}
@Test
public void clientLocalAddressOnRequestIsNull() {
when(restClientRequest.getRequest()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -130,7 +129,7 @@ public class LocalHostItemTest {
Mockito.when(routingContext.request()).thenReturn(serverRequest);
Mockito.when(serverRequest.localAddress()).thenReturn(null);
String result = LocalHostAccessItem.getLocalAddress(routingContext);
- assertEquals("-", result);
+ Assertions.assertEquals("-", result);
}
@Test
@@ -139,7 +138,7 @@ public class LocalHostItemTest {
when(clientRequest.connection()).thenReturn(connection);
when(connection.localAddress()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -149,7 +148,7 @@ public class LocalHostItemTest {
Mockito.when(socketAddress.host()).thenReturn(null);
String result = LocalHostAccessItem.getLocalAddress(routingContext);
- assertEquals("-", result);
+ Assertions.assertEquals("-", result);
}
@Test
@@ -159,7 +158,7 @@ public class LocalHostItemTest {
when(connection.localAddress()).thenReturn(socketAddress);
when(socketAddress.host()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -170,7 +169,7 @@ public class LocalHostItemTest {
Mockito.when(socketAddress.host()).thenReturn(localHost);
String result = LocalHostAccessItem.getLocalAddress(routingContext);
- assertEquals("-", result);
+ Assertions.assertEquals("-", result);
}
@Test
@@ -180,6 +179,6 @@ public class LocalHostItemTest {
when(connection.localAddress()).thenReturn(socketAddress);
when(socketAddress.host()).thenReturn("");
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalPortItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalPortItemTest.java
index 81e48fc4e..1cae6145d 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalPortItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/LocalPortItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.HashMap;
@@ -30,6 +29,7 @@ import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpClientRequest;
@@ -87,7 +87,7 @@ public class LocalPortItemTest {
Mockito.when(socketAddress.port()).thenReturn(8080);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("8080", strBuilder.toString());
+ Assertions.assertEquals("8080", strBuilder.toString());
}
@Test
@@ -97,21 +97,21 @@ public class LocalPortItemTest {
when(connection.localAddress()).thenReturn(socketAddress);
when(socketAddress.port()).thenReturn(8080);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("8080", strBuilder.toString());
+ Assertions.assertEquals("8080", strBuilder.toString());
}
@Test
public void serverFormattedElementOnRequestIsNull() {
Mockito.when(routingContext.request()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void clientFormattedElementOnRequestIsNull() {
when(restClientRequest.getRequest()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -119,7 +119,7 @@ public class LocalPortItemTest {
Mockito.when(routingContext.request()).thenReturn(serverRequest);
Mockito.when(serverRequest.localAddress()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -128,6 +128,6 @@ public class LocalPortItemTest {
when(clientRequest.connection()).thenReturn(connection);
when(connection.localAddress()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/PlainTextItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/PlainTextItemTest.java
index 305371ae7..2e60a1e9a 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/PlainTextItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/PlainTextItemTest.java
@@ -17,12 +17,11 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
-
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class PlainTextItemTest {
@@ -43,13 +42,13 @@ public class PlainTextItemTest {
public void serverFormattedElement() {
PlainTextAccessItem element = new PlainTextAccessItem("contentTest");
element.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("contentTest", strBuilder.toString());
+ Assertions.assertEquals("contentTest", strBuilder.toString());
}
@Test
public void clientFormattedElement() {
PlainTextAccessItem element = new PlainTextAccessItem("contentTest");
element.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("contentTest", strBuilder.toString());
+ Assertions.assertEquals("contentTest", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/QueryStringItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/QueryStringItemTest.java
index 60927f065..796205e21 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/QueryStringItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/QueryStringItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.HashMap;
@@ -30,6 +29,7 @@ import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpClientRequest;
@@ -75,7 +75,7 @@ public class QueryStringItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.query()).thenReturn(query);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals(query, strBuilder.toString());
+ Assertions.assertEquals(query, strBuilder.toString());
}
@Test
@@ -89,14 +89,14 @@ public class QueryStringItemTest {
when(clientRequest.query()).thenReturn(query);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals(query, strBuilder.toString());
+ Assertions.assertEquals(query, strBuilder.toString());
}
@Test
public void serverFormattedElementOnRequestIsNull() {
when(routingContext.request()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -108,7 +108,7 @@ public class QueryStringItemTest {
when(restClientRequest.getRequest()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -116,7 +116,7 @@ public class QueryStringItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.query()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -129,7 +129,7 @@ public class QueryStringItemTest {
when(clientRequest.query()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -138,7 +138,7 @@ public class QueryStringItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.query()).thenReturn(query);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -152,6 +152,6 @@ public class QueryStringItemTest {
when(clientRequest.query()).thenReturn(query);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RemoteHostItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RemoteHostItemTest.java
index f6b442e3f..e8a6c5f95 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RemoteHostItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RemoteHostItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,6 +31,7 @@ import org.junit.Test;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
import io.vertx.ext.web.RoutingContext;
+import org.junit.jupiter.api.Assertions;
public class RemoteHostItemTest {
public static final RemoteHostAccessItem ELEMENT = new RemoteHostAccessItem();
@@ -76,7 +76,7 @@ public class RemoteHostItemTest {
when(socketAddress.host()).thenReturn(remoteHost);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals(remoteHost, strBuilder.toString());
+ Assertions.assertEquals(remoteHost, strBuilder.toString());
}
@Test
@@ -87,14 +87,14 @@ public class RemoteHostItemTest {
when(endpoint.getAddress()).thenReturn(uriEndpointObject);
when(uriEndpointObject.getHostOrIp()).thenReturn(remoteHost);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals(remoteHost, strBuilder.toString());
+ Assertions.assertEquals(remoteHost, strBuilder.toString());
}
@Test
public void serverFormattedElementOnRequestIsNull() {
when(routingContext.request()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -102,7 +102,7 @@ public class RemoteHostItemTest {
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getEndpoint()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -110,7 +110,7 @@ public class RemoteHostItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.remoteAddress()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -119,7 +119,7 @@ public class RemoteHostItemTest {
when(invocation.getEndpoint()).thenReturn(endpoint);
when(endpoint.getAddress()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -128,7 +128,7 @@ public class RemoteHostItemTest {
when(serverRequest.remoteAddress()).thenReturn(socketAddress);
when(socketAddress.host()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -138,7 +138,7 @@ public class RemoteHostItemTest {
when(endpoint.getAddress()).thenReturn(uriEndpointObject);
when(uriEndpointObject.getHostOrIp()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -147,7 +147,7 @@ public class RemoteHostItemTest {
when(serverRequest.remoteAddress()).thenReturn(socketAddress);
when(socketAddress.host()).thenReturn("");
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -157,6 +157,6 @@ public class RemoteHostItemTest {
when(endpoint.getAddress()).thenReturn(uriEndpointObject);
when(uriEndpointObject.getHostOrIp()).thenReturn("");
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestHeaderItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestHeaderItemTest.java
index b4949dfc5..712516f97 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestHeaderItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestHeaderItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.HashMap;
@@ -30,6 +29,7 @@ import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.MultiMap;
@@ -85,8 +85,8 @@ public class RequestHeaderItemTest {
when(serverRequest.headers()).thenReturn(headers);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals(testValue, strBuilder.toString());
- assertEquals(ELEMENT.getVarName(), VAR_NAME);
+ Assertions.assertEquals(testValue, strBuilder.toString());
+ Assertions.assertEquals(ELEMENT.getVarName(), VAR_NAME);
}
@Test
@@ -102,7 +102,7 @@ public class RequestHeaderItemTest {
when(headers.get(VAR_NAME)).thenReturn(testValue);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals(testValue, strBuilder.toString());
+ Assertions.assertEquals(testValue, strBuilder.toString());
}
@Test
@@ -111,7 +111,7 @@ public class RequestHeaderItemTest {
when(serverRequest.headers()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -124,7 +124,7 @@ public class RequestHeaderItemTest {
when(clientRequest.headers()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -136,6 +136,6 @@ public class RequestHeaderItemTest {
when(serverRequest.headers()).thenReturn(headers);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestProtocolItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestProtocolItemTest.java
index d777883b9..d0d7a34c3 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestProtocolItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestProtocolItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.core.Endpoint;
@@ -27,6 +26,7 @@ import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpServerRequest;
@@ -72,17 +72,17 @@ public class RequestProtocolItemTest {
when(serverRequest.version()).thenReturn(HttpVersion.HTTP_1_1);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("HTTP/1.1", strBuilder.toString());
+ Assertions.assertEquals("HTTP/1.1", strBuilder.toString());
strBuilder = new StringBuilder();
when(serverRequest.version()).thenReturn(HttpVersion.HTTP_1_0);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("HTTP/1.0", strBuilder.toString());
+ Assertions.assertEquals("HTTP/1.0", strBuilder.toString());
strBuilder = new StringBuilder();
when(serverRequest.version()).thenReturn(HttpVersion.HTTP_2);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("HTTP/2.0", strBuilder.toString());
+ Assertions.assertEquals("HTTP/2.0", strBuilder.toString());
}
@Test
@@ -92,7 +92,7 @@ public class RequestProtocolItemTest {
when(endpoint.getAddress()).thenReturn(urlEndpoint);
when(urlEndpoint.isHttp2Enabled()).thenReturn(true);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("HTTP/2.0", strBuilder.toString());
+ Assertions.assertEquals("HTTP/2.0", strBuilder.toString());
strBuilder = new StringBuilder();
when(finishEvent.getInvocation()).thenReturn(invocation);
@@ -100,7 +100,7 @@ public class RequestProtocolItemTest {
when(endpoint.getAddress()).thenReturn(urlEndpoint);
when(urlEndpoint.isHttp2Enabled()).thenReturn(false);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("HTTP/1.1", strBuilder.toString());
+ Assertions.assertEquals("HTTP/1.1", strBuilder.toString());
}
@Test
@@ -109,7 +109,7 @@ public class RequestProtocolItemTest {
when(serverRequest.version()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -119,6 +119,6 @@ public class RequestProtocolItemTest {
when(endpoint.getAddress()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("HTTP/1.1", strBuilder.toString());
+ Assertions.assertEquals("HTTP/1.1", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseHeaderItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseHeaderItemTest.java
index 088a775d3..978a4e387 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseHeaderItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseHeaderItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
@@ -25,6 +24,7 @@ import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.apache.servicecomb.swagger.invocation.Response;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.MultiMap;
@@ -71,8 +71,8 @@ public class ResponseHeaderItemTest {
when(serverResponse.headers()).thenReturn(headers);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals(headerValue, strBuilder.toString());
- assertEquals(ELEMENT.getVarName(), VAR_NAME);
+ Assertions.assertEquals(headerValue, strBuilder.toString());
+ Assertions.assertEquals(ELEMENT.getVarName(), VAR_NAME);
}
@Test
@@ -84,8 +84,8 @@ public class ResponseHeaderItemTest {
when(finishEvent.getResponse()).thenReturn(response);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals(headerValue, strBuilder.toString());
- assertEquals(ELEMENT.getVarName(), VAR_NAME);
+ Assertions.assertEquals(headerValue, strBuilder.toString());
+ Assertions.assertEquals(ELEMENT.getVarName(), VAR_NAME);
}
@Test
@@ -94,7 +94,7 @@ public class ResponseHeaderItemTest {
when(serverResponse.headers()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -103,21 +103,21 @@ public class ResponseHeaderItemTest {
when(response.getHeaders()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void serverFormattedElementOnResponseIsNull() {
when(routingContext.response()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void clientFormattedElementOnResponseIsNull() {
when(finishEvent.getResponse()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -129,7 +129,7 @@ public class ResponseHeaderItemTest {
when(serverResponse.headers()).thenReturn(headers);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -141,6 +141,6 @@ public class ResponseHeaderItemTest {
when(response.getHeaders()).thenReturn(headers);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseSizeItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseSizeItemTest.java
index 55a1b094e..122bd4a60 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseSizeItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseSizeItemTest.java
@@ -17,13 +17,13 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpServerResponse;
@@ -60,20 +60,20 @@ public class ResponseSizeItemTest {
when(serverResponse.bytesWritten()).thenReturn(bytesWritten);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals(String.valueOf(bytesWritten), strBuilder.toString());
+ Assertions.assertEquals(String.valueOf(bytesWritten), strBuilder.toString());
}
@Test
public void clientFormattedElement() {
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("0", strBuilder.toString());
+ Assertions.assertEquals("0", strBuilder.toString());
}
@Test
public void getFormattedElementOnResponseIsNull() {
when(routingContext.response()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("0", strBuilder.toString());
+ Assertions.assertEquals("0", strBuilder.toString());
}
@Test
@@ -82,6 +82,6 @@ public class ResponseSizeItemTest {
when(routingContext.response()).thenReturn(serverResponse);
when(serverResponse.bytesWritten()).thenReturn(bytesWritten);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("0", strBuilder.toString());
+ Assertions.assertEquals("0", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/TransportItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/TransportItemTest.java
index 0f1c980b9..cd4e8ee2b 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/TransportItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/TransportItemTest.java
@@ -23,7 +23,7 @@ import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -55,20 +55,20 @@ public class TransportItemTest {
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getConfigTransportName()).thenReturn("rest");
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("rest", strBuilder.toString());
+ Assertions.assertEquals("rest", strBuilder.toString());
strBuilder = new StringBuilder();
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getEndpoint()).thenReturn(endpoint);
when(endpoint.getEndpoint()).thenReturn("rest:xxx:30100");
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("rest", strBuilder.toString());
+ Assertions.assertEquals("rest", strBuilder.toString());
}
@Test
public void serverFormattedElement() {
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("rest", strBuilder.toString());
+ Assertions.assertEquals("rest", strBuilder.toString());
}
@Test
@@ -81,7 +81,7 @@ public class TransportItemTest {
when(invocation.getEndpoint()).thenReturn(endpoint);
when(endpoint.getEndpoint()).thenReturn("rest:xxx:30100");
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("rest", strBuilder.toString());
+ Assertions.assertEquals("rest", strBuilder.toString());
}
@Test
@@ -93,7 +93,7 @@ public class TransportItemTest {
when(invocation.getEndpoint()).thenReturn(endpoint);
when(endpoint.getEndpoint()).thenReturn("rest:xxx:30100");
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("rest", strBuilder.toString());
+ Assertions.assertEquals("rest", strBuilder.toString());
}
@Test
@@ -104,6 +104,6 @@ public class TransportItemTest {
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getEndpoint()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathItemTest.java
index 1d5d0638a..f7c72ae30 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathItemTest.java
@@ -29,7 +29,7 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.definition.SchemaMeta;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -92,7 +92,7 @@ public class UrlPathItemTest {
when(operationMeta.getOperationPath()).thenReturn("/test");
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals(uri, strBuilder.toString());
+ Assertions.assertEquals(uri, strBuilder.toString());
strBuilder = new StringBuilder();
Map<String, Object> handlerContext = new HashMap<>();
@@ -104,7 +104,7 @@ public class UrlPathItemTest {
when(restClientRequest.getRequest()).thenReturn(clientRequest);
when(clientRequest.path()).thenReturn(uri);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals(uri, strBuilder.toString());
+ Assertions.assertEquals(uri, strBuilder.toString());
}
@Test
@@ -113,14 +113,14 @@ public class UrlPathItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.path()).thenReturn(uri);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals(uri, strBuilder.toString());
+ Assertions.assertEquals(uri, strBuilder.toString());
}
@Test
public void serverFormattedElementOnRequestIsNull() {
when(routingContext.request()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -131,7 +131,7 @@ public class UrlPathItemTest {
when(invocation.getHandlerContext()).thenReturn(handlerContext);
when(restClientRequest.getRequest()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -139,7 +139,7 @@ public class UrlPathItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.path()).thenReturn(null);
ITEM.appendServerFormattedItem(accessLogEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -151,6 +151,6 @@ public class UrlPathItemTest {
when(restClientRequest.getRequest()).thenReturn(clientRequest);
when(clientRequest.path()).thenReturn(null);
ITEM.appendClientFormattedItem(finishEvent, strBuilder);
- Assert.assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathWithQueryItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathWithQueryItemTest.java
index a2f01e896..d07c80f70 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathWithQueryItemTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/UrlPathWithQueryItemTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import org.apache.servicecomb.common.rest.RestConst;
@@ -26,6 +25,7 @@ import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.http.HttpServerRequest;
@@ -65,7 +65,7 @@ public class UrlPathWithQueryItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.uri()).thenReturn(uri);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals(uri, strBuilder.toString());
+ Assertions.assertEquals(uri, strBuilder.toString());
}
@Test
@@ -74,21 +74,21 @@ public class UrlPathWithQueryItemTest {
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getLocalContext(RestConst.REST_CLIENT_REQUEST_PATH)).thenReturn(uri);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals(uri, strBuilder.toString());
+ Assertions.assertEquals(uri, strBuilder.toString());
}
@Test
public void serverFormattedElementOnRequestIsNull() {
when(routingContext.request()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
public void clientFormattedElementOnRequestIsNull() {
when(finishEvent.getInvocation()).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -96,7 +96,7 @@ public class UrlPathWithQueryItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.uri()).thenReturn(null);
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -104,7 +104,7 @@ public class UrlPathWithQueryItemTest {
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getLocalContext(RestConst.REST_CLIENT_REQUEST_PATH)).thenReturn(null);
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -112,7 +112,7 @@ public class UrlPathWithQueryItemTest {
when(routingContext.request()).thenReturn(serverRequest);
when(serverRequest.uri()).thenReturn("");
ELEMENT.appendServerFormattedItem(accessLogEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
@Test
@@ -120,6 +120,6 @@ public class UrlPathWithQueryItemTest {
when(finishEvent.getInvocation()).thenReturn(invocation);
when(invocation.getLocalContext(RestConst.REST_CLIENT_REQUEST_PATH)).thenReturn("");
ELEMENT.appendClientFormattedItem(finishEvent, strBuilder);
- assertEquals("-", strBuilder.toString());
+ Assertions.assertEquals("-", strBuilder.toString());
}
}
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
index fa682dd5a..e682acf21 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
@@ -17,9 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.parser.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -50,7 +47,7 @@ import org.apache.servicecomb.common.accessLog.core.element.impl.UrlPathWithQuer
import org.apache.servicecomb.common.accessLog.core.parser.CompositeVertxRestAccessLogItemMeta;
import org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta;
import org.apache.servicecomb.core.event.ServerAccessLogEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -88,123 +85,123 @@ public class VertxRestAccessLogPatternParserTest {
@Test
public void testParsePatternFullTest() {
List<AccessLogItem<RoutingContext>> result = logPatternParser.parsePattern(ROW_PATTERN);
- assertEquals(29, result.size());
+ Assertions.assertEquals(29, result.size());
StringBuilder builder = new StringBuilder();
result.get(0).appendServerFormattedItem(accessLogEvent, builder);
- assertEquals("[", builder.toString());
- assertEquals(HttpMethodAccessItem.class, result.get(1).getClass());
+ Assertions.assertEquals("[", builder.toString());
+ Assertions.assertEquals(HttpMethodAccessItem.class, result.get(1).getClass());
builder = new StringBuilder();
result.get(2).appendServerFormattedItem(accessLogEvent, builder);
- assertEquals("] ", builder.toString());
- assertEquals(HttpMethodAccessItem.class, result.get(3).getClass());
+ Assertions.assertEquals("] ", builder.toString());
+ Assertions.assertEquals(HttpMethodAccessItem.class, result.get(3).getClass());
builder = new StringBuilder();
result.get(4).appendServerFormattedItem(accessLogEvent, builder);
- assertEquals(" ", builder.toString());
- assertEquals(HttpStatusAccessItem.class, result.get(5).getClass());
- assertEquals(DurationSecondAccessItem.class, result.get(6).getClass());
- assertEquals(DurationMillisecondAccessItem.class, result.get(7).getClass());
- assertEquals(RemoteHostAccessItem.class, result.get(8).getClass());
- assertEquals(LocalHostAccessItem.class, result.get(9).getClass());
- assertEquals(LocalPortAccessItem.class, result.get(10).getClass());
- assertEquals(ResponseSizeAccessItem.class, result.get(11).getClass());
- assertEquals("0", ((ResponseSizeAccessItem) result.get(11)).getZeroBytes());
- assertEquals(ResponseSizeAccessItem.class, result.get(12).getClass());
- assertEquals("-", ((ResponseSizeAccessItem) result.get(12)).getZeroBytes());
- assertEquals(FirstLineOfRequestAccessItem.class, result.get(13).getClass());
- assertEquals(UrlPathAccessItem.class, result.get(14).getClass());
- assertEquals(QueryStringAccessItem.class, result.get(15).getClass());
- assertEquals(UrlPathAccessItem.class, result.get(16).getClass());
- assertEquals(QueryStringAccessItem.class, result.get(17).getClass());
- assertEquals(UrlPathWithQueryAccessItem.class, result.get(18).getClass());
- assertEquals(RequestProtocolAccessItem.class, result.get(19).getClass());
- assertEquals(ConfigurableDatetimeAccessItem.class, result.get(20).getClass());
- assertEquals(ConfigurableDatetimeAccessItem.DEFAULT_DATETIME_PATTERN,
+ Assertions.assertEquals(" ", builder.toString());
+ Assertions.assertEquals(HttpStatusAccessItem.class, result.get(5).getClass());
+ Assertions.assertEquals(DurationSecondAccessItem.class, result.get(6).getClass());
+ Assertions.assertEquals(DurationMillisecondAccessItem.class, result.get(7).getClass());
+ Assertions.assertEquals(RemoteHostAccessItem.class, result.get(8).getClass());
+ Assertions.assertEquals(LocalHostAccessItem.class, result.get(9).getClass());
+ Assertions.assertEquals(LocalPortAccessItem.class, result.get(10).getClass());
+ Assertions.assertEquals(ResponseSizeAccessItem.class, result.get(11).getClass());
+ Assertions.assertEquals("0", ((ResponseSizeAccessItem) result.get(11)).getZeroBytes());
+ Assertions.assertEquals(ResponseSizeAccessItem.class, result.get(12).getClass());
+ Assertions.assertEquals("-", ((ResponseSizeAccessItem) result.get(12)).getZeroBytes());
+ Assertions.assertEquals(FirstLineOfRequestAccessItem.class, result.get(13).getClass());
+ Assertions.assertEquals(UrlPathAccessItem.class, result.get(14).getClass());
+ Assertions.assertEquals(QueryStringAccessItem.class, result.get(15).getClass());
+ Assertions.assertEquals(UrlPathAccessItem.class, result.get(16).getClass());
+ Assertions.assertEquals(QueryStringAccessItem.class, result.get(17).getClass());
+ Assertions.assertEquals(UrlPathWithQueryAccessItem.class, result.get(18).getClass());
+ Assertions.assertEquals(RequestProtocolAccessItem.class, result.get(19).getClass());
+ Assertions.assertEquals(ConfigurableDatetimeAccessItem.class, result.get(20).getClass());
+ Assertions.assertEquals(ConfigurableDatetimeAccessItem.DEFAULT_DATETIME_PATTERN,
((ConfigurableDatetimeAccessItem) result.get(20)).getPattern());
- assertEquals(ConfigurableDatetimeAccessItem.DEFAULT_LOCALE, ((ConfigurableDatetimeAccessItem) result.get(20)).getLocale());
- assertEquals(TimeZone.getDefault(), ((ConfigurableDatetimeAccessItem) result.get(20)).getTimezone());
- assertEquals("yyyy MM dd HH:mm:ss zzz", ((ConfigurableDatetimeAccessItem) result.get(21)).getPattern());
- assertEquals(ConfigurableDatetimeAccessItem.DEFAULT_LOCALE, ((ConfigurableDatetimeAccessItem) result.get(21)).getLocale());
- assertEquals(TimeZone.getDefault(), ((ConfigurableDatetimeAccessItem) result.get(21)).getTimezone());
- assertEquals("yyyy MM dd HH:mm:ss", ((ConfigurableDatetimeAccessItem) result.get(22)).getPattern());
- assertEquals(Locale.forLanguageTag("en-US"), ((ConfigurableDatetimeAccessItem) result.get(22)).getLocale());
- assertEquals(TimeZone.getTimeZone("GMT+0"), ((ConfigurableDatetimeAccessItem) result.get(22)).getTimezone());
- assertEquals(RequestHeaderAccessItem.class, result.get(23).getClass());
- assertEquals("incoming-header", ((RequestHeaderAccessItem) result.get(23)).getVarName());
- assertEquals(ResponseHeaderAccessItem.class, result.get(24).getClass());
- assertEquals("outgoing-header", ((ResponseHeaderAccessItem) result.get(24)).getVarName());
- assertEquals(CookieAccessItem.class, result.get(25).getClass());
- assertEquals("cookie", ((CookieAccessItem) result.get(25)).getVarName());
- assertEquals(TraceIdAccessItem.class, result.get(26).getClass());
- assertEquals(InvocationContextAccessItem.class, result.get(27).getClass());
- assertEquals("ctx", ((InvocationContextAccessItem) result.get(27)).getVarName());
- assertEquals(TransportAccessItem.class, result.get(28).getClass());
+ Assertions.assertEquals(ConfigurableDatetimeAccessItem.DEFAULT_LOCALE, ((ConfigurableDatetimeAccessItem) result.get(20)).getLocale());
+ Assertions.assertEquals(TimeZone.getDefault(), ((ConfigurableDatetimeAccessItem) result.get(20)).getTimezone());
+ Assertions.assertEquals("yyyy MM dd HH:mm:ss zzz", ((ConfigurableDatetimeAccessItem) result.get(21)).getPattern());
+ Assertions.assertEquals(ConfigurableDatetimeAccessItem.DEFAULT_LOCALE, ((ConfigurableDatetimeAccessItem) result.get(21)).getLocale());
+ Assertions.assertEquals(TimeZone.getDefault(), ((ConfigurableDatetimeAccessItem) result.get(21)).getTimezone());
+ Assertions.assertEquals("yyyy MM dd HH:mm:ss", ((ConfigurableDatetimeAccessItem) result.get(22)).getPattern());
+ Assertions.assertEquals(Locale.forLanguageTag("en-US"), ((ConfigurableDatetimeAccessItem) result.get(22)).getLocale());
+ Assertions.assertEquals(TimeZone.getTimeZone("GMT+0"), ((ConfigurableDatetimeAccessItem) result.get(22)).getTimezone());
+ Assertions.assertEquals(RequestHeaderAccessItem.class, result.get(23).getClass());
+ Assertions.assertEquals("incoming-header", ((RequestHeaderAccessItem) result.get(23)).getVarName());
+ Assertions.assertEquals(ResponseHeaderAccessItem.class, result.get(24).getClass());
+ Assertions.assertEquals("outgoing-header", ((ResponseHeaderAccessItem) result.get(24)).getVarName());
+ Assertions.assertEquals(CookieAccessItem.class, result.get(25).getClass());
+ Assertions.assertEquals("cookie", ((CookieAccessItem) result.get(25)).getVarName());
+ Assertions.assertEquals(TraceIdAccessItem.class, result.get(26).getClass());
+ Assertions.assertEquals(InvocationContextAccessItem.class, result.get(27).getClass());
+ Assertions.assertEquals("ctx", ((InvocationContextAccessItem) result.get(27)).getVarName());
+ Assertions.assertEquals(TransportAccessItem.class, result.get(28).getClass());
}
@Test
public void testParsePattern() {
String pattern = " %m cs-uri-stem %{response-header}o ";
List<AccessLogItem<RoutingContext>> result = logPatternParser.parsePattern(pattern);
- assertEquals(7, result.size());
+ Assertions.assertEquals(7, result.size());
StringBuilder stringBuilder = new StringBuilder();
result.get(0).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
- assertEquals(HttpMethodAccessItem.class, result.get(1).getClass());
+ Assertions.assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(HttpMethodAccessItem.class, result.get(1).getClass());
stringBuilder = new StringBuilder();
result.get(2).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
- assertEquals(UrlPathAccessItem.class, result.get(3).getClass());
+ Assertions.assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(UrlPathAccessItem.class, result.get(3).getClass());
stringBuilder = new StringBuilder();
result.get(4).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
- assertEquals(ResponseHeaderAccessItem.class, result.get(5).getClass());
- assertEquals("response-header", ((ResponseHeaderAccessItem) result.get(5)).getVarName());
+ Assertions.assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(ResponseHeaderAccessItem.class, result.get(5).getClass());
+ Assertions.assertEquals("response-header", ((ResponseHeaderAccessItem) result.get(5)).getVarName());
stringBuilder = new StringBuilder();
result.get(6).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(" ", stringBuilder.toString());
}
@Test
public void testParsePatternWithNoBlank() {
String pattern = "%mcs-uri-stem%{response-header}o";
List<AccessLogItem<RoutingContext>> result = logPatternParser.parsePattern(pattern);
- assertEquals(3, result.size());
+ Assertions.assertEquals(3, result.size());
- assertEquals(HttpMethodAccessItem.class, result.get(0).getClass());
- assertEquals(UrlPathAccessItem.class, result.get(1).getClass());
- assertEquals(ResponseHeaderAccessItem.class, result.get(2).getClass());
- assertEquals("response-header", ((ResponseHeaderAccessItem) result.get(2)).getVarName());
+ Assertions.assertEquals(HttpMethodAccessItem.class, result.get(0).getClass());
+ Assertions.assertEquals(UrlPathAccessItem.class, result.get(1).getClass());
+ Assertions.assertEquals(ResponseHeaderAccessItem.class, result.get(2).getClass());
+ Assertions.assertEquals("response-header", ((ResponseHeaderAccessItem) result.get(2)).getVarName());
}
@Test
public void testParsePatternComplex() {
String pattern = "%m cs-uri-stem %{response-header}o abc cs-uri-query %s%{request} header}i plain cs-uri";
List<AccessLogItem<RoutingContext>> result = logPatternParser.parsePattern(pattern);
- assertEquals(12, result.size());
+ Assertions.assertEquals(12, result.size());
- assertEquals(HttpMethodAccessItem.class, result.get(0).getClass());
+ Assertions.assertEquals(HttpMethodAccessItem.class, result.get(0).getClass());
StringBuilder stringBuilder = new StringBuilder();
result.get(1).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
- assertEquals(UrlPathAccessItem.class, result.get(2).getClass());
+ Assertions.assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(UrlPathAccessItem.class, result.get(2).getClass());
stringBuilder = new StringBuilder();
result.get(3).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
- assertEquals(ResponseHeaderAccessItem.class, result.get(4).getClass());
- assertEquals("response-header", ((ResponseHeaderAccessItem) result.get(4)).getVarName());
+ Assertions.assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(ResponseHeaderAccessItem.class, result.get(4).getClass());
+ Assertions.assertEquals("response-header", ((ResponseHeaderAccessItem) result.get(4)).getVarName());
stringBuilder = new StringBuilder();
result.get(5).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" abc ", stringBuilder.toString());
- assertEquals(QueryStringAccessItem.class, result.get(6).getClass());
+ Assertions.assertEquals(" abc ", stringBuilder.toString());
+ Assertions.assertEquals(QueryStringAccessItem.class, result.get(6).getClass());
stringBuilder = new StringBuilder();
result.get(7).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" ", stringBuilder.toString());
- assertEquals(HttpStatusAccessItem.class, result.get(8).getClass());
- assertEquals(RequestHeaderAccessItem.class, result.get(9).getClass());
- assertEquals("request} header", ((RequestHeaderAccessItem) result.get(9)).getVarName());
+ Assertions.assertEquals(" ", stringBuilder.toString());
+ Assertions.assertEquals(HttpStatusAccessItem.class, result.get(8).getClass());
+ Assertions.assertEquals(RequestHeaderAccessItem.class, result.get(9).getClass());
+ Assertions.assertEquals("request} header", ((RequestHeaderAccessItem) result.get(9)).getVarName());
stringBuilder = new StringBuilder();
result.get(10).appendServerFormattedItem(accessLogEvent, stringBuilder);
- assertEquals(" plain ", stringBuilder.toString());
- assertEquals(UrlPathWithQueryAccessItem.class, result.get(11).getClass());
+ Assertions.assertEquals(" plain ", stringBuilder.toString());
+ Assertions.assertEquals(UrlPathWithQueryAccessItem.class, result.get(11).getClass());
}
Comparator<VertxRestAccessLogItemMeta> comparator = VertxRestAccessLogPatternParser.accessLogItemMetaComparator;
@@ -214,43 +211,43 @@ public class VertxRestAccessLogPatternParserTest {
*/
@Test
public void testCompareMetaSimple() {
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta(null, null, null, 0),
new VertxRestAccessLogItemMeta(null, null, null, 1)
) < 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta(null, "}abc", null, 0),
new VertxRestAccessLogItemMeta(null, null, null, 0)
) < 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta(null, "}abc", null, 0),
new VertxRestAccessLogItemMeta(null, "}de", null, 0)
) < 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta(null, "}abc", null, 0),
new VertxRestAccessLogItemMeta(null, "}ab", null, 0)
) < 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta("%abc", null, null, 0),
new VertxRestAccessLogItemMeta("%de", null, null, 0)
) < 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta("%abc", null, null, 0),
new VertxRestAccessLogItemMeta("%ab", null, null, 0)
) < 0
);
- Assert.assertEquals(0, comparator.compare(
+ Assertions.assertEquals(0, comparator.compare(
new VertxRestAccessLogItemMeta("%abc", null, null, 0),
new VertxRestAccessLogItemMeta("%abc", null, null, 0)
));
@@ -261,25 +258,25 @@ public class VertxRestAccessLogPatternParserTest {
*/
@Test
public void testCompareMetaComplex() {
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta("%bcd", "}ab", null, 0),
new VertxRestAccessLogItemMeta("%abc", "}abc", null, 0)
) > 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta("%abc", null, null, 0),
new VertxRestAccessLogItemMeta("%bcd", "}ab", null, 0)
) > 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta("%bcd", "}abc", null, 0),
new VertxRestAccessLogItemMeta("%abc", "}abc", null, 0)
) > 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
comparator.compare(
new VertxRestAccessLogItemMeta("%abc", "}abc", null, 1),
new VertxRestAccessLogItemMeta("%ab", "}ab", null, 0)
@@ -289,17 +286,17 @@ public class VertxRestAccessLogPatternParserTest {
@Test
public void testComparePlaceholderString() {
- Assert.assertTrue(
+ Assertions.assertTrue(
VertxRestAccessLogPatternParser.comparePlaceholderString("abc", "bbc") < 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
VertxRestAccessLogPatternParser.comparePlaceholderString("abc", "ab") < 0
);
- Assert.assertEquals(0, VertxRestAccessLogPatternParser.comparePlaceholderString("abc", "abc"));
- Assert.assertTrue(
+ Assertions.assertEquals(0, VertxRestAccessLogPatternParser.comparePlaceholderString("abc", "abc"));
+ Assertions.assertTrue(
VertxRestAccessLogPatternParser.comparePlaceholderString("bbc", "abc") > 0
);
- Assert.assertTrue(
+ Assertions.assertTrue(
VertxRestAccessLogPatternParser.comparePlaceholderString("ab", "abc") > 0
);
}
@@ -344,19 +341,19 @@ public class VertxRestAccessLogPatternParserTest {
List<VertxRestAccessLogItemMeta> accessLogItemMetaList =
Deencapsulation.getField(parser, "metaList");
- assertEquals(7, accessLogItemMetaList.size());
- assertEquals("%_", accessLogItemMetaList.get(0).getPrefix());
- assertEquals("%a", accessLogItemMetaList.get(1).getPrefix());
- assertEquals("}abc", accessLogItemMetaList.get(1).getSuffix());
- assertEquals("%{", accessLogItemMetaList.get(2).getPrefix());
- assertEquals("}abc", accessLogItemMetaList.get(2).getSuffix());
- assertEquals("%{", accessLogItemMetaList.get(3).getPrefix());
- assertEquals("}a", accessLogItemMetaList.get(3).getSuffix());
- assertEquals("%m", accessLogItemMetaList.get(4).getPrefix());
- assertNull(accessLogItemMetaList.get(4).getSuffix());
- assertEquals("%{", accessLogItemMetaList.get(5).getPrefix());
- assertNull(accessLogItemMetaList.get(5).getSuffix());
- assertEquals("%0", accessLogItemMetaList.get(6).getPrefix());
- assertEquals("}abc", accessLogItemMetaList.get(6).getSuffix());
+ Assertions.assertEquals(7, accessLogItemMetaList.size());
+ Assertions.assertEquals("%_", accessLogItemMetaList.get(0).getPrefix());
+ Assertions.assertEquals("%a", accessLogItemMetaList.get(1).getPrefix());
+ Assertions.assertEquals("}abc", accessLogItemMetaList.get(1).getSuffix());
+ Assertions.assertEquals("%{", accessLogItemMetaList.get(2).getPrefix());
+ Assertions.assertEquals("}abc", accessLogItemMetaList.get(2).getSuffix());
+ Assertions.assertEquals("%{", accessLogItemMetaList.get(3).getPrefix());
+ Assertions.assertEquals("}a", accessLogItemMetaList.get(3).getSuffix());
+ Assertions.assertEquals("%m", accessLogItemMetaList.get(4).getPrefix());
+ Assertions.assertNull(accessLogItemMetaList.get(4).getSuffix());
+ Assertions.assertEquals("%{", accessLogItemMetaList.get(5).getPrefix());
+ Assertions.assertNull(accessLogItemMetaList.get(5).getSuffix());
+ Assertions.assertEquals("%0", accessLogItemMetaList.get(6).getPrefix());
+ Assertions.assertEquals("}abc", accessLogItemMetaList.get(6).getSuffix());
}
}
diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/definition/TestResponseRootDeserializer.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/definition/TestResponseRootDeserializer.java
index 5b7c9aa71..8165736b2 100644
--- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/definition/TestResponseRootDeserializer.java
+++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/definition/TestResponseRootDeserializer.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.servicecomb.foundation.protobuf.internal.ProtoConst;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -37,34 +37,34 @@ class Model {
public class TestResponseRootDeserializer {
@Test
public void testNeedConvert() {
- Assert.assertEquals(SimpleType.constructUnsafe(Object.class), ProtoConst.OBJECT_TYPE);
- Assert.assertEquals(false,
+ Assertions.assertEquals(SimpleType.constructUnsafe(Object.class), ProtoConst.OBJECT_TYPE);
+ Assertions.assertEquals(false,
ResponseRootDeserializer.needConvert(1, TypeFactory.defaultInstance().constructType(int.class)));
- Assert.assertEquals(false,
+ Assertions.assertEquals(false,
ResponseRootDeserializer.needConvert(1, TypeFactory.defaultInstance().constructType(Integer.class)));
- Assert.assertEquals(false,
+ Assertions.assertEquals(false,
ResponseRootDeserializer
.needConvert(Integer.valueOf(1), TypeFactory.defaultInstance().constructType(int.class)));
- Assert.assertEquals(false,
+ Assertions.assertEquals(false,
ResponseRootDeserializer
.needConvert(Integer.valueOf(1), TypeFactory.defaultInstance().constructType(Integer.class)));
- Assert.assertEquals(true,
+ Assertions.assertEquals(true,
ResponseRootDeserializer
.needConvert(new HashMap<>(), TypeFactory.defaultInstance().constructType(Model.class)));
- Assert.assertEquals(false,
+ Assertions.assertEquals(false,
ResponseRootDeserializer
.needConvert(new Model(), TypeFactory.defaultInstance().constructType(Model.class)));
- Assert.assertEquals(false,
+ Assertions.assertEquals(false,
ResponseRootDeserializer
.needConvert(new Model(), TypeFactory.defaultInstance().constructType(Object.class)));
List<Model> modelList = new ArrayList<>();
List<Map> modemaplList = new ArrayList<>();
- Assert.assertEquals(true,
+ Assertions.assertEquals(true,
ResponseRootDeserializer
.needConvert(modemaplList, TypeFactory.defaultInstance().constructType(new TypeReference<List<Model>>() {
})));
// This case should be false, however it is not exists in real applications, for simpler, take it true.
- Assert.assertEquals(true,
+ Assertions.assertEquals(true,
ResponseRootDeserializer
.needConvert(modelList, TypeFactory.defaultInstance().constructType(new TypeReference<List<Model>>() {
})));
diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestProtoToStringGenerator.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestProtoToStringGenerator.java
index 9618313ab..a5faec8e2 100644
--- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestProtoToStringGenerator.java
+++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestProtoToStringGenerator.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.codec.protobuf.internal.converter;
import org.apache.servicecomb.foundation.protobuf.internal.parser.ProtoParser;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.protostuff.compiler.model.Proto;
@@ -78,6 +78,6 @@ public class TestProtoToStringGenerator {
Proto proto = protoParser.parseFromContent(content);
String newContent = new ProtoToStringGenerator(proto).protoToString();
- Assert.assertEquals(content, newContent);
+ Assertions.assertEquals(content, newContent);
}
}
diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodec.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodec.java
index 822d4d861..97b60f57a 100644
--- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodec.java
+++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodec.java
@@ -51,7 +51,7 @@ import org.apache.servicecomb.swagger.generator.core.AbstractSwaggerGenerator;
import org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGenerator;
import org.apache.servicecomb.swagger.generator.springmvc.SpringmvcSwaggerGenerator;
import org.apache.servicecomb.swagger.invocation.InvocationType;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -178,8 +178,8 @@ public class TestSchemaMetaCodec {
RequestRootDeserializer<Object> requestDeserializer = providerOperationProtobuf.getRequestRootDeserializer();
Map<String, Object> decodedUserArgs = requestDeserializer.deserialize(values);
- Assert.assertEquals(user.name, ((User) decodedUserArgs.get("user")).name);
- Assert.assertEquals(user.friends.get(0).name, ((User) decodedUserArgs.get("user")).friends.get(0).name);
+ Assertions.assertEquals(user.name, ((User) decodedUserArgs.get("user")).name);
+ Assertions.assertEquals(user.friends.get(0).name, ((User) decodedUserArgs.get("user")).friends.get(0).name);
// write request map (pojo)
args = new HashMap<>();
@@ -194,8 +194,8 @@ public class TestSchemaMetaCodec {
values = requestSerializer.serialize(args);
decodedUserArgs = requestDeserializer.deserialize(values);
- Assert.assertEquals(user.name, ((User) decodedUserArgs.get("user")).name);
- Assert.assertEquals(user.friends.get(0).name, ((User) decodedUserArgs.get("user")).friends.get(0).name);
+ Assertions.assertEquals(user.name, ((User) decodedUserArgs.get("user")).name);
+ Assertions.assertEquals(user.friends.get(0).name, ((User) decodedUserArgs.get("user")).friends.get(0).name);
// response message
ResponseRootSerializer responseSerializer = providerOperationProtobuf.findResponseRootSerializer(200);
@@ -203,16 +203,16 @@ public class TestSchemaMetaCodec {
ResponseRootDeserializer<Object> responseDeserializer = consumerOperationProtobuf.findResponseRootDeserializer(200);
User decodedUser = (User) responseDeserializer
.deserialize(values, TypeFactory.defaultInstance().constructType(User.class));
- Assert.assertEquals(user.name, decodedUser.name);
- Assert.assertEquals(user.friends.get(0).name, decodedUser.friends.get(0).name);
+ Assertions.assertEquals(user.name, decodedUser.name);
+ Assertions.assertEquals(user.friends.get(0).name, decodedUser.friends.get(0).name);
user.friends = new ArrayList<>();
values = responseSerializer.serialize(user);
decodedUser = (User) responseDeserializer
.deserialize(values, TypeFactory.defaultInstance().constructType(User.class));
- Assert.assertEquals(user.name, decodedUser.name);
+ Assertions.assertEquals(user.name, decodedUser.name);
// proto buffer encode and decode empty list to be null
- Assert.assertEquals(null, decodedUser.friends);
+ Assertions.assertEquals(null, decodedUser.friends);
}
@Test
@@ -262,14 +262,14 @@ public class TestSchemaMetaCodec {
Map<String, Object> decodedUserArgs = requestDeserializer.deserialize(values);
if (isPojo) {
decodedUserArgs = (Map<String, Object>) decodedUserArgs.get("users");
- Assert.assertEquals(user.name,
+ Assertions.assertEquals(user.name,
((Map<String, Map<String, Object>>) decodedUserArgs.get("users")).get("test").get("name"));
- Assert.assertEquals(user.friends.get(0).name,
+ Assertions.assertEquals(user.friends.get(0).name,
((List<Map<String, Object>>) ((Map<String, Map<String, Object>>) decodedUserArgs.get("users")).get("test")
.get("friends")).get(0).get("name"));
} else {
- Assert.assertEquals(user.name, ((Map<String, User>) decodedUserArgs.get("users")).get("test").name);
- Assert.assertEquals(user.friends.get(0).name,
+ Assertions.assertEquals(user.name, ((Map<String, User>) decodedUserArgs.get("users")).get("test").name);
+ Assertions.assertEquals(user.friends.get(0).name,
((Map<String, User>) decodedUserArgs.get("users")).get("test").friends.get(0).name);
}
// response message
@@ -277,15 +277,15 @@ public class TestSchemaMetaCodec {
values = responseSerializer.serialize(userMap);
ResponseRootDeserializer<Object> responseDeserializer = consumerOperationProtobuf.findResponseRootDeserializer(200);
Map<String, User> decodedUser = (Map<String, User>) responseDeserializer.deserialize(values, ProtoConst.MAP_TYPE);
- Assert.assertEquals(user.name, decodedUser.get("test").name);
- Assert.assertEquals(user.friends.get(0).name, decodedUser.get("test").friends.get(0).name);
+ Assertions.assertEquals(user.name, decodedUser.get("test").name);
+ Assertions.assertEquals(user.friends.get(0).name, decodedUser.get("test").friends.get(0).name);
user.friends = new ArrayList<>();
values = responseSerializer.serialize(userMap);
decodedUser = (Map<String, User>) responseDeserializer.deserialize(values, ProtoConst.MAP_TYPE);
- Assert.assertEquals(user.name, decodedUser.get("test").name);
+ Assertions.assertEquals(user.name, decodedUser.get("test").name);
// proto buffer encode and decode empty list to be null
- Assert.assertEquals(null, decodedUser.get("test").friends);
+ Assertions.assertEquals(null, decodedUser.get("test").friends);
}
@Test
@@ -346,31 +346,31 @@ public class TestSchemaMetaCodec {
Map<String, Object> decodedSwaggerArgs = requestDeserializer.deserialize(values);
Map<String, Object> decodedArgs;
if (isPojo) {
- Assert.assertEquals(1, decodedSwaggerArgs.size());
+ Assertions.assertEquals(1, decodedSwaggerArgs.size());
decodedArgs = (Map<String, Object>) decodedSwaggerArgs.get("baseBody");
} else {
decodedArgs = decodedSwaggerArgs;
}
- Assert.assertEquals(boolValue, decodedArgs.get("boolValue"));
- Assert.assertEquals(iValue, decodedArgs.get("iValue"));
- Assert.assertEquals(lValue, decodedArgs.get("lValue"));
- Assert.assertEquals(fValue, decodedArgs.get("fValue"));
- Assert.assertEquals(dValue, decodedArgs.get("dValue"));
+ Assertions.assertEquals(boolValue, decodedArgs.get("boolValue"));
+ Assertions.assertEquals(iValue, decodedArgs.get("iValue"));
+ Assertions.assertEquals(lValue, decodedArgs.get("lValue"));
+ Assertions.assertEquals(fValue, decodedArgs.get("fValue"));
+ Assertions.assertEquals(dValue, decodedArgs.get("dValue"));
if (isPojo) {
- Assert.assertEquals(2, ((List<Integer>) decodedArgs.get("iArray")).size());
- Assert.assertEquals(60, (((List<Integer>) decodedArgs.get("iArray")).get(0).intValue()));
- Assert.assertEquals(70, (((List<Integer>) decodedArgs.get("iArray")).get(1).intValue()));
- Assert.assertEquals(color.ordinal(), decodedArgs.get("color"));
- Assert.assertEquals(date.getTime(), decodedArgs.get("date"));
- Assert.assertEquals(localDate.getLong(ChronoField.EPOCH_DAY), decodedArgs.get("localDate"));
- Assert.assertEquals(true, ((Map) decodedArgs.get("empty")).isEmpty());
+ Assertions.assertEquals(2, ((List<Integer>) decodedArgs.get("iArray")).size());
+ Assertions.assertEquals(60, (((List<Integer>) decodedArgs.get("iArray")).get(0).intValue()));
+ Assertions.assertEquals(70, (((List<Integer>) decodedArgs.get("iArray")).get(1).intValue()));
+ Assertions.assertEquals(color.ordinal(), decodedArgs.get("color"));
+ Assertions.assertEquals(date.getTime(), decodedArgs.get("date"));
+ Assertions.assertEquals(localDate.getLong(ChronoField.EPOCH_DAY), decodedArgs.get("localDate"));
+ Assertions.assertEquals(true, ((Map) decodedArgs.get("empty")).isEmpty());
} else {
- Assert.assertArrayEquals(iArray, (int[]) decodedArgs.get("iArray"));
- Assert.assertEquals(color, decodedArgs.get("color"));
- Assert.assertEquals(date, decodedArgs.get("date"));
- Assert.assertTrue(decodedArgs.get("localDate") instanceof LocalDate);
- Assert.assertEquals(localDate, decodedArgs.get("localDate"));
- Assert.assertTrue(decodedArgs.get("empty") instanceof Empty);
+ Assertions.assertArrayEquals(iArray, (int[]) decodedArgs.get("iArray"));
+ Assertions.assertEquals(color, decodedArgs.get("color"));
+ Assertions.assertEquals(date, decodedArgs.get("date"));
+ Assertions.assertTrue(decodedArgs.get("localDate") instanceof LocalDate);
+ Assertions.assertEquals(localDate, decodedArgs.get("localDate"));
+ Assertions.assertTrue(decodedArgs.get("empty") instanceof Empty);
}
// default value testing
@@ -387,16 +387,16 @@ public class TestSchemaMetaCodec {
args.put("empty", null);
values = requestSerializer.serialize(args);
decodedArgs = requestDeserializer.deserialize(values);
- Assert.assertEquals(null, decodedArgs.get("boolValue"));
- Assert.assertEquals(null, decodedArgs.get("iValue"));
- Assert.assertEquals(null, decodedArgs.get("lValue"));
- Assert.assertEquals(null, decodedArgs.get("fValue"));
- Assert.assertEquals(null, decodedArgs.get("dValue"));
- Assert.assertEquals(null, decodedArgs.get("iArray"));
- Assert.assertEquals(null, decodedArgs.get("color"));
- Assert.assertEquals(null, decodedArgs.get("localDate"));
- Assert.assertEquals(null, decodedArgs.get("date"));
- Assert.assertEquals(null, decodedArgs.get("empty"));
+ Assertions.assertEquals(null, decodedArgs.get("boolValue"));
+ Assertions.assertEquals(null, decodedArgs.get("iValue"));
+ Assertions.assertEquals(null, decodedArgs.get("lValue"));
+ Assertions.assertEquals(null, decodedArgs.get("fValue"));
+ Assertions.assertEquals(null, decodedArgs.get("dValue"));
+ Assertions.assertEquals(null, decodedArgs.get("iArray"));
+ Assertions.assertEquals(null, decodedArgs.get("color"));
+ Assertions.assertEquals(null, decodedArgs.get("localDate"));
+ Assertions.assertEquals(null, decodedArgs.get("date"));
+ Assertions.assertEquals(null, decodedArgs.get("empty"));
// response message
ResponseRootSerializer responseSerializer = providerOperationProtobuf.findResponseRootSerializer(200);
@@ -404,7 +404,7 @@ public class TestSchemaMetaCodec {
ResponseRootDeserializer<Object> responseDeserializer = consumerOperationProtobuf.findResponseRootDeserializer(200);
Object decodedValue = responseDeserializer
.deserialize(values, TypeFactory.defaultInstance().constructType(int.class));
- Assert.assertEquals(30, (int) decodedValue);
+ Assertions.assertEquals(30, (int) decodedValue);
}
@Test
@@ -456,27 +456,27 @@ public class TestSchemaMetaCodec {
Map<String, Object> decodedSwaggerArgs = requestDeserializer.deserialize(values);
Map<String, Object> decodedArgs;
if (isPojo) {
- Assert.assertEquals(1, decodedSwaggerArgs.size());
+ Assertions.assertEquals(1, decodedSwaggerArgs.size());
decodedArgs = (Map<String, Object>) decodedSwaggerArgs.get("value");
} else {
decodedArgs = decodedSwaggerArgs;
}
List<List<?>> listOfUsersRaw = (List<List<?>>) decodedArgs.get("value");
- Assert.assertEquals(1, listOfUsersRaw.size());
+ Assertions.assertEquals(1, listOfUsersRaw.size());
List<?> mapUsersRaw = (List<?>) listOfUsersRaw.get(0);
- Assert.assertEquals(1, mapUsersRaw.size());
+ Assertions.assertEquals(1, mapUsersRaw.size());
if (isPojo) {
Map<String, Object> userMap = (Map<String, Object>) mapUsersRaw.get(0);
- Assert.assertEquals("user", userMap.get("name"));
+ Assertions.assertEquals("user", userMap.get("name"));
// proto buffer encode and decode empty list to be null
friends = (List<User>) userMap.get("friends");
Map<String, Object> friendMap = (Map<String, Object>) friends.get(0);
- Assert.assertEquals("friend", friendMap.get("name"));
+ Assertions.assertEquals("friend", friendMap.get("name"));
} else {
user = (User) mapUsersRaw.get(0);
- Assert.assertEquals("user", user.name);
+ Assertions.assertEquals("user", user.name);
// proto buffer encode and decode empty list to be null
- Assert.assertEquals("friend", user.friends.get(0).name);
+ Assertions.assertEquals("friend", user.friends.get(0).name);
}
}
@@ -511,7 +511,7 @@ public class TestSchemaMetaCodec {
RequestRootDeserializer<Object> requestDeserializer = providerOperationProtobuf.getRequestRootDeserializer();
Map<String, Object> decodedArgs = requestDeserializer.deserialize(values);
int result = (int) decodedArgs.get("value");
- Assert.assertEquals(2, result);
+ Assertions.assertEquals(2, result);
User user = new User();
user.name = "user";
@@ -524,11 +524,11 @@ public class TestSchemaMetaCodec {
values = requestSerializer.serialize(args);
decodedArgs = requestDeserializer.deserialize(values);
Map<String, Object> userMap = (Map<String, Object>) decodedArgs.get("value");
- Assert.assertEquals("user", userMap.get("name"));
+ Assertions.assertEquals("user", userMap.get("name"));
// proto buffer encode and decode empty list to be null
friends = (List<User>) userMap.get("friends");
Map<String, Object> friendMap = (Map<String, Object>) friends.get(0);
- Assert.assertEquals("friend", friendMap.get("name"));
+ Assertions.assertEquals("friend", friendMap.get("name"));
args.clear();
People people = new People();
@@ -542,8 +542,8 @@ public class TestSchemaMetaCodec {
values = requestSerializer.serialize(args);
decodedArgs = requestDeserializer.deserialize(values);
people = (People) decodedArgs.get("value");
- Assert.assertEquals("user", people.name);
+ Assertions.assertEquals("user", people.name);
// proto buffer encode and decode empty list to be null
- Assert.assertEquals("friend", people.friends.get(0).name);
+ Assertions.assertEquals("friend", people.friends.get(0).name);
}
}
diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodecRestTemplate.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodecRestTemplate.java
index c638e8c85..9b3e5c07b 100644
--- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodecRestTemplate.java
+++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSchemaMetaCodecRestTemplate.java
@@ -44,7 +44,7 @@ import org.apache.servicecomb.swagger.engine.SwaggerProducer;
import org.apache.servicecomb.swagger.engine.SwaggerProducerOperation;
import org.apache.servicecomb.swagger.generator.springmvc.SpringmvcSwaggerGenerator;
import org.apache.servicecomb.swagger.invocation.InvocationType;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -157,8 +157,8 @@ public class TestSchemaMetaCodecRestTemplate {
RequestRootDeserializer<Object> requestDeserializer = providerOperationProtobuf.getRequestRootDeserializer();
Map<String, Object> decodedUserArgs = requestDeserializer.deserialize(values);
- Assert.assertEquals(user.name, ((User) decodedUserArgs.get("user")).name);
- Assert.assertEquals(user.friends.get(0).name, ((User) decodedUserArgs.get("user")).friends.get(0).name);
+ Assertions.assertEquals(user.name, ((User) decodedUserArgs.get("user")).name);
+ Assertions.assertEquals(user.friends.get(0).name, ((User) decodedUserArgs.get("user")).friends.get(0).name);
// response message
ResponseRootSerializer responseSerializer = providerOperationProtobuf.findResponseRootSerializer(200);
@@ -166,16 +166,16 @@ public class TestSchemaMetaCodecRestTemplate {
ResponseRootDeserializer<Object> responseDeserializer = consumerOperationProtobuf.findResponseRootDeserializer(200);
User decodedUser = (User) responseDeserializer
.deserialize(values, TypeFactory.defaultInstance().constructType(User.class));
- Assert.assertEquals(user.name, decodedUser.name);
- Assert.assertEquals(user.friends.get(0).name, decodedUser.friends.get(0).name);
+ Assertions.assertEquals(user.name, decodedUser.name);
+ Assertions.assertEquals(user.friends.get(0).name, decodedUser.friends.get(0).name);
user.friends = new ArrayList<>();
values = responseSerializer.serialize(user);
decodedUser = (User) responseDeserializer
.deserialize(values, TypeFactory.defaultInstance().constructType(User.class));
- Assert.assertEquals(user.name, decodedUser.name);
+ Assertions.assertEquals(user.name, decodedUser.name);
// proto buffer encode and decode empty list to be null
- Assert.assertEquals(null, decodedUser.friends);
+ Assertions.assertEquals(null, decodedUser.friends);
}
@Test
@@ -218,17 +218,17 @@ public class TestSchemaMetaCodecRestTemplate {
values = requestSerializer.serialize(args);
RequestRootDeserializer<Object> requestDeserializer = providerOperationProtobuf.getRequestRootDeserializer();
Map<String, Object> decodedArgs = requestDeserializer.deserialize(values);
- Assert.assertEquals(boolValue, decodedArgs.get("boolValue"));
- Assert.assertEquals(iValue, decodedArgs.get("iValue"));
- Assert.assertEquals(lValue, decodedArgs.get("lValue"));
- Assert.assertEquals(fValue, decodedArgs.get("fValue"));
- Assert.assertEquals(dValue, decodedArgs.get("dValue"));
- Assert.assertArrayEquals(iArray, (int[]) decodedArgs.get("iArray"));
- Assert.assertEquals(color, decodedArgs.get("color"));
- Assert.assertEquals(date, decodedArgs.get("date"));
- Assert.assertTrue(decodedArgs.get("localDate") instanceof LocalDate);
- Assert.assertEquals(localDate, decodedArgs.get("localDate"));
- Assert.assertTrue(decodedArgs.get("empty") instanceof Empty);
+ Assertions.assertEquals(boolValue, decodedArgs.get("boolValue"));
+ Assertions.assertEquals(iValue, decodedArgs.get("iValue"));
+ Assertions.assertEquals(lValue, decodedArgs.get("lValue"));
+ Assertions.assertEquals(fValue, decodedArgs.get("fValue"));
+ Assertions.assertEquals(dValue, decodedArgs.get("dValue"));
+ Assertions.assertArrayEquals(iArray, (int[]) decodedArgs.get("iArray"));
+ Assertions.assertEquals(color, decodedArgs.get("color"));
+ Assertions.assertEquals(date, decodedArgs.get("date"));
+ Assertions.assertTrue(decodedArgs.get("localDate") instanceof LocalDate);
+ Assertions.assertEquals(localDate, decodedArgs.get("localDate"));
+ Assertions.assertTrue(decodedArgs.get("empty") instanceof Empty);
// default value testing
args.put("boolValue", false);
@@ -244,16 +244,16 @@ public class TestSchemaMetaCodecRestTemplate {
args.put("empty", null);
values = requestSerializer.serialize(args);
decodedArgs = requestDeserializer.deserialize(values);
- Assert.assertEquals(null, decodedArgs.get("boolValue"));
- Assert.assertEquals(null, decodedArgs.get("iValue"));
- Assert.assertEquals(null, decodedArgs.get("lValue"));
- Assert.assertEquals(null, decodedArgs.get("fValue"));
- Assert.assertEquals(null, decodedArgs.get("dValue"));
- Assert.assertEquals(null, decodedArgs.get("iArray"));
- Assert.assertEquals(null, decodedArgs.get("color"));
- Assert.assertEquals(null, decodedArgs.get("localDate"));
- Assert.assertEquals(null, decodedArgs.get("date"));
- Assert.assertEquals(null, decodedArgs.get("empty"));
+ Assertions.assertEquals(null, decodedArgs.get("boolValue"));
+ Assertions.assertEquals(null, decodedArgs.get("iValue"));
+ Assertions.assertEquals(null, decodedArgs.get("lValue"));
+ Assertions.assertEquals(null, decodedArgs.get("fValue"));
+ Assertions.assertEquals(null, decodedArgs.get("dValue"));
+ Assertions.assertEquals(null, decodedArgs.get("iArray"));
+ Assertions.assertEquals(null, decodedArgs.get("color"));
+ Assertions.assertEquals(null, decodedArgs.get("localDate"));
+ Assertions.assertEquals(null, decodedArgs.get("date"));
+ Assertions.assertEquals(null, decodedArgs.get("empty"));
// response message
ResponseRootSerializer responseSerializer = providerOperationProtobuf.findResponseRootSerializer(200);
@@ -261,6 +261,6 @@ public class TestSchemaMetaCodecRestTemplate {
ResponseRootDeserializer<Object> responseDeserializer = consumerOperationProtobuf.findResponseRootDeserializer(200);
Object decodedValue = responseDeserializer
.deserialize(values, TypeFactory.defaultInstance().constructType(int.class));
- Assert.assertEquals(30, (int) decodedValue);
+ Assertions.assertEquals(30, (int) decodedValue);
}
}
diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
index 20bb1e440..e2600ed0c 100644
--- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
+++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
import org.apache.servicecomb.codec.protobuf.internal.converter.model.ProtoSchema;
import org.apache.servicecomb.swagger.generator.springmvc.SpringmvcSwaggerGenerator;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.protostuff.compiler.model.Proto;
@@ -43,19 +43,19 @@ public class TestSwaggerToProtoGenerator {
SwaggerToProtoGenerator generator = new SwaggerToProtoGenerator("a.b", swagger);
Proto proto = generator.convert();
- Assert.assertEquals(protoContent.replaceAll("\r\n", "\n"),
+ Assertions.assertEquals(protoContent.replaceAll("\r\n", "\n"),
new ProtoToStringGenerator(proto).protoToString().replaceAll("\r\n", "\n"));
}
@Test
public void testEscape() {
- Assert.assertEquals("hello_my_service", SwaggerToProtoGenerator.escapeMessageName("hello.my.service"));
- Assert.assertEquals("hello_my_service", SwaggerToProtoGenerator.escapeMessageName("hello_my_service"));
- Assert.assertEquals("hello.my_service", SwaggerToProtoGenerator.escapePackageName("hello.my-service"));
- Assert.assertEquals("hello.test.test", SwaggerToProtoGenerator.escapePackageName("hello.test.test"));
- Assert.assertEquals("hello_my.test.test", SwaggerToProtoGenerator.escapePackageName("hello:my.test.test"));
- Assert.assertEquals(false, SwaggerToProtoGenerator.isValidEnum("hello.test.test"));
- Assert.assertEquals(false, SwaggerToProtoGenerator.isValidEnum("hello.my-service"));
- Assert.assertEquals(true, SwaggerToProtoGenerator.isValidEnum("My_ENum"));
+ Assertions.assertEquals("hello_my_service", SwaggerToProtoGenerator.escapeMessageName("hello.my.service"));
+ Assertions.assertEquals("hello_my_service", SwaggerToProtoGenerator.escapeMessageName("hello_my_service"));
+ Assertions.assertEquals("hello.my_service", SwaggerToProtoGenerator.escapePackageName("hello.my-service"));
+ Assertions.assertEquals("hello.test.test", SwaggerToProtoGenerator.escapePackageName("hello.test.test"));
+ Assertions.assertEquals("hello_my.test.test", SwaggerToProtoGenerator.escapePackageName("hello:my.test.test"));
+ Assertions.assertEquals(false, SwaggerToProtoGenerator.isValidEnum("hello.test.test"));
+ Assertions.assertEquals(false, SwaggerToProtoGenerator.isValidEnum("hello.my-service"));
+ Assertions.assertEquals(true, SwaggerToProtoGenerator.isValidEnum("My_ENum"));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
index 56b80d38d..39e7893e4 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.common.rest;
import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;
import static com.google.common.net.HttpHeaders.TRANSFER_ENCODING;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.HashMap;
@@ -75,7 +74,7 @@ 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.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -181,7 +180,7 @@ public class TestAbstractRestInvocation {
public void setHttpServerFilters(@Mocked List<HttpServerFilter> httpServerFilters) {
restInvocation.setHttpServerFilters(httpServerFilters);
- Assert.assertSame(httpServerFilters, restInvocation.httpServerFilters);
+ Assertions.assertSame(httpServerFilters, restInvocation.httpServerFilters);
}
@Test
@@ -227,7 +226,7 @@ public class TestAbstractRestInvocation {
Map<String, String> context = invocation.getContext();
restInvocation.setContext();
- Assert.assertSame(context, invocation.getContext());
+ Assertions.assertSame(context, invocation.getContext());
}
@Test
@@ -241,7 +240,7 @@ public class TestAbstractRestInvocation {
Map<String, String> context = invocation.getContext();
restInvocation.setContext();
- Assert.assertSame(context, invocation.getContext());
+ Assertions.assertSame(context, invocation.getContext());
}
@Test
@@ -291,12 +290,12 @@ public class TestAbstractRestInvocation {
@Test
public void getContext() {
invocation.addContext("key", "test");
- assertEquals("test", restInvocation.getContext("key"));
+ Assertions.assertEquals("test", restInvocation.getContext("key"));
}
@Test
public void getContextNull() {
- Assert.assertNull(restInvocation.getContext("key"));
+ Assertions.assertNull(restInvocation.getContext("key"));
}
@Test
@@ -328,7 +327,7 @@ public class TestAbstractRestInvocation {
restInvocation.invoke();
- Assert.assertSame(response, result.value);
+ Assertions.assertSame(response, result.value);
}
@Test
@@ -354,7 +353,7 @@ public class TestAbstractRestInvocation {
restInvocation.invoke();
- Assert.assertTrue(result.value);
+ Assertions.assertTrue(result.value);
}
@Test
@@ -378,7 +377,7 @@ public class TestAbstractRestInvocation {
restInvocation.invoke();
- Assert.assertTrue(result.value);
+ Assertions.assertTrue(result.value);
}
@Test
@@ -410,7 +409,7 @@ public class TestAbstractRestInvocation {
restInvocation.invoke();
- Assert.assertSame(error, result.value);
+ Assertions.assertSame(error, result.value);
}
@Test
@@ -431,7 +430,7 @@ public class TestAbstractRestInvocation {
@Override
public void sendFailResponse(Throwable throwable) {
- Assert.fail("must not fail");
+ Assertions.fail("must not fail");
}
};
initRestInvocation();
@@ -439,7 +438,7 @@ public class TestAbstractRestInvocation {
restInvocation.invoke();
- assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartServerFiltersRequest());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartServerFiltersRequest());
}
@Test
@@ -449,7 +448,7 @@ public class TestAbstractRestInvocation {
restInvocation.produceProcessor = null;
restInvocation.sendFailResponse(new RuntimeExceptionWithoutStackTrace());
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
restInvocation.produceProcessor);
}
@@ -471,8 +470,8 @@ public class TestAbstractRestInvocation {
Throwable e = new InvocationException(Status.BAD_GATEWAY, "");
restInvocation.sendFailResponse(e);
- Assert.assertSame(e, result.value.getResult());
- Assert.assertSame(
+ Assertions.assertSame(e, result.value.getResult());
+ Assertions.assertSame(
ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(), restInvocation.produceProcessor);
}
@@ -514,8 +513,8 @@ public class TestAbstractRestInvocation {
EventManager.unregister(subscriber);
- Assert.assertSame(invocation, eventHolder.value.getInvocation());
- Assert.assertSame(response, result.value);
+ Assertions.assertSame(invocation, eventHolder.value.getInvocation());
+ Assertions.assertSame(response, result.value);
}
@Test
@@ -572,7 +571,7 @@ public class TestAbstractRestInvocation {
restInvocation.executeHttpServerFilters(response);
- Assert.assertTrue(flag.value);
+ Assertions.assertTrue(flag.value);
}
@Test
@@ -623,7 +622,7 @@ public class TestAbstractRestInvocation {
initRestInvocation();
restInvocation.sendResponse(response);
- assertEquals(expected, result);
+ Assertions.assertEquals(expected, result);
}
@Test
@@ -711,9 +710,9 @@ public class TestAbstractRestInvocation {
try {
restInvocation.sendResponse(response);
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (Error e) {
- assertEquals(headers.toString(), resultHeaders.toString());
+ Assertions.assertEquals(headers.toString(), resultHeaders.toString());
}
}
@@ -750,8 +749,8 @@ public class TestAbstractRestInvocation {
initRestInvocation();
restInvocation.sendResponse(response);
- assertEquals("\"ok\"", buffer.toString());
- assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishServerFiltersResponse());
+ Assertions.assertEquals("\"ok\"", buffer.toString());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishServerFiltersResponse());
}
@Test
@@ -805,7 +804,7 @@ public class TestAbstractRestInvocation {
restInvocation.setHttpServerFilters(httpServerFilters);
restInvocation.sendResponse(response);
- assertEquals("\"ok\"-filter", buffer.toString());
+ Assertions.assertEquals("\"ok\"-filter", buffer.toString());
}
@Test
@@ -849,8 +848,8 @@ public class TestAbstractRestInvocation {
};
restInvocation.findRestOperation(microserviceMeta);
- Assert.assertSame(restOperation, restInvocation.restOperationMeta);
- Assert.assertSame(pathVars, requestEx.getAttribute(RestConst.PATH_PARAMETERS));
+ Assertions.assertSame(restOperation, restInvocation.restOperationMeta);
+ Assertions.assertSame(pathVars, requestEx.getAttribute(RestConst.PATH_PARAMETERS));
}
@Test
@@ -887,7 +886,7 @@ public class TestAbstractRestInvocation {
restInvocation.scheduleInvocation();
- Assert.assertSame(error, result.value);
+ Assertions.assertSame(error, result.value);
}
@Test
@@ -953,7 +952,7 @@ public class TestAbstractRestInvocation {
restInvocation.scheduleInvocation();
- Assert.assertSame(rejectedExecutionException, holder.value);
+ Assertions.assertSame(rejectedExecutionException, holder.value);
}
public static class ScheduleInvocationEventHandler {
@@ -1004,11 +1003,11 @@ public class TestAbstractRestInvocation {
restInvocation.scheduleInvocation();
EventManager.unregister(subscriber);
- Assert.assertTrue(result.value);
- assertEquals(nanoTime, invocation.getInvocationStageTrace().getStart());
- assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartSchedule());
- Assert.assertSame(invocation, eventHolder.value.getInvocation());
- assertEquals("tid", invocation.getTraceId());
+ Assertions.assertTrue(result.value);
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStart());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartSchedule());
+ Assertions.assertSame(invocation, eventHolder.value.getInvocation());
+ Assertions.assertEquals("tid", invocation.getTraceId());
}
@Test
@@ -1034,9 +1033,9 @@ public class TestAbstractRestInvocation {
restInvocation.runOnExecutor();
- Assert.assertTrue(result.value);
- Assert.assertSame(invocation, restInvocation.invocation);
- assertEquals(time, invocation.getInvocationStageTrace().getStartExecution());
+ Assertions.assertTrue(result.value);
+ Assertions.assertSame(invocation, restInvocation.invocation);
+ Assertions.assertEquals(time, invocation.getInvocationStageTrace().getStartExecution());
}
@Test
@@ -1058,9 +1057,9 @@ public class TestAbstractRestInvocation {
restInvocation.doInvoke();
- Assert.assertSame(response, result.value);
- assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartHandlersRequest());
- assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishHandlersResponse());
+ Assertions.assertSame(response, result.value);
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getStartHandlersRequest());
+ Assertions.assertEquals(nanoTime, invocation.getInvocationStageTrace().getFinishHandlersResponse());
}
@Test
@@ -1094,7 +1093,7 @@ public class TestAbstractRestInvocation {
@Override
public void setContentType(String type) {
- assertEquals("application/json; charset=utf-8", type);
+ Assertions.assertEquals("application/json; charset=utf-8", type);
}
};
restInvocation.requestEx = requestEx;
@@ -1102,9 +1101,9 @@ public class TestAbstractRestInvocation {
restInvocation.scheduleInvocation();
- assertEquals(Integer.valueOf(590), status.value);
- assertEquals("Unexpected producer error, please check logs for details", reasonPhrase.value);
- assertEquals(Integer.valueOf(1), endCount.value);
+ Assertions.assertEquals(Integer.valueOf(590), status.value);
+ Assertions.assertEquals("Unexpected producer error, please check logs for details", reasonPhrase.value);
+ Assertions.assertEquals(Integer.valueOf(1), endCount.value);
}
@SuppressWarnings("deprecation")
@@ -1137,7 +1136,7 @@ public class TestAbstractRestInvocation {
@Override
public void setContentType(String type) {
- assertEquals("application/json; charset=utf-8", type);
+ Assertions.assertEquals("application/json; charset=utf-8", type);
}
@Override
@@ -1148,9 +1147,9 @@ public class TestAbstractRestInvocation {
initRestInvocation();
restInvocation.scheduleInvocation();
- assertEquals(Integer.valueOf(429), status.value);
- assertEquals("Too Many Requests", reasonPhrase.value);
- assertEquals("{\"message\":\"rejected by qps flowcontrol\"}", responseBody.value);
- assertEquals(Integer.valueOf(1), endCount.value);
+ Assertions.assertEquals(Integer.valueOf(429), status.value);
+ Assertions.assertEquals("Too Many Requests", reasonPhrase.value);
+ Assertions.assertEquals("{\"message\":\"rejected by qps flowcontrol\"}", responseBody.value);
+ Assertions.assertEquals(Integer.valueOf(1), endCount.value);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java
index a288db17c..bb270c055 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.common.rest;
import org.apache.servicecomb.common.rest.definition.path.PathRegExp;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
public class TestDefPath {
@@ -26,13 +26,13 @@ public class TestDefPath {
@Test
public void testPathRegExp() throws Exception {
PathRegExp oPathRegExp = new PathRegExp("//{test}//");
- Assert.assertEquals(1, oPathRegExp.getGroupCount());
- Assert.assertEquals(0, oPathRegExp.getGroupWithRegExpCount());
+ Assertions.assertEquals(1, oPathRegExp.getGroupCount());
+ Assertions.assertEquals(0, oPathRegExp.getGroupWithRegExpCount());
PathRegExp oSecondPathRegExp = new PathRegExp("{[^/:]+?}");
- Assert.assertEquals(1, oSecondPathRegExp.getGroupCount());
- Assert.assertEquals(1, oSecondPathRegExp.getGroupWithRegExpCount());
- Assert.assertEquals("test/", PathRegExp.ensureEndWithSlash("test/"));
- Assert.assertEquals("test/", PathRegExp.ensureEndWithSlash("test"));
- Assert.assertEquals(null, oSecondPathRegExp.match("{test/test}", null));
+ Assertions.assertEquals(1, oSecondPathRegExp.getGroupCount());
+ Assertions.assertEquals(1, oSecondPathRegExp.getGroupWithRegExpCount());
+ Assertions.assertEquals("test/", PathRegExp.ensureEndWithSlash("test/"));
+ Assertions.assertEquals("test/", PathRegExp.ensureEndWithSlash("test"));
+ Assertions.assertEquals(null, oSecondPathRegExp.match("{test/test}", null));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
index f4a874b54..807f1fe72 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
@@ -26,7 +26,7 @@ import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.AfterClass;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -81,12 +81,12 @@ public class TestRestEngineSchemaListener {
@Test
public void testLocateStaticFound() {
- Assert.assertNotNull(spm.producerLocateOperation("/staticEx", "GET"));
+ Assertions.assertNotNull(spm.producerLocateOperation("/staticEx", "GET"));
}
@Test
public void testLocateDynamicFound() {
OperationLocator locator = spm.producerLocateOperation("/dynamic/1", "GET");
- Assert.assertEquals("1", locator.getPathVarMap().get("id"));
+ Assertions.assertEquals("1", locator.getPathVarMap().get("id"));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
index eced4c8bd..c8d88f7ac 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
@@ -41,7 +41,7 @@ import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.AfterClass;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -124,7 +124,7 @@ public class TestRestProducerInvocation {
restProducerInvocation.invoke(transport, requestEx, responseEx, httpServerFilters);
- Assert.assertSame(expected, throwableOfSendFailResponse);
+ Assertions.assertSame(expected, throwableOfSendFailResponse);
}
@Test
@@ -145,8 +145,8 @@ public class TestRestProducerInvocation {
};
restProducerInvocation.invoke(transport, requestEx, responseEx, httpServerFilters);
- Assert.assertTrue(scheduleInvocation);
- Assert.assertSame(requestEx, requestEx.getAttribute(RestConst.REST_REQUEST));
+ Assertions.assertTrue(scheduleInvocation);
+ Assertions.assertSame(requestEx, requestEx.getAttribute(RestConst.REST_REQUEST));
}
@Test
@@ -205,7 +205,7 @@ public class TestRestProducerInvocation {
initRestProducerInvocation();
restProducerInvocation.findRestOperation();
- Assert.assertSame(restOperationMeta, restProducerInvocation.restOperationMeta);
- Assert.assertSame(pathVars, requestEx.getAttribute(RestConst.PATH_PARAMETERS));
+ Assertions.assertSame(restOperationMeta, restProducerInvocation.restOperationMeta);
+ Assertions.assertSame(pathVars, requestEx.getAttribute(RestConst.PATH_PARAMETERS));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java
index f92f9e0de..4409b11ae 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java
@@ -20,7 +20,7 @@ import javax.servlet.MultipartConfigElement;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.After;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
@@ -42,15 +42,15 @@ public class TestUploadConfig {
UploadConfig uploadConfig = new UploadConfig();
MultipartConfigElement multipartConfigElement = uploadConfig.toMultipartConfigElement();
- Assert.assertEquals("upload", uploadConfig.getLocation());
- Assert.assertEquals(-1L, uploadConfig.getMaxFileSize());
- Assert.assertEquals(-1L, uploadConfig.getMaxSize());
- Assert.assertEquals(0, uploadConfig.getFileSizeThreshold());
+ Assertions.assertEquals("upload", uploadConfig.getLocation());
+ Assertions.assertEquals(-1L, uploadConfig.getMaxFileSize());
+ Assertions.assertEquals(-1L, uploadConfig.getMaxSize());
+ Assertions.assertEquals(0, uploadConfig.getFileSizeThreshold());
- Assert.assertEquals("upload", multipartConfigElement.getLocation());
- Assert.assertEquals(-1L, multipartConfigElement.getMaxFileSize());
- Assert.assertEquals(-1L, multipartConfigElement.getMaxRequestSize());
- Assert.assertEquals(0, multipartConfigElement.getFileSizeThreshold());
+ Assertions.assertEquals("upload", multipartConfigElement.getLocation());
+ Assertions.assertEquals(-1L, multipartConfigElement.getMaxFileSize());
+ Assertions.assertEquals(-1L, multipartConfigElement.getMaxRequestSize());
+ Assertions.assertEquals(0, multipartConfigElement.getFileSizeThreshold());
}
@Test
@@ -63,14 +63,14 @@ public class TestUploadConfig {
UploadConfig uploadConfig = new UploadConfig();
MultipartConfigElement multipartConfigElement = uploadConfig.toMultipartConfigElement();
- Assert.assertEquals("upload", uploadConfig.getLocation());
- Assert.assertEquals(1, uploadConfig.getMaxFileSize());
- Assert.assertEquals(2, uploadConfig.getMaxSize());
- Assert.assertEquals(3, uploadConfig.getFileSizeThreshold());
+ Assertions.assertEquals("upload", uploadConfig.getLocation());
+ Assertions.assertEquals(1, uploadConfig.getMaxFileSize());
+ Assertions.assertEquals(2, uploadConfig.getMaxSize());
+ Assertions.assertEquals(3, uploadConfig.getFileSizeThreshold());
- Assert.assertEquals("upload", multipartConfigElement.getLocation());
- Assert.assertEquals(1, multipartConfigElement.getMaxFileSize());
- Assert.assertEquals(2, multipartConfigElement.getMaxRequestSize());
- Assert.assertEquals(3, multipartConfigElement.getFileSizeThreshold());
+ Assertions.assertEquals("upload", multipartConfigElement.getLocation());
+ Assertions.assertEquals(1, multipartConfigElement.getMaxFileSize());
+ Assertions.assertEquals(2, multipartConfigElement.getMaxRequestSize());
+ Assertions.assertEquals(3, multipartConfigElement.getFileSizeThreshold());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java
index 160f3f215..b6a0932f3 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java
@@ -34,7 +34,7 @@ import org.apache.servicecomb.common.rest.definition.RestParam;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.AfterClass;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
@@ -87,10 +87,10 @@ public class TestRestCodec {
Map<String, Object> args = new HashMap<>();
args.put("header", "abc");
RestCodec.argsToRest(args, restOperation, clientRequest);
- Assert.assertEquals("abc", header.get("header"));
+ Assertions.assertEquals("abc", header.get("header"));
} catch (Exception e) {
e.printStackTrace();
- Assert.assertTrue(false);
+ Assertions.assertTrue(false);
}
}
@@ -116,7 +116,7 @@ public class TestRestCodec {
};
Map<String, Object> xx = RestCodec.restToArgs(request, restOperation);
- Assert.assertEquals(xx.get("test"), s);
+ Assertions.assertEquals(xx.get("test"), s);
}
@Test
@@ -142,10 +142,10 @@ public class TestRestCodec {
RestCodec.restToArgs(request, restOperation);
success = true;
} catch (InvocationException e) {
- Assert.assertEquals(400, e.getStatusCode());
- Assert.assertTrue(((CommonExceptionData) e.getErrorData()).getMessage().contains("Parameter is not valid"));
+ Assertions.assertEquals(400, e.getStatusCode());
+ Assertions.assertTrue(((CommonExceptionData) e.getErrorData()).getMessage().contains("Parameter is not valid"));
}
- Assert.assertEquals(success, false);
+ Assertions.assertEquals(success, false);
}
@Test
@@ -172,8 +172,8 @@ public class TestRestCodec {
RestCodec.restToArgs(request, restOperation);
success = true;
} catch (InvocationException e) {
- Assert.assertEquals(e.getStatusCode(), Status.BAD_REQUEST.getStatusCode());
+ Assertions.assertEquals(e.getStatusCode(), Status.BAD_REQUEST.getStatusCode());
}
- Assert.assertEquals(success, false);
+ Assertions.assertEquals(success, false);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
index c5a0d2d07..317e603d5 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
@@ -17,14 +17,12 @@
package org.apache.servicecomb.common.rest.codec;
-import static org.junit.Assert.assertFalse;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Date;
import org.apache.servicecomb.foundation.common.utils.RestObjectMapper;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.core.JsonParser.Feature;
@@ -43,27 +41,27 @@ public class TestRestObjectMapper {
// must read/write ISO 8061 dates
Date date = mapper.readValue("\"2017-07-21T17:32:28Z\"".getBytes(), Date.class);
String dateStr = mapper.writeValueAsString(date);
- Assert.assertEquals(dateStr, "\"2017-07-21T17:32:28.000+00:00\"");
+ Assertions.assertEquals(dateStr, "\"2017-07-21T17:32:28.000+00:00\"");
date = mapper.readValue("\"2017-07-21T17:32:28.320+0100\"".getBytes(), Date.class);
dateStr = mapper.writeValueAsString(date);
- Assert.assertEquals(dateStr, "\"2017-07-21T16:32:28.320+00:00\""); // one hour later
+ Assertions.assertEquals(dateStr, "\"2017-07-21T16:32:28.320+00:00\""); // one hour later
}
@Test
public void testAutoCloseSource() {
- assertFalse(RestObjectMapperFactory.getRestObjectMapper().getFactory().isEnabled(Feature.AUTO_CLOSE_SOURCE));
+ Assertions.assertFalse(RestObjectMapperFactory.getRestObjectMapper().getFactory().isEnabled(Feature.AUTO_CLOSE_SOURCE));
}
@Test
public void testDeserializationFeature() {
- assertFalse(
+ Assertions.assertFalse(
RestObjectMapperFactory.getRestObjectMapper().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
}
@Test
public void testDefaultViewInclusionFeature() {
- assertFalse(RestObjectMapperFactory.getRestObjectMapper().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
+ Assertions.assertFalse(RestObjectMapperFactory.getRestObjectMapper().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
}
@Test
@@ -73,23 +71,23 @@ public class TestRestObjectMapper {
obj.put("desc", "b");
PojoModel model = RestObjectMapperFactory.getRestObjectMapper()
.convertValue(obj, TypeFactory.defaultInstance().constructType(PojoModel.class));
- Assert.assertEquals("a", model.getName());
- Assert.assertEquals("b", model.getDesc());
+ Assertions.assertEquals("a", model.getName());
+ Assertions.assertEquals("b", model.getDesc());
RestObjectMapperFactory.setDefaultRestObjectMapper(new RestObjectMapper());
model = RestObjectMapperFactory.getRestObjectMapper()
.convertValue(obj, TypeFactory.defaultInstance().constructType(PojoModel.class));
- Assert.assertEquals("a", model.getName());
- Assert.assertEquals("b", model.getDesc());
+ Assertions.assertEquals("a", model.getName());
+ Assertions.assertEquals("b", model.getDesc());
InputStream inputStream = new ByteArrayInputStream(new byte[0]);
try {
RestObjectMapperFactory.getRestObjectMapper().readValue(inputStream, PojoModel.class);
- Assert.fail();
+ Assertions.fail();
} catch (MismatchedInputException e) {
// right place, nothing to do.
} catch (Exception e) {
- Assert.fail();
+ Assertions.fail();
}
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
index 3b28c130c..46a2a26cc 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -23,7 +23,7 @@ import java.util.concurrent.Callable;
import org.apache.servicecomb.foundation.common.utils.RestObjectMapper;
import org.apache.servicecomb.foundation.test.scaffolding.model.Color;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.core.exc.InputCoercionException;
@@ -80,18 +80,18 @@ public class TestDoSFix {
long start = System.currentTimeMillis();
try {
Object ret = callable.call();
- Assert.fail("expect failed, but succes to be " + ret);
+ Assertions.fail("expect failed, but succes to be " + ret);
} catch (AssertionError e) {
throw e;
} catch (Throwable e) {
if (eCls != e.getClass()) {
e.printStackTrace();
}
- Assert.assertEquals(eCls, e.getClass());
+ Assertions.assertEquals(eCls, e.getClass());
}
long time = System.currentTimeMillis() - start;
- Assert.assertTrue("did not fix DoS problem, time:" + time, time < 1000);
+ Assertions.assertTrue(time < 1000, "did not fix DoS problem, time:" + time);
}
void fastFail(String input, Class<?> cls, Class<?> eCls) {
@@ -177,7 +177,7 @@ public class TestDoSFix {
long start = System.currentTimeMillis();
try {
Object ret = callable.call();
- Assert.assertTrue(System.currentTimeMillis() - start < 1000);
+ Assertions.assertTrue(System.currentTimeMillis() - start < 1000);
return ret;
} catch (Throwable e) {
throw new IllegalStateException(e);
@@ -196,24 +196,24 @@ public class TestDoSFix {
}
void batFastSucc(Class<?> cls, Object expected) {
- Assert.assertEquals(expected, fastSucc(invalidNum, cls));
- Assert.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidNum.getBytes()), cls));
+ Assertions.assertEquals(expected, fastSucc(invalidNum, cls));
+ Assertions.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidNum.getBytes()), cls));
- Assert.assertEquals(expected, fastSucc(invalidStr, cls));
- Assert.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidStr.getBytes()), cls));
+ Assertions.assertEquals(expected, fastSucc(invalidStr, cls));
+ Assertions.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidStr.getBytes()), cls));
- Assert.assertEquals(expected, fastSucc(invalidArrNum, cls));
- Assert.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidArrNum.getBytes()), cls));
+ Assertions.assertEquals(expected, fastSucc(invalidArrNum, cls));
+ Assertions.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidArrNum.getBytes()), cls));
- Assert.assertEquals(expected, fastSucc(invalidArrStr, cls));
- Assert.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidArrStr.getBytes()), cls));
+ Assertions.assertEquals(expected, fastSucc(invalidArrStr, cls));
+ Assertions.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidArrStr.getBytes()), cls));
}
void checkField(Model model, String fieldName, Object expected) {
try {
Field field = Model.class.getField(fieldName);
Object value = field.get(model);
- Assert.assertEquals(expected, value);
+ Assertions.assertEquals(expected, value);
} catch (Throwable e) {
throw new IllegalStateException(e);
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java
index b0f61d7e1..85dba2404 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java
@@ -17,8 +17,6 @@
package org.apache.servicecomb.common.rest.codec.param;
-import static org.junit.Assert.fail;
-
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Date;
@@ -34,7 +32,7 @@ import org.apache.servicecomb.common.rest.codec.RestClientRequest;
import org.apache.servicecomb.common.rest.codec.param.BodyProcessorCreator.BodyProcessor;
import org.apache.servicecomb.common.rest.codec.param.BodyProcessorCreator.RawJsonBodyProcessor;
import org.apache.servicecomb.foundation.vertx.stream.BufferInputStream;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
@@ -124,7 +122,7 @@ public class TestBodyProcessor {
};
Object result = processor.getValue(request);
- Assert.assertEquals("10", result);
+ Assertions.assertEquals("10", result);
}
@Test
@@ -138,7 +136,7 @@ public class TestBodyProcessor {
};
Object result = processor.getValue(request);
- Assert.assertNull(result);
+ Assertions.assertNull(result);
}
@Test
@@ -153,7 +151,7 @@ public class TestBodyProcessor {
}
};
- Assert.assertEquals("abc", processor.getValue(request));
+ Assertions.assertEquals("abc", processor.getValue(request));
}
@Test
@@ -168,7 +166,7 @@ public class TestBodyProcessor {
}
};
- Assert.assertEquals(1, processor.getValue(request));
+ Assertions.assertEquals(1, processor.getValue(request));
}
@Test
@@ -176,7 +174,7 @@ public class TestBodyProcessor {
setupGetValue(Integer.class);
inputBodyByteBuf.writeCharSequence("\"1\"", StandardCharsets.UTF_8);
- Assert.assertEquals(1, processor.getValue(request));
+ Assertions.assertEquals(1, processor.getValue(request));
}
@Test
@@ -185,8 +183,8 @@ public class TestBodyProcessor {
createProcessor(String.class);
processor.setValue(clientRequest, "value");
- Assert.assertEquals(MediaType.APPLICATION_JSON, headers.get(HttpHeaders.CONTENT_TYPE));
- Assert.assertEquals("\"value\"", outputBodyBuffer.toString());
+ Assertions.assertEquals(MediaType.APPLICATION_JSON, headers.get(HttpHeaders.CONTENT_TYPE));
+ Assertions.assertEquals("\"value\"", outputBodyBuffer.toString());
}
@Test
@@ -196,8 +194,8 @@ public class TestBodyProcessor {
headers.add(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN);
processor.setValue(clientRequest, "value");
- Assert.assertEquals(MediaType.TEXT_PLAIN, headers.get(HttpHeaders.CONTENT_TYPE));
- Assert.assertEquals("value", outputBodyBuffer.toString());
+ Assertions.assertEquals(MediaType.TEXT_PLAIN, headers.get(HttpHeaders.CONTENT_TYPE));
+ Assertions.assertEquals("value", outputBodyBuffer.toString());
}
@Test
@@ -208,23 +206,23 @@ public class TestBodyProcessor {
try {
processor.setValue(clientRequest, new Date());
- fail("an exception is expected!");
+ Assertions.fail("an exception is expected!");
} catch (Exception e) {
- Assert.assertEquals(IllegalArgumentException.class, e.getClass());
- Assert.assertEquals("Content-Type is text/plain while arg type is not String", e.getMessage());
+ Assertions.assertEquals(IllegalArgumentException.class, e.getClass());
+ Assertions.assertEquals("Content-Type is text/plain while arg type is not String", e.getMessage());
}
}
@Test
public void testGetParameterPath() {
createProcessor(String.class);
- Assert.assertEquals("", processor.getParameterPath());
+ Assertions.assertEquals("", processor.getParameterPath());
}
@Test
public void testGetProcessorType() {
createProcessor(String.class);
- Assert.assertEquals("body", processor.getProcessorType());
+ Assertions.assertEquals("body", processor.getProcessorType());
}
@Test
@@ -233,7 +231,7 @@ public class TestBodyProcessor {
initInputStream();
inputBodyByteBuf.writeCharSequence("\"1\"", StandardCharsets.UTF_8);
- Assert.assertEquals("\"1\"", processor.getValue(request));
+ Assertions.assertEquals("\"1\"", processor.getValue(request));
}
@Test
@@ -248,7 +246,7 @@ public class TestBodyProcessor {
};
Object result = processor.getValue(request);
- Assert.assertEquals("10", result);
+ Assertions.assertEquals("10", result);
}
@Test
@@ -262,7 +260,7 @@ public class TestBodyProcessor {
};
Object result = processor.getValue(request);
- Assert.assertNull(result);
+ Assertions.assertNull(result);
}
@Test
@@ -271,8 +269,8 @@ public class TestBodyProcessor {
createRawJsonProcessor();
processor.setValue(clientRequest, "value");
- Assert.assertEquals(MediaType.APPLICATION_JSON, headers.get(HttpHeaders.CONTENT_TYPE));
- Assert.assertEquals("value", outputBodyBuffer.toString());
+ Assertions.assertEquals(MediaType.APPLICATION_JSON, headers.get(HttpHeaders.CONTENT_TYPE));
+ Assertions.assertEquals("value", outputBodyBuffer.toString());
}
static class BodyModel {
@@ -297,8 +295,8 @@ public class TestBodyProcessor {
};
BodyModel bm = (BodyModel) processor.getValue(request);
- Assert.assertEquals("n", bm.name);
- Assert.assertEquals(10, bm.age);
+ Assertions.assertEquals("n", bm.name);
+ Assertions.assertEquals(10, bm.age);
}
@Test
@@ -317,7 +315,7 @@ public class TestBodyProcessor {
};
BodyModel bm = (BodyModel) processor.getValue(request);
- Assert.assertEquals("n", bm.name);
- Assert.assertEquals(10, bm.age);
+ Assertions.assertEquals("n", bm.name);
+ Assertions.assertEquals(10, bm.age);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessorCreator.java
index 6d704ba13..7038eb865 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessorCreator.java
@@ -20,7 +20,7 @@ package org.apache.servicecomb.common.rest.codec.param;
import org.apache.servicecomb.common.rest.codec.param.BodyProcessorCreator.BodyProcessor;
import org.apache.servicecomb.common.rest.codec.param.BodyProcessorCreator.RawJsonBodyProcessor;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.swagger.models.parameters.BodyParameter;
@@ -34,7 +34,7 @@ public class TestBodyProcessorCreator {
ParamValueProcessor processor = creator.create(param, String.class);
- Assert.assertEquals(BodyProcessor.class, processor.getClass());
+ Assertions.assertEquals(BodyProcessor.class, processor.getClass());
}
@Test
@@ -46,6 +46,6 @@ public class TestBodyProcessorCreator {
ParamValueProcessor processor = creator.create(param, String.class);
- Assert.assertEquals(RawJsonBodyProcessor.class, processor.getClass());
+ Assertions.assertEquals(RawJsonBodyProcessor.class, processor.getClass());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
index 0fab41c33..f2597f0df 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.servicecomb.common.rest.codec.RestClientRequest;
import org.apache.servicecomb.common.rest.codec.param.CookieProcessorCreator.CookieProcessor;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -73,7 +73,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", String.class, null, false);
Object value = processor.getValue(request);
- Assert.assertNull(value);
+ Assertions.assertNull(value);
}
@Test
@@ -88,9 +88,9 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", String.class, null, true);
try {
processor.getValue(request);
- Assert.assertEquals("required is true, throw exception", "not throw exception");
+ Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (Exception e) {
- Assert.assertTrue(e.getMessage().contains("Parameter is required."));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is required."));
}
}
@@ -106,7 +106,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c2", String.class, null, false);
Object value = processor.getValue(request);
- Assert.assertNull(value);
+ Assertions.assertNull(value);
}
@Test
@@ -121,7 +121,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", String.class);
Object value = processor.getValue(request);
- Assert.assertEquals("c1v", value);
+ Assertions.assertEquals("c1v", value);
}
@Test
@@ -137,9 +137,9 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", String.class, null, true);
try {
processor.getValue(request);
- Assert.assertEquals("required is true, throw exception", "not throw exception");
+ Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (Exception e) {
- Assert.assertTrue(e.getMessage().contains("Parameter is required."));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is required."));
}
}
@@ -155,7 +155,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", String.class, "test", false);
Object result = processor.getValue(request);
- Assert.assertEquals("test", result);
+ Assertions.assertEquals("test", result);
}
@SuppressWarnings("deprecation")
@@ -173,7 +173,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", Date.class);
Object value = processor.getValue(request);
- Assert.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
+ Assertions.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
}
@Test
@@ -182,7 +182,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", String.class);
processor.setValue(clientRequest, "c1v");
- Assert.assertEquals("c1v", cookies.get("c1"));
+ Assertions.assertEquals("c1v", cookies.get("c1"));
}
@Test
@@ -194,7 +194,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("h1", Date.class);
processor.setValue(clientRequest, date);
- Assert.assertEquals(strDate, cookies.get("h1"));
+ Assertions.assertEquals(strDate, cookies.get("h1"));
}
@Test
@@ -207,12 +207,12 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("h1", Date.class);
processor.setValue(clientRequest, date);
- Assert.assertEquals(strDate, cookies.get("h1"));
+ Assertions.assertEquals(strDate, cookies.get("h1"));
}
@Test
public void testGetProcessorType() {
CookieProcessor processor = createProcessor("c1", String.class);
- Assert.assertEquals("cookie", processor.getProcessorType());
+ Assertions.assertEquals("cookie", processor.getProcessorType());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessorCreator.java
index 1d23d9009..67b3698c7 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessorCreator.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.common.rest.codec.param;
import org.apache.servicecomb.common.rest.codec.param.CookieProcessorCreator.CookieProcessor;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.swagger.models.parameters.CookieParameter;
@@ -33,6 +33,6 @@ public class TestCookieProcessorCreator {
ParamValueProcessor processor = creator.create(p, String.class);
- Assert.assertEquals(CookieProcessor.class, processor.getClass());
+ Assertions.assertEquals(CookieProcessor.class, processor.getClass());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
index 5e33af9e8..1cec51884 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
@@ -31,7 +31,7 @@ import org.apache.servicecomb.common.rest.codec.RestClientRequest;
import org.apache.servicecomb.common.rest.codec.param.FormProcessorCreator.FormProcessor;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -92,7 +92,7 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", String.class);
Object value = processor.getValue(request);
- Assert.assertEquals("value", value);
+ Assertions.assertEquals("value", value);
}
@Test
@@ -106,7 +106,7 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", String.class);
Object value = processor.getValue(request);
- Assert.assertEquals("value", value);
+ Assertions.assertEquals("value", value);
}
@SuppressWarnings("deprecation")
@@ -123,7 +123,7 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", Date.class);
Object value = processor.getValue(request);
- Assert.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
+ Assertions.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
}
@Test
@@ -137,7 +137,7 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", String[].class, null, false);
String[] value = (String[]) processor.getValue(request);
- Assert.assertNull(value);
+ Assertions.assertNull(value);
}
@Test
@@ -152,9 +152,9 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", String.class, null, true);
try {
processor.getValue(request);
- Assert.assertEquals("required is true, throw exception", "not throw exception");
+ Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (Exception e) {
- Assert.assertTrue(e.getMessage().contains("Parameter is required."));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is required."));
}
}
@@ -212,7 +212,7 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", String.class);
processor.setValue(clientRequest, "value");
- Assert.assertEquals("value", forms.get("name"));
+ Assertions.assertEquals("value", forms.get("name"));
}
@Test
@@ -223,12 +223,12 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", Date.class);
processor.setValue(clientRequest, date);
- Assert.assertSame(date, forms.get("name"));
+ Assertions.assertSame(date, forms.get("name"));
}
@Test
public void testGetProcessorType() {
ParamValueProcessor processor = createProcessor("name", String.class);
- Assert.assertEquals("formData", processor.getProcessorType());
+ Assertions.assertEquals("formData", processor.getProcessorType());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessorCreator.java
index 4551f6a13..986c52d45 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessorCreator.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.common.rest.codec.param;
import org.apache.servicecomb.common.rest.codec.param.FormProcessorCreator.FormProcessor;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.swagger.models.parameters.FormParameter;
@@ -33,6 +33,6 @@ public class TestFormProcessorCreator {
ParamValueProcessor processor = creator.create(p, String.class);
- Assert.assertEquals(FormProcessor.class, processor.getClass());
+ Assertions.assertEquals(FormProcessor.class, processor.getClass());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
index a29459aab..c0f818201 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
@@ -32,7 +32,7 @@ import org.apache.servicecomb.common.rest.codec.RestClientRequest;
import org.apache.servicecomb.common.rest.codec.param.HeaderProcessorCreator.HeaderProcessor;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -92,7 +92,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", String.class);
Object value = processor.getValue(request);
- Assert.assertEquals("h1v", value);
+ Assertions.assertEquals("h1v", value);
}
@SuppressWarnings("deprecation")
@@ -109,7 +109,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", Date.class);
Object value = processor.getValue(request);
- Assert.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
+ Assertions.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
}
@Test
@@ -123,7 +123,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", String[].class, null, false);
String[] value = (String[]) processor.getValue(request);
- Assert.assertNull(value);
+ Assertions.assertNull(value);
}
@Test
@@ -138,9 +138,9 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", String.class);
try {
processor.getValue(request);
- Assert.assertEquals("required is true, throw exception", "not throw exception");
+ Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (Exception e) {
- Assert.assertTrue(e.getMessage().contains("Parameter is required."));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is required."));
}
}
@@ -155,7 +155,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", String.class, "test", false);
Object value = processor.getValue(request);
- Assert.assertEquals("test", value);
+ Assertions.assertEquals("test", value);
}
@Test
@@ -212,7 +212,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", String.class);
processor.setValue(clientRequest, "h1v");
- Assert.assertEquals("h1v", headers.get("h1"));
+ Assertions.assertEquals("h1v", headers.get("h1"));
}
@Test
@@ -220,7 +220,7 @@ public class TestHeaderProcessor {
createClientRequest();
HeaderProcessor processor = createProcessor("h1", String.class);
processor.setValue(clientRequest, null);
- Assert.assertEquals(0, headers.size());
+ Assertions.assertEquals(0, headers.size());
}
@Test
@@ -232,7 +232,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", Date.class);
processor.setValue(clientRequest, date);
- Assert.assertEquals(strDate, headers.get("h1"));
+ Assertions.assertEquals(strDate, headers.get("h1"));
}
@Test
@@ -243,12 +243,12 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", Date.class);
processor.setValue(clientRequest, date);
- Assert.assertEquals(strDate, headers.get("h1"));
+ Assertions.assertEquals(strDate, headers.get("h1"));
}
@Test
public void testGetProcessorType() {
HeaderProcessor processor = createProcessor("h1", String.class);
- Assert.assertEquals("header", processor.getProcessorType());
+ Assertions.assertEquals("header", processor.getProcessorType());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessorCreator.java
index 8e8e9f4ef..71349df3d 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessorCreator.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.common.rest.codec.param;
import org.apache.servicecomb.common.rest.codec.param.HeaderProcessorCreator.HeaderProcessor;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.swagger.models.parameters.HeaderParameter;
@@ -33,6 +33,6 @@ public class TestHeaderProcessorCreator {
ParamValueProcessor processor = creator.create(hp, String.class);
- Assert.assertEquals(HeaderProcessor.class, processor.getClass());
+ Assertions.assertEquals(HeaderProcessor.class, processor.getClass());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
index 443a04adf..670f165cb 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.common.rest.codec.param.PathProcessorCreator.PathProcessor;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -58,14 +58,14 @@ public class TestPathProcessor {
public void testGetValueNoPathVars() throws Exception {
createProcessor("name", String.class);
- Assert.assertEquals(null, processor.getValue(request));
+ Assertions.assertEquals(null, processor.getValue(request));
}
@Test
public void testGetValuePathNotFound() throws Exception {
prepareGetValue("name", String.class);
- Assert.assertEquals(null, processor.getValue(request));
+ Assertions.assertEquals(null, processor.getValue(request));
}
@Test
@@ -73,7 +73,7 @@ public class TestPathProcessor {
prepareGetValue("name", String.class);
pathVars.put("name", "value");
- Assert.assertEquals("value", processor.getValue(request));
+ Assertions.assertEquals("value", processor.getValue(request));
}
@Test
@@ -81,7 +81,7 @@ public class TestPathProcessor {
prepareGetValue("name", String.class);
pathVars.put("name", "a%20b");
- Assert.assertEquals("a b", processor.getValue(request));
+ Assertions.assertEquals("a b", processor.getValue(request));
}
@Test
@@ -89,7 +89,7 @@ public class TestPathProcessor {
prepareGetValue("name", String.class);
pathVars.put("name", "a+b");
- Assert.assertEquals("a+b", processor.getValue(request));
+ Assertions.assertEquals("a+b", processor.getValue(request));
}
@Test
@@ -97,19 +97,19 @@ public class TestPathProcessor {
prepareGetValue("name", String.class);
pathVars.put("name", "%25%25");
- Assert.assertEquals("%%", processor.getValue(request));
+ Assertions.assertEquals("%%", processor.getValue(request));
}
@Test
public void testGetColon() throws Exception {
prepareGetValue("name", String.class);
pathVars.put("name", "aa:bb");
- Assert.assertEquals("aa:bb", processor.getValue(request));
+ Assertions.assertEquals("aa:bb", processor.getValue(request));
}
@Test
public void testGetProcessorType() {
createProcessor("name", String.class);
- Assert.assertEquals("path", processor.getProcessorType());
+ Assertions.assertEquals("path", processor.getProcessorType());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessorCreator.java
index b6a993278..fdc52c37d 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessorCreator.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.common.rest.codec.param;
import org.apache.servicecomb.common.rest.codec.param.PathProcessorCreator.PathProcessor;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.swagger.models.parameters.Parameter;
@@ -34,6 +34,6 @@ public class TestPathProcessorCreator {
ParamValueProcessor processor = creator.create(parameter, String.class);
- Assert.assertEquals(PathProcessor.class, processor.getClass());
+ Assertions.assertEquals(PathProcessor.class, processor.getClass());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java
index 824400dcc..5d97a10bc 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -68,7 +68,7 @@ public class TestQueryProcessor {
ParamValueProcessor processor = createProcessor("name", String.class, "multi");
Object value = processor.getValue(request);
- Assert.assertEquals("value", value);
+ Assertions.assertEquals("value", value);
}
@Test
@@ -102,7 +102,7 @@ public class TestQueryProcessor {
@Test
public void testGetProcessorType() {
ParamValueProcessor processor = createProcessor("name", String.class, "multi");
- Assert.assertEquals("query", processor.getProcessorType());
+ Assertions.assertEquals("query", processor.getProcessorType());
}
@Test
@@ -117,9 +117,9 @@ public class TestQueryProcessor {
ParamValueProcessor processor = createProcessor("name", String.class, "multi");
try {
processor.getValue(request);
- Assert.assertEquals("required is true, throw exception", "not throw exception");
+ Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (Exception e) {
- Assert.assertTrue(e.getMessage().contains("Parameter is required."));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is required."));
}
}
@@ -134,6 +134,6 @@ public class TestQueryProcessor {
ParamValueProcessor processor = createProcessor("name", String.class, "test", false, "multi");
Object result = processor.getValue(request);
- Assert.assertEquals("test", result);
+ Assertions.assertEquals("test", result);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
index f5b0e77e7..1cb5d46e4 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import org.mockito.Mockito;
@@ -40,16 +40,16 @@ public class TestQueryProcessorCreator {
ParamValueProcessor processor = creator.create(parameter, String.class);
- Assert.assertEquals(QueryProcessor.class, processor.getClass());
+ Assertions.assertEquals(QueryProcessor.class, processor.getClass());
String result = (String) processor.convertValue("Hello", TypeFactory.defaultInstance().constructType(String.class));
- Assert.assertEquals("Hello", result);
+ Assertions.assertEquals("Hello", result);
result = (String) processor.convertValue("", TypeFactory.defaultInstance().constructType(String.class));
- Assert.assertEquals("", result);
+ Assertions.assertEquals("", result);
result = (String) processor.convertValue(null, TypeFactory.defaultInstance().constructType(String.class));
- Assert.assertEquals(null, result);
+ Assertions.assertEquals(null, result);
}
@SuppressWarnings("UnusedAssignment")
@@ -64,19 +64,19 @@ public class TestQueryProcessorCreator {
ParamValueProcessor processor = creator.create(parameter, String.class);
- Assert.assertEquals(QueryProcessor.class, processor.getClass());
+ Assertions.assertEquals(QueryProcessor.class, processor.getClass());
Mockito.when(request.getParameter("query")).thenReturn("Hello");
String result = (String) processor.getValue(request);
- Assert.assertEquals("Hello", result);
+ Assertions.assertEquals("Hello", result);
Mockito.when(request.getParameter("query")).thenReturn("");
result = (String) processor.getValue(request);
- Assert.assertEquals(null, result);
+ Assertions.assertEquals(null, result);
Mockito.when(request.getParameter("query")).thenReturn(null);
result = (String) processor.convertValue(null, TypeFactory.defaultInstance().constructType(String.class));
result = (String) processor.getValue(request);
- Assert.assertEquals(null, result);
+ Assertions.assertEquals(null, result);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java
index f7f7901ce..9a0e275f7 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java
@@ -27,7 +27,7 @@ import javax.ws.rs.core.MediaType;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import org.mockito.Mockito;
@@ -57,7 +57,7 @@ public class TestRestClientRequestImpl {
restClientRequest.addForm("def", "world");
restClientRequest.addForm("ghi", null);
Buffer buffer = restClientRequest.getBodyBuffer();
- Assert.assertEquals("abc=Hello&def=world&", buffer.toString());
+ Assertions.assertEquals("abc=Hello&def=world&", buffer.toString());
}
@Test
@@ -83,8 +83,8 @@ public class TestRestClientRequestImpl {
restClientRequest.write(Buffer.buffer("I love servicecomb"));
restClientRequest.end();
Buffer buffer = restClientRequest.getBodyBuffer();
- Assert.assertEquals("I love servicecomb", buffer.toString());
- Assert.assertEquals("sessionid=abcdefghijklmnopqrstuvwxyz; region=china-north; ",
+ Assertions.assertEquals("I love servicecomb", buffer.toString());
+ Assertions.assertEquals("sessionid=abcdefghijklmnopqrstuvwxyz; region=china-north; ",
restClientRequest.request.headers().get(HttpHeaders.COOKIE));
}
@@ -100,7 +100,7 @@ public class TestRestClientRequestImpl {
};
RestClientRequestImpl restClientRequest = new RestClientRequestImpl(request, null, null);
Buffer buffer = restClientRequest.fileBoundaryInfo("boundary", "name", part);
- Assert.assertEquals("\r\n" +
+ Assertions.assertEquals("\r\n" +
"--boundary\r\n" +
"Content-Disposition: form-data; name=\"name\"; filename=\"null\"\r\n" +
"Content-Type: abc\r\n" +
@@ -120,7 +120,7 @@ public class TestRestClientRequestImpl {
};
RestClientRequestImpl restClientRequest = new RestClientRequestImpl(request, null, null);
Buffer buffer = restClientRequest.fileBoundaryInfo("boundary", "name", part);
- Assert.assertEquals("\r\n" +
+ Assertions.assertEquals("\r\n" +
"--boundary\r\n" +
"Content-Disposition: form-data; name=\"name\"; filename=\"a.txt\"\r\n" +
"Content-Type: text/plain\r\n" +
@@ -137,7 +137,7 @@ public class TestRestClientRequestImpl {
restClientRequest.attach(fileName, part);
Multimap<String, Part> uploads = Deencapsulation.getField(restClientRequest, "uploads");
- Assert.assertEquals(1, uploads.size());
+ Assertions.assertEquals(1, uploads.size());
MatcherAssert.assertThat(uploads.asMap(), Matchers.hasEntry(fileName, Arrays.asList(part)));
}
@@ -148,7 +148,7 @@ public class TestRestClientRequestImpl {
restClientRequest.attach("fileName", null);
Multimap<String, Part> uploads = Deencapsulation.getField(restClientRequest, "uploads");
- Assert.assertTrue(uploads.isEmpty());
+ Assertions.assertTrue(uploads.isEmpty());
}
@Test
@@ -172,7 +172,7 @@ public class TestRestClientRequestImpl {
RestClientRequestImpl restClientRequest = new RestClientRequestImpl(request, context, null);
restClientRequest.doEndWithUpload();
- Assert.assertEquals("multipart/form-data; charset=UTF-8; boundary=boundary00000000-0000-0000-0000-000000000000",
+ Assertions.assertEquals("multipart/form-data; charset=UTF-8; boundary=boundary00000000-0000-0000-0000-000000000000",
headers.get(HttpHeaders.CONTENT_TYPE));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java
index dcd5ea4e5..7dcda4e64 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceJsonProcessor.java
@@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -40,25 +40,25 @@ public class TestProduceJsonProcessor {
@Test
public void testEncodeResponseNull() throws Exception {
Buffer buffer = pp.encodeResponse(null);
- Assert.assertNull(buffer);
+ Assertions.assertNull(buffer);
ByteArrayOutputStream os = new ByteArrayOutputStream();
pp.encodeResponse(os, null);
- Assert.assertEquals(0, os.size());
+ Assertions.assertEquals(0, os.size());
}
@Test
public void testdecodeResponseNull() throws Exception {
JavaType resultType = TypeFactory.unknownType();
Object result = pp.decodeResponse(Buffer.buffer(), resultType);
- Assert.assertNull(result);
+ Assertions.assertNull(result);
ByteArrayInputStream is = new ByteArrayInputStream(new byte[] {});
try {
pp.decodeResponse(is, resultType);
- Assert.fail();
+ Assertions.fail();
} catch (Exception e) {
- Assert.assertTrue(e instanceof MismatchedInputException);
+ Assertions.assertTrue(e instanceof MismatchedInputException);
}
}
@@ -66,10 +66,10 @@ public class TestProduceJsonProcessor {
public void testBufferNormal() throws Exception {
String value = "abc";
Buffer buffer = pp.encodeResponse(value);
- Assert.assertEquals("\"abc\"", buffer.toString(StandardCharsets.UTF_8));
+ Assertions.assertEquals("\"abc\"", buffer.toString(StandardCharsets.UTF_8));
Object result = pp.decodeResponse(buffer, stringType);
- Assert.assertEquals(value, result);
+ Assertions.assertEquals(value, result);
}
@Test
@@ -78,11 +78,11 @@ public class TestProduceJsonProcessor {
ByteArrayOutputStream os = new ByteArrayOutputStream();
pp.encodeResponse(os, value);
- Assert.assertEquals("\"abc\"", os.toString(StandardCharsets.UTF_8.name()));
+ Assertions.assertEquals("\"abc\"", os.toString(StandardCharsets.UTF_8.name()));
ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
Object result = pp.decodeResponse(is, stringType);
- Assert.assertEquals(value, result);
+ Assertions.assertEquals(value, result);
os.close();
is.close();
@@ -90,12 +90,12 @@ public class TestProduceJsonProcessor {
@Test
public void testSetSerializationView() {
- Assert.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
+ Assertions.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
pp.setSerializationView(null);
- Assert.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
+ Assertions.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
pp.setSerializationView(Object.class);
- Assert.assertEquals(Object.class.getCanonicalName(), pp.getSerializationView());
+ Assertions.assertEquals(Object.class.getCanonicalName(), pp.getSerializationView());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceProcessorManager.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceProcessorManager.java
index 1c08656b9..82cea9313 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceProcessorManager.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceProcessorManager.java
@@ -17,13 +17,13 @@
package org.apache.servicecomb.common.rest.codec.produce;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
public class TestProduceProcessorManager {
@Test
public void testDefault() {
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
ProduceProcessorManager.INSTANCE.findDefaultProcessor());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java
index aa6eca9ab..5f2f149d2 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/produce/TestProduceTextPlainProcessor.java
@@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.JavaType;
@@ -39,32 +39,32 @@ public class TestProduceTextPlainProcessor {
@Test
public void testEncodeResponseNull() throws Exception {
Buffer buffer = pp.encodeResponse(null);
- Assert.assertNull(buffer);
+ Assertions.assertNull(buffer);
ByteArrayOutputStream os = new ByteArrayOutputStream();
pp.encodeResponse(os, null);
- Assert.assertEquals(0, os.size());
+ Assertions.assertEquals(0, os.size());
}
@Test
public void testdecodeResponseNull() throws Exception {
JavaType resultType = TypeFactory.unknownType();
Object result = pp.decodeResponse(Buffer.buffer(), resultType);
- Assert.assertNull(result);
+ Assertions.assertNull(result);
ByteArrayInputStream is = new ByteArrayInputStream(new byte[] {});
result = pp.decodeResponse(is, resultType);
- Assert.assertEquals(result, "");
+ Assertions.assertEquals(result, "");
}
@Test
public void testBufferNormal() throws Exception {
String value = "abc";
Buffer buffer = pp.encodeResponse(value);
- Assert.assertEquals(value, buffer.toString(StandardCharsets.UTF_8));
+ Assertions.assertEquals(value, buffer.toString(StandardCharsets.UTF_8));
Object result = pp.decodeResponse(buffer, stringType);
- Assert.assertEquals(value, result);
+ Assertions.assertEquals(value, result);
}
@Test
@@ -73,11 +73,11 @@ public class TestProduceTextPlainProcessor {
ByteArrayOutputStream os = new ByteArrayOutputStream();
pp.encodeResponse(os, value);
- Assert.assertEquals(value, os.toString(StandardCharsets.UTF_8.name()));
+ Assertions.assertEquals(value, os.toString(StandardCharsets.UTF_8.name()));
ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
Object result = pp.decodeResponse(is, stringType);
- Assert.assertEquals(value, result);
+ Assertions.assertEquals(value, result);
os.close();
is.close();
@@ -85,12 +85,12 @@ public class TestProduceTextPlainProcessor {
@Test
public void testSetSerializationView() {
- Assert.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
+ Assertions.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
pp.setSerializationView(null);
- Assert.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
+ Assertions.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
pp.setSerializationView(Object.class);
- Assert.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
+ Assertions.assertEquals(DEFAULT_SERIAL_CLASS, pp.getSerializationView());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
index 4a1943abc..2bc4f9a2e 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
@@ -17,8 +17,6 @@
package org.apache.servicecomb.common.rest.definition;
-import static org.junit.Assert.fail;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +26,7 @@ import org.apache.servicecomb.common.rest.definition.path.QueryVarParamWriter;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
import org.junit.After;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
@@ -51,48 +49,48 @@ public class TestPath {
@Test
public void testPathRegExp() throws Exception {
PathRegExp oPathRegExp = new PathRegExp("//{test}//");
- Assert.assertEquals(1, oPathRegExp.getGroupCount());
- Assert.assertEquals(0, oPathRegExp.getGroupWithRegExpCount());
+ Assertions.assertEquals(1, oPathRegExp.getGroupCount());
+ Assertions.assertEquals(0, oPathRegExp.getGroupWithRegExpCount());
PathRegExp oSecondPathRegExp = new PathRegExp("{[^/:]+?}");
- Assert.assertEquals(1, oSecondPathRegExp.getGroupCount());
- Assert.assertEquals(1, oSecondPathRegExp.getGroupWithRegExpCount());
- Assert.assertEquals("test/", PathRegExp.ensureEndWithSlash("test/"));
- Assert.assertEquals("test/", PathRegExp.ensureEndWithSlash("test"));
- Assert.assertEquals(null, oSecondPathRegExp.match("{test/test}", null));
- Assert.assertEquals("(]+?)/(.*)", (oSecondPathRegExp.toString()));
- Assert.assertEquals(false, oSecondPathRegExp.isStaticPath());
- Assert.assertEquals(0, oSecondPathRegExp.getStaticCharCount());
- Assert.assertNotEquals(null, (oPathRegExp.match("//{test}//", new HashMap<>())));
+ Assertions.assertEquals(1, oSecondPathRegExp.getGroupCount());
+ Assertions.assertEquals(1, oSecondPathRegExp.getGroupWithRegExpCount());
+ Assertions.assertEquals("test/", PathRegExp.ensureEndWithSlash("test/"));
+ Assertions.assertEquals("test/", PathRegExp.ensureEndWithSlash("test"));
+ Assertions.assertNull(oSecondPathRegExp.match("{test/test}", null));
+ Assertions.assertEquals("(]+?)/(.*)", (oSecondPathRegExp.toString()));
+ Assertions.assertFalse(oSecondPathRegExp.isStaticPath());
+ Assertions.assertEquals(0, oSecondPathRegExp.getStaticCharCount());
+ Assertions.assertNotEquals(null, (oPathRegExp.match("//{test}//", new HashMap<>())));
// Error Scenarios
new PathRegExp("//{test \t}//");
// Error Scenarios for double {{
try {
new PathRegExp("//{test{");
- fail("an exception is expected!");
+ Assertions.fail("an exception is expected!");
} catch (Exception e) {
- Assert.assertEquals(true, e.getMessage().contains("A variable must not contain an extra"));
+ Assertions.assertTrue(e.getMessage().contains("A variable must not contain an extra"));
}
// Error Scenarios for illegal }}
try {
new PathRegExp("//}");
- fail("an exception is expected!");
+ Assertions.fail("an exception is expected!");
} catch (Exception e) {
- Assert.assertEquals(true, e.getMessage().contains("is only allowed as"));
+ Assertions.assertTrue(e.getMessage().contains("is only allowed as"));
}
// Error Scenarios for illegal ;
try {
new PathRegExp("//;");
- fail("an exception is expected!");
+ Assertions.fail("an exception is expected!");
} catch (Exception e) {
- Assert.assertEquals(true, e.getMessage().contains("matrix parameters are not allowed in"));
+ Assertions.assertTrue(e.getMessage().contains("matrix parameters are not allowed in"));
}
// Error Scenarios for NO } ;
try {
new PathRegExp("//{test");
- fail("an exception is expected!");
+ Assertions.fail("an exception is expected!");
} catch (Exception e) {
- Assert.assertEquals(true, e.getMessage().contains("No '}' found after"));
+ Assertions.assertTrue(e.getMessage().contains("No '}' found after"));
}
}
@@ -114,8 +112,8 @@ public class TestPath {
Map<String, Object> parameters = new HashMap<>();
parameters.put("id", 100);
parameters.put("q", "query");
- Assert.assertEquals("/root/100?q=query", oURLPathBuilder.createRequestPath(parameters));
- Assert.assertEquals("/root/100", oURLPathBuilder.createPathString(parameters));
+ Assertions.assertEquals("/root/100?q=query", oURLPathBuilder.createRequestPath(parameters));
+ Assertions.assertEquals("/root/100", oURLPathBuilder.createPathString(parameters));
}
@Test
@@ -157,12 +155,12 @@ public class TestPath {
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
}
private void verify(QueryVarParamWriter writer, Map<String, Object> args, String expect) throws Exception {
URLPathStringBuilder sb = new URLPathStringBuilder();
writer.write(sb, args);
- Assert.assertEquals(expect, sb.build());
+ Assertions.assertEquals(expect, sb.build());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationComparator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationComparator.java
index cc4970ead..f4f6a3e58 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationComparator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationComparator.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.common.rest.definition;
import org.apache.servicecomb.common.rest.locator.MicroservicePaths;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
public class TestRestOperationComparator {
@@ -35,8 +35,8 @@ public class TestRestOperationComparator {
paths.addResource(more);
paths.sortPath();
- Assert.assertSame(more, paths.getDynamicPathOperationList().get(0));
- Assert.assertSame(less, paths.getDynamicPathOperationList().get(1));
+ Assertions.assertSame(more, paths.getDynamicPathOperationList().get(0));
+ Assertions.assertSame(less, paths.getDynamicPathOperationList().get(1));
}
@Test
@@ -52,8 +52,8 @@ public class TestRestOperationComparator {
paths.addResource(more);
paths.sortPath();
- Assert.assertSame(more, paths.getDynamicPathOperationList().get(0));
- Assert.assertSame(less, paths.getDynamicPathOperationList().get(1));
+ Assertions.assertSame(more, paths.getDynamicPathOperationList().get(0));
+ Assertions.assertSame(less, paths.getDynamicPathOperationList().get(1));
}
@Test
@@ -69,7 +69,7 @@ public class TestRestOperationComparator {
paths.addResource(more);
paths.sortPath();
- Assert.assertSame(more, paths.getDynamicPathOperationList().get(0));
- Assert.assertSame(less, paths.getDynamicPathOperationList().get(1));
+ Assertions.assertSame(more, paths.getDynamicPathOperationList().get(0));
+ Assertions.assertSame(less, paths.getDynamicPathOperationList().get(1));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
index e7022bf92..2c1adfb59 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java
@@ -38,7 +38,7 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -185,15 +185,15 @@ public class TestRestOperationMeta {
operationMeta.produces = null;
operationMeta.createProduceProcessors();
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
for (String produce : ProduceProcessorManager.INSTANCE.keys()) {
ProduceProcessor expected = ProduceProcessorManager.INSTANCE.findProcessor(produce, null);
- Assert.assertSame(expected, operationMeta.findProduceProcessor(produce));
+ Assertions.assertSame(expected, operationMeta.findProduceProcessor(produce));
}
}
@@ -203,15 +203,15 @@ public class TestRestOperationMeta {
operationMeta.produces = null;
operationMeta.createProduceProcessors();
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
for (String produce : ProduceProcessorManager.INSTANCE.keys()) {
ProduceProcessor expected = ProduceProcessorManager.INSTANCE.findProcessor(produce, Object.class);
- Assert.assertSame(expected, operationMeta.findProduceProcessor(produce));
+ Assertions.assertSame(expected, operationMeta.findProduceProcessor(produce));
}
}
@@ -221,15 +221,15 @@ public class TestRestOperationMeta {
operationMeta.produces = Arrays.asList();
operationMeta.createProduceProcessors();
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
for (String produce : ProduceProcessorManager.INSTANCE.keys()) {
ProduceProcessor expected = ProduceProcessorManager.INSTANCE.findProcessor(produce, null);
- Assert.assertSame(expected, operationMeta.findProduceProcessor(produce));
+ Assertions.assertSame(expected, operationMeta.findProduceProcessor(produce));
}
}
@@ -239,15 +239,15 @@ public class TestRestOperationMeta {
operationMeta.produces = Arrays.asList();
operationMeta.createProduceProcessors();
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
for (String produce : ProduceProcessorManager.INSTANCE.keys()) {
ProduceProcessor expected = ProduceProcessorManager.INSTANCE.findProcessor(produce, Object.class);
- Assert.assertSame(expected, operationMeta.findProduceProcessor(produce));
+ Assertions.assertSame(expected, operationMeta.findProduceProcessor(produce));
}
}
@@ -255,72 +255,72 @@ public class TestRestOperationMeta {
public void testCreateProduceProcessorsNormal() {
findOperation("json");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
operationMeta.findProduceProcessor(MediaType.APPLICATION_JSON));
- Assert.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
+ Assertions.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
}
@Test
public void testCreateProduceProcessorsNormalWithView() {
findOperation("jsonWithView");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
operationMeta.findProduceProcessor(MediaType.APPLICATION_JSON));
- Assert.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
+ Assertions.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
}
@Test
public void testCreateProduceProcessorsNotSupported() {
findOperation("notSupport");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessor(),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
operationMeta.findProduceProcessor(MediaType.APPLICATION_JSON));
- Assert.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
+ Assertions.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
}
@Test
public void testCreateProduceProcessorsNotSupportedWithView() {
findOperation("notSupportWithView");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor((String) null));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor("*/*"));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(ProduceProcessorManager.DEFAULT_TYPE));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultProcessorByViewClass(Object.class),
operationMeta.findProduceProcessor(MediaType.APPLICATION_JSON));
- Assert.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
+ Assertions.assertNull(operationMeta.findProduceProcessor(MediaType.TEXT_PLAIN));
}
@Test
public void testCreateProduceProcessorsTextAndWildcard() {
findOperation("textPlain");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
operationMeta.ensureFindProduceProcessor(MediaType.WILDCARD));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
operationMeta.ensureFindProduceProcessor(MediaType.TEXT_PLAIN));
- Assert.assertNull(operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
+ Assertions.assertNull(operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON));
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
operationMeta.ensureFindProduceProcessor(
MediaType.APPLICATION_JSON + "," + MediaType.APPLICATION_XML + "," + MediaType.WILDCARD));
}
@@ -329,12 +329,12 @@ public class TestRestOperationMeta {
public void testCreateProduceProcessorsTextAndWildcardWithView() {
findOperation("textPlainWithView");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(MediaType.WILDCARD));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(MediaType.TEXT_PLAIN));
- Assert.assertNull(operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
+ Assertions.assertNull(operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON));
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(
MediaType.APPLICATION_JSON + "," + MediaType.APPLICATION_XML + "," + MediaType.WILDCARD));
}
@@ -343,9 +343,9 @@ public class TestRestOperationMeta {
public void testCreateProduceProcessorsWithSemicolon() {
findOperation("textCharJsonChar");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultPlainProcessor(),
operationMeta.ensureFindProduceProcessor(MediaType.TEXT_PLAIN));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findDefaultJsonProcessor(),
operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON));
}
@@ -353,22 +353,22 @@ public class TestRestOperationMeta {
public void testCreateProduceProcessorsWithSemicolonWithView() {
findOperation("textCharJsonCharWithView");
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findPlainProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(MediaType.TEXT_PLAIN));
- Assert.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
+ Assertions.assertSame(ProduceProcessorManager.INSTANCE.findJsonProcessorByViewClass(Object.class),
operationMeta.ensureFindProduceProcessor(MediaType.APPLICATION_JSON));
}
@Test
public void testEnsureFindProduceProcessorAcceptNotFound() {
findOperation("textCharJsonChar");
- Assert.assertNull(operationMeta.ensureFindProduceProcessor("notSupport"));
+ Assertions.assertNull(operationMeta.ensureFindProduceProcessor("notSupport"));
}
@Test
public void testEnsureFindProduceProcessorAcceptNotFoundWithView() {
findOperation("textCharJsonCharWithView");
- Assert.assertNull(operationMeta.ensureFindProduceProcessor("notSupport"));
+ Assertions.assertNull(operationMeta.ensureFindProduceProcessor("notSupport"));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java
index 01978e838..04ab59c92 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.servicecomb.common.rest.definition.RestParam;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import mockit.Mock;
@@ -38,7 +38,7 @@ public class PathVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("test", "abc");
pathVarParamWriter.write(pathBuilder, parameters);
- Assert.assertEquals("abc", pathBuilder.build());
+ Assertions.assertEquals("abc", pathBuilder.build());
}
@Test
@@ -49,7 +49,7 @@ public class PathVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("test", "a 20bc");
pathVarParamWriter.write(pathBuilder, parameters);
- Assert.assertEquals("a%2020bc", pathBuilder.build());
+ Assertions.assertEquals("a%2020bc", pathBuilder.build());
}
@Test
@@ -60,7 +60,7 @@ public class PathVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("test", "a%%bc");
pathVarParamWriter.write(pathBuilder, parameters);
- Assert.assertEquals("/api/a%25%25bc", pathBuilder.build());
+ Assertions.assertEquals("/api/a%25%25bc", pathBuilder.build());
}
@Test
@@ -71,7 +71,7 @@ public class PathVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("test", "a/bc");
pathVarParamWriter.write(pathBuilder, parameters);
- Assert.assertEquals("/api/a%2Fbc", pathBuilder.build());
+ Assertions.assertEquals("/api/a%2Fbc", pathBuilder.build());
}
@Test
@@ -81,7 +81,7 @@ public class PathVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("test", 12);
pathVarParamWriter.write(pathBuilder, parameters);
- Assert.assertEquals("12", pathBuilder.build());
+ Assertions.assertEquals("12", pathBuilder.build());
}
private PathVarParamWriter createPathVarParamWriter() {
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/QueryVarParamWriterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/QueryVarParamWriterTest.java
index 60c2561ba..915f43475 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/QueryVarParamWriterTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/QueryVarParamWriterTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.servicecomb.common.rest.definition.RestParam;
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -65,13 +65,13 @@ public class QueryVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("q", "a");
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a", stringBuilder.build());
+ Assertions.assertEquals("?q=a", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a", stringBuilder.build());
+ Assertions.assertEquals("?q=a", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a", stringBuilder.build());
+ Assertions.assertEquals("?q=a", stringBuilder.build());
}
@Test
@@ -80,13 +80,13 @@ public class QueryVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("test", null);
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
}
@Test
@@ -95,71 +95,71 @@ public class QueryVarParamWriterTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("q", new String[] {"ab", "cd", "ef"});
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab%2Ccd%2Cef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab%2Ccd%2Cef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
// encode space char
stringBuilder = new URLPathStringBuilder();
parameters.put("q", new String[] {"a b", " ", "", "ef"});
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a+b%2C+%2C%2Cef", stringBuilder.build());
+ Assertions.assertEquals("?q=a+b%2C+%2C%2Cef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
// pass blank string
stringBuilder = new URLPathStringBuilder();
parameters.put("q", new String[] {""});
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=", stringBuilder.build());
+ Assertions.assertEquals("?q=", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=", stringBuilder.build());
+ Assertions.assertEquals("?q=", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=", stringBuilder.build());
+ Assertions.assertEquals("?q=", stringBuilder.build());
// pass empty
stringBuilder = new URLPathStringBuilder();
parameters.put("q", new String[] {});
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
// pass null
parameters.put("q", new String[] {null});
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
parameters.put("q", new String[] {null, "ab", null, "cd", null, null, "", null, "ef", null});
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab%2Ccd%2C%2Cef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab%2Ccd%2C%2Cef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
}
@Test
@@ -169,70 +169,70 @@ public class QueryVarParamWriterTest {
parameters.put("q", queryList);
URLPathStringBuilder stringBuilder = new URLPathStringBuilder();
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab%2Ccd%2Cef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab%2Ccd%2Cef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=ef", stringBuilder.build());
// encode space char
parameters.put("q", Arrays.asList("a b", " ", "", "ef"));
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a+b%2C+%2C%2Cef", stringBuilder.build());
+ Assertions.assertEquals("?q=a+b%2C+%2C%2Cef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=a+b&q=+&q=&q=ef", stringBuilder.build());
// pass blank string
stringBuilder = new URLPathStringBuilder();
parameters.put("q", Collections.singletonList(""));
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=", stringBuilder.build());
+ Assertions.assertEquals("?q=", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=", stringBuilder.build());
+ Assertions.assertEquals("?q=", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=", stringBuilder.build());
+ Assertions.assertEquals("?q=", stringBuilder.build());
// pass empty
stringBuilder = new URLPathStringBuilder();
parameters.put("q", new ArrayList<>());
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
// pass null
parameters.put("q", Collections.singletonList(null));
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("", stringBuilder.build());
+ Assertions.assertEquals("", stringBuilder.build());
parameters.put("q", Arrays.asList(null, "ab", null, "cd", null, null, "", null, "ef", null));
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterCsv.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab%2Ccd%2C%2Cef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab%2Ccd%2C%2Cef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterMulti.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
stringBuilder = new URLPathStringBuilder();
queryVarParamWriterDefault.write(stringBuilder, parameters);
- Assert.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
+ Assertions.assertEquals("?q=ab&q=cd&q=&q=ef", stringBuilder.build());
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilderTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilderTest.java
index 90882c4ac..e864fb9f4 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilderTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilderTest.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.servicecomb.common.rest.definition.RestParam;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import io.swagger.models.parameters.Parameter;
@@ -45,9 +45,9 @@ public class URLPathBuilderTest {
parameters.put("p1", "abcPath");
parameters.put("q0", 11);
parameters.put("q1", "queryABC");
- Assert.assertEquals("/path/10/and/abcPath?q0=11&q1=queryABC",
+ Assertions.assertEquals("/path/10/and/abcPath?q0=11&q1=queryABC",
urlPathBuilder.createRequestPath(parameters));
- Assert.assertEquals("/path/10/and/abcPath",
+ Assertions.assertEquals("/path/10/and/abcPath",
urlPathBuilder.createPathString(parameters));
}
@@ -61,9 +61,9 @@ public class URLPathBuilderTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("p", "ab%% %cd%");
parameters.put("q", "ab%% %cd%");
- Assert.assertEquals("/path/ab%25%25%20%25cd%25?q=ab%25%25+%25cd%25",
+ Assertions.assertEquals("/path/ab%25%25%20%25cd%25?q=ab%25%25+%25cd%25",
urlPathBuilder.createRequestPath(parameters));
- Assert.assertEquals("/path/ab%25%25%20%25cd%25",
+ Assertions.assertEquals("/path/ab%25%25%20%25cd%25",
urlPathBuilder.createPathString(parameters));
}
@@ -77,19 +77,19 @@ public class URLPathBuilderTest {
Map<String, Object> parameters = new HashMap<>();
parameters.put("strArr", new Object[] {"a", "b", "c"});
parameters.put("intArr", new Object[] {1, 2, 3});
- Assert.assertEquals("/path?strArr=a&strArr=b&strArr=c&intArr=1&intArr=2&intArr=3",
+ Assertions.assertEquals("/path?strArr=a&strArr=b&strArr=c&intArr=1&intArr=2&intArr=3",
urlPathBuilder.createRequestPath(parameters));
parameters.put("strArr", new Object[] {});
parameters.put("intArr", new Object[] {1, 2, 3});
- Assert.assertEquals("/path?intArr=1&intArr=2&intArr=3",
+ Assertions.assertEquals("/path?intArr=1&intArr=2&intArr=3",
urlPathBuilder.createRequestPath(parameters));
parameters.put("strArr", new Object[] {"a", "b", "c"});
parameters.put("intArr", new Object[] {});
- Assert.assertEquals("/path?strArr=a&strArr=b&strArr=c",
+ Assertions.assertEquals("/path?strArr=a&strArr=b&strArr=c",
urlPathBuilder.createRequestPath(parameters));
parameters.put("strArr", new Object[] {});
parameters.put("intArr", new Object[] {});
- Assert.assertEquals("/path",
+ Assertions.assertEquals("/path",
urlPathBuilder.createRequestPath(parameters));
}
@@ -107,9 +107,9 @@ public class URLPathBuilderTest {
parameters.put("p1", "abcPath");
parameters.put("q0", 11);
parameters.put("q1", "queryABC");
- Assert.assertEquals("/path/10/and/abcPath?q0=11&q1=queryABC",
+ Assertions.assertEquals("/path/10/and/abcPath?q0=11&q1=queryABC",
urlPathBuilder.createRequestPath(parameters));
- Assert.assertEquals("/path/10/and/abcPath",
+ Assertions.assertEquals("/path/10/and/abcPath",
urlPathBuilder.createPathString(parameters));
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java
index 2fc9a55aa..80cc23705 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java
@@ -17,10 +17,9 @@
package org.apache.servicecomb.common.rest.definition.path;
-import static org.junit.Assert.assertEquals;
-
import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class URLPathStringBuilderTest {
@Test
@@ -28,27 +27,27 @@ public class URLPathStringBuilderTest {
URLPathStringBuilder builder = new URLPathStringBuilder();
builder.appendPath("/path");
builder.appendQuery("q", "abc");
- assertEquals("/path?q=abc", builder.build());
+ Assertions.assertEquals("/path?q=abc", builder.build());
}
@Test
public void appendPath() {
URLPathStringBuilder builder = new URLPathStringBuilder();
builder.appendPath("/abc");
- assertEquals("/abc", builder.build());
+ Assertions.assertEquals("/abc", builder.build());
builder.appendPath("/de fg");
- assertEquals("/abc/de fg", builder.build());
+ Assertions.assertEquals("/abc/de fg", builder.build());
}
@Test
public void appendQuery() {
URLPathStringBuilder builder = new URLPathStringBuilder();
- assertEquals("", builder.build());
+ Assertions.assertEquals("", builder.build());
builder.appendQuery("ab", "cd");
- assertEquals("?ab=cd", builder.build());
+ Assertions.assertEquals("?ab=cd", builder.build());
builder.appendQuery("ef", "");
- assertEquals("?ab=cd&ef=", builder.build());
+ Assertions.assertEquals("?ab=cd&ef=", builder.build());
builder.appendQuery("gh", "jk");
- assertEquals("?ab=cd&ef=&gh=jk", builder.build());
+ Assertions.assertEquals("?ab=cd&ef=&gh=jk", builder.build());
}
}
\ No newline at end of file
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java
index 34e790ff9..f945d73e6 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -33,7 +33,7 @@ public class TestHttpServerFilter {
HttpServerFilter filter = new HttpServerFilterBaseForTest();
CompletableFuture<Void> future = filter.beforeSendResponseAsync(null, null);
- Assert.assertNull(future.get());
+ Assertions.assertNull(future.get());
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
index 0d59a3b1f..1a45c4289 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
@@ -24,7 +24,7 @@ import java.util.concurrent.ExecutionException;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -52,7 +52,7 @@ public class TestHttpServerFilterBeforeSendResponseExecutor {
public void runSucc() throws InterruptedException, ExecutionException {
CompletableFuture<Void> result = executor.run();
- Assert.assertNull(result.get());
+ Assertions.assertNull(result.get());
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java
index 47a7f87f6..30d6a45a8 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java
@@ -29,7 +29,7 @@ import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.response.ResponsesMeta;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -83,7 +83,7 @@ public class TestServerRestArgsFilter {
}
};
- Assert.assertNull(filter.beforeSendResponseAsync(invocation, responseEx));
- Assert.assertTrue(invokedSendPart);
+ Assertions.assertNull(filter.beforeSendResponseAsync(invocation, responseEx));
+ Assertions.assertTrue(invokedSendPart);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
index 6841a1725..d1be85e94 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
@@ -25,7 +25,7 @@ import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.junit.AfterClass;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -59,10 +59,10 @@ public class TestMicroservicePaths {
@Test
public void staticGroup() {
RestOperationMeta meta = paths.getStaticPathOperationMap().get("/static/").findValue("POST");
- Assert.assertSame("postStatic", meta.getOperationMeta().getOperationId());
+ Assertions.assertSame("postStatic", meta.getOperationMeta().getOperationId());
meta = paths.getStaticPathOperationMap().get("/static/").findValue("GET");
- Assert.assertSame("getStatic", meta.getOperationMeta().getOperationId());
+ Assertions.assertSame("getStatic", meta.getOperationMeta().getOperationId());
}
@Test
@@ -85,8 +85,8 @@ public class TestMicroservicePaths {
@Test
public void dynamicPath() {
- Assert.assertEquals("dynamicExId", paths.getDynamicPathOperationList().get(0).getOperationMeta().getOperationId());
- Assert.assertEquals("dynamicId", paths.getDynamicPathOperationList().get(1).getOperationMeta().getOperationId());
+ Assertions.assertEquals("dynamicExId", paths.getDynamicPathOperationList().get(0).getOperationMeta().getOperationId());
+ Assertions.assertEquals("dynamicId", paths.getDynamicPathOperationList().get(1).getOperationMeta().getOperationId());
}
@Test
@@ -97,7 +97,7 @@ public class TestMicroservicePaths {
StringBuilder sb = new StringBuilder();
collector.getEvents().stream()
.forEach(e -> sb.append(e.getMessage()).append("\n"));
- Assert.assertEquals(
+ Assertions.assertEquals(
"Swagger mapped \"{[/static/], method=[POST], produces=[application/json]}\" onto public void org.apache.servicecomb.common.rest.locator.TestPathSchema.postStatic()\n"
+ "Swagger mapped \"{[/static/], method=[GET], produces=[application/json]}\" onto public void org.apache.servicecomb.common.rest.locator.TestPathSchema.getStatic()\n"
+ "Swagger mapped \"{[/staticEx/], method=[GET], produces=[application/json]}\" onto public void org.apache.servicecomb.common.rest.locator.TestPathSchema.getStaticEx()\n"
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
index 99ec24a19..7f89e1099 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestServicePathManager.java
@@ -24,7 +24,7 @@ import org.apache.servicecomb.foundation.common.utils.ClassLoaderScopeContext;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.junit.After;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +47,7 @@ public class TestServicePathManager {
.run();
ServicePathManager spm = ServicePathManager.getServicePathManager(scbEngine.getProducerMicroserviceMeta());
- Assert.assertSame(spm.producerPaths, spm.swaggerPaths);
+ Assertions.assertSame(spm.producerPaths, spm.swaggerPaths);
scbEngine.destroy();
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java
index 7005eaaba..66ec64924 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java
@@ -30,7 +30,7 @@ import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
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.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,11 +50,11 @@ public class TestClassPathStaticResourceHandler {
Part part = response.getResult();
try (InputStream is = part.getInputStream()) {
- Assert.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).endsWith("<html></html>"));
+ Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).endsWith("<html></html>"));
}
- Assert.assertEquals("text/html", part.getContentType());
- Assert.assertEquals("text/html", response.getHeader(HttpHeaders.CONTENT_TYPE));
- Assert.assertEquals("inline", response.getHeader(HttpHeaders.CONTENT_DISPOSITION));
+ Assertions.assertEquals("text/html", part.getContentType());
+ Assertions.assertEquals("text/html", response.getHeader(HttpHeaders.CONTENT_TYPE));
+ Assertions.assertEquals("inline", response.getHeader(HttpHeaders.CONTENT_DISPOSITION));
}
@Test
@@ -62,11 +62,11 @@ public class TestClassPathStaticResourceHandler {
Response response = handler.handle("notExist.html");
InvocationException invocationException = response.getResult();
- Assert.assertEquals(Status.NOT_FOUND, invocationException.getStatus());
- Assert.assertEquals(Status.NOT_FOUND.getReasonPhrase(),
+ Assertions.assertEquals(Status.NOT_FOUND, invocationException.getStatus());
+ Assertions.assertEquals(Status.NOT_FOUND.getReasonPhrase(),
((CommonExceptionData) invocationException.getErrorData()).getMessage());
- Assert.assertEquals(404, response.getStatusCode());
- Assert.assertEquals("Not Found", response.getReasonPhrase());
+ Assertions.assertEquals(404, response.getStatusCode());
+ Assertions.assertEquals("Not Found", response.getReasonPhrase());
}
@Test
@@ -74,11 +74,11 @@ public class TestClassPathStaticResourceHandler {
Response response = handler.handle("../microservice.yaml");
InvocationException invocationException = response.getResult();
- Assert.assertEquals(Status.NOT_FOUND, invocationException.getStatus());
- Assert.assertEquals(Status.NOT_FOUND.getReasonPhrase(),
+ Assertions.assertEquals(Status.NOT_FOUND, invocationException.getStatus());
+ Assertions.assertEquals(Status.NOT_FOUND.getReasonPhrase(),
((CommonExceptionData) invocationException.getErrorData()).getMessage());
- Assert.assertEquals(404, response.getStatusCode());
- Assert.assertEquals("Not Found", response.getReasonPhrase());
+ Assertions.assertEquals(404, response.getStatusCode());
+ Assertions.assertEquals("Not Found", response.getReasonPhrase());
}
@Test
@@ -93,15 +93,15 @@ public class TestClassPathStaticResourceHandler {
try (LogCollector logCollector = new LogCollector()) {
Response response = handler.handle("index.html");
- Assert.assertEquals("failed to process static resource, path=web-root/index.html",
+ Assertions.assertEquals("failed to process static resource, path=web-root/index.html",
logCollector.getLastEvents().getMessage());
InvocationException invocationException = response.getResult();
- Assert.assertEquals(Status.INTERNAL_SERVER_ERROR, invocationException.getStatus());
- Assert.assertEquals("failed to process static resource.",
+ Assertions.assertEquals(Status.INTERNAL_SERVER_ERROR, invocationException.getStatus());
+ Assertions.assertEquals("failed to process static resource.",
((CommonExceptionData) invocationException.getErrorData()).getMessage());
- Assert.assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode());
- Assert.assertEquals(Status.INTERNAL_SERVER_ERROR.getReasonPhrase(), response.getReasonPhrase());
+ Assertions.assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode());
+ Assertions.assertEquals(Status.INTERNAL_SERVER_ERROR.getReasonPhrase(), response.getReasonPhrase());
}
}
}