You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/06/29 02:49:31 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2618] Remove unused mocked field in TestDefaultHttpServerMetrics (#3150)
This is an automated email from the ASF dual-hosted git repository.
shoothzj 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 c1e75d770 [SCB-2618] Remove unused mocked field in TestDefaultHttpServerMetrics (#3150)
c1e75d770 is described below
commit c1e75d7703c03076c22d4c43b69152d84b983d98
Author: TingTing Wang <19...@qq.com>
AuthorDate: Wed Jun 29 10:49:26 2022 +0800
[SCB-2618] Remove unused mocked field in TestDefaultHttpServerMetrics (#3150)
---
.../foundation/vertx/metrics/TestDefaultHttpServerMetrics.java | 10 ----------
.../foundation/vertx/metrics/TestDefaultTcpServerMetrics.java | 3 ---
.../vertx/metrics/TestDefaultVertxMetricsFactory.java | 4 ----
parents/default/pom.xml | 8 ++++----
4 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultHttpServerMetrics.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultHttpServerMetrics.java
index 2c64f1408..d8cbc40c9 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultHttpServerMetrics.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultHttpServerMetrics.java
@@ -24,17 +24,13 @@ import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultTcpSocketMe
import org.junit.Before;
import org.junit.Test;
-import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
-import io.vertx.core.http.HttpServer;
import io.vertx.core.http.HttpServerOptions;
import io.vertx.core.net.SocketAddress;
import mockit.Mocked;
import org.junit.jupiter.api.Assertions;
public class TestDefaultHttpServerMetrics {
- @Mocked
- Vertx vertx;
VertxOptions vertxOptions = new VertxOptions();
@@ -42,12 +38,6 @@ public class TestDefaultHttpServerMetrics {
DefaultVertxMetrics defaultVertxMetrics;
- @Mocked
- HttpServer listen1_server1;
-
- @Mocked
- HttpServer listen1_server2;
-
@Mocked
SocketAddress listen1_addr;
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultTcpServerMetrics.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultTcpServerMetrics.java
index 12f3a1663..f9b93f1ce 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultTcpServerMetrics.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultTcpServerMetrics.java
@@ -24,7 +24,6 @@ import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultTcpSocketMe
import org.junit.Before;
import org.junit.Test;
-import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.net.NetServerOptions;
import io.vertx.core.net.SocketAddress;
@@ -32,8 +31,6 @@ import mockit.Mocked;
import org.junit.jupiter.api.Assertions;
public class TestDefaultTcpServerMetrics {
- @Mocked
- Vertx vertx;
VertxOptions vertxOptions = new VertxOptions();
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultVertxMetricsFactory.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultVertxMetricsFactory.java
index 9db33b09f..1ae56ebee 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultVertxMetricsFactory.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/metrics/TestDefaultVertxMetricsFactory.java
@@ -18,16 +18,12 @@ package org.apache.servicecomb.foundation.vertx.metrics;
import org.junit.Test;
-import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.metrics.MetricsOptions;
import io.vertx.core.spi.metrics.VertxMetrics;
-import mockit.Mocked;
import org.junit.jupiter.api.Assertions;
public class TestDefaultVertxMetricsFactory {
- @Mocked
- Vertx vertx;
VertxOptions options = new VertxOptions();
diff --git a/parents/default/pom.xml b/parents/default/pom.xml
index aca724256..0f145ce6e 100644
--- a/parents/default/pom.xml
+++ b/parents/default/pom.xml
@@ -46,13 +46,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>