Skip to content

Commit 97317ce

Browse files
committed
Revert "feat:dubbo-remoting-zookeeper-curator5 remove dubbo-test module (#15082)"
This reverts commit d8f5406.
1 parent bc729af commit 97317ce

File tree

11 files changed

+61
-348
lines changed

11 files changed

+61
-348
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,5 @@
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>
6761
</dependencies>
6862
</project>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,5 @@
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>
9488
</dependencies>
9589
</project>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,5 @@
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>
6155
</dependencies>
6256
</project>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,5 @@
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>
6660
</dependencies>
6761
</project>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@
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>
7771
<dependency>
7872
<groupId>org.apache.logging.log4j</groupId>
7973
<artifactId>log4j-slf4j-impl</artifactId>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,5 @@
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>
4640
</dependencies>
4741
</project>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
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+
4249
<dependency>
4350
<groupId>org.apache.curator</groupId>
4451
<artifactId>curator-framework</artifactId>

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

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

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

21-
import org.junit.jupiter.api.AfterAll;
2221
import org.junit.jupiter.api.BeforeAll;
2322
import org.junit.jupiter.api.BeforeEach;
2423
import org.junit.jupiter.api.Test;
25-
import org.mockito.MockedConstruction;
2624

2725
import static org.hamcrest.MatcherAssert.assertThat;
2826
import static org.hamcrest.core.IsNot.not;
2927
import static org.hamcrest.core.IsNull.nullValue;
30-
import static org.mockito.Mockito.mock;
31-
import static org.mockito.Mockito.mockConstructionWithAnswer;
3228

3329
class Curator5ZookeeperClientManagerTest {
3430
private ZookeeperClient zookeeperClient;
3531
private ZookeeperClientManager zookeeperClientManager;
36-
private static MockedConstruction<Curator5ZookeeperClient> mockedCurator5ZookeeperClientConstruction;
3732
private static String zookeeperConnectionAddress1;
3833

3934
@BeforeAll
4035
public static void beforeAll() {
4136
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()));
4737
}
4838

4939
@BeforeEach
@@ -57,9 +47,4 @@ void testZookeeperClient() {
5747
assertThat(zookeeperClient, not(nullValue()));
5848
zookeeperClient.close();
5949
}
60-
61-
@AfterAll
62-
public static void afterAll() {
63-
mockedCurator5ZookeeperClientConstruction.close();
64-
}
6550
}

0 commit comments

Comments
 (0)