[cleanup][test] Remove and prevent junit (apache#20611)

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
lhotari · Jul 7, 2023 · c1f52f8 · c1f52f8
1 parent cedc513
commit c1f52f8
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 43 deletions.
diff --git 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
@@ -24,11 +24,11 @@
 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
@@ -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/.../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java b/.../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java
@@ -37,9 +37,9 @@
 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/loadbalance/extensions/channel/ServiceUnitStateCompactionStrategyTest.java b/.../pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateCompactionStrategyTest.java
@@ -25,7 +25,7 @@
 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/.../test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java b/.../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 void testConstructors() {
                 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
@@ -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 void testReplicatorProducerStatInTopic() throws Exception {
 
         // 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/.../src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java b/.../src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java
@@ -37,7 +37,6 @@
 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 void testCreateNonExistentPartitions() throws PulsarAdminException, Pulsa
         } catch (PulsarClientException.TopicDoesNotExistException ignored) {
 
         }
-        Assert.assertEquals(admin.topics().getPartitionedTopicMetadata(topicName).partitions, 4);
+        assertEquals(admin.topics().getPartitionedTopicMetadata(topicName).partitions, 4);
     }
 
 
@@ -212,41 +211,41 @@ public void testSubscriptionsOnNonPersistentTopic() throws Exception {
                 .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/...broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java b/...broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
@@ -80,7 +80,7 @@
 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/...er/src/test/java/org/apache/pulsar/broker/transaction/SegmentAbortedTxnProcessorTest.java b/...er/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 @@ private void waitTaskExecuteCompletely(AbortedTxnProcessor processor) throws Exc
                 .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 @@ private void verifyAbortedTxnIDAndSegmentIndex(AbortedTxnProcessor processor, in
         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 @@ private void verifySnapshotSegmentsSize(String topic, int size) throws Exception
                 segmentCount++;
             }
         }
-        Assert.assertEquals(segmentCount, size);
+        assertEquals(segmentCount, size);
     }
 
     private void verifySnapshotSegmentsIndexSize(String topic, int size) throws Exception {
@@ -286,7 +286,7 @@ private void verifySnapshotSegmentsIndexSize(String topic, int size) throws Exce
             }
             System.out.printf("message.getValue().getTopicName() :" + message.getValue().getTopicName());
         }
-        Assert.assertEquals(indexCount, size);
+        assertEquals(indexCount, size);
     }
 
     private void doCompaction(TopicName topic) throws Exception {