Skip to content

Commit 2cb5c2d

Browse files
author
Heesung Sohn
committed
refactor 2
1 parent ecfbca1 commit 2cb5c2d

38 files changed

+299
-59
lines changed

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,9 @@ flexible messaging model and an intuitive client API.</description>
25652565
<module>pulsar-package-management</module>
25662566
<!-- package management releated modules (end) -->
25672567

2568+
<module>pulsar-inttest-lib</module>
2569+
<module>pulsar-inttest-client</module>
2570+
25682571
<!-- all these 3 modules should be put at the end in this exact sequence -->
25692572
<module>distribution</module>
25702573
<module>docker</module>
@@ -2621,6 +2624,9 @@ flexible messaging model and an intuitive client API.</description>
26212624

26222625
<module>pulsar-client-messagecrypto-bc</module>
26232626

2627+
<module>pulsar-inttest-lib</module>
2628+
<module>pulsar-inttest-client</module>
2629+
26242630
<!-- all these modules should be put at the end in this exact sequence -->
26252631
<module>distribution</module>
26262632
<module>pulsar-metadata</module>

‎pulsar-inttest-client/pom.xml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<project
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
24+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
25+
<modelVersion>4.0.0</modelVersion>
26+
<parent>
27+
<groupId>org.apache.pulsar</groupId>
28+
<artifactId>pulsar</artifactId>
29+
<version>4.1.0-SNAPSHOT</version>
30+
</parent>
31+
32+
<artifactId>pulsar-inttest-client</artifactId>
33+
<description>Pulsar Integration Common Client Test Classes</description>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.apache.pulsar</groupId>
38+
<artifactId>pulsar-inttest-lib</artifactId>
39+
<version>${project.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.testng</groupId>
43+
<artifactId>testng</artifactId>
44+
<version>${testng.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.apache.pulsar</groupId>
48+
<artifactId>pulsar-client-api</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.apache.pulsar</groupId>
53+
<artifactId>pulsar-client-admin-api</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
56+
57+
</dependencies>
58+
59+
<build>
60+
<plugins>
61+
<plugin>
62+
<groupId>org.gaul</groupId>
63+
<artifactId>modernizer-maven-plugin</artifactId>
64+
<configuration>
65+
<failOnViolations>true</failOnViolations>
66+
<javaVersion>8</javaVersion>
67+
</configuration>
68+
<executions>
69+
<execution>
70+
<id>modernizer</id>
71+
<phase>verify</phase>
72+
<goals>
73+
<goal>modernizer</goal>
74+
</goals>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
79+
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
81+
<artifactId>maven-checkstyle-plugin</artifactId>
82+
<executions>
83+
<execution>
84+
<id>checkstyle</id>
85+
<phase>verify</phase>
86+
<goals>
87+
<goal>check</goal>
88+
</goals>
89+
</execution>
90+
</executions>
91+
</plugin>
92+
93+
</plugins>
94+
</build>
95+
</project>

tests/integration/src/main/java/org/apache/pulsar/tests/integration/IntegTest.java renamed to pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/IntegTest.java

File renamed without changes.

tests/integration/src/main/java/org/apache/pulsar/tests/integration/messaging/TopicMessagingTest.java renamed to pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/messaging/TopicMessagingTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
package org.apache.pulsar.tests.integration.messaging;
2020

21-
import static org.apache.pulsar.tests.integration.IntegTestUtils.getNonPartitionedTopic;
22-
import static org.apache.pulsar.tests.integration.IntegTestUtils.getPartitionedTopic;
21+
import static org.apache.pulsar.tests.integration.utils.IntegTestUtils.getNonPartitionedTopic;
22+
import static org.apache.pulsar.tests.integration.utils.IntegTestUtils.getPartitionedTopic;
2323
import static org.testng.Assert.assertEquals;
2424
import static org.testng.Assert.assertNotNull;
2525
import static org.testng.Assert.assertTrue;
@@ -52,7 +52,6 @@
5252
@Slf4j
5353
public class TopicMessagingTest extends IntegTest {
5454

55-
5655
public TopicMessagingTest(PulsarClient client, PulsarAdmin admin) {
5756
super(client, admin);
5857
}

tests/integration/src/main/java/org/apache/pulsar/tests/integration/messaging/package-info.java renamed to pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/messaging/package-info.java

File renamed without changes.

tests/integration/src/main/java/org/apache/pulsar/tests/integration/package-info.java renamed to pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/package-info.java

File renamed without changes.

‎pulsar-inttest-lib/pom.xml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<project
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
24+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
25+
<modelVersion>4.0.0</modelVersion>
26+
<parent>
27+
<groupId>org.apache.pulsar</groupId>
28+
<artifactId>pulsar</artifactId>
29+
<version>4.1.0-SNAPSHOT</version>
30+
</parent>
31+
32+
<artifactId>pulsar-inttest-lib</artifactId>
33+
<description>Pulsar Integration Common Library</description>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>com.github.docker-java</groupId>
38+
<artifactId>docker-java-core</artifactId>
39+
<version>${docker-java.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.pulsar</groupId>
43+
<artifactId>pulsar-client-admin-api</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.testcontainers</groupId>
48+
<artifactId>testcontainers</artifactId>
49+
<version>${testcontainers.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.apache.httpcomponents</groupId>
53+
<artifactId>httpcore</artifactId>
54+
<version>${apache-httpcomponents.version}</version>
55+
</dependency>
56+
</dependencies>
57+
58+
<build>
59+
<plugins>
60+
<plugin>
61+
<groupId>org.gaul</groupId>
62+
<artifactId>modernizer-maven-plugin</artifactId>
63+
<configuration>
64+
<failOnViolations>true</failOnViolations>
65+
<javaVersion>8</javaVersion>
66+
</configuration>
67+
<executions>
68+
<execution>
69+
<id>modernizer</id>
70+
<phase>verify</phase>
71+
<goals>
72+
<goal>modernizer</goal>
73+
</goals>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-checkstyle-plugin</artifactId>
81+
<executions>
82+
<execution>
83+
<id>checkstyle</id>
84+
<phase>verify</phase>
85+
<goals>
86+
<goal>check</goal>
87+
</goals>
88+
</execution>
89+
</executions>
90+
</plugin>
91+
92+
</plugins>
93+
</build>
94+
</project>

tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BKContainer.java renamed to pulsar-inttest-lib/src/main/java/org/apache/pulsar/tests/integration/containers/BKContainer.java

File renamed without changes.

tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BrokerContainer.java renamed to pulsar-inttest-lib/src/main/java/org/apache/pulsar/tests/integration/containers/BrokerContainer.java

File renamed without changes.

tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java renamed to pulsar-inttest-lib/src/main/java/org/apache/pulsar/tests/integration/containers/CSContainer.java

File renamed without changes.

0 commit comments

Comments
 (0)