Skip to content

Commit d8f5406

Browse files
authored
feat:dubbo-remoting-zookeeper-curator5 remove dubbo-test module (#15082)
1 parent da3ed53 commit d8f5406

File tree

11 files changed

+348
-61
lines changed

11 files changed

+348
-61
lines changed

dubbo-remoting/dubbo-remoting-api/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,11 @@
5858
<artifactId>log4j-slf4j-impl</artifactId>
5959
<scope>test</scope>
6060
</dependency>
61+
<dependency>
62+
<groupId>org.apache.dubbo</groupId>
63+
<artifactId>dubbo-test-check</artifactId>
64+
<version>${project.parent.version}</version>
65+
<scope>test</scope>
66+
</dependency>
6167
</dependencies>
6268
</project>

dubbo-remoting/dubbo-remoting-http12/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,11 @@
8585
<artifactId>log4j-slf4j-impl</artifactId>
8686
<scope>test</scope>
8787
</dependency>
88+
<dependency>
89+
<groupId>org.apache.dubbo</groupId>
90+
<artifactId>dubbo-test-check</artifactId>
91+
<version>${project.parent.version}</version>
92+
<scope>test</scope>
93+
</dependency>
8894
</dependencies>
8995
</project>

dubbo-remoting/dubbo-remoting-http3/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,11 @@
5252
<artifactId>log4j-slf4j-impl</artifactId>
5353
<scope>test</scope>
5454
</dependency>
55+
<dependency>
56+
<groupId>org.apache.dubbo</groupId>
57+
<artifactId>dubbo-test-check</artifactId>
58+
<version>${project.parent.version}</version>
59+
<scope>test</scope>
60+
</dependency>
5561
</dependencies>
5662
</project>

dubbo-remoting/dubbo-remoting-netty/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,11 @@
5757
<version>${project.parent.version}</version>
5858
<scope>test</scope>
5959
</dependency>
60+
<dependency>
61+
<groupId>org.apache.dubbo</groupId>
62+
<artifactId>dubbo-test-check</artifactId>
63+
<version>${project.parent.version}</version>
64+
<scope>test</scope>
65+
</dependency>
6066
</dependencies>
6167
</project>

dubbo-remoting/dubbo-remoting-netty4/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
<version>${project.parent.version}</version>
6969
<scope>test</scope>
7070
</dependency>
71+
<dependency>
72+
<groupId>org.apache.dubbo</groupId>
73+
<artifactId>dubbo-test-check</artifactId>
74+
<version>${project.parent.version}</version>
75+
<scope>test</scope>
76+
</dependency>
7177
<dependency>
7278
<groupId>org.apache.logging.log4j</groupId>
7379
<artifactId>log4j-slf4j-impl</artifactId>

dubbo-remoting/dubbo-remoting-websocket/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,11 @@
3737
<artifactId>dubbo-remoting-http12</artifactId>
3838
<version>${project.parent.version}</version>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.apache.dubbo</groupId>
42+
<artifactId>dubbo-test-check</artifactId>
43+
<version>${project.parent.version}</version>
44+
<scope>test</scope>
45+
</dependency>
4046
</dependencies>
4147
</project>

dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@
3939
<version>${project.parent.version}</version>
4040
</dependency>
4141

42-
<dependency>
43-
<groupId>org.apache.dubbo</groupId>
44-
<artifactId>dubbo-test-common</artifactId>
45-
<version>${project.parent.version}</version>
46-
<scope>test</scope>
47-
</dependency>
48-
4942
<dependency>
5043
<groupId>org.apache.curator</groupId>
5144
<artifactId>curator-framework</artifactId>

dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientManagerTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,32 @@
1818

1919
import org.apache.dubbo.common.URL;
2020

21+
import org.junit.jupiter.api.AfterAll;
2122
import org.junit.jupiter.api.BeforeAll;
2223
import org.junit.jupiter.api.BeforeEach;
2324
import org.junit.jupiter.api.Test;
25+
import org.mockito.MockedConstruction;
2426

2527
import static org.hamcrest.MatcherAssert.assertThat;
2628
import static org.hamcrest.core.IsNot.not;
2729
import static org.hamcrest.core.IsNull.nullValue;
30+
import static org.mockito.Mockito.mock;
31+
import static org.mockito.Mockito.mockConstructionWithAnswer;
2832

2933
class Curator5ZookeeperClientManagerTest {
3034
private ZookeeperClient zookeeperClient;
3135
private ZookeeperClientManager zookeeperClientManager;
36+
private static MockedConstruction<Curator5ZookeeperClient> mockedCurator5ZookeeperClientConstruction;
3237
private static String zookeeperConnectionAddress1;
3338

3439
@BeforeAll
3540
public static void beforeAll() {
3641
zookeeperConnectionAddress1 = System.getProperty("zookeeper.connection.address.1");
42+
Curator5ZookeeperClient mockCurator5ZookeeperClient = mock(Curator5ZookeeperClient.class);
43+
mockedCurator5ZookeeperClientConstruction =
44+
mockConstructionWithAnswer(Curator5ZookeeperClient.class, invocationOnMock -> invocationOnMock
45+
.getMethod()
46+
.invoke(mockCurator5ZookeeperClient, invocationOnMock.getArguments()));
3747
}
3848

3949
@BeforeEach
@@ -47,4 +57,9 @@ void testZookeeperClient() {
4757
assertThat(zookeeperClient, not(nullValue()));
4858
zookeeperClient.close();
4959
}
60+
61+
@AfterAll
62+
public static void afterAll() {
63+
mockedCurator5ZookeeperClientConstruction.close();
64+
}
5065
}

0 commit comments

Comments
 (0)