This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 8b404d4ce14 [improve][test] Bump TestNG to 7.6.1 (#18521)
8b404d4ce14 is described below
commit 8b404d4ce14a1a10bd7569826754800f2cab5b0b
Author: Zixuan Liu <[email protected]>
AuthorDate: Fri Nov 18 19:43:13 2022 +0800
[improve][test] Bump TestNG to 7.6.1 (#18521)
Signed-off-by: Zixuan Liu <[email protected]>
---
build/run_integration_group.sh | 7 +++++++
buildtools/pom.xml | 2 +-
pom.xml | 2 +-
pulsar-client-admin/pom.xml | 6 ++++++
pulsar-client-all/pom.xml | 3 +++
.../pulsar/client/impl/BatchMessageContainerImplTest.java | 6 +++---
.../apache/pulsar/client/impl/ClientBuilderImplTest.java | 4 ++--
.../pulsar/client/impl/ProducerStatsRecorderImplTest.java | 14 ++++++--------
.../apache/pulsar/common/util/TrustManagerProxyTest.java | 4 ++--
pulsar-io/kafka/pom.xml | 6 ++++++
.../storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java | 5 ++---
11 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/build/run_integration_group.sh b/build/run_integration_group.sh
index 6456911999e..c107a2adb1e 100755
--- a/build/run_integration_group.sh
+++ b/build/run_integration_group.sh
@@ -25,6 +25,8 @@ set -o pipefail
set -o errexit
JAVA_MAJOR_VERSION="$(java -version 2>&1 |grep " version " | awk -F\" '{ print
$2 }' | awk -F. '{ if ($1=="1") { print $2 } else { print $1 } }')"
+# Used to shade run test on Java 8, because the latest TestNG requires Java 11
or higher.
+TESTNG_VERSION="7.3.0"
# lists all active maven modules with given parameters
# parses the modules from the "mvn initialize" output
@@ -95,6 +97,11 @@ test_group_shade_run() {
if [[ $JAVA_MAJOR_VERSION -gt 8 && $JAVA_MAJOR_VERSION -lt 17 ]]; then
additional_args="-Dmaven.compiler.source=$JAVA_MAJOR_VERSION
-Dmaven.compiler.target=$JAVA_MAJOR_VERSION"
fi
+
+ if [[ $JAVA_MAJOR_VERSION -ge 8 && $JAVA_MAJOR_VERSION -lt 11 ]]; then
+ additional_args="$additional_args -Dtestng.version=$TESTNG_VERSION"
+ fi
+
mvn_run_integration_test --skip-build-deps --clean "$@" -Denforcer.skip=true
-DShadeTests -DtestForkCount=1 -DtestReuseFork=false $additional_args
}
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index a463f114c62..706736e4c26 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -41,7 +41,7 @@
<surefire.version>3.0.0-M3</surefire.version>
<log4j2.version>2.18.0</log4j2.version>
<slf4j.version>1.7.32</slf4j.version>
- <testng.version>7.3.0</testng.version>
+ <testng.version>7.6.1</testng.version>
<commons-lang3.version>3.11</commons-lang3.version>
<license-maven-plugin.version>4.1</license-maven-plugin.version>
<maven-shade-plugin.version>3.4.0</maven-shade-plugin.version>
diff --git a/pom.xml b/pom.xml
index 82cf6954490..41589a69b3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,7 +241,7 @@ flexible messaging model and an intuitive client
API.</description>
<!-- Set docker-java.version to the version of docker-java used in
Testcontainers -->
<docker-java.version>3.2.13</docker-java.version>
<kerby.version>1.1.1</kerby.version>
- <testng.version>7.3.0</testng.version>
+ <testng.version>7.6.1</testng.version>
<mockito.version>3.12.4</mockito.version>
<javassist.version>3.25.0-GA</javassist.version>
<skyscreamer.version>1.5.0</skyscreamer.version>
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index 89fccfccd56..983dfbdaf08 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -107,6 +107,12 @@
<artifactId>pulsar-package-core</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index 11f46b92704..7c7b2ed7f80 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -412,6 +412,9 @@
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${pulsar.client.compiler.release}</maxJdkVersion>
+ <ignoredScopes>
+ <ignoreScope>test</ignoreScope>
+ </ignoredScopes>
</enforceBytecodeVersion>
</rules>
</configuration>
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
index a51be6b4bd0..4b80e19c256 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import io.netty.buffer.ByteBufAllocator;
import io.netty.util.ReferenceCountUtil;
import java.lang.reflect.Field;
@@ -36,7 +37,6 @@ import org.apache.pulsar.client.api.CompressionType;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
import org.apache.pulsar.common.api.proto.MessageMetadata;
-import org.junit.Assert;
import org.testng.annotations.Test;
public class BatchMessageContainerImplTest {
@@ -112,7 +112,7 @@ public class BatchMessageContainerImplTest {
clientFiled.setAccessible(true);
clientFiled.set(producer, pulsarClient);
} catch (Exception e){
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
when(producer.getConfiguration()).thenReturn(producerConfigurationData);
@@ -155,7 +155,7 @@ public class BatchMessageContainerImplTest {
clientFiled.setAccessible(true);
clientFiled.set(producer, pulsarClient);
} catch (Exception e){
- Assert.fail(e.getMessage());
+ fail(e.getMessage());
}
ByteBuffer payload =
ByteBuffer.wrap("payload".getBytes(StandardCharsets.UTF_8));
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
index cacf2c30c53..c435d6f05e4 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
@@ -18,10 +18,10 @@
*/
package org.apache.pulsar.client.impl;
+import static org.testng.Assert.fail;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.ServiceUrlProvider;
-import org.junit.Assert;
import org.testng.annotations.Test;
public class ClientBuilderImplTest {
@@ -90,7 +90,7 @@ public class ClientBuilderImplTest {
// test config not correct.
try {
PulsarClient.builder().connectionMaxIdleSeconds(30);
- Assert.fail();
+ fail();
} catch (IllegalArgumentException e){
}
}
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
index 0b4379e087f..32d0eff6e79 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
@@ -18,20 +18,18 @@
*/
package org.apache.pulsar.client.impl;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import io.netty.util.HashedWheelTimer;
import io.netty.util.Timer;
+import java.util.concurrent.TimeUnit;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
import org.testng.annotations.Test;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-
/**
* Unit tests of {@link ProducerStatsRecorderImpl}.
*/
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
index 31c74c2f09b..8114f9b9356 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.pulsar.common.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import com.google.common.io.Resources;
import java.security.cert.X509Certificate;
import java.util.Arrays;
diff --git a/pulsar-io/kafka/pom.xml b/pulsar-io/kafka/pom.xml
index ca7485510c8..f6711e572ce 100644
--- a/pulsar-io/kafka/pom.xml
+++ b/pulsar-io/kafka/pom.xml
@@ -113,6 +113,12 @@
<artifactId>jjwt-jackson</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git
a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
index 02c32e67186..559cc54d8b6 100644
---
a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
+++
b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
@@ -18,13 +18,13 @@
*/
package
org.apache.pulsar.packages.management.storage.bookkeeper.bookkeeper.test;
+import static org.testng.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-
import org.apache.bookkeeper.test.ZooKeeperCluster;
import org.apache.bookkeeper.util.IOUtils;
import org.apache.bookkeeper.zookeeper.ZooKeeperClient;
@@ -33,7 +33,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.test.ClientBase;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -135,7 +134,7 @@ public class ZooKeeperUtil implements ZooKeeperCluster {
if (this.serverFactory != null) {
this.serverFactory.shutdown();
- Assert.assertTrue("waiting for server down",
ClientBase.waitForServerDown(this.getZooKeeperConnectString(),
(long)ClientBase.CONNECTION_TIMEOUT));
+
assertTrue(ClientBase.waitForServerDown(this.getZooKeeperConnectString(),
(long)ClientBase.CONNECTION_TIMEOUT),"waiting for server down");
}
if (this.zks != null) {
