Remove dubbo-test in dubbo-metrics,dubbo-registry,dubbo-serialization

Author: Stellar1999

dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/event/SimpleMetricsEventMulticasterTest.java

@@ -22,6 +22,7 @@
 import org.apache.dubbo.metrics.listener.MetricsLifeListener;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -55,6 +56,11 @@ public void onEvent(MetricsEvent event) {
         requestEvent = new TimeCounterEvent(applicationModel, null) {};
     }
 
+    @AfterEach
+    public void destroy() {
+        ApplicationModel.defaultModel().destroy();
+    }
+
     @Test
     void testPublishFinishEvent() {
 

dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/model/ApplicationMetricTest.java

@@ -21,6 +21,7 @@
 
 import java.util.Map;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -101,4 +102,10 @@ void testEquals() {}
 
     @Test
     void testHashCode() {}
+
+    @AfterEach
+    public void destroy() {
+        ApplicationModel applicationModel = ApplicationModel.defaultModel();
+        applicationModel.destroy();
+    }
 }

dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/metrics/model/sample/ErrorCodeSampleTest.java

@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 public class ErrorCodeSampleTest {
@@ -70,4 +71,9 @@ void testErrorCodeMetric() {
 
         System.out.println(samples);
     }
+
+    @AfterEach
+    public void tearDown() {
+        FrameworkModel.defaultModel().destroy();
+    }
 }

dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java

@@ -28,10 +28,12 @@
 import org.apache.dubbo.rpc.RpcContext;
 import org.apache.dubbo.rpc.RpcException;
 import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.model.ApplicationModel;
 
 import java.util.Arrays;
 import java.util.List;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -240,4 +242,10 @@ void testOnErrorWithoutStartTime() {
         Throwable rpcException = new RpcException();
         monitorFilter.onError(rpcException, serviceInvoker, invocation);
     }
+
+    @AfterEach
+    public void destroy() {
+        ApplicationModel applicationModel = ApplicationModel.defaultModel();
+        applicationModel.destroy();
+    }
 }

dubbo-metrics/dubbo-metrics-registry/src/test/java/org/apache/dubbo/metrics/registry/metrics/collector/RegistryMetricsCollectorTest.java

@@ -30,14 +30,14 @@
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Lists;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -75,8 +75,9 @@ public void teardown() {
 
     @Test
     void testRegisterMetrics() {
-
-        RegistryEvent registryEvent = RegistryEvent.toRegisterEvent(applicationModel, Lists.newArrayList("reg1"));
+        List<String> registryClusterNames = new ArrayList<>();
+        registryClusterNames.add("reg1");
+        RegistryEvent registryEvent = RegistryEvent.toRegisterEvent(applicationModel, registryClusterNames);
         MetricsEventBus.post(registryEvent, () -> {
             List<MetricSample> metricSamples = collector.collect();
             // push success +1 -> other default 0 = APP_LEVEL_KEYS.size()
@@ -94,7 +95,7 @@ void testRegisterMetrics() {
         Assertions.assertEquals(APP_LEVEL_KEYS.size() + REGISTER_LEVEL_KEYS.size() + 5, metricSamples.size());
         long c1 = registryEvent.getTimePair().calc();
 
-        registryEvent = RegistryEvent.toRegisterEvent(applicationModel, Lists.newArrayList("reg1"));
+        registryEvent = RegistryEvent.toRegisterEvent(applicationModel, registryClusterNames);
         TimePair lastTimePair = registryEvent.getTimePair();
         MetricsEventBus.post(
                 registryEvent,
@@ -145,7 +146,8 @@ void testRegisterMetrics() {
     void testServicePushMetrics() {
 
         String serviceName = "demo.gameService";
-        List<String> rcNames = Lists.newArrayList("demo1");
+        List<String> rcNames = new ArrayList<>();
+        rcNames.add("demo1");
 
         RegistryEvent registryEvent = RegistryEvent.toRsEvent(applicationModel, serviceName, 2, rcNames);
         MetricsEventBus.post(registryEvent, () -> {

dubbo-metrics/dubbo-metrics-registry/src/test/java/org/apache/dubbo/metrics/registry/metrics/collector/RegistryMetricsTest.java

@@ -28,6 +28,7 @@
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -37,7 +38,6 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.collect.Lists;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -292,13 +292,16 @@ void eventFailed(RegistryEvent event) {
     }
 
     RegistryEvent registerEvent() {
-        RegistryEvent event = RegistryEvent.toRegisterEvent(applicationModel, Lists.newArrayList("reg1"));
+        List<String> registryClusterNames = new ArrayList<>();
+        registryClusterNames.add("reg1");
+        RegistryEvent event = RegistryEvent.toRegisterEvent(applicationModel, registryClusterNames);
         event.setAvailable(true);
         return event;
     }
 
     RegistryEvent rsEvent() {
-        List<String> rcNames = Lists.newArrayList("demo1");
+        List<String> rcNames = new ArrayList<>();
+        rcNames.add("demo1");
         RegistryEvent event = RegistryEvent.toRsEvent(applicationModel, "TestServiceInterface1", 1, rcNames);
         event.setAvailable(true);
         return event;

dubbo-metrics/pom.xml

@@ -42,12 +42,4 @@
     <skip_maven_deploy>false</skip_maven_deploy>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-check</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>

dubbo-registry/pom.xml

@@ -37,13 +37,4 @@
   <properties>
     <skip_maven_deploy>false</skip_maven_deploy>
   </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-check</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>

dubbo-serialization/pom.xml

@@ -36,12 +36,4 @@
     <skip_maven_deploy>false</skip_maven_deploy>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-check</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>