You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/02/19 05:55:20 UTC
[pulsar] 01/06: Split pulsar-client-and-admin-shade-test into two
parts (#8716)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 6fa5e705ed31be044a64fc0ce61b70696a31e113
Author: Weijie Guo <re...@163.com>
AuthorDate: Tue Dec 1 20:59:47 2020 +0800
Split pulsar-client-and-admin-shade-test into two parts (#8716)
Motivation
Add test for #8697 and other shade problems.
Modifications
splitting pulsar-client-and-admin-shade-test into two parts, before the pulsar-admin and pulsar-client shade tests were together, can cause some potential problems.
* Add CI test for shade package
* fix style
* fix license
* separate shade package
* fix pom.xml
* fix codestyle
* remove unused import
Co-authored-by: WeijieGuo <re...@bupt.edu.cn>
(cherry picked from commit 7f62bbcbd687d67d5b3fd9b1bab2101e64c42c59)
---
tests/bc_2_0_0/pom.xml | 6 ------
tests/bc_2_0_1/pom.xml | 6 ------
tests/pom.xml | 3 ++-
.../pom.xml | 20 ++------------------
.../pulsar/tests/integration/PulsarContainer.java | 0
.../apache/pulsar/tests/integration/SmokeTest.java | 0
.../src/test/resources/pulsar.xml | 2 +-
tests/pulsar-client-all-shade-test/pom.xml | 6 ------
.../pom.xml | 15 +++++----------
.../pulsar/tests/integration/PulsarContainer.java | 0
.../apache/pulsar/tests/integration/SmokeTest.java | 13 -------------
.../src/test/resources/pulsar.xml | 2 +-
12 files changed, 11 insertions(+), 62 deletions(-)
diff --git a/tests/bc_2_0_0/pom.xml b/tests/bc_2_0_0/pom.xml
index b3e3672..bb35003 100644
--- a/tests/bc_2_0_0/pom.xml
+++ b/tests/bc_2_0_0/pom.xml
@@ -35,12 +35,6 @@
<dependencies>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
<version>2.0.0-rc1-incubating</version>
diff --git a/tests/bc_2_0_1/pom.xml b/tests/bc_2_0_1/pom.xml
index e0c10c8..9af0c7f 100644
--- a/tests/bc_2_0_1/pom.xml
+++ b/tests/bc_2_0_1/pom.xml
@@ -35,12 +35,6 @@
<dependencies>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
<version>2.0.1-incubating</version>
diff --git a/tests/pom.xml b/tests/pom.xml
index 0c10fd0..6c5aa88 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -37,7 +37,8 @@
<module>bc_2_0_0</module>
<module>bc_2_0_1</module>
<module>pulsar-client-all-shade-test</module>
- <module>pulsar-client-and-admin-shade-test</module>
+ <module>pulsar-client-shade-test</module>
+ <module>pulsar-client-admin-shade-test</module>
</modules>
<build>
<plugins>
diff --git a/tests/pulsar-client-and-admin-shade-test/pom.xml b/tests/pulsar-client-admin-shade-test/pom.xml
similarity index 89%
rename from tests/pulsar-client-and-admin-shade-test/pom.xml
rename to tests/pulsar-client-admin-shade-test/pom.xml
index 4f495dc..3e1420e 100644
--- a/tests/pulsar-client-and-admin-shade-test/pom.xml
+++ b/tests/pulsar-client-admin-shade-test/pom.xml
@@ -23,26 +23,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.pulsar.tests</groupId>
<artifactId>tests-parent</artifactId>
<version>2.7.0</version>
</parent>
- <artifactId>pulsar-client-and-admin-shade-test</artifactId>
+ <artifactId>pulsar-client-admin-shade-test</artifactId>
<packaging>jar</packaging>
- <name>Apache Pulsar :: Tests :: Pulsar-Client-And-Admin-Shade Test</name>
+ <name>Apache Pulsar :: Tests :: Pulsar-Client-Admin-Shade Test</name>
<dependencies>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-admin</artifactId>
<version>${project.version}</version>
@@ -50,13 +43,6 @@
</dependency>
<dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
@@ -130,6 +116,4 @@
</build>
</profile>
</profiles>
-
-
</project>
diff --git a/tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
similarity index 100%
copy from tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
copy to tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
diff --git a/tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
similarity index 100%
copy from tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
copy to tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
diff --git a/tests/pulsar-client-and-admin-shade-test/src/test/resources/pulsar.xml b/tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml
similarity index 94%
copy from tests/pulsar-client-and-admin-shade-test/src/test/resources/pulsar.xml
copy to tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml
index 35bb553..cdb099d 100644
--- a/tests/pulsar-client-and-admin-shade-test/src/test/resources/pulsar.xml
+++ b/tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml
@@ -22,7 +22,7 @@
<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Shade Tests" verbose="2" annotations="JDK">
- <test name="pulsar-client-and-admin-shade-suite" preserve-order="true" >
+ <test name="pulsar-client-admin-shade-suite" preserve-order="true" >
<classes>
<class name="org.apache.pulsar.tests.integration.SmokeTest" />
</classes>
diff --git a/tests/pulsar-client-all-shade-test/pom.xml b/tests/pulsar-client-all-shade-test/pom.xml
index 2784b2e..f6f17a4 100644
--- a/tests/pulsar-client-all-shade-test/pom.xml
+++ b/tests/pulsar-client-all-shade-test/pom.xml
@@ -36,12 +36,6 @@
<dependencies>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-all</artifactId>
<version>${project.version}</version>
diff --git a/tests/pulsar-client-all-shade-test/pom.xml b/tests/pulsar-client-shade-test/pom.xml
similarity index 91%
copy from tests/pulsar-client-all-shade-test/pom.xml
copy to tests/pulsar-client-shade-test/pom.xml
index 2784b2e..5917fc5 100644
--- a/tests/pulsar-client-all-shade-test/pom.xml
+++ b/tests/pulsar-client-shade-test/pom.xml
@@ -23,27 +23,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.pulsar.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0-SNAPSHOT</version>
</parent>
- <artifactId>pulsar-client-all-shade-test</artifactId>
+ <artifactId>pulsar-client-shade-test</artifactId>
<packaging>jar</packaging>
- <name>Apache Pulsar :: Tests :: Pulsar-Client-All-Shade Test</name>
+ <name>Apache Pulsar :: Tests :: Pulsar-Client-Shade Test</name>
<dependencies>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client-all</artifactId>
+ <artifactId>pulsar-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
similarity index 100%
rename from tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
rename to tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
diff --git a/tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
similarity index 80%
rename from tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
rename to tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index 4427fa1..60d97ed 100644
--- a/tests/pulsar-client-and-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -19,8 +19,6 @@
package org.apache.pulsar.tests.integration;
import lombok.Cleanup;
-import org.apache.pulsar.client.admin.PulsarAdmin;
-import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.Producer;
@@ -33,8 +31,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
public class SmokeTest {
@@ -76,15 +72,6 @@ public class SmokeTest {
}
- @Test
- public void checkAdmin() throws PulsarClientException, PulsarAdminException {
- PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(pulsarContainer.getPulsarAdminUrl()).build();
- List<String> expectedNamespacesList = new ArrayList<>();
- expectedNamespacesList.add("public/default");
- expectedNamespacesList.add("public/functions");
- Assert.assertEquals(admin.namespaces().getNamespaces("public"), expectedNamespacesList);
- }
-
@AfterClass
public void cleanup(){
pulsarContainer.stop();
diff --git a/tests/pulsar-client-and-admin-shade-test/src/test/resources/pulsar.xml b/tests/pulsar-client-shade-test/src/test/resources/pulsar.xml
similarity index 94%
rename from tests/pulsar-client-and-admin-shade-test/src/test/resources/pulsar.xml
rename to tests/pulsar-client-shade-test/src/test/resources/pulsar.xml
index 35bb553..4f20868 100644
--- a/tests/pulsar-client-and-admin-shade-test/src/test/resources/pulsar.xml
+++ b/tests/pulsar-client-shade-test/src/test/resources/pulsar.xml
@@ -22,7 +22,7 @@
<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Shade Tests" verbose="2" annotations="JDK">
- <test name="pulsar-client-and-admin-shade-suite" preserve-order="true" >
+ <test name="pulsar-client-shade-suite" preserve-order="true" >
<classes>
<class name="org.apache.pulsar.tests.integration.SmokeTest" />
</classes>