Skip to content

Commit d00f447

Browse files
RainYuYRainYuY
committed
Remove dubbo-test in dubbo-metrics,dubbo-registry,dubbo-serialization
1 parent 403e127 commit d00f447

File tree

12 files changed

+95
-61
lines changed

12 files changed

+95
-61
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.dubbo.metrics.listener.MetricsLifeListener;
2323
import org.apache.dubbo.rpc.model.ApplicationModel;
2424

25+
import org.junit.jupiter.api.AfterEach;
2526
import org.junit.jupiter.api.Assertions;
2627
import org.junit.jupiter.api.BeforeEach;
2728
import org.junit.jupiter.api.Test;
@@ -55,6 +56,11 @@ public void onEvent(MetricsEvent event) {
5556
requestEvent = new TimeCounterEvent(applicationModel, null) {};
5657
}
5758

59+
@AfterEach
60+
public void destroy() {
61+
ApplicationModel.defaultModel().destroy();
62+
}
63+
5864
@Test
5965
void testPublishFinishEvent() {
6066

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.util.Map;
2323

24+
import org.junit.jupiter.api.AfterEach;
2425
import org.junit.jupiter.api.Assertions;
2526
import org.junit.jupiter.api.Test;
2627

@@ -101,4 +102,10 @@ void testEquals() {}
101102

102103
@Test
103104
void testHashCode() {}
105+
106+
@AfterEach
107+
public void destroy() {
108+
ApplicationModel applicationModel = ApplicationModel.defaultModel();
109+
applicationModel.destroy();
110+
}
104111
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.concurrent.atomic.AtomicLong;
3232

33+
import org.junit.jupiter.api.AfterEach;
3334
import org.junit.jupiter.api.Test;
3435

3536
public class ErrorCodeSampleTest {
@@ -70,4 +71,9 @@ void testErrorCodeMetric() {
7071

7172
System.out.println(samples);
7273
}
74+
75+
@AfterEach
76+
public void tearDown() {
77+
FrameworkModel.defaultModel().destroy();
78+
}
7379
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@
2828
import org.apache.dubbo.rpc.RpcContext;
2929
import org.apache.dubbo.rpc.RpcException;
3030
import org.apache.dubbo.rpc.RpcInvocation;
31+
import org.apache.dubbo.rpc.model.ApplicationModel;
3132

3233
import java.util.Arrays;
3334
import java.util.List;
3435

36+
import org.junit.jupiter.api.AfterEach;
3537
import org.junit.jupiter.api.Assertions;
3638
import org.junit.jupiter.api.Test;
3739
import org.mockito.Mockito;
@@ -240,4 +242,10 @@ void testOnErrorWithoutStartTime() {
240242
Throwable rpcException = new RpcException();
241243
monitorFilter.onError(rpcException, serviceInvoker, invocation);
242244
}
245+
246+
@AfterEach
247+
public void destroy() {
248+
ApplicationModel applicationModel = ApplicationModel.defaultModel();
249+
applicationModel.destroy();
250+
}
243251
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
import org.apache.dubbo.rpc.model.ApplicationModel;
3131
import org.apache.dubbo.rpc.model.FrameworkModel;
3232

33+
import java.util.ArrayList;
3334
import java.util.Collections;
3435
import java.util.HashMap;
3536
import java.util.List;
3637
import java.util.Map;
3738
import java.util.Objects;
3839
import java.util.stream.Collectors;
3940

40-
import com.google.common.collect.Lists;
4141
import org.junit.jupiter.api.AfterEach;
4242
import org.junit.jupiter.api.Assertions;
4343
import org.junit.jupiter.api.BeforeEach;
@@ -75,8 +75,9 @@ public void teardown() {
7575

7676
@Test
7777
void testRegisterMetrics() {
78-
79-
RegistryEvent registryEvent = RegistryEvent.toRegisterEvent(applicationModel, Lists.newArrayList("reg1"));
78+
List<String> registryClusterNames = new ArrayList<>();
79+
registryClusterNames.add("reg1");
80+
RegistryEvent registryEvent = RegistryEvent.toRegisterEvent(applicationModel, registryClusterNames);
8081
MetricsEventBus.post(registryEvent, () -> {
8182
List<MetricSample> metricSamples = collector.collect();
8283
// push success +1 -> other default 0 = APP_LEVEL_KEYS.size()
@@ -94,7 +95,7 @@ void testRegisterMetrics() {
9495
Assertions.assertEquals(APP_LEVEL_KEYS.size() + REGISTER_LEVEL_KEYS.size() + 5, metricSamples.size());
9596
long c1 = registryEvent.getTimePair().calc();
9697

97-
registryEvent = RegistryEvent.toRegisterEvent(applicationModel, Lists.newArrayList("reg1"));
98+
registryEvent = RegistryEvent.toRegisterEvent(applicationModel, registryClusterNames);
9899
TimePair lastTimePair = registryEvent.getTimePair();
99100
MetricsEventBus.post(
100101
registryEvent,
@@ -145,7 +146,8 @@ void testRegisterMetrics() {
145146
void testServicePushMetrics() {
146147

147148
String serviceName = "demo.gameService";
148-
List<String> rcNames = Lists.newArrayList("demo1");
149+
List<String> rcNames = new ArrayList<>();
150+
rcNames.add("demo1");
149151

150152
RegistryEvent registryEvent = RegistryEvent.toRsEvent(applicationModel, serviceName, 2, rcNames);
151153
MetricsEventBus.post(registryEvent, () -> {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.dubbo.rpc.model.ApplicationModel;
2929
import org.apache.dubbo.rpc.model.FrameworkModel;
3030

31+
import java.util.ArrayList;
3132
import java.util.List;
3233
import java.util.NoSuchElementException;
3334
import java.util.Optional;
@@ -37,7 +38,6 @@
3738
import java.util.concurrent.ScheduledFuture;
3839
import java.util.concurrent.TimeUnit;
3940

40-
import com.google.common.collect.Lists;
4141
import org.junit.jupiter.api.Assertions;
4242
import org.junit.jupiter.api.BeforeEach;
4343
import org.junit.jupiter.api.Test;
@@ -292,13 +292,16 @@ void eventFailed(RegistryEvent event) {
292292
}
293293

294294
RegistryEvent registerEvent() {
295-
RegistryEvent event = RegistryEvent.toRegisterEvent(applicationModel, Lists.newArrayList("reg1"));
295+
List<String> registryClusterNames = new ArrayList<>();
296+
registryClusterNames.add("reg1");
297+
RegistryEvent event = RegistryEvent.toRegisterEvent(applicationModel, registryClusterNames);
296298
event.setAvailable(true);
297299
return event;
298300
}
299301

300302
RegistryEvent rsEvent() {
301-
List<String> rcNames = Lists.newArrayList("demo1");
303+
List<String> rcNames = new ArrayList<>();
304+
rcNames.add("demo1");
302305
RegistryEvent event = RegistryEvent.toRsEvent(applicationModel, "TestServiceInterface1", 1, rcNames);
303306
event.setAvailable(true);
304307
return event;

‎dubbo-metrics/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,4 @@
4242
<skip_maven_deploy>false</skip_maven_deploy>
4343
</properties>
4444

45-
<dependencies>
46-
<dependency>
47-
<groupId>org.apache.dubbo</groupId>
48-
<artifactId>dubbo-test-check</artifactId>
49-
<version>${project.parent.version}</version>
50-
<scope>test</scope>
51-
</dependency>
52-
</dependencies>
5345
</project>

‎dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java‎

Lines changed: 53 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,52 +16,94 @@
1616
*/
1717
package org.apache.dubbo.registry.zookeeper;
1818

19+
import com.google.common.collect.Lists;
20+
import org.apache.curator.CuratorZookeeperClient;
21+
import org.apache.curator.framework.CuratorFramework;
22+
import org.apache.curator.framework.CuratorFrameworkFactory;
23+
import org.apache.curator.framework.WatcherRemoveCuratorFramework;
24+
import org.apache.curator.framework.api.CreateBuilder;
25+
import org.apache.curator.framework.api.DeleteBuilder;
26+
import org.apache.curator.framework.api.ExistsBuilder;
27+
import org.apache.curator.framework.api.GetChildrenBuilder;
28+
import org.apache.curator.framework.api.GetDataBuilder;
29+
import org.apache.curator.framework.api.SetDataBuilder;
30+
import org.apache.curator.framework.listen.StandardListenerManager;
31+
1932
import org.apache.dubbo.common.URL;
2033
import org.apache.dubbo.common.status.Status;
2134
import org.apache.dubbo.registry.NotifyListener;
2235
import org.apache.dubbo.registry.Registry;
2336
import org.apache.dubbo.registry.status.RegistryStatusChecker;
37+
import org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperClient;
38+
import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
39+
import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
2440
import org.apache.dubbo.rpc.RpcException;
2541
import org.apache.dubbo.rpc.model.ApplicationModel;
2642

43+
import java.util.ArrayList;
2744
import java.util.List;
2845
import java.util.Map;
2946
import java.util.Set;
3047
import java.util.concurrent.CountDownLatch;
3148

49+
import org.apache.zookeeper.KeeperException.NodeExistsException;
50+
import org.apache.zookeeper.data.Stat;
3251
import org.junit.jupiter.api.Assertions;
3352
import org.junit.jupiter.api.BeforeAll;
3453
import org.junit.jupiter.api.BeforeEach;
3554
import org.junit.jupiter.api.Disabled;
3655
import org.junit.jupiter.api.Test;
56+
import org.mockito.invocation.InvocationOnMock;
57+
import org.mockito.stubbing.Answer;
3758

3859
import static org.hamcrest.CoreMatchers.is;
3960
import static org.hamcrest.CoreMatchers.not;
4061
import static org.hamcrest.CoreMatchers.nullValue;
4162
import static org.hamcrest.MatcherAssert.assertThat;
4263
import static org.hamcrest.Matchers.containsString;
4364
import static org.junit.jupiter.api.Assertions.fail;
65+
import static org.mockito.ArgumentMatchers.any;
66+
import static org.mockito.ArgumentMatchers.anyBoolean;
67+
import static org.mockito.ArgumentMatchers.anyInt;
68+
import static org.mockito.ArgumentMatchers.anyString;
69+
import static org.mockito.Mockito.doAnswer;
70+
import static org.mockito.Mockito.doReturn;
71+
import static org.mockito.Mockito.doThrow;
4472
import static org.mockito.Mockito.mock;
73+
import static org.mockito.Mockito.mockStatic;
74+
import static org.mockito.Mockito.spy;
75+
import static org.mockito.Mockito.when;
4576

4677
class ZookeeperRegistryTest {
4778
private static String zookeeperConnectionAddress1;
4879
private ZookeeperRegistry zookeeperRegistry;
4980
private String service = "org.apache.dubbo.test.injvmServie";
50-
private URL serviceUrl = URL.valueOf("zookeeper://zookeeper/" + service + "?notify=false&methods=test1,test2");
81+
private String url = "zookeeper://zookeeper/" + service + "?notify=false&methods=test1,test2";
82+
private URL serviceUrl = URL.valueOf(url);
5183
private URL anyUrl = URL.valueOf("zookeeper://zookeeper/*");
5284
private URL registryUrl;
5385
private ZookeeperRegistryFactory zookeeperRegistryFactory;
5486
private NotifyListener listener;
5587

88+
// mock object
89+
private static ZookeeperClientManager mockZookeeperClientManager;
90+
private static ZookeeperClient mockZookeeperClient;
91+
92+
5693
@BeforeAll
5794
public static void beforeAll() {
58-
zookeeperConnectionAddress1 = System.getProperty("zookeeper.connection.address.1");
95+
zookeeperConnectionAddress1 = "zookeeper://localhost:" + "2181";
96+
mockZookeeperClientManager = mock(ZookeeperClientManager.class);
97+
mockZookeeperClient = mock(ZookeeperClient.class);
5998
}
6099

100+
61101
@BeforeEach
62102
public void setUp() throws Exception {
63103
this.registryUrl = URL.valueOf(zookeeperConnectionAddress1);
64104
zookeeperRegistryFactory = new ZookeeperRegistryFactory(ApplicationModel.defaultModel());
105+
zookeeperRegistryFactory.setZookeeperTransporter(mockZookeeperClientManager);
106+
when(mockZookeeperClientManager.connect(registryUrl)).thenReturn(mockZookeeperClient);
65107
this.zookeeperRegistry = (ZookeeperRegistry) zookeeperRegistryFactory.createRegistry(registryUrl);
66108
}
67109

@@ -105,6 +147,7 @@ void testSubscribe() {
105147
@Test
106148
void testAvailable() {
107149
zookeeperRegistry.register(serviceUrl);
150+
when(mockZookeeperClient.isConnected()).thenReturn(true);
108151
assertThat(zookeeperRegistry.isAvailable(), is(true));
109152

110153
zookeeperRegistry.destroy();
@@ -113,6 +156,7 @@ void testAvailable() {
113156

114157
@Test
115158
void testLookup() {
159+
when(mockZookeeperClient.getChildren(any())).thenReturn(Lists.newArrayList(url));
116160
List<URL> lookup = zookeeperRegistry.lookup(serviceUrl);
117161
assertThat(lookup.size(), is(1));
118162

@@ -134,36 +178,19 @@ void testLookupIllegalUrl() {
134178
@Test
135179
void testLookupWithException() {
136180
URL errorUrl = URL.valueOf("multicast://0.0.0.0/");
181+
when(mockZookeeperClient.getChildren(any())).thenThrow(new IllegalStateException());
137182
Assertions.assertThrows(RpcException.class, () -> zookeeperRegistry.lookup(errorUrl));
138183
}
139184

140-
@Disabled
141-
@Test
142-
/*
143-
This UT is unstable, consider remove it later.
144-
@see https://github.com/apache/dubbo/issues/1787
145-
*/
146-
public void testStatusChecker() {
147-
RegistryStatusChecker registryStatusChecker = new RegistryStatusChecker(ApplicationModel.defaultModel());
148-
Status status = registryStatusChecker.check();
149-
assertThat(status.getLevel(), is(Status.Level.UNKNOWN));
150-
151-
Registry registry = zookeeperRegistryFactory.getRegistry(registryUrl);
152-
assertThat(registry, not(nullValue()));
153-
154-
status = registryStatusChecker.check();
155-
assertThat(status.getLevel(), is(Status.Level.ERROR));
156-
157-
registry.register(serviceUrl);
158-
status = registryStatusChecker.check();
159-
assertThat(status.getLevel(), is(Status.Level.OK));
160-
}
161-
162185
@Test
163186
void testSubscribeAnyValue() throws InterruptedException {
164187
final CountDownLatch latch = new CountDownLatch(1);
165188
zookeeperRegistry.register(serviceUrl);
166189
zookeeperRegistry.subscribe(anyUrl, urls -> latch.countDown());
190+
doAnswer(invocationOnMock -> {
191+
latch.countDown();
192+
return null;
193+
}).when(mockZookeeperClient).create(any(),anyBoolean(),anyBoolean());
167194
zookeeperRegistry.register(serviceUrl);
168195
latch.await();
169196
}
@@ -176,6 +203,7 @@ void testDestroy() {
176203

177204
@Test
178205
void testDoRegisterWithException() {
206+
doThrow(new IllegalStateException()).when(mockZookeeperClient).create(any(), anyBoolean(), anyBoolean());
179207
Assertions.assertThrows(RpcException.class, () -> {
180208
URL errorUrl = URL.valueOf("multicast://0.0.0.0/");
181209
zookeeperRegistry.doRegister(errorUrl);
@@ -184,6 +212,7 @@ void testDoRegisterWithException() {
184212

185213
@Test
186214
void testDoUnregisterWithException() {
215+
doThrow(new IllegalStateException()).when(mockZookeeperClient).delete(any());
187216
Assertions.assertThrows(RpcException.class, () -> {
188217
URL errorUrl = URL.valueOf("multicast://0.0.0.0/");
189218
zookeeperRegistry.doUnregister(errorUrl);

‎dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtilsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CuratorFrameworkUtilsTest {
4848

4949
@BeforeAll
5050
public static void init() throws Exception {
51-
zookeeperConnectionAddress1 = System.getProperty("zookeeper.connection.address.1");
51+
zookeeperConnectionAddress1 = "zookeeper://localhost:" + "2181";
5252

5353
registryUrl = URL.valueOf(zookeeperConnectionAddress1);
5454
registryUrl.setScopeModel(ApplicationModel.defaultModel());

‎dubbo-registry/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,4 @@
3737
<properties>
3838
<skip_maven_deploy>false</skip_maven_deploy>
3939
</properties>
40-
41-
<dependencies>
42-
<dependency>
43-
<groupId>org.apache.dubbo</groupId>
44-
<artifactId>dubbo-test-check</artifactId>
45-
<version>${project.parent.version}</version>
46-
<scope>test</scope>
47-
</dependency>
48-
</dependencies>
4940
</project>

0 commit comments

Comments
 (0)
⚡