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:39:12 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 edge part1 (#2911)
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 64175d5c8 [SCB-2475] migrate to junit5 edge part1 (#2911)
64175d5c8 is described below
commit 64175d5c8364dd8d522ee20da18426e580ea1afe
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Tue May 17 15:39:08 2022 +0800
[SCB-2475] migrate to junit5 edge part1 (#2911)
---
.../edge/core/TestAbstractEdgeDispatcher.java | 12 +++++------
.../edge/core/TestCompatiblePathVersionMapper.java | 7 +++----
.../edge/core/TestDefaultEdgeDispatcher.java | 8 ++++----
.../edge/core/TestEdgeBootListener.java | 8 ++++----
.../edge/core/TestURLMappedEdgeDispatcher.java | 24 +++++++++++-----------
.../apache/servicecomb/edge/core/TestUtils.java | 18 ++++++++--------
6 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
index 09973cb42..dc6726874 100644
--- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
+++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.Assert;
import org.junit.Test;
import io.vertx.core.http.HttpServerResponse;
@@ -32,9 +31,10 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestAbstractEdgeDispatcher {
- class AbstractEdgeDispatcherForTest extends AbstractEdgeDispatcher {
+ static class AbstractEdgeDispatcherForTest extends AbstractEdgeDispatcher {
@Override
public int getOrder() {
return 0;
@@ -74,8 +74,8 @@ public class TestAbstractEdgeDispatcher {
AbstractEdgeDispatcherForTest dispatcher = new AbstractEdgeDispatcherForTest();
dispatcher.onFailure(context);
- Assert.assertEquals(502, map.get("code"));
- Assert.assertEquals("Bad Gateway", map.get("msg"));
+ Assertions.assertEquals(502, map.get("code"));
+ Assertions.assertEquals("Bad Gateway", map.get("msg"));
new Expectations() {
{
@@ -90,7 +90,7 @@ public class TestAbstractEdgeDispatcher {
dispatcher = new AbstractEdgeDispatcherForTest();
dispatcher.onFailure(context);
- Assert.assertEquals(401, map.get("code"));
- Assert.assertEquals("unauthorized", map.get("msg"));
+ Assertions.assertEquals(401, map.get("code"));
+ Assertions.assertEquals("unauthorized", map.get("msg"));
}
}
diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java
index 44be94f61..390da6ad6 100644
--- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java
+++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestCompatiblePathVersionMapper.java
@@ -19,9 +19,8 @@ package org.apache.servicecomb.edge.core;
import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.registry.version.VersionRule;
-import org.junit.Assert;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestCompatiblePathVersionMapper {
CompatiblePathVersionMapper mapper = new CompatiblePathVersionMapper();
@@ -30,7 +29,7 @@ public class TestCompatiblePathVersionMapper {
public void getOrCreate() {
VersionRule versionRule = mapper.getOrCreate("v1");
- Assert.assertEquals("1.0.0.0-2.0.0.0", versionRule.getVersionRule());
+ Assertions.assertEquals("1.0.0.0-2.0.0.0", versionRule.getVersionRule());
}
@Test
@@ -72,6 +71,6 @@ public class TestCompatiblePathVersionMapper {
public void createVersionRule_32767() {
VersionRule versionRule = mapper.getOrCreate("v32767");
- Assert.assertEquals("32767.0.0.0+", versionRule.getVersionRule());
+ Assertions.assertEquals("32767.0.0.0+", versionRule.getVersionRule());
}
}
diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
index 639eb0286..e367a3dda 100644
--- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
+++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
@@ -23,7 +23,6 @@ import static org.apache.servicecomb.edge.core.DefaultEdgeDispatcher.VERSION;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -35,6 +34,7 @@ import io.vertx.ext.web.RoutingContext;
import mockit.Deencapsulation;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestDefaultEdgeDispatcher {
@Before
@@ -83,9 +83,9 @@ public class TestDefaultEdgeDispatcher {
}
};
dispatcher.init(router);
- Assert.assertEquals(dispatcher.enabled(), false);
- Assert.assertEquals(Utils.findActualPath("/api/test", 1), "/test");
- Assert.assertEquals(dispatcher.getOrder(), 20000);
+ Assertions.assertFalse(dispatcher.enabled());
+ Assertions.assertEquals(Utils.findActualPath("/api/test", 1), "/test");
+ Assertions.assertEquals(dispatcher.getOrder(), 20000);
dispatcher.onRequest(context);
// assert done in expectations.
diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
index 992aad06c..185897e6b 100644
--- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
+++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
@@ -22,11 +22,11 @@ import org.apache.servicecomb.core.BootListener.EventType;
import org.apache.servicecomb.core.executor.ExecutorManager;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import com.netflix.config.DynamicPropertyFactory;
+import org.junit.jupiter.api.Assertions;
public class TestEdgeBootListener {
EdgeBootListener listener = new EdgeBootListener();
@@ -51,7 +51,7 @@ public class TestEdgeBootListener {
bootEvent.setEventType(EventType.AFTER_CONSUMER_PROVIDER);
listener.onBootEvent(bootEvent);
- Assert.assertEquals(ExecutorManager.EXECUTOR_DEFAULT,
+ Assertions.assertEquals(ExecutorManager.EXECUTOR_DEFAULT,
DynamicPropertyFactory.getInstance().getStringProperty(ExecutorManager.KEY_EXECUTORS_DEFAULT, null).get());
}
@@ -62,7 +62,7 @@ public class TestEdgeBootListener {
bootEvent.setEventType(EventType.BEFORE_PRODUCER_PROVIDER);
listener.onBootEvent(bootEvent);
- Assert.assertEquals(ExecutorManager.EXECUTOR_DEFAULT,
+ Assertions.assertEquals(ExecutorManager.EXECUTOR_DEFAULT,
DynamicPropertyFactory.getInstance().getStringProperty(ExecutorManager.KEY_EXECUTORS_DEFAULT, null).get());
}
@@ -71,7 +71,7 @@ public class TestEdgeBootListener {
bootEvent.setEventType(EventType.BEFORE_PRODUCER_PROVIDER);
listener.onBootEvent(bootEvent);
- Assert.assertEquals(ExecutorManager.EXECUTOR_REACTIVE,
+ Assertions.assertEquals(ExecutorManager.EXECUTOR_REACTIVE,
DynamicPropertyFactory.getInstance().getStringProperty(ExecutorManager.KEY_EXECUTORS_DEFAULT, null).get());
}
}
diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
index a209a408e..199576802 100644
--- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
+++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.transport.rest.vertx.RestBodyHandler;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -31,6 +30,7 @@ import io.vertx.ext.web.RoutingContext;
import mockit.Deencapsulation;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestURLMappedEdgeDispatcher {
@Before
@@ -51,7 +51,7 @@ public class TestURLMappedEdgeDispatcher {
URLMappedEdgeDispatcher dispatcher = new URLMappedEdgeDispatcher();
Map<String, URLMappedConfigurationItem> items = Deencapsulation
.getField(dispatcher, "configurations");
- Assert.assertEquals(items.size(), 0);
+ Assertions.assertEquals(items.size(), 0);
new Expectations() {
{
@@ -67,22 +67,22 @@ public class TestURLMappedEdgeDispatcher {
ArchaiusUtils.setProperty("servicecomb.http.dispatcher.edge.url.mappings.service1.prefixSegmentCount", 2);
ArchaiusUtils.setProperty("servicecomb.http.dispatcher.edge.url.mappings.service1.versionRule", "2.0.0+");
items = Deencapsulation.getField(dispatcher, "configurations");
- Assert.assertEquals(items.size(), 1);
+ Assertions.assertEquals(items.size(), 1);
URLMappedConfigurationItem item = items.get("service1");
- Assert.assertEquals(item.getMicroserviceName(), "serviceName");
- Assert.assertEquals(item.getPrefixSegmentCount(), 2);
- Assert.assertEquals(item.getStringPattern(), "/a/b/c/.*");
- Assert.assertEquals(item.getVersionRule(), "2.0.0+");
+ Assertions.assertEquals(item.getMicroserviceName(), "serviceName");
+ Assertions.assertEquals(item.getPrefixSegmentCount(), 2);
+ Assertions.assertEquals(item.getStringPattern(), "/a/b/c/.*");
+ Assertions.assertEquals(item.getVersionRule(), "2.0.0+");
ArchaiusUtils.setProperty("servicecomb.http.dispatcher.edge.url.mappings.service2.versionRule", "2.0.0+");
ArchaiusUtils.setProperty("servicecomb.http.dispatcher.edge.url.mappings.service3.path", "/b/c/d/.*");
items = Deencapsulation.getField(dispatcher, "configurations");
- Assert.assertEquals(items.size(), 1);
+ Assertions.assertEquals(items.size(), 1);
item = items.get("service1");
- Assert.assertEquals(item.getMicroserviceName(), "serviceName");
- Assert.assertEquals(item.getPrefixSegmentCount(), 2);
- Assert.assertEquals(item.getStringPattern(), "/a/b/c/.*");
- Assert.assertEquals(item.getVersionRule(), "2.0.0+");
+ Assertions.assertEquals(item.getMicroserviceName(), "serviceName");
+ Assertions.assertEquals(item.getPrefixSegmentCount(), 2);
+ Assertions.assertEquals(item.getStringPattern(), "/a/b/c/.*");
+ Assertions.assertEquals(item.getVersionRule(), "2.0.0+");
URLMappedConfigurationItem finalItem = item;
new Expectations() {
diff --git a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestUtils.java b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestUtils.java
index c92373fb3..f7fcfa18c 100644
--- a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestUtils.java
+++ b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestUtils.java
@@ -17,17 +17,17 @@
package org.apache.servicecomb.edge.core;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestUtils {
@Test
- public void testUtisl() {
- Assert.assertEquals(Utils.findActualPath("/a/b/c", -1), "/a/b/c");
- Assert.assertEquals(Utils.findActualPath("/a/b/c", 0), "/a/b/c");
- Assert.assertEquals(Utils.findActualPath("/a/b/c", 1), "/b/c");
- Assert.assertEquals(Utils.findActualPath("/a/b/c", 2), "/c");
- Assert.assertEquals(Utils.findActualPath("/a/b/c", 3), "");
- Assert.assertEquals(Utils.findActualPath("/a/b/c", 100), "");
+ public void testUtils() {
+ Assertions.assertEquals("/a/b/c", Utils.findActualPath("/a/b/c", -1));
+ Assertions.assertEquals("/a/b/c", Utils.findActualPath("/a/b/c", 0));
+ Assertions.assertEquals("/b/c", Utils.findActualPath("/a/b/c", 1));
+ Assertions.assertEquals("/c", Utils.findActualPath("/a/b/c", 2));
+ Assertions.assertEquals("", Utils.findActualPath("/a/b/c", 3));
+ Assertions.assertEquals("", Utils.findActualPath("/a/b/c", 100));
}
}