You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by zi...@apache.org on 2023/07/07 15:45:48 UTC
[pulsar] branch master updated: [cleanup][test] Remove and prevent junit (#20611)
This is an automated email from the ASF dual-hosted git repository.
zixuan 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 c1f52f83afa [cleanup][test] Remove and prevent junit (#20611)
c1f52f83afa is described below
commit c1f52f83afa76763a4c9270ea837f3b0772ce197
Author: Zixuan Liu <no...@gmail.com>
AuthorDate: Fri Jul 7 23:45:36 2023 +0800
[cleanup][test] Remove and prevent junit (#20611)
Signed-off-by: Zixuan Liu <no...@gmail.com>
---
.../src/main/resources/pulsar/checkstyle.xml | 2 +-
.../pulsar/broker/EmbeddedPulsarCluster.java | 2 +-
.../broker/admin/AdminApiMultiBrokersTest.java | 2 +-
.../channel/ServiceUnitStateChannelTest.java | 6 ++--
.../ServiceUnitStateCompactionStrategyTest.java | 2 +-
.../extensions/data/BrokerLookupDataTest.java | 35 +++++++++++-----------
.../broker/service/OneWayReplicatorTest.java | 4 +--
.../nonpersistent/NonPersistentTopicTest.java | 19 ++++++------
.../service/persistent/PersistentTopicTest.java | 2 +-
.../SegmentAbortedTxnProcessorTest.java | 12 ++++----
10 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/buildtools/src/main/resources/pulsar/checkstyle.xml b/buildtools/src/main/resources/pulsar/checkstyle.xml
index b3812ca8ccc..c63c8993408 100644
--- a/buildtools/src/main/resources/pulsar/checkstyle.xml
+++ b/buildtools/src/main/resources/pulsar/checkstyle.xml
@@ -137,7 +137,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
<module name="IllegalImport">
<property name="illegalPkgs"
- value="autovalue.shaded, avro.shaded, bk-shade, com.google.api.client.repackaged, com.google.appengine.repackaged, org.apache.curator.shaded, org.testcontainers.shaded" />
+ value="autovalue.shaded, avro.shaded, bk-shade, com.google.api.client.repackaged, com.google.appengine.repackaged, org.apache.curator.shaded, org.testcontainers.shaded, org.junit" />
</module>
<module name="RedundantModifier">
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java
index b20895434a5..ff454f9c566 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java
@@ -24,11 +24,11 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.Builder;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.metadata.bookkeeper.BKCluster;
-import org.junit.platform.commons.util.StringUtils;
public class EmbeddedPulsarCluster implements AutoCloseable {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java
index 13cac6b5905..de4cf9658b2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.pulsar.broker.admin;
-import static org.junit.Assert.assertFalse;
+import static org.testng.Assert.assertFalse;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java
index d8b4f1d75d2..ace31b1d60b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java
@@ -37,9 +37,9 @@ import static org.apache.pulsar.metadata.api.extended.SessionEvent.SessionReesta
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThrows;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.AssertJUnit.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateCompactionStrategyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateCompactionStrategyTest.java
index 62de91dab29..049da191a80 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateCompactionStrategyTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateCompactionStrategyTest.java
@@ -25,7 +25,7 @@ import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUni
import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Owned;
import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Releasing;
import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Splitting;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java
index 7bcd0687f00..0d874e0f771 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java
@@ -18,14 +18,15 @@
*/
package org.apache.pulsar.broker.loadbalance.extensions.data;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
import org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl;
import org.apache.pulsar.broker.lookup.LookupResult;
import org.apache.pulsar.policies.data.loadbalancer.AdvertisedListener;
-import org.junit.Assert;
import org.testng.annotations.Test;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
@Test(groups = "broker")
public class BrokerLookupDataTest {
@@ -44,21 +45,21 @@ public class BrokerLookupDataTest {
webServiceUrl, webServiceUrlTls, pulsarServiceUrl,
pulsarServiceUrlTls, advertisedListeners, protocols, true, true,
ExtensibleLoadManagerImpl.class.getName(), System.currentTimeMillis(),"3.0");
- Assert.assertEquals(webServiceUrl, lookupData.webServiceUrl());
- Assert.assertEquals(webServiceUrlTls, lookupData.webServiceUrlTls());
- Assert.assertEquals(pulsarServiceUrl, lookupData.pulsarServiceUrl());
- Assert.assertEquals(pulsarServiceUrlTls, lookupData.pulsarServiceUrlTls());
- Assert.assertEquals(Optional.of("9092"), lookupData.getProtocol("kafka"));
- Assert.assertEquals(Optional.empty(), lookupData.getProtocol("echo"));
- Assert.assertTrue(lookupData.persistentTopicsEnabled());
- Assert.assertTrue(lookupData.nonPersistentTopicsEnabled());
- Assert.assertEquals("3.0", lookupData.brokerVersion());
+ assertEquals(webServiceUrl, lookupData.webServiceUrl());
+ assertEquals(webServiceUrlTls, lookupData.webServiceUrlTls());
+ assertEquals(pulsarServiceUrl, lookupData.pulsarServiceUrl());
+ assertEquals(pulsarServiceUrlTls, lookupData.pulsarServiceUrlTls());
+ assertEquals(Optional.of("9092"), lookupData.getProtocol("kafka"));
+ assertEquals(Optional.empty(), lookupData.getProtocol("echo"));
+ assertTrue(lookupData.persistentTopicsEnabled());
+ assertTrue(lookupData.nonPersistentTopicsEnabled());
+ assertEquals("3.0", lookupData.brokerVersion());
LookupResult lookupResult = lookupData.toLookupResult();
- Assert.assertEquals(webServiceUrl, lookupResult.getLookupData().getHttpUrl());
- Assert.assertEquals(webServiceUrlTls, lookupResult.getLookupData().getHttpUrlTls());
- Assert.assertEquals(pulsarServiceUrl, lookupResult.getLookupData().getBrokerUrl());
- Assert.assertEquals(pulsarServiceUrlTls, lookupResult.getLookupData().getBrokerUrlTls());
+ assertEquals(webServiceUrl, lookupResult.getLookupData().getHttpUrl());
+ assertEquals(webServiceUrlTls, lookupResult.getLookupData().getHttpUrlTls());
+ assertEquals(pulsarServiceUrl, lookupResult.getLookupData().getBrokerUrl());
+ assertEquals(pulsarServiceUrlTls, lookupResult.getLookupData().getBrokerUrlTls());
}
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
index e8a21502fb1..b1bc2b993f9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
@@ -19,13 +19,13 @@
package org.apache.pulsar.broker.service;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import java.util.concurrent.TimeUnit;
import org.apache.pulsar.broker.BrokerTestUtil;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.common.policies.data.TopicStats;
-import org.junit.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -65,7 +65,7 @@ public class OneWayReplicatorTest extends OneWayReplicatorTestBase {
// Verify there has one item in the attribute "publishers" or "replications"
TopicStats topicStats2 = admin2.topics().getStats(topicName);
- Assert.assertTrue(topicStats2.getPublishers().size() + topicStats2.getReplication().size() > 0);
+ assertTrue(topicStats2.getPublishers().size() + topicStats2.getReplication().size() > 0);
// cleanup.
consumer2.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java
index eb25489076b..b33381126e5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java
@@ -37,7 +37,6 @@ import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.TopicStats;
import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap;
import org.awaitility.Awaitility;
-import org.junit.Assert;
import org.mockito.Mockito;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -126,7 +125,7 @@ public class NonPersistentTopicTest extends BrokerTestBase {
} catch (PulsarClientException.TopicDoesNotExistException ignored) {
}
- Assert.assertEquals(admin.topics().getPartitionedTopicMetadata(topicName).partitions, 4);
+ assertEquals(admin.topics().getPartitionedTopicMetadata(topicName).partitions, 4);
}
@@ -212,41 +211,41 @@ public class NonPersistentTopicTest extends BrokerTestBase {
.subscribe();
ConcurrentOpenHashMap<String, NonPersistentSubscription> subscriptionMap = mockTopic.getSubscriptions();
- Assert.assertEquals(subscriptionMap.size(), 4);
+ assertEquals(subscriptionMap.size(), 4);
// Check exclusive subscription
NonPersistentSubscription exclusiveSub = subscriptionMap.get(exclusiveSubName);
- Assert.assertNotNull(exclusiveSub);
+ assertNotNull(exclusiveSub);
exclusiveConsumer.close();
Awaitility.waitAtMost(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS)
.until(() -> subscriptionMap.get(exclusiveSubName) == null);
// Check failover subscription
NonPersistentSubscription failoverSub = subscriptionMap.get(failoverSubName);
- Assert.assertNotNull(failoverSub);
+ assertNotNull(failoverSub);
failoverConsumer1.close();
failoverSub = subscriptionMap.get(failoverSubName);
- Assert.assertNotNull(failoverSub);
+ assertNotNull(failoverSub);
failoverConsumer2.close();
Awaitility.waitAtMost(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS)
.until(() -> subscriptionMap.get(failoverSubName) == null);
// Check shared subscription
NonPersistentSubscription sharedSub = subscriptionMap.get(sharedSubName);
- Assert.assertNotNull(sharedSub);
+ assertNotNull(sharedSub);
sharedConsumer1.close();
sharedSub = subscriptionMap.get(sharedSubName);
- Assert.assertNotNull(sharedSub);
+ assertNotNull(sharedSub);
sharedConsumer2.close();
Awaitility.waitAtMost(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS)
.until(() -> subscriptionMap.get(sharedSubName) == null);
// Check KeyShared subscription
NonPersistentSubscription keySharedSub = subscriptionMap.get(keySharedSubName);
- Assert.assertNotNull(keySharedSub);
+ assertNotNull(keySharedSub);
keySharedConsumer1.close();
keySharedSub = subscriptionMap.get(keySharedSubName);
- Assert.assertNotNull(keySharedSub);
+ assertNotNull(keySharedSub);
keySharedConsumer2.close();
Awaitility.waitAtMost(10, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS)
.until(() -> subscriptionMap.get(keySharedSubName) == null);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
index 412b8207e34..bda6d0bdceb 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
@@ -80,7 +80,7 @@ import org.apache.pulsar.common.policies.data.Policies;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TopicStats;
import org.awaitility.Awaitility;
-import org.junit.Assert;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/SegmentAbortedTxnProcessorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/SegmentAbortedTxnProcessorTest.java
index 32de5944dad..9e1c1992477 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/SegmentAbortedTxnProcessorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/SegmentAbortedTxnProcessorTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.pulsar.broker.transaction;
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.lang.reflect.Field;
@@ -152,7 +152,7 @@ public class SegmentAbortedTxnProcessorTest extends TransactionTestBase {
.getDeclaredField("taskQueue");
taskQueueField.setAccessible(true);
Queue queue = (Queue) taskQueueField.get(persistentWorker);
- Awaitility.await().untilAsserted(() -> Assert.assertEquals(queue.size(), 0));
+ Awaitility.await().untilAsserted(() -> assertEquals(queue.size(), 0));
}
private void verifyAbortedTxnIDAndSegmentIndex(AbortedTxnProcessor processor, int begin, int txnIdSize)
@@ -170,8 +170,8 @@ public class SegmentAbortedTxnProcessorTest extends TransactionTestBase {
indexField.setAccessible(true);
LinkedList<TxnID> unsealedSegment = (LinkedList<TxnID>) unsealedSegmentField.get(processor);
LinkedMap<PositionImpl, TxnID> indexes = (LinkedMap<PositionImpl, TxnID>) indexField.get(processor);
- Assert.assertEquals(unsealedSegment.size(), txnIdSize % SEGMENT_SIZE);
- Assert.assertEquals(indexes.size(), txnIdSize / SEGMENT_SIZE);
+ assertEquals(unsealedSegment.size(), txnIdSize % SEGMENT_SIZE);
+ assertEquals(indexes.size(), txnIdSize / SEGMENT_SIZE);
}
// Verify the update index future can be completed when the queue has other tasks.
@@ -269,7 +269,7 @@ public class SegmentAbortedTxnProcessorTest extends TransactionTestBase {
segmentCount++;
}
}
- Assert.assertEquals(segmentCount, size);
+ assertEquals(segmentCount, size);
}
private void verifySnapshotSegmentsIndexSize(String topic, int size) throws Exception {
@@ -286,7 +286,7 @@ public class SegmentAbortedTxnProcessorTest extends TransactionTestBase {
}
System.out.printf("message.getValue().getTopicName() :" + message.getValue().getTopicName());
}
- Assert.assertEquals(indexCount, size);
+ assertEquals(indexCount, size);
}
private void doCompaction(TopicName topic) throws Exception {