This is an automated email from the ASF dual-hosted git repository.
rainyu pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 47a141c12a metadata-api test unit test modification (#15879)
47a141c12a is described below
commit 47a141c12a0d4f66d988e1200dd410fec42e3eac
Author: LJQHDL <[email protected]>
AuthorDate: Fri Dec 19 22:23:06 2025 +0800
metadata-api test unit test modification (#15879)
* test(metadata-api): unitize tests; mock ApplicationModel deps; remove
hamcrest; sync store for AbstractMetadataReport
* test(metadata-api): convert tests to unit style; mock ApplicationModel;
sync AbstractMetadataReport tests
* chore: add bin/ to .gitignore
* metadata-api test modify
* style: apply spotless formatting
* Deleted test dependency, added back assertions
* style: fix formatting issues via spotless
* Fix formatting of dependencies tag in pom.xml
* Remove empty dependencies section
Removed empty dependencies section from pom.xml
* style: fix formatting issues via spotless
* Remove empty line in pom.xml
---------
Co-authored-by: LBQD <[email protected]>
Co-authored-by: Rain Yu <[email protected]>
Co-authored-by: zrlw <[email protected]>
---
.../metadata/AbstractServiceNameMappingTest.java | 26 +++++++++++++++++++---
.../report/MetadataReportInstanceTest.java | 4 +---
.../report/support/AbstractMetadataReportTest.java | 18 ++++++++-------
dubbo-metadata/pom.xml | 9 --------
4 files changed, 34 insertions(+), 23 deletions(-)
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/AbstractServiceNameMappingTest.java
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/AbstractServiceNameMappingTest.java
index 3cd01884d8..21886fbe22 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/AbstractServiceNameMappingTest.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/AbstractServiceNameMappingTest.java
@@ -28,22 +28,42 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import static org.apache.dubbo.common.constants.RegistryConstants.PROVIDED_BY;
import static
org.apache.dubbo.common.constants.RegistryConstants.SUBSCRIBED_SERVICE_NAMES_KEY;
+import static org.mockito.Mockito.*;
/**
* @see AbstractServiceNameMapping
*/
class AbstractServiceNameMappingTest {
- private MockServiceNameMapping mapping = new
MockServiceNameMapping(ApplicationModel.defaultModel());
- private MockServiceNameMapping2 mapping2 = new
MockServiceNameMapping2(ApplicationModel.defaultModel());
+ private ApplicationModel applicationModel =
Mockito.mock(ApplicationModel.class);
+ private MockServiceNameMapping mapping;
+ private MockServiceNameMapping2 mapping2;
URL url = URL.valueOf("dubbo://127.0.0.1:21880/" +
AbstractServiceNameMappingTest.class.getName());
@BeforeEach
- public void setUp() throws Exception {}
+ public void setUp() throws Exception {
+ org.apache.dubbo.rpc.model.FrameworkModel frameworkModel =
+ org.apache.dubbo.rpc.model.FrameworkModel.defaultModel();
+ frameworkModel
+ .getBeanFactory()
+
.getOrRegisterBean(org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository.class);
+ org.apache.dubbo.config.context.ConfigManager configManager =
+
Mockito.mock(org.apache.dubbo.config.context.ConfigManager.class);
+ org.apache.dubbo.config.ApplicationConfig appConfig =
+ Mockito.mock(org.apache.dubbo.config.ApplicationConfig.class);
+
Mockito.when(applicationModel.getFrameworkModel()).thenReturn(frameworkModel);
+
Mockito.when(applicationModel.getApplicationConfigManager()).thenReturn(configManager);
+
Mockito.when(configManager.getApplication()).thenReturn(java.util.Optional.of(appConfig));
+ Mockito.when(appConfig.getEnableFileCache()).thenReturn(Boolean.TRUE);
+
Mockito.when(applicationModel.tryGetApplicationName()).thenReturn("unit-test");
+ mapping = new MockServiceNameMapping(applicationModel);
+ mapping2 = new MockServiceNameMapping2(applicationModel);
+ }
@AfterEach
public void clearup() {
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/MetadataReportInstanceTest.java
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/MetadataReportInstanceTest.java
index 226bd62f3a..2a8d02f9ce 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/MetadataReportInstanceTest.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/MetadataReportInstanceTest.java
@@ -25,12 +25,10 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
import java.util.Collections;
import java.util.Map;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -69,7 +67,7 @@ class MetadataReportInstanceTest {
void test() {
Assertions.assertNull(
metadataReportInstance.getMetadataReport(registryId), "the
metadata report was not initialized.");
- assertThat(metadataReportInstance.getMetadataReports(true),
Matchers.anEmptyMap());
+
Assertions.assertTrue(metadataReportInstance.getMetadataReports(true).isEmpty());
metadataReportInstance.init(Collections.singletonList(metadataReportConfig));
MetadataReport metadataReport =
metadataReportInstance.getMetadataReport(registryId);
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
index de7f7656d4..16bba0679a 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
@@ -71,7 +71,7 @@ class AbstractMetadataReportTest {
.setApplication(new
ApplicationConfig(getClass().getSimpleName()));
URL url = URL.valueOf("zookeeper://" +
NetUtils.getLocalAddress().getHostName()
- +
":4444/org.apache.dubbo.TestService?version=1.0.0&application=vic");
+ +
":4444/org.apache.dubbo.TestService?version=1.0.0&application=vic&sync=true");
abstractMetadataReport = new NewMetadataReport(url, applicationModel);
}
@@ -126,9 +126,10 @@ class AbstractMetadataReportTest {
@Test
void testFileExistAfterPut() throws ClassNotFoundException {
// just for one method
- URL singleUrl = URL.valueOf(
- "redis://" + NetUtils.getLocalAddress().getHostName()
- +
":4444/org.apache.dubbo.metadata.store.InterfaceNameTestService?version=1.0.0&application=singleTest");
+ String filePath = System.getProperty("user.home") +
"/dubbo-md-unit.properties";
+ URL singleUrl = URL.valueOf("redis://" +
NetUtils.getLocalAddress().getHostName()
+ +
":4444/org.apache.dubbo.metadata.store.InterfaceNameTestService?version=1.0.0&application=singleTest&sync=true&file="
+ + filePath);
NewMetadataReport singleMetadataReport = new
NewMetadataReport(singleUrl, applicationModel);
assertFalse(singleMetadataReport.file.exists());
@@ -156,11 +157,11 @@ class AbstractMetadataReportTest {
String group = null;
String application = "vic.retry";
URL storeUrl = URL.valueOf("retryReport://" +
NetUtils.getLocalAddress().getHostName()
- +
":4444/org.apache.dubbo.TestServiceForRetry?version=1.0.0.retry&application=vic.retry");
+ +
":4444/org.apache.dubbo.TestServiceForRetry?version=1.0.0.retry&application=vic.retry&sync=true");
RetryMetadataReport retryReport = new RetryMetadataReport(storeUrl, 2,
applicationModel);
retryReport.metadataReportRetry.retryPeriod = 400L;
URL url = URL.valueOf("dubbo://" +
NetUtils.getLocalAddress().getHostName()
- +
":4444/org.apache.dubbo.TestService?version=1.0.0&application=vic");
+ +
":4444/org.apache.dubbo.TestService?version=1.0.0&application=vic&sync=true");
Assertions.assertNull(retryReport.metadataReportRetry.retryScheduledFuture);
assertEquals(0, retryReport.metadataReportRetry.retryCounter.get());
assertTrue(retryReport.store.isEmpty());
@@ -192,8 +193,9 @@ class AbstractMetadataReportTest {
String version = "1.0.0.retrycancel";
String group = null;
String application = "vic.retry";
- URL storeUrl = URL.valueOf("retryReport://" +
NetUtils.getLocalAddress().getHostName()
- +
":4444/org.apache.dubbo.TestServiceForRetryCancel?version=1.0.0.retrycancel&application=vic.retry");
+ URL storeUrl = URL.valueOf(
+ "retryReport://" + NetUtils.getLocalAddress().getHostName()
+ +
":4444/org.apache.dubbo.TestServiceForRetryCancel?version=1.0.0.retrycancel&application=vic.retry&sync=true");
RetryMetadataReport retryReport = new RetryMetadataReport(storeUrl, 2,
applicationModel);
retryReport.metadataReportRetry.retryPeriod = 150L;
retryReport.metadataReportRetry.retryTimesIfNonFail = 2;
diff --git a/dubbo-metadata/pom.xml b/dubbo-metadata/pom.xml
index d4dd9e1f81..2814755e63 100644
--- a/dubbo-metadata/pom.xml
+++ b/dubbo-metadata/pom.xml
@@ -33,13 +33,4 @@
<module>dubbo-metadata-report-zookeeper</module>
<module>dubbo-metadata-report-nacos</module>
</modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-test-check</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
