Skip to content

Commit

Permalink
Use mock instead of real objects for testing
Browse files Browse the repository at this point in the history 
1.mock
2.field modifier
3.make Gson to be a common field
  • Loading branch information
@BurningCN
BurningCN committed Sep 28, 2021
1 parent 9189637 commit 4622951
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 195 deletions.
4 changes: 2 additions & 2 deletions .../main/java/org/apache/dubbo/registry/client/metadata/store/RemoteMetadataServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ public MetadataInfo getMetadata(ServiceInstance instance) {
metadataReport = getMetadataReports().entrySet().iterator().next().getValue();
}
Map<String, String> params = new HashMap<>(instance.getExtendParams());
if (instance.getRegistryCluster() != null && !instance.getRegistryCluster().equalsIgnoreCase(params.get(REGISTRY_CLUSTER_KEY))) {
params.put(REGISTRY_CLUSTER_KEY, instance.getRegistryCluster());
if (registryCluster != null && !registryCluster.equalsIgnoreCase(params.get(REGISTRY_CLUSTER_KEY))) {
params.put(REGISTRY_CLUSTER_KEY, registryCluster);
}
return metadataReport.getAppMetadata(identifier, params);
}
Expand Down
1 change: 0 additions & 1 deletion .../org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,6 @@ static List<ServiceInstance> buildInstances(List<Object> rawURls) {
String rawURL = (String)obj;
DefaultServiceInstance instance = new DefaultServiceInstance();
final URL dubboUrl = URL.valueOf(rawURL);
instance = new DefaultServiceInstance();
instance.setRawAddress(rawURL);
instance.setHost(dubboUrl.getHost());
instance.setEnabled(true);
Expand Down
7 changes: 6 additions & 1 deletion ...apache/dubbo/registry/client/metadata/MetadataServiceURLParamsMetadataCustomizerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@
import java.io.IOException;
import java.util.Map;

import static org.apache.dubbo.common.constants.CommonConstants.*;
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PORT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.METADATA_SERVICE_URL_PARAMS_PROPERTY_NAME;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down
119 changes: 0 additions & 119 deletions ...api/src/test/java/org/apache/dubbo/registry/client/metadata/store/MockMetadataReport.java
View file

This file was deleted.

28 changes: 0 additions & 28 deletions .../test/java/org/apache/dubbo/registry/client/metadata/store/MockMetadataReportFactory.java
View file

This file was deleted.

111 changes: 68 additions & 43 deletions ...t/java/org/apache/dubbo/registry/client/metadata/store/RemoteMetadataServiceImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,54 +17,75 @@
package org.apache.dubbo.registry.client.metadata.store;

import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
import org.apache.dubbo.metadata.MetadataInfo;
import org.apache.dubbo.metadata.WritableMetadataService;
import org.apache.dubbo.metadata.report.MetadataReport;
import org.apache.dubbo.metadata.report.MetadataReportInstance;
import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceInstance;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.stubbing.Answer;

import java.util.HashMap;
import java.util.Map;

import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.EXPORTED_SERVICES_REVISION_PROPERTY_NAME;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

public class RemoteMetadataServiceImplTest {
private static RemoteMetadataServiceImpl remoteMetadataService;
private static ApplicationModel scopeModel;

private static final String REGISTRY_CLUSTER = "registry9103";
private static final String SERVICE_NAME = "A";
private RemoteMetadataServiceImpl remoteMetadataService;
private MetadataReport metadataReport;
private MetadataInfo metadataInfo;
private String reversion;

@BeforeEach
public void setUp() {
ApplicationModel applicationModel = spy(ApplicationModel.defaultModel());
ScopeBeanFactory beanFactory = mock(ScopeBeanFactory.class);
MetadataReportInstance metadataReportInstance = mock(MetadataReportInstance.class);
metadataReport = mock(MetadataReport.class);

Map<String, MetadataReport> clusterToMetadataReport = new HashMap<>();
clusterToMetadataReport.put(REGISTRY_CLUSTER, metadataReport);
when(metadataReportInstance.getMetadataReports(anyBoolean())).thenReturn(clusterToMetadataReport);
when(applicationModel.getBeanFactory()).thenReturn(beanFactory);
when(beanFactory.getBean(MetadataReportInstance.class)).thenReturn(metadataReportInstance);

metadataInfo = new MetadataInfo();
URL url = URL.valueOf("dubbo://30.225.21.30:20880/org.apache.dubbo.registry.service.DemoService");
metadataInfo.addService(new MetadataInfo.ServiceInfo(url));
reversion = metadataInfo.calAndGetRevision();
Map<String, MetadataInfo> clusterToMetadataInfo = new HashMap<>();
clusterToMetadataInfo.put(REGISTRY_CLUSTER, metadataInfo);

WritableMetadataService writableMetadataService = mock(WritableMetadataService.class);
when(applicationModel.getDefaultExtension(WritableMetadataService.class)).thenReturn(writableMetadataService);
when(writableMetadataService.getMetadataInfos()).thenReturn(clusterToMetadataInfo);
when(metadataReport.getAppMetadata(any(),any())).thenAnswer((Answer<MetadataInfo>) invocationOnMock -> {
SubscriberMetadataIdentifier identifier = invocationOnMock.getArgument(0, SubscriberMetadataIdentifier.class);
if (SERVICE_NAME.equals(identifier.getApplication()) && reversion.equals(identifier.getRevision())) {
return metadataInfo;
}
return null;
});

@BeforeAll
public static void setUp() {
ApplicationConfig applicationConfig = new ApplicationConfig();
applicationConfig.setName("A");
scopeModel = ApplicationModel.defaultModel();
scopeModel.getApplicationConfigManager().setApplication(applicationConfig);

URL url = URL.valueOf("metadata://127.0.0.1:20880/TestService?version=1.0.0&metadata=mock&sync.report=true");
MetadataReportConfig metadataReportConfig = mock(MetadataReportConfig.class);
when(metadataReportConfig.getApplicationModel()).thenReturn(scopeModel);
when(metadataReportConfig.toUrl()).thenReturn(url);
when(metadataReportConfig.getScopeModel()).thenReturn(scopeModel);
when(metadataReportConfig.getRegistry()).thenReturn(REGISTRY_CLUSTER);
MetadataReportInstance metadataReportInstance = scopeModel.getBeanFactory().getBean(MetadataReportInstance.class);
metadataReportInstance.init(metadataReportConfig);

remoteMetadataService = new RemoteMetadataServiceImpl();
remoteMetadataService.setScopeModel(scopeModel);
}

@AfterAll
public static void clearUp() {
ApplicationModel.reset();
remoteMetadataService.setScopeModel(applicationModel);
}

@Test
Expand All @@ -73,37 +94,41 @@ public void testPublishAndGetMetadata() {
// test getMetadataReports
Map<String, MetadataReport> metadataReports = remoteMetadataService.getMetadataReports();
Assertions.assertTrue(metadataReports.containsKey(REGISTRY_CLUSTER));
Assertions.assertTrue(metadataReports.get(REGISTRY_CLUSTER) instanceof MockMetadataReport);

// test publishMetadata
WritableMetadataService writableMetadataService = scopeModel.getDefaultExtension(WritableMetadataService.class);
URL url = URL.valueOf("dubbo://30.225.21.30:20880/org.apache.dubbo.registry.service.DemoService?REGISTRY_CLUSTER=" + REGISTRY_CLUSTER);
writableMetadataService.exportURL(url);
remoteMetadataService.publishMetadata("A");
remoteMetadataService.publishMetadata(SERVICE_NAME);

ArgumentCaptor<SubscriberMetadataIdentifier> identifierArgumentCaptor = ArgumentCaptor.forClass(SubscriberMetadataIdentifier.class);
ArgumentCaptor<MetadataInfo> metadataInfoArgumentCaptor = ArgumentCaptor.forClass(MetadataInfo.class);
verify(metadataReport, times(1)).publishAppMetadata(identifierArgumentCaptor.capture(), metadataInfoArgumentCaptor.capture());
SubscriberMetadataIdentifier identifier = identifierArgumentCaptor.getValue();
Assertions.assertEquals(identifier.getRevision(), reversion);
Assertions.assertEquals(identifier.getApplication(), SERVICE_NAME);

// test getMetadata
ServiceInstance serviceInstance = new DefaultServiceInstance();
DefaultServiceInstance serviceInstance = new DefaultServiceInstance(SERVICE_NAME, "127.0.0.1", 20880, ApplicationModel.defaultModel());
serviceInstance.setRegistryCluster(REGISTRY_CLUSTER);
Map<String, MetadataInfo> metadataInfos = writableMetadataService.getMetadataInfos();
MetadataInfo localMetadataInfo = metadataInfos.get(REGISTRY_CLUSTER);
String revision = localMetadataInfo.calAndGetRevision();
serviceInstance.getMetadata().put(EXPORTED_SERVICES_REVISION_PROPERTY_NAME, revision);
serviceInstance.getMetadata().put(EXPORTED_SERVICES_REVISION_PROPERTY_NAME, reversion);

MetadataInfo remoteMetadataInfo = remoteMetadataService.getMetadata(serviceInstance);
Assertions.assertEquals(localMetadataInfo, remoteMetadataInfo);
Assertions.assertEquals(remoteMetadataInfo, metadataInfo);

serviceInstance.setServiceName("FAIL_SERVICE_NAME");
remoteMetadataInfo = remoteMetadataService.getMetadata(serviceInstance);
Assertions.assertNull(remoteMetadataInfo);
}

@Test
public void testPublishServiceDefinition() {
// test provider publishServiceDefinition
URL providerURL = URL.valueOf("dubbo://127.0.0.1:8888/org.apache.dubbo.registry.service.DemoService?side=provider");
remoteMetadataService.publishServiceDefinition(providerURL);
verify(metadataReport, times(1)).storeProviderMetadata(any(),any());

// test consumer publishServiceDefinition
URL consumerURL = URL.valueOf("dubbo://127.0.0.1:8888/org.apache.dubbo.registry.service.DemoService?side=consumer");
remoteMetadataService.publishServiceDefinition(consumerURL);

Map<String, MetadataReport> metadataReports = remoteMetadataService.getMetadataReports();
MockMetadataReport metadataReport = (MockMetadataReport) metadataReports.get(REGISTRY_CLUSTER);
Assertions.assertEquals(metadataReport.store.size(),2);
verify(metadataReport, times(1)).storeConsumerMetadata(any(),any());

}
}
1 change: 0 additions & 1 deletion .../src/test/resources/META-INF/dubbo/org.apache.dubbo.metadata.report.MetadataReportFactory
View file

This file was deleted.

0 comments on commit 4622951

Please sign in to comment.