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/17 07:38:32 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 providers part 1 (#2832)
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 4d0f60a64 [SCB-2475] migrate to junit5 providers part 1 (#2832)
4d0f60a64 is described below
commit 4d0f60a64276bd1c3297bc50f363265a01de7cef
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Tue May 17 15:38:27 2022 +0800
[SCB-2475] migrate to junit5 providers part 1 (#2832)
---
.../servicecomb/provider/pojo/TestInvoker.java | 16 +++--
.../provider/pojo/TestPojoProducerProvider.java | 66 ---------------------
.../pojo/instance/TestPojoInstanceFactory.java | 16 ++---
.../pojo/instance/TestSpringInstanceFactory.java | 12 ++--
.../pojo/reference/PojoReferenceMetaTest.java | 11 ++--
.../pojo/reference/TestRpcReferenceProcessor.java | 16 ++---
.../provider/pojo/schema/TestPojoProducers.java | 21 ++++---
.../provider/pojo/schema/TestPojoSchemaMeta.java | 8 +--
.../common/TestInvocationToHttpServletRequest.java | 48 +++++++--------
.../common/TestProducerHttpRequestArgMapper.java | 6 +-
.../rest/common/TestRestConsumerProvider.java | 6 +-
.../provider/rest/common/TestRestProducers.java | 12 ++--
.../rest/common/TestRestServiceProvider.java | 4 +-
.../reference/TestCommonToHttpServletRequest.java | 68 +++++++++++-----------
.../reference/TestCseClientHttpRequest.java | 6 +-
.../reference/TestCseClientHttpRequestFactory.java | 8 +--
.../reference/TestCseClientHttpResponse.java | 14 ++---
.../springmvc/reference/TestCseHttpEntity.java | 12 ++--
.../reference/TestCseRequestCallback.java | 6 +-
.../springmvc/reference/TestCseRestTemplate.java | 12 ++--
.../reference/TestCseUriTemplateHandler.java | 10 ++--
.../springmvc/reference/TestRequestMeta.java | 14 ++---
.../TestRestTemplateCopyHeaderFilter.java | 16 ++---
.../reference/TestRestTemplateWrapper.java | 1 -
...WithProviderPrefixClientHttpRequestFactory.java | 6 +-
...UrlWithServiceNameClientHttpRequestFactory.java | 6 +-
.../CseAsyncClientHttpRequestFactoryTest.java | 6 +-
.../async/CseAsyncClientHttpRequestTest.java | 6 +-
.../async/CseAsyncRequestCallbackTest.java | 10 ++--
.../reference/async/CseAsyncRestTemplateTest.java | 8 +--
30 files changed, 187 insertions(+), 264 deletions(-)
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java
index 6f3f3fc9c..c89cd68fc 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java
@@ -17,11 +17,7 @@
package org.apache.servicecomb.provider.pojo;
-import java.io.File;
-import java.lang.reflect.Method;
-
-import javax.servlet.http.Part;
-
+import com.fasterxml.jackson.databind.JavaType;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
@@ -29,18 +25,20 @@ import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.http.ReadStreamPart;
import org.apache.servicecomb.registry.DiscoveryManager;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
-import com.fasterxml.jackson.databind.JavaType;
+import javax.servlet.http.Part;
+import java.io.File;
+import java.lang.reflect.Method;
public class TestInvoker {
public interface DownloadIntf {
ReadStreamPart download();
}
- public class DownloadSchema {
+ public static class DownloadSchema {
public File download() {
return null;
}
@@ -69,7 +67,7 @@ public class TestInvoker {
Method method = DownloadIntf.class.getMethod("download");
JavaType javaType = refresher.getLatestMeta().ensureFindOperationMeta(method).getResponsesType();
- Assert.assertSame(Part.class, javaType.getRawClass());
+ Assertions.assertSame(Part.class, javaType.getRawClass());
scbEngine.destroy();
}
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestPojoProducerProvider.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestPojoProducerProvider.java
deleted file mode 100644
index 2535629b1..000000000
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestPojoProducerProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.provider.pojo;
-
-public class TestPojoProducerProvider {
-// @Test
-// public void testPojoProducerProviderAlreadyInited(@Injectable PojoProducers producers,
-// @Injectable PojoProducerMeta meta, @Mocked RegistryUtils utils,
-// @Injectable Microservice service) throws Exception {
-// List<PojoProducerMeta> producersMeta = new ArrayList<>();
-// producersMeta.add(meta);
-// Person bean = new Person();
-// new Expectations() {
-// {
-// producers.getProducers();
-// result = producersMeta;
-// meta.getInstance();
-// result = bean;
-// }
-// };
-// PojoProducerProvider provider = new PojoProducerProvider();
-// Deencapsulation.setField(provider, "producerSchemaFactory", factory);
-// Deencapsulation.setField(provider, "pojoProducers", producers);
-// provider.init();
-// // expectations done in Expectations
-// }
-//
-// @Test
-// public void testPojoProducerProvider(@Injectable ProducerSchemaFactory factory,
-// @Injectable PojoProducers producers, @Injectable PojoProducerMeta meta, @Mocked RegistryUtils utils,
-// @Injectable Microservice service) throws Exception {
-// List<PojoProducerMeta> producersMeta = new ArrayList<>();
-// producersMeta.add(meta);
-// new Expectations() {
-// {
-// producers.getProducers();
-// result = producersMeta;
-// meta.getInstance();
-// result = null;
-// meta.getImplementation();
-// result = "pojo:org.apache.servicecomb.provider.pojo.Person";
-// }
-// };
-// PojoProducerProvider provider = new PojoProducerProvider();
-// Deencapsulation.setField(provider, "producerSchemaFactory", factory);
-// Deencapsulation.setField(provider, "pojoProducers", producers);
-// provider.init();
-// Assert.assertEquals(provider.getName(), "pojo");
-// // expectations done in Expectations
-// }
-}
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestPojoInstanceFactory.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestPojoInstanceFactory.java
index 57143094d..489451ef5 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestPojoInstanceFactory.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestPojoInstanceFactory.java
@@ -18,29 +18,25 @@
package org.apache.servicecomb.provider.pojo.instance;
import org.apache.servicecomb.provider.pojo.PojoConst;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestPojoInstanceFactory {
@Test
- public void testInitException()
- throws Exception {
-
+ public void testInitException() {
PojoInstanceFactory lPojoInstanceFactory = new PojoInstanceFactory();
try {
lPojoInstanceFactory.create("TestPojoInstanceFactory");
} catch (Error e) {
- Assert.assertEquals("Fail to create instance of class:TestPojoInstanceFactory", e.getMessage());
+ Assertions.assertEquals("Fail to create instance of class:TestPojoInstanceFactory", e.getMessage());
}
}
@Test
- public void testInit()
- throws Exception {
-
+ public void testInit() {
PojoInstanceFactory lPojoInstanceFactory = new PojoInstanceFactory();
lPojoInstanceFactory.create("org.apache.servicecomb.provider.pojo.instance.TestPojoInstanceFactory");
- Assert.assertEquals(PojoConst.POJO, lPojoInstanceFactory.getImplName());
+ Assertions.assertEquals(PojoConst.POJO, lPojoInstanceFactory.getImplName());
}
}
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestSpringInstanceFactory.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestSpringInstanceFactory.java
index 2b178170b..1bee70be7 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestSpringInstanceFactory.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/instance/TestSpringInstanceFactory.java
@@ -19,32 +19,30 @@ package org.apache.servicecomb.provider.pojo.instance;
import org.apache.servicecomb.provider.common.MockUtil;
import org.apache.servicecomb.provider.pojo.PojoConst;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestSpringInstanceFactory {
@Test
- public void testInitException()
- throws Exception {
+ public void testInitException() {
SpringInstanceFactory lSpringInstanceFactory = new SpringInstanceFactory();
MockUtil.getInstance().mockBeanUtils();
try {
lSpringInstanceFactory.create("TestSpringInstanceFactory");
} catch (Error e) {
- Assert.assertEquals("Fail to find bean:TestSpringInstanceFactory", e.getMessage());
+ Assertions.assertEquals("Fail to find bean:TestSpringInstanceFactory", e.getMessage());
}
}
@Test
- public void testInit()
- throws Exception {
+ public void testInit() {
SpringInstanceFactory lSpringInstanceFactory = new SpringInstanceFactory();
MockUtil.getInstance().mockBeanUtils();
MockUtil.getInstance().mockBeanUtilsObject();
lSpringInstanceFactory.create("org.apache.servicecomb.provider.pojo.instance.TestPojoInstanceFactory");
- Assert.assertEquals(PojoConst.SPRING, lSpringInstanceFactory.getImplName());
+ Assertions.assertEquals(PojoConst.SPRING, lSpringInstanceFactory.getImplName());
}
}
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
index 5b59cc509..16f52e2a9 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/PojoReferenceMetaTest.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.provider.pojo.reference;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.SCBEngine;
@@ -28,9 +27,9 @@ import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.provider.pojo.IPerson;
import org.hamcrest.MatcherAssert;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class PojoReferenceMetaTest {
@Before
@@ -53,9 +52,9 @@ public class PojoReferenceMetaTest {
pojoReferenceMeta.setConsumerIntf(IPerson.class);
pojoReferenceMeta.afterPropertiesSet();
- Assert.assertEquals(IPerson.class, pojoReferenceMeta.getObjectType());
+ Assertions.assertEquals(IPerson.class, pojoReferenceMeta.getObjectType());
MatcherAssert.assertThat(pojoReferenceMeta.getProxy(), instanceOf(IPerson.class));
- Assert.assertTrue(pojoReferenceMeta.isSingleton());
+ Assertions.assertTrue(pojoReferenceMeta.isSingleton());
scbEngine.destroy();
}
@@ -68,9 +67,9 @@ public class PojoReferenceMetaTest {
try {
pojoReferenceMeta.afterPropertiesSet();
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (ServiceCombException e) {
- Assert.assertEquals(
+ Assertions.assertEquals(
"microserviceName=test, schemaid=schemaId, \n"
+ "do not support implicit interface anymore, \n"
+ "because that caused problems:\n"
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
index 2cb357788..8aba481e7 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/reference/TestRpcReferenceProcessor.java
@@ -25,9 +25,9 @@ import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
import org.apache.servicecomb.provider.pojo.Person;
import org.apache.servicecomb.provider.pojo.PersonReference;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.context.ApplicationContext;
import mockit.Injectable;
@@ -48,7 +48,7 @@ public class TestRpcReferenceProcessor {
@Test
public void postProcessAfterInitialization() {
Object bean = new Object();
- Assert.assertSame(bean, consumers.postProcessAfterInitialization(bean, "test"));
+ Assertions.assertSame(bean, consumers.postProcessAfterInitialization(bean, "test"));
}
@Test
@@ -57,12 +57,12 @@ public class TestRpcReferenceProcessor {
PersonReference bean = new PersonReference();
- Assert.assertNull(bean.person);
+ Assertions.assertNull(bean.person);
consumers.setEmbeddedValueResolver((strVal) -> strVal);
- Assert.assertSame(bean, consumers.postProcessBeforeInitialization(bean, "id"));
+ Assertions.assertSame(bean, consumers.postProcessBeforeInitialization(bean, "id"));
- Assert.assertNotNull(bean.person);
+ Assertions.assertNotNull(bean.person);
scbEngine.destroy();
}
@@ -71,11 +71,11 @@ public class TestRpcReferenceProcessor {
public void testNoReference(@Injectable ApplicationContext applicationContext) {
Person bean = new Person();
- Assert.assertNull(bean.name);
+ Assertions.assertNull(bean.name);
- Assert.assertSame(bean, consumers.postProcessBeforeInitialization(bean, "id"));
+ Assertions.assertSame(bean, consumers.postProcessBeforeInitialization(bean, "id"));
- Assert.assertNull(bean.name);
+ Assertions.assertNull(bean.name);
}
@Test
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoProducers.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoProducers.java
index f9aa23d12..14c7500d1 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoProducers.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoProducers.java
@@ -17,15 +17,14 @@
package org.apache.servicecomb.provider.pojo.schema;
+import mockit.Expectations;
+import mockit.Injectable;
import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
import org.apache.servicecomb.provider.pojo.IPerson;
import org.apache.servicecomb.provider.pojo.Person;
import org.apache.servicecomb.provider.pojo.RpcSchema;
-import org.junit.Assert;
import org.junit.Test;
-
-import mockit.Expectations;
-import mockit.Injectable;
+import org.junit.jupiter.api.Assertions;
public class TestPojoProducers {
PojoProducers producer = new PojoProducers();
@@ -33,22 +32,22 @@ public class TestPojoProducers {
@Test
public void postProcessBeforeInitialization() {
Object bean = new Object();
- Assert.assertSame(bean, producer.postProcessBeforeInitialization(bean, "test"));
+ Assertions.assertSame(bean, producer.postProcessBeforeInitialization(bean, "test"));
}
@Test
public void testPojoProducers() {
Person bean = new Person();
- Assert.assertSame(bean, producer.postProcessAfterInitialization(bean, "test"));
- Assert.assertEquals(producer.getProducerMetas().size(), 1);
+ Assertions.assertSame(bean, producer.postProcessAfterInitialization(bean, "test"));
+ Assertions.assertEquals(producer.getProducerMetas().size(), 1);
}
@Test
public void testPojoProducersSchemaNull(@Injectable RpcSchema schema) {
IPerson bean = new IPerson() {
};
- Assert.assertSame(bean, producer.postProcessAfterInitialization(bean, "test"));
- Assert.assertEquals(producer.getProducerMetas().size(), 0);
+ Assertions.assertSame(bean, producer.postProcessAfterInitialization(bean, "test"));
+ Assertions.assertEquals(producer.getProducerMetas().size(), 0);
}
@RpcSchema
@@ -63,8 +62,8 @@ public class TestPojoProducers {
{
}
};
- Assert.assertSame(bean, producer.postProcessAfterInitialization(bean, "test"));
- Assert.assertEquals(producer.getProducerMetas().size(), 1);
+ Assertions.assertSame(bean, producer.postProcessAfterInitialization(bean, "test"));
+ Assertions.assertEquals(producer.getProducerMetas().size(), 1);
}
@Test
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoSchemaMeta.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoSchemaMeta.java
index cb0a63bd5..6bc0c2f0c 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoSchemaMeta.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/schema/TestPojoSchemaMeta.java
@@ -18,12 +18,12 @@
package org.apache.servicecomb.provider.pojo.schema;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Deencapsulation;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestPojoSchemaMeta {
@@ -47,7 +47,7 @@ public class TestPojoSchemaMeta {
lPojoSchemaMeta.setImplementation("implementation");
Deencapsulation.setField(lPojoSchemaMeta, "pojoProducers", producers);
lPojoSchemaMeta.afterPropertiesSet();
- Assert.assertEquals("implementation", lPojoSchemaMeta.getImplementation());
+ Assertions.assertEquals("implementation", lPojoSchemaMeta.getImplementation());
}
@Test
@@ -55,13 +55,13 @@ public class TestPojoSchemaMeta {
throws Exception {
Object lObject = new Object();
lPojoSchemaMeta.setInstance(lObject);
- Assert.assertEquals(lObject, lPojoSchemaMeta.getInstance());
+ Assertions.assertEquals(lObject, lPojoSchemaMeta.getInstance());
}
@Test
public void testGetSchemaId()
throws Exception {
lPojoSchemaMeta.setSchemaId("schemaId");
- Assert.assertEquals("schemaId", lPojoSchemaMeta.getSchemaId());
+ Assertions.assertEquals("schemaId", lPojoSchemaMeta.getSchemaId());
}
}
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java
index 1b2e7296c..f94a0ef76 100644
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java
+++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java
@@ -34,13 +34,13 @@ import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import io.vertx.core.net.SocketAddress;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestInvocationToHttpServletRequest {
@Mocked
@@ -92,7 +92,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertNull(request.getParameter("name"));
+ Assertions.assertNull(request.getParameter("name"));
}
@Test
@@ -106,7 +106,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertNull(request.getParameter("name"));
+ Assertions.assertNull(request.getParameter("name"));
}
@Test
@@ -120,7 +120,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertEquals("value", request.getParameter("name"));
+ Assertions.assertEquals("value", request.getParameter("name"));
}
@Test
@@ -132,7 +132,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertNull(request.getParameterValues("name"));
+ Assertions.assertNull(request.getParameterValues("name"));
}
@Test
@@ -183,7 +183,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertEquals("value", request.getHeader("name"));
+ Assertions.assertEquals("value", request.getHeader("name"));
}
@Test
@@ -197,7 +197,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertEquals(-1, request.getIntHeader("name"));
+ Assertions.assertEquals(-1, request.getIntHeader("name"));
}
@Test
@@ -213,9 +213,9 @@ public class TestInvocationToHttpServletRequest {
try {
request.getIntHeader("name");
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (NumberFormatException e) {
- Assert.assertEquals("For input string: \"value\"", e.getMessage());
+ Assertions.assertEquals("For input string: \"value\"", e.getMessage());
}
}
@@ -230,7 +230,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertEquals(1, request.getIntHeader("name"));
+ Assertions.assertEquals(1, request.getIntHeader("name"));
}
@Test
@@ -242,7 +242,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertEquals("GET", request.getMethod());
+ Assertions.assertEquals("GET", request.getMethod());
}
@Test
@@ -256,7 +256,7 @@ public class TestInvocationToHttpServletRequest {
}
};
- Assert.assertEquals("/path", request.getPathInfo());
+ Assertions.assertEquals("/path", request.getPathInfo());
}
@Test
@@ -272,10 +272,10 @@ public class TestInvocationToHttpServletRequest {
try {
request.getPathInfo();
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (ServiceCombException e) {
- Assert.assertEquals("Failed to get path info.", e.getMessage());
- Assert.assertEquals("error", e.getCause().getMessage());
+ Assertions.assertEquals("Failed to get path info.", e.getMessage());
+ Assertions.assertEquals("error", e.getCause().getMessage());
}
}
@@ -294,9 +294,9 @@ public class TestInvocationToHttpServletRequest {
String addr = request.getRemoteAddr();
String host = request.getRemoteHost();
int port = request.getRemotePort();
- Assert.assertEquals(addr, "127.0.0.2");
- Assert.assertEquals(host, "127.0.0.2");
- Assert.assertEquals(port, 8088);
+ Assertions.assertEquals(addr, "127.0.0.2");
+ Assertions.assertEquals(host, "127.0.0.2");
+ Assertions.assertEquals(port, 8088);
}
@Test
@@ -316,24 +316,24 @@ public class TestInvocationToHttpServletRequest {
String addr = request.getRemoteAddr();
String host = request.getRemoteHost();
int port = request.getRemotePort();
- Assert.assertEquals(addr, "");
- Assert.assertEquals(host, "");
- Assert.assertEquals(port, 0);
+ Assertions.assertEquals(addr, "");
+ Assertions.assertEquals(host, "");
+ Assertions.assertEquals(port, 0);
}
@Test
public void testGetContextPath(@Mocked Invocation invocation) throws Exception {
InvocationToHttpServletRequest request = new InvocationToHttpServletRequest(invocation);
- Assert.assertEquals("", request.getContextPath());
+ Assertions.assertEquals("", request.getContextPath());
}
@Test
public void getContentType() {
- Assert.assertNull(request.getContentType());
+ Assertions.assertNull(request.getContentType());
}
@Test
public void getCharacterEncoding() {
- Assert.assertNull(request.getCharacterEncoding());
+ Assertions.assertNull(request.getCharacterEncoding());
}
}
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
index 8d3626f3f..e16ef6c53 100644
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
+++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
@@ -26,11 +26,11 @@ import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.definition.OperationMeta;
-import org.junit.Assert;
import org.junit.Test;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestProducerHttpRequestArgMapper {
@Mocked
@@ -50,7 +50,7 @@ public class TestProducerHttpRequestArgMapper {
}
};
- Assert.assertSame(request, mapper.createContextArg(invocation));
+ Assertions.assertSame(request, mapper.createContextArg(invocation));
}
@Test
@@ -69,6 +69,6 @@ public class TestProducerHttpRequestArgMapper {
}
};
- Assert.assertEquals(InvocationToHttpServletRequest.class, mapper.createContextArg(invocation).getClass());
+ Assertions.assertEquals(InvocationToHttpServletRequest.class, mapper.createContextArg(invocation).getClass());
}
}
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestConsumerProvider.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestConsumerProvider.java
index d630645d2..4f7109946 100644
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestConsumerProvider.java
+++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestConsumerProvider.java
@@ -18,8 +18,8 @@
package org.apache.servicecomb.provider.rest.common;
import org.apache.servicecomb.common.rest.RestConst;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestRestConsumerProvider {
@@ -27,6 +27,6 @@ public class TestRestConsumerProvider {
public void testInit() throws Exception {
RestConsumerProvider instance = new RestConsumerProvider();
instance.init();
- Assert.assertEquals(RestConst.REST, instance.getName());
+ Assertions.assertEquals(RestConst.REST, instance.getName());
}
}
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
index 2416e67fe..1d276ea5e 100644
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
+++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
@@ -18,8 +18,8 @@
package org.apache.servicecomb.provider.rest.common;
import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestRestProducers {
@RestSchema(schemaId = "test")
@@ -31,21 +31,21 @@ public class TestRestProducers {
@Test
public void postProcessBeforeInitialization() {
Object bean = new Object();
- Assert.assertSame(bean, producer.postProcessBeforeInitialization(bean, "test"));
+ Assertions.assertSame(bean, producer.postProcessBeforeInitialization(bean, "test"));
}
@Test
public void postProcessAfterInitializationNormal() {
RestSchemaForTest bean = new RestSchemaForTest();
- Assert.assertSame(bean, producer.postProcessAfterInitialization(bean, ""));
- Assert.assertEquals(1, producer.getProducerMetaList().size());
+ Assertions.assertSame(bean, producer.postProcessAfterInitialization(bean, ""));
+ Assertions.assertEquals(1, producer.getProducerMetaList().size());
}
@Test
public void postProcessAfterInitializationNoAnnotation() {
Object bean = new Object();
- Assert.assertSame(bean, producer.postProcessAfterInitialization(bean, ""));
- Assert.assertEquals(0, producer.getProducerMetaList().size());
+ Assertions.assertSame(bean, producer.postProcessAfterInitialization(bean, ""));
+ Assertions.assertEquals(0, producer.getProducerMetaList().size());
}
@Test
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
index 66536cba5..6c5a77224 100644
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
+++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
@@ -19,8 +19,8 @@ package org.apache.servicecomb.provider.rest.common;
import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.context.ApplicationContext;
import mockit.Expectations;
@@ -40,6 +40,6 @@ public class TestRestServiceProvider {
RestProducerProvider restProducerProvider = new RestProducerProvider();
restProducerProvider.init();
- Assert.assertEquals(RestConst.REST, restProducerProvider.getName());
+ Assertions.assertEquals(RestConst.REST, restProducerProvider.getName());
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java
index bfc8aa8c4..ab9bf59ee 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java
@@ -36,8 +36,8 @@ import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestCommonToHttpServletRequest {
@Test
@@ -45,8 +45,8 @@ public class TestCommonToHttpServletRequest {
Map<String, Object> forms = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, null, forms, true);
- Assert.assertEquals(null, request.getAttribute(RestConst.BODY_PARAMETER));
- Assert.assertEquals(forms, request.getAttribute(RestConst.FORM_PARAMETERS));
+ Assertions.assertNull(request.getAttribute(RestConst.BODY_PARAMETER));
+ Assertions.assertEquals(forms, request.getAttribute(RestConst.FORM_PARAMETERS));
}
@Test
@@ -54,8 +54,8 @@ public class TestCommonToHttpServletRequest {
Object body = new Object();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, null, body, false);
- Assert.assertEquals(null, request.getAttribute(RestConst.FORM_PARAMETERS));
- Assert.assertEquals(body, request.getAttribute(RestConst.BODY_PARAMETER));
+ Assertions.assertNull(request.getAttribute(RestConst.FORM_PARAMETERS));
+ Assertions.assertEquals(body, request.getAttribute(RestConst.BODY_PARAMETER));
}
@Test
@@ -64,9 +64,9 @@ public class TestCommonToHttpServletRequest {
fileKeys.add("test1");
fileKeys.add("test2");
HttpServletRequest request = new CommonToHttpServletRequest(null, null, null, null, false, fileKeys);
- Assert.assertEquals(2, ((CommonToHttpServletRequest) request).getFileKeys().size());
- Assert.assertEquals("test1", ((CommonToHttpServletRequest) request).getFileKeys().get(0));
- Assert.assertEquals("test2", ((CommonToHttpServletRequest) request).getFileKeys().get(1));
+ Assertions.assertEquals(2, ((CommonToHttpServletRequest) request).getFileKeys().size());
+ Assertions.assertEquals("test1", ((CommonToHttpServletRequest) request).getFileKeys().get(0));
+ Assertions.assertEquals("test2", ((CommonToHttpServletRequest) request).getFileKeys().get(1));
}
@Test
@@ -74,7 +74,7 @@ public class TestCommonToHttpServletRequest {
Map<String, String> pathParams = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(pathParams, null, null, null, false);
- Assert.assertEquals(pathParams, request.getAttribute(RestConst.PATH_PARAMETERS));
+ Assertions.assertEquals(pathParams, request.getAttribute(RestConst.PATH_PARAMETERS));
}
@Test
@@ -83,7 +83,7 @@ public class TestCommonToHttpServletRequest {
httpHeaders.put(HttpHeaders.CONTENT_TYPE, Arrays.asList("json"));
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertEquals("json", request.getContentType());
+ Assertions.assertEquals("json", request.getContentType());
}
@Test
@@ -92,7 +92,7 @@ public class TestCommonToHttpServletRequest {
queryParams.put("name", Arrays.asList("value"));
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assert.assertEquals("value", request.getParameter("name"));
+ Assertions.assertEquals("value", request.getParameter("name"));
}
@Test
@@ -101,7 +101,7 @@ public class TestCommonToHttpServletRequest {
queryParams.put("name", Arrays.asList());
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assert.assertEquals(null, request.getParameter("name"));
+ Assertions.assertEquals(null, request.getParameter("name"));
}
@Test
@@ -109,7 +109,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> queryParams = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assert.assertEquals(null, request.getParameter("name"));
+ Assertions.assertEquals(null, request.getParameter("name"));
}
@Test
@@ -127,7 +127,7 @@ public class TestCommonToHttpServletRequest {
queryParams.put("name", Arrays.asList());
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assert.assertArrayEquals(new String[0], request.getParameterValues("name"));
+ Assertions.assertArrayEquals(new String[0], request.getParameterValues("name"));
}
@Test
@@ -135,7 +135,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> queryParams = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assert.assertArrayEquals(new String[0], request.getParameterValues("name"));
+ Assertions.assertArrayEquals(new String[0], request.getParameterValues("name"));
}
@Test
@@ -144,7 +144,7 @@ public class TestCommonToHttpServletRequest {
httpHeaders.put("name", Arrays.asList("value"));
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertEquals("value", request.getHeader("name"));
+ Assertions.assertEquals("value", request.getHeader("name"));
}
@Test
@@ -153,7 +153,7 @@ public class TestCommonToHttpServletRequest {
httpHeaders.put("name", Arrays.asList());
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertEquals(null, request.getHeader("name"));
+ Assertions.assertEquals(null, request.getHeader("name"));
}
@Test
@@ -170,7 +170,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> httpHeaders = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertFalse(request.getHeaderNames().hasMoreElements());
+ Assertions.assertFalse(request.getHeaderNames().hasMoreElements());
}
@Test
@@ -178,7 +178,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> httpHeaders = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertEquals(null, request.getHeader("name"));
+ Assertions.assertEquals(null, request.getHeader("name"));
}
@Test
@@ -196,7 +196,7 @@ public class TestCommonToHttpServletRequest {
httpHeaders.put("name", Arrays.asList());
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertFalse(request.getHeaders("name").hasMoreElements());
+ Assertions.assertFalse(request.getHeaders("name").hasMoreElements());
}
@Test
@@ -204,7 +204,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> httpHeaders = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertFalse(request.getHeaders("name").hasMoreElements());
+ Assertions.assertFalse(request.getHeaders("name").hasMoreElements());
}
@Test
@@ -212,7 +212,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> httpHeaders = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assert.assertEquals(0, request.getCookies().length);
+ Assertions.assertEquals(0, request.getCookies().length);
}
@Test
@@ -222,16 +222,16 @@ public class TestCommonToHttpServletRequest {
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
Cookie[] cookies = request.getCookies();
- Assert.assertSame(cookies, request.getCookies());
- Assert.assertEquals(1, cookies.length);
- Assert.assertEquals("k1", cookies[0].getName());
- Assert.assertEquals("v1", cookies[0].getValue());
+ Assertions.assertSame(cookies, request.getCookies());
+ Assertions.assertEquals(1, cookies.length);
+ Assertions.assertEquals("k1", cookies[0].getName());
+ Assertions.assertEquals("v1", cookies[0].getValue());
}
@Test
public void testGetInputStream() throws IOException {
HttpServletRequest request = new CommonToHttpServletRequest(null, null, null, null, false);
- Assert.assertNull(request.getInputStream());
+ Assertions.assertNull(request.getInputStream());
}
@Test
@@ -240,7 +240,7 @@ public class TestCommonToHttpServletRequest {
HttpServletRequestEx request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
request.setHeader("name", "v1");
request.setHeader("name", "v2");
- Assert.assertEquals("v2", request.getHeader("name"));
+ Assertions.assertEquals("v2", request.getHeader("name"));
}
@Test
@@ -272,13 +272,13 @@ public class TestCommonToHttpServletRequest {
try {
Collection<Part> tmpParts = request.getParts();
ArrayList<Part> parts = new ArrayList<>(tmpParts);
- Assert.assertEquals(4, parts.size());
- Assert.assertEquals("test1", parts.get(0).getName());
- Assert.assertEquals("test1", parts.get(1).getName());
- Assert.assertEquals("test2", parts.get(2).getName());
- Assert.assertEquals("test2", parts.get(3).getName());
+ Assertions.assertEquals(4, parts.size());
+ Assertions.assertEquals("test1", parts.get(0).getName());
+ Assertions.assertEquals("test1", parts.get(1).getName());
+ Assertions.assertEquals("test2", parts.get(2).getName());
+ Assertions.assertEquals("test2", parts.get(3).getName());
} catch (Throwable e) {
- Assert.fail("should not throw exception");
+ Assertions.fail("should not throw exception");
}
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequest.java
index e507de1bd..ae55f1145 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequest.java
@@ -27,9 +27,9 @@ import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.DiscoveryManager;
import org.apache.servicecomb.swagger.invocation.Response;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.web.bind.annotation.RequestBody;
@@ -89,7 +89,7 @@ public class TestCseClientHttpRequest {
client.execute();
- Assert.assertArrayEquals(body, (byte[]) holder.value.getInvocationArguments().get("input"));
- Assert.assertEquals("123", holder.value.getInvocationArguments().get("token"));
+ Assertions.assertArrayEquals(body, (byte[]) holder.value.getInvocationArguments().get("input"));
+ Assertions.assertEquals("123", holder.value.getInvocationArguments().get("token"));
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequestFactory.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequestFactory.java
index 8b92976a3..35b8950de 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequestFactory.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpRequestFactory.java
@@ -20,8 +20,8 @@ package org.apache.servicecomb.provider.springmvc.reference;
import java.io.IOException;
import java.net.URI;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.springframework.http.HttpMethod;
public class TestCseClientHttpRequestFactory {
@@ -31,10 +31,10 @@ public class TestCseClientHttpRequestFactory {
CseClientHttpRequestFactory lCseClientHttpRequestFactory = new CseClientHttpRequestFactory();
try {
- Assert.assertEquals(HttpMethod.GET,
+ Assertions.assertEquals(HttpMethod.GET,
lCseClientHttpRequestFactory.createRequest(URI.create("/test"), HttpMethod.GET).getMethod());
} catch (IOException e) {
- Assert.assertNotNull(e);
+ Assertions.assertNotNull(e);
}
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpResponse.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpResponse.java
index b2fd6d30d..756563b00 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpResponse.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseClientHttpResponse.java
@@ -20,8 +20,8 @@ package org.apache.servicecomb.provider.springmvc.reference;
import java.io.IOException;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpStatus;
public class TestCseClientHttpResponse {
@@ -33,32 +33,32 @@ public class TestCseClientHttpResponse {
@Test
public void testGetResult() {
- Assert.assertNull(cseclientrequest.getResult());
+ Assertions.assertNull(cseclientrequest.getResult());
}
@Test
public void testGetBody() throws IOException {
- Assert.assertNotNull(cseclientrequest.getBody());
+ Assertions.assertNotNull(cseclientrequest.getBody());
}
@Test
public void testGetHeaders() {
- Assert.assertNotNull(cseclientrequest.getHeaders());
+ Assertions.assertNotNull(cseclientrequest.getHeaders());
}
@Test
public void testGetStatusCode() throws IOException {
- Assert.assertEquals(HttpStatus.OK, cseclientrequest.getStatusCode());
+ Assertions.assertEquals(HttpStatus.OK, cseclientrequest.getStatusCode());
}
@Test
public void testGetRawStatusCode() throws IOException {
- Assert.assertEquals(200, cseclientrequest.getRawStatusCode());
+ Assertions.assertEquals(200, cseclientrequest.getRawStatusCode());
}
@Test
public void testGetStatusText() throws IOException {
cseclientrequest.close();
- Assert.assertEquals(HttpStatus.OK.getReasonPhrase(), cseclientrequest.getStatusText());
+ Assertions.assertEquals(HttpStatus.OK.getReasonPhrase(), cseclientrequest.getStatusText());
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseHttpEntity.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseHttpEntity.java
index ecec41b1d..e057c70ec 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseHttpEntity.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseHttpEntity.java
@@ -17,8 +17,8 @@
package org.apache.servicecomb.provider.springmvc.reference;
import org.apache.servicecomb.swagger.invocation.context.InvocationContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestCseHttpEntity {
@Test
@@ -26,14 +26,14 @@ public class TestCseHttpEntity {
CseHttpEntity<String> entity = new CseHttpEntity<>(null, null);
entity.addContext("c1", "c1v");
- Assert.assertEquals(1, entity.getContext().getContext().size());
- Assert.assertEquals("c1v", entity.getContext().getContext("c1"));
+ Assertions.assertEquals(1, entity.getContext().getContext().size());
+ Assertions.assertEquals("c1v", entity.getContext().getContext("c1"));
InvocationContext context = new InvocationContext();
context.addContext("c2", "c2v");
entity.setContext(context);
- Assert.assertEquals(1, entity.getContext().getContext().size());
- Assert.assertEquals("c2v", entity.getContext().getContext("c2"));
+ Assertions.assertEquals(1, entity.getContext().getContext().size());
+ Assertions.assertEquals("c2v", entity.getContext().getContext("c2"));
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRequestCallback.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRequestCallback.java
index 3fb7b100f..97c16990f 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRequestCallback.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRequestCallback.java
@@ -18,8 +18,8 @@ package org.apache.servicecomb.provider.springmvc.reference;
import java.io.IOException;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.web.client.RequestCallback;
import mockit.Injectable;
@@ -32,7 +32,7 @@ public class TestCseRequestCallback {
CseRequestCallback cb = new CseRequestCallback(null, callback, null);
cb.doWithRequest(request);
- Assert.assertEquals(null, request.getContext());
+ Assertions.assertNull(request.getContext());
}
@Test
@@ -44,6 +44,6 @@ public class TestCseRequestCallback {
CseRequestCallback cb = new CseRequestCallback(entity, callback, null);
cb.doWithRequest(request);
- Assert.assertEquals(entity.getContext(), request.getContext());
+ Assertions.assertEquals(entity.getContext(), request.getContext());
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRestTemplate.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRestTemplate.java
index d863eeee7..85957c306 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRestTemplate.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseRestTemplate.java
@@ -17,13 +17,13 @@
package org.apache.servicecomb.provider.springmvc.reference;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestCseRestTemplate {
- @Test
- public void testCseRestTemplate() {
- Assert.assertEquals(CseRestTemplate.class, new CseRestTemplate().getClass());
- }
+ @Test
+ public void testCseRestTemplate() {
+ Assertions.assertEquals(CseRestTemplate.class, new CseRestTemplate().getClass());
+ }
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseUriTemplateHandler.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseUriTemplateHandler.java
index 9d095f2a2..a692262ef 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseUriTemplateHandler.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCseUriTemplateHandler.java
@@ -20,24 +20,24 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestCseUriTemplateHandler {
@Test
public void testCrossApp() {
CseUriTemplateHandler handler = new CseUriTemplateHandler();
URI uri = handler.expand("cse://{ap}{p}:ms/{path}?q={query}", "ap", "p", "path", "query");
- Assert.assertEquals("cse://app:ms/path?q=query", uri.toString());
+ Assertions.assertEquals("cse://app:ms/path?q=query", uri.toString());
Map<String, String> vars = new HashMap<>();
vars.put("app", "app");
vars.put("path", "path");
vars.put("q", "query");
uri = handler.expand("cse://{app}:ms/{path}?q={q}", vars);
- Assert.assertEquals("cse://app:ms/path?q=query", uri.toString());
+ Assertions.assertEquals("cse://app:ms/path?q=query", uri.toString());
uri = handler.expand("cse://ms/{path}?q={query}", "path", "query");
- Assert.assertEquals("cse://ms/path?q=query", uri.toString());
+ Assertions.assertEquals("cse://ms/path?q=query", uri.toString());
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRequestMeta.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRequestMeta.java
index 0f5485868..cabcbde46 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRequestMeta.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRequestMeta.java
@@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class TestRequestMeta {
@@ -41,30 +41,30 @@ public class TestRequestMeta {
@Test
public void testGetReferenceConfig() {
ReferenceConfig value = requestmeta.getReferenceConfig();
- Assert.assertNotNull(value);
+ Assertions.assertNotNull(value);
}
@Test
public void testGetPathParams() {
Map<String, String> value = requestmeta.getPathParams();
- Assert.assertNotNull(value);
+ Assertions.assertNotNull(value);
}
@Test
public void testGetSwaggerRestOperation() {
RestOperationMeta value = requestmeta.getSwaggerRestOperation();
- Assert.assertNotNull(value);
+ Assertions.assertNotNull(value);
}
@Test
public void testGetOperationMeta() {
- Assert.assertNull(requestmeta.getOperationMeta());
+ Assertions.assertNull(requestmeta.getOperationMeta());
}
@Test
public void testGetOperationQualifiedName() {
Mockito.when(operationMeta.getSchemaQualifiedName()).thenReturn("value");
String qualifiedName = operationMeta.getSchemaQualifiedName();
- Assert.assertEquals("value", qualifiedName);
+ Assertions.assertEquals("value", qualifiedName);
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateCopyHeaderFilter.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateCopyHeaderFilter.java
index 90bc5f0ae..e94bb9f9d 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateCopyHeaderFilter.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateCopyHeaderFilter.java
@@ -26,8 +26,8 @@ import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpHeaders;
import mockit.Expectations;
@@ -38,7 +38,7 @@ public class TestRestTemplateCopyHeaderFilter {
@Test
public void getOrder() {
- Assert.assertEquals(-10000, filter.getOrder());
+ Assertions.assertEquals(-10000, filter.getOrder());
}
@Test
@@ -53,7 +53,7 @@ public class TestRestTemplateCopyHeaderFilter {
HttpServletRequestEx requestEx = new CommonToHttpServletRequest(null, null, new HttpHeaders(), null, false);
filter.beforeSendRequest(invocation, requestEx);
- Assert.assertFalse(requestEx.getHeaderNames().hasMoreElements());
+ Assertions.assertFalse(requestEx.getHeaderNames().hasMoreElements());
}
@Test
@@ -73,9 +73,9 @@ public class TestRestTemplateCopyHeaderFilter {
HttpServletRequestEx requestEx = new CommonToHttpServletRequest(null, null, new HttpHeaders(), null, false);
filter.beforeSendRequest(invocation, requestEx);
- Assert.assertEquals("headerValue0", requestEx.getHeader("headerName0"));
- Assert.assertEquals("headerValue2", requestEx.getHeader("headerName2"));
- Assert.assertNull(requestEx.getHeader("headerName1"));
+ Assertions.assertEquals("headerValue0", requestEx.getHeader("headerName0"));
+ Assertions.assertEquals("headerValue2", requestEx.getHeader("headerName2"));
+ Assertions.assertNull(requestEx.getHeader("headerName1"));
}
@Test
@@ -113,11 +113,11 @@ public class TestRestTemplateCopyHeaderFilter {
HttpServletRequestEx requestEx = new CommonToHttpServletRequest(null, null, new HttpHeaders(), null, false);
filter.beforeSendRequest(invocation, requestEx);
- Assert.assertNull((requestEx.getHeader(HttpHeaders.CONTENT_LENGTH)));
+ Assertions.assertNull((requestEx.getHeader(HttpHeaders.CONTENT_LENGTH)));
}
@Test
public void afterReceiveResponse() {
- Assert.assertNull(filter.afterReceiveResponse(null, null));
+ Assertions.assertNull(filter.afterReceiveResponse(null, null));
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateWrapper.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateWrapper.java
index 30294f119..770d80366 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateWrapper.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestRestTemplateWrapper.java
@@ -22,7 +22,6 @@ import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java
index 0364f85ef..0713e6430 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithProviderPrefixClientHttpRequestFactory.java
@@ -30,8 +30,8 @@ import org.apache.servicecomb.core.invocation.InvocationFactory;
import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
import org.apache.servicecomb.provider.springmvc.reference.UrlWithProviderPrefixClientHttpRequestFactory.UrlWithProviderPrefixClientHttpRequest;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpMethod;
import mockit.Deencapsulation;
@@ -48,7 +48,7 @@ public class TestUrlWithProviderPrefixClientHttpRequestFactory {
UrlWithProviderPrefixClientHttpRequest request =
(UrlWithProviderPrefixClientHttpRequest) factory.createRequest(uri, HttpMethod.GET);
- Assert.assertEquals("/v1/path", request.findUriPath(uri));
+ Assertions.assertEquals("/v1/path", request.findUriPath(uri));
}
@Test
@@ -78,6 +78,6 @@ public class TestUrlWithProviderPrefixClientHttpRequestFactory {
Deencapsulation.invoke(request, "invoke", new HashMap<>());
- Assert.assertEquals("/v1/path", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
+ Assertions.assertEquals("/v1/path", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java
index 0d138b42c..e53ba38db 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestUrlWithServiceNameClientHttpRequestFactory.java
@@ -30,8 +30,8 @@ import org.apache.servicecomb.core.invocation.InvocationFactory;
import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
import org.apache.servicecomb.provider.springmvc.reference.UrlWithServiceNameClientHttpRequestFactory.UrlWithServiceNameClientHttpRequest;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpMethod;
import mockit.Deencapsulation;
@@ -48,7 +48,7 @@ public class TestUrlWithServiceNameClientHttpRequestFactory {
UrlWithServiceNameClientHttpRequest request =
(UrlWithServiceNameClientHttpRequest) factory.createRequest(uri, HttpMethod.GET);
- Assert.assertEquals("/ms/v1/path", request.findUriPath(uri));
+ Assertions.assertEquals("/ms/v1/path", request.findUriPath(uri));
}
@Test
@@ -77,6 +77,6 @@ public class TestUrlWithServiceNameClientHttpRequestFactory {
Deencapsulation.invoke(request, "invoke", new HashMap<>());
- Assert.assertEquals("/ms/v1/path", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
+ Assertions.assertEquals("/ms/v1/path", handlerContext.get(RestConst.REST_CLIENT_REQUEST_PATH));
}
}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java
index ce10009a0..7475fff10 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java
@@ -19,15 +19,15 @@ package org.apache.servicecomb.provider.springmvc.reference.async;
import java.net.URI;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.springframework.http.HttpMethod;
public class CseAsyncClientHttpRequestFactoryTest {
@Test
public void testCseAsyncClientHttpRequestFactory() {
CseAsyncClientHttpRequestFactory cseAsyncClientHttpRequestFactory = new CseAsyncClientHttpRequestFactory();
- Assert.assertEquals(HttpMethod.GET,
+ Assertions.assertEquals(HttpMethod.GET,
cseAsyncClientHttpRequestFactory.createAsyncRequest(URI.create("/test"), HttpMethod.GET).getMethod());
}
}
\ No newline at end of file
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java
index 55f182f46..60c8ac6ad 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java
@@ -30,9 +30,9 @@ import org.apache.servicecomb.provider.springmvc.reference.CseClientHttpResponse
import org.apache.servicecomb.registry.DiscoveryManager;
import org.apache.servicecomb.swagger.invocation.Response;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.util.concurrent.ListenableFuture;
@@ -87,7 +87,7 @@ public class CseAsyncClientHttpRequestTest {
byte[] body = "abc".getBytes();
client.setRequestBody(body);
client.executeAsync();
- Assert.assertArrayEquals(body, (byte[]) holder.value.getInvocationArguments().get("input"));
+ Assertions.assertArrayEquals(body, (byte[]) holder.value.getInvocationArguments().get("input"));
}
@Test
@@ -113,7 +113,7 @@ public class CseAsyncClientHttpRequestTest {
new ListenableFutureCallback<ClientHttpResponse>() {
@Override
public void onFailure(Throwable ex) {
- Assert.assertSame(error, ex);
+ Assertions.assertSame(error, ex);
}
@Override
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java
index daefd3ac8..80280dac6 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java
@@ -18,8 +18,8 @@
package org.apache.servicecomb.provider.springmvc.reference.async;
import org.apache.servicecomb.provider.springmvc.reference.CseHttpEntity;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.springframework.http.HttpEntity;
import mockit.Injectable;
@@ -30,7 +30,7 @@ public class CseAsyncRequestCallbackTest {
CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest();
CseAsyncRequestCallback<HttpEntity<?>> cb = new CseAsyncRequestCallback<>(null);
cb.doWithRequest(request);
- Assert.assertEquals(null, request.getContext());
+ Assertions.assertNull(request.getContext());
}
@Test
@@ -38,7 +38,7 @@ public class CseAsyncRequestCallbackTest {
CseAsyncRequestCallback<String> cb = new CseAsyncRequestCallback<>(entity);
CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest();
cb.doWithRequest(request);
- Assert.assertEquals(entity.getBody(), request.getBody());
+ Assertions.assertEquals(entity.getBody(), request.getBody());
}
@Test
@@ -47,6 +47,6 @@ public class CseAsyncRequestCallbackTest {
entity.addContext("c1", "c2");
CseAsyncRequestCallback<String> cb = new CseAsyncRequestCallback<>(entity);
cb.doWithRequest(request);
- Assert.assertEquals(entity.getContext(), request.getContext());
+ Assertions.assertEquals(entity.getContext(), request.getContext());
}
-}
\ No newline at end of file
+}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java
index 3e5ce64cb..8041b14d5 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java
@@ -17,13 +17,13 @@
package org.apache.servicecomb.provider.springmvc.reference.async;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class CseAsyncRestTemplateTest {
@Test
public void testCseAsyncRestTemplate() {
- Assert.assertEquals(CseAsyncRestTemplate.class, new CseAsyncRestTemplate().getClass());
+ Assertions.assertEquals(CseAsyncRestTemplate.class, new CseAsyncRestTemplate().getClass());
}
-}
\ No newline at end of file
+}