This is an automated email from the ASF dual-hosted git repository.
mmerli 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 a1e7c9f Migrate Junit tests and annotations to TestNG (#9858)
a1e7c9f is described below
commit a1e7c9f7151f42cb31d7970423cc64689a41dcd6
Author: Lari Hotari <[email protected]>
AuthorDate: Wed Mar 10 19:28:56 2021 +0200
Migrate Junit tests and annotations to TestNG (#9858)
---
.../pulsar/broker/admin/AdminApiSchemaTest.java | 35 ++++++-------
.../broker/admin/MaxUnackedMessagesTest.java | 36 ++++++-------
.../pulsar/broker/admin/TopicAutoCreationTest.java | 15 +++---
.../service/CurrentLedgerRolloverIfFullTest.java | 2 +-
.../service/TransactionMarkerDeleteTest.java | 19 +++----
.../TransactionMetadataStoreServiceTest.java | 29 +++++-----
.../service/persistent/TopicDuplicationTest.java | 24 ++++-----
...kenOauth2AuthenticatedProducerConsumerTest.java | 8 +--
.../client/impl/ConsumerAckResponseTest.java | 20 +++----
.../pulsar/client/impl/MessageChunkingTest.java | 14 ++---
.../client/impl/MessagePublishThrottlingTest.java | 3 +-
.../impl/TopicPublishThrottlingInitTest.java | 3 +-
.../functions/worker/PulsarFunctionTlsTest.java | 4 +-
.../java/org/apache/pulsar/schema/SchemaTest.java | 18 +++----
.../SchemaCompatibilityCheckTest.java | 23 ++++----
.../stats/client/PulsarBrokerStatsClientTest.java | 20 ++++---
.../pulsar/admin/cli/PulsarAdminToolTest.java | 28 +++++++++-
.../apache/pulsar/admin/cli/TestCmdPackages.java | 16 +++---
.../pulsar/common/api/raw/RawMessageImplTest.java | 14 ++---
.../pulsar/functions/config/TestWorkerConfig.java | 19 +++----
.../pulsar/functions/worker/WorkerUtilsTest.java | 35 ++++++-------
.../node/TestAbstractConfigurationProvider.java | 59 ++++++++++-----------
...TestAbstractZooKeeperConfigurationProvider.java | 30 +++++------
.../pulsar/io/flume/node/TestApplication.java | 27 +++++-----
.../flume/node/TestEnvVarResolverProperties.java | 7 ++-
...PollingPropertiesFileConfigurationProvider.java | 33 ++++++------
.../TestPollingZooKeeperConfigurationProvider.java | 10 ++--
.../TestPropertiesFileConfigurationProvider.java | 34 ++++++------
.../TestStaticZooKeeperConfigurationProvider.java | 2 +-
.../pulsar/io/flume/sink/StringSinkTests.java | 2 +-
.../pulsar/io/flume/source/StringSourceTests.java | 9 ++--
.../io/influxdb/InfluxDBGenericRecordSinkTest.java | 10 ++--
.../io/influxdb/v2/InfluxDBSinkConfigTest.java | 10 ++--
.../pulsar/io/influxdb/v2/InfluxDBSinkTest.java | 50 ++++++++++--------
.../bookkeeper/BookKeeperPackagesStorageTest.java | 38 ++++++--------
.../apache/pulsar/proxy/server/ProxyStatsTest.java | 16 +++---
.../websocket/AbstractWebSocketHandlerTest.java | 61 ++++++++++------------
...kIsolatedBookieEnsemblePlacementPolicyTest.java | 7 +--
.../messaging/NonDurableConsumerMessagingTest.java | 13 ++---
.../integration/topologies/PulsarTestBase.java | 2 +-
.../jcloud/impl/BufferedOffloadStreamTest.java | 41 +++++++--------
41 files changed, 401 insertions(+), 445 deletions(-)
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
index b7b5414..e9b4728 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
@@ -18,27 +18,22 @@
*/
package org.apache.pulsar.broker.admin;
+import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;
+import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
import com.google.common.collect.Sets;
-import static java.lang.String.format;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.client.api.DigestType;
import org.apache.bookkeeper.client.api.LedgerMetadata;
-import org.apache.bookkeeper.mledger.impl.LedgerMetadataUtils;
-import org.apache.bookkeeper.mledger.impl.PositionImpl;
import org.apache.bookkeeper.net.BookieId;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.client.admin.PulsarAdminException;
@@ -52,7 +47,7 @@ import
org.apache.pulsar.common.policies.data.SchemaAutoUpdateCompatibilityStrat
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.schema.SchemaInfo;
import org.apache.pulsar.common.schema.SchemaInfoWithVersion;
-import org.awaitility.Awaitility;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
@@ -147,7 +142,7 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
public Object[][] versions() {
return new Object[][] { { ApiVersion.V1 }, { ApiVersion.V2 } };
}
-
+
@Test(dataProvider = "schemas")
public void testSchemaInfoApi(Schema<?> schema) throws Exception {
testSchemaInfoApi(schema, "schematest/test/test-" +
schema.getSchemaInfo().getType());
@@ -167,12 +162,12 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
SchemaInfo readSi = admin.schemas().getSchemaInfo(topicName);
log.info("Read schema of topic {} : {}", topicName, readSi);
- assertEquals(si, readSi);
+ assertEquals(readSi, si);
readSi = admin.schemas().getSchemaInfo(topicName + "-partition-0");
log.info("Read schema of topic {} : {}", topicName, readSi);
- assertEquals(si, readSi);
+ assertEquals(readSi, si);
}
@@ -220,14 +215,14 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
SchemaInfoWithVersion readSi =
admin.schemas().getSchemaInfoWithVersion(topicName);
log.info("Read schema of topic {} : {}", topicName, readSi);
- assertEquals(si, readSi.getSchemaInfo());
- assertEquals(0, readSi.getVersion());
+ assertEquals(readSi.getSchemaInfo(), si);
+ assertEquals(readSi.getVersion(), 0);
readSi = admin.schemas().getSchemaInfoWithVersion(topicName +
"-partition-0");
log.info("Read schema of topic {} : {}", topicName, readSi);
- assertEquals(si, readSi.getSchemaInfo());
- assertEquals(0, readSi.getVersion());
+ assertEquals(readSi.getSchemaInfo(), si);
+ assertEquals(readSi.getVersion(), 0);
}
@@ -241,7 +236,7 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
keyValueSchema.getSchemaInfo());
SchemaInfo schemaInfo = admin.schemas().getSchemaInfo(topicName);
- assertEquals(schemaInfo, keyValueSchema.getSchemaInfo());
+ assertEquals(keyValueSchema.getSchemaInfo(), schemaInfo);
}
@Test
@@ -347,10 +342,10 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
})).when(mockBookKeeper).getLedgerMetadata(anyLong());
PersistentTopicInternalStats persistentTopicInternalStats =
admin.topics().getInternalStats(topicName);
List<PersistentTopicInternalStats.LedgerInfo> list =
persistentTopicInternalStats.schemaLedgers;
- assertEquals(1, list.size());
+ assertEquals(list.size(), 1);
PersistentTopicInternalStats.LedgerInfo ledgerInfo = list.get(0);
- assertEquals(ledgerId, ledgerInfo.ledgerId);
- assertEquals(entryId + 1, ledgerInfo.entries);
- assertEquals(length, ledgerInfo.size);
+ assertEquals(ledgerInfo.ledgerId, ledgerId);
+ assertEquals(ledgerInfo.entries, entryId + 1);
+ assertEquals(ledgerInfo.size, length);
}
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
index 385a570..ad93202 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.pulsar.broker.admin;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.fail;
+import com.google.common.collect.Maps;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -27,8 +32,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
-import com.google.common.collect.Maps;
import lombok.Cleanup;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.ConsumerBuilder;
@@ -41,17 +44,11 @@ import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.naming.TopicName;
import org.awaitility.Awaitility;
-import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.testng.collections.Lists;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
-
public class MaxUnackedMessagesTest extends ProducerConsumerBase {
private final String testTenant = "my-property";
private final String testNamespace = "my-ns";
@@ -137,7 +134,7 @@ public class MaxUnackedMessagesTest extends
ProducerConsumerBase {
// client must receive number of messages = unAckedMessagesBufferSize
rather all produced messages: check
// delta as 3 consumers with receiverQueueSize = 10
- Assert.assertEquals(messages.size(), unackMsgAllowed,
receiverQueueSize * 3);
+ assertEquals(unackMsgAllowed, messages.size(), receiverQueueSize * 3);
// start acknowledging messages
messages.forEach((m, c) -> {
@@ -172,7 +169,7 @@ public class MaxUnackedMessagesTest extends
ProducerConsumerBase {
latch.await(10, TimeUnit.SECONDS);
// total received-messages should match to produced messages (it may
have duplicate messages)
- Assert.assertEquals(result.size(), expectedRemainingMessages);
+ assertEquals(result.size(), expectedRemainingMessages);
producer.close();
consumers.forEach(c -> {
@@ -228,12 +225,13 @@ public class MaxUnackedMessagesTest extends
ProducerConsumerBase {
waitCacheInit(topicName);
assertNull(admin.namespaces().getMaxUnackedMessagesPerSubscription(myNamespace));
assertNull(admin.topics().getMaxUnackedMessagesOnSubscription(topicName));
-
assertEquals(admin.topics().getMaxUnackedMessagesOnSubscription(topicName, true)
- ,
Integer.valueOf(conf.getMaxUnackedMessagesPerSubscription()));
+
assertEquals(admin.topics().getMaxUnackedMessagesOnSubscription(topicName,
true),
+ Integer.valueOf(conf.getMaxUnackedMessagesPerSubscription()));
admin.namespaces().setMaxUnackedMessagesPerSubscription(myNamespace,
10);
Awaitility.await().untilAsserted(()
- ->
assertEquals(admin.namespaces().getMaxUnackedMessagesPerSubscription(myNamespace),
Integer.valueOf(10)));
+ ->
assertEquals(admin.namespaces().getMaxUnackedMessagesPerSubscription(myNamespace),
+ Integer.valueOf(10)));
admin.topics().setMaxUnackedMessagesOnSubscription(topicName, 20);
Awaitility.await().untilAsserted(()
@@ -241,11 +239,12 @@ public class MaxUnackedMessagesTest extends
ProducerConsumerBase {
admin.topics().removeMaxUnackedMessagesOnSubscription(topicName);
Awaitility.await().untilAsserted(()
- ->
assertEquals(admin.namespaces().getMaxUnackedMessagesPerSubscription(myNamespace),
Integer.valueOf(10)));
+ ->
assertEquals(admin.namespaces().getMaxUnackedMessagesPerSubscription(myNamespace),
+ Integer.valueOf(10)));
admin.namespaces().removeMaxUnackedMessagesPerSubscription(myNamespace);
-
assertEquals(admin.topics().getMaxUnackedMessagesOnSubscription(topicName, true)
- ,
Integer.valueOf(conf.getMaxUnackedMessagesPerSubscription()));
+
assertEquals(admin.topics().getMaxUnackedMessagesOnSubscription(topicName,
true),
+ Integer.valueOf(conf.getMaxUnackedMessagesPerSubscription()));
}
@Test(timeOut = 30000)
@@ -312,7 +311,8 @@ public class MaxUnackedMessagesTest extends
ProducerConsumerBase {
assertEquals(consumer3Counter.get(), unackMsgAllowed);
}
- private void startConsumer(Consumer<String> consumer, AtomicInteger
consumerCounter, CountDownLatch countDownLatch) {
+ private void startConsumer(Consumer<String> consumer, AtomicInteger
consumerCounter,
+ CountDownLatch countDownLatch) {
new Thread(() -> {
while (true) {
try {
@@ -333,6 +333,6 @@ public class MaxUnackedMessagesTest extends
ProducerConsumerBase {
pulsarClient.newConsumer().topic(topicName).subscriptionName("my-sub").subscribe().close();
TopicName topic = TopicName.get(topicName);
Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .until(()->
pulsar.getTopicPoliciesService().cacheIsInitialized(topic));
+ .until(() ->
pulsar.getTopicPoliciesService().cacheIsInitialized(topic));
}
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
index 08583ed..baa63c3 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
@@ -19,18 +19,17 @@
package org.apache.pulsar.broker.admin;
+import static org.testng.Assert.assertEquals;
+import java.util.List;
+import java.util.UUID;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.ProducerConsumerBase;
import org.apache.pulsar.client.api.PulsarClientException;
-import org.junit.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.util.List;
-import java.util.UUID;
-
public class TopicAutoCreationTest extends ProducerConsumerBase {
@Override
@@ -61,8 +60,8 @@ public class TopicAutoCreationTest extends
ProducerConsumerBase {
List<String> partitionedTopics =
admin.topics().getPartitionedTopicList(namespaceName);
List<String> topics = admin.topics().getList(namespaceName);
- Assert.assertEquals(partitionedTopics.size(), 1);
- Assert.assertEquals(topics.size(), 3);
+ assertEquals(partitionedTopics.size(), 1);
+ assertEquals(topics.size(), 3);
producer.close();
for (String t : topics) {
@@ -80,8 +79,8 @@ public class TopicAutoCreationTest extends
ProducerConsumerBase {
partitionedTopics =
admin.topics().getPartitionedTopicList(namespaceName);
topics = admin.topics().getList(namespaceName);
- Assert.assertEquals(partitionedTopics.size(), 0);
- Assert.assertEquals(topics.size(), 1);
+ assertEquals(partitionedTopics.size(), 0);
+ assertEquals(topics.size(), 1);
producer.close();
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java
index 783eac5..5e2aa80 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java
@@ -26,8 +26,8 @@ import
org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.Producer;
-import org.junit.Test;
import org.testng.Assert;
+import org.testng.annotations.Test;
public class CurrentLedgerRolloverIfFullTest extends BrokerTestBase {
@Override
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java
index 82140de..5a28cc4 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.pulsar.broker.service;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import java.util.Collections;
import org.apache.bookkeeper.mledger.ManagedCursor;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.bookkeeper.mledger.Position;
@@ -27,20 +32,12 @@ import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.common.api.proto.CommandAck.AckType;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
import org.apache.pulsar.common.api.proto.MarkersMessageIdData;
import org.apache.pulsar.common.protocol.Markers;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.util.Collections;
-
public class TransactionMarkerDeleteTest extends BrokerTestBase{
@BeforeMethod
@@ -78,12 +75,12 @@ public class TransactionMarkerDeleteTest extends
BrokerTestBase{
.newTxnCommitMarker(1, 1, 1).array());
Position position3 = managedLedger.addEntry(Markers
.newTxnCommitMarker(1, 1, 1).array());
- assertEquals(3, cursor.getNumberOfEntriesInBacklog(true));
+ assertEquals(cursor.getNumberOfEntriesInBacklog(true), 3);
assertTrue(((PositionImpl)
cursor.getMarkDeletedPosition()).compareTo((PositionImpl) position1) < 0);
persistentSubscription.acknowledgeMessage(Collections.singletonList(position1),
AckType.Individual, Collections.emptyMap());
Thread.sleep(1000L);
- assertEquals(0, ((PositionImpl) persistentSubscription.getCursor()
- .getMarkDeletedPosition()).compareTo((PositionImpl)
position3));
+ assertEquals(((PositionImpl) persistentSubscription.getCursor()
+ .getMarkDeletedPosition()).compareTo((PositionImpl)
position3), 0);
}
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java
index 00cebd1..b28c586 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java
@@ -18,6 +18,16 @@
*/
package org.apache.pulsar.broker.service;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.mledger.Position;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.pulsar.broker.ServiceConfiguration;
@@ -32,21 +42,10 @@ import
org.apache.pulsar.transaction.coordinator.exceptions.CoordinatorException
import
org.apache.pulsar.transaction.coordinator.impl.MLTransactionMetadataStore;
import org.apache.pulsar.transaction.coordinator.proto.TxnStatus;
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.Test;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
public class TransactionMetadataStoreServiceTest extends BrokerTestBase {
@@ -89,9 +88,9 @@ public class TransactionMetadataStoreServiceTest extends
BrokerTestBase {
TxnID txnID0 =
transactionMetadataStoreService.newTransaction(TransactionCoordinatorID.get(0),
5).get();
TxnID txnID1 =
transactionMetadataStoreService.newTransaction(TransactionCoordinatorID.get(1),
5).get();
TxnID txnID2 =
transactionMetadataStoreService.newTransaction(TransactionCoordinatorID.get(2),
5).get();
- Assert.assertEquals(0, txnID0.getMostSigBits());
- Assert.assertEquals(1, txnID1.getMostSigBits());
- Assert.assertEquals(2, txnID2.getMostSigBits());
+ Assert.assertEquals(txnID0.getMostSigBits(), 0);
+ Assert.assertEquals(txnID1.getMostSigBits(), 1);
+ Assert.assertEquals(txnID2.getMostSigBits(), 2);
transactionMetadataStoreService.removeTransactionMetadataStore(TransactionCoordinatorID.get(0));
transactionMetadataStoreService.removeTransactionMetadataStore(TransactionCoordinatorID.get(1));
transactionMetadataStoreService.removeTransactionMetadataStore(TransactionCoordinatorID.get(2));
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java
index b6117aa..75c72a2 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java
@@ -18,12 +18,18 @@
*/
package org.apache.pulsar.broker.service.persistent;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-
import lombok.Cleanup;
import org.apache.bookkeeper.mledger.ManagedCursor;
import org.apache.bookkeeper.mledger.impl.PositionImpl;
@@ -32,19 +38,11 @@ import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.ProducerConsumerBase;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.common.naming.TopicName;
-import org.junit.Assert;
+import org.awaitility.Awaitility;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.awaitility.Awaitility;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
public class TopicDuplicationTest extends ProducerConsumerBase {
private final String testTenant = "my-property";
@@ -80,7 +78,7 @@ public class TopicDuplicationTest extends
ProducerConsumerBase {
admin.topics().enableDeduplication(topicName, true);
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.until(()-> admin.topics().getDeduplicationEnabled(topicName)
!= null);
- Assert.assertEquals(admin.topics().getDeduplicationEnabled(topicName),
true);
+ assertTrue(admin.topics().getDeduplicationEnabled(topicName));
admin.topics().disableDeduplication(topicName);
Awaitility.await().atMost(5, TimeUnit.SECONDS)
@@ -99,7 +97,7 @@ public class TopicDuplicationTest extends
ProducerConsumerBase {
admin.topics().setDeduplicationStatus(topicName, true);
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.until(() -> admin.topics().getDeduplicationStatus(topicName)
!= null);
- Assert.assertEquals(admin.topics().getDeduplicationStatus(topicName),
true);
+ assertTrue(admin.topics().getDeduplicationStatus(topicName));
admin.topics().removeDeduplicationStatus(topicName);
Awaitility.await().atMost(5, TimeUnit.SECONDS)
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
index d0b6349..742e3ab 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
@@ -19,7 +19,8 @@
package org.apache.pulsar.client.api;
import static org.mockito.Mockito.spy;
-
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
import com.google.common.collect.Sets;
import java.net.URI;
import java.net.URL;
@@ -37,7 +38,6 @@ import
org.apache.pulsar.client.impl.auth.oauth2.AuthenticationFactoryOAuth2;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.awaitility.Awaitility;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
@@ -207,12 +207,12 @@ public class TokenOauth2AuthenticatedProducerConsumerTest
extends ProducerConsum
.pollInterval(Duration.ofSeconds(1))
.untilAsserted(() -> {
String accessTokenNew =
producerImpl.getClientCnx().getAuthenticationDataProvider().getCommandData();
- Assert.assertNotEquals(accessTokenOld, accessTokenNew);
+ assertNotEquals(accessTokenNew, accessTokenOld);
});
// get the lastDisconnectTime, it should be same with the before,
because the connection shouldn't disconnect
long lastDisconnectTimeAfterTokenExpired =
producer.getLastDisconnectedTimestamp();
- Assert.assertEquals(lastDisconnectTime,
lastDisconnectTimeAfterTokenExpired);
+ assertEquals(lastDisconnectTimeAfterTokenExpired, lastDisconnectTime);
for (int i = 0; i < 10; i++) {
String message = "my-message-" + i;
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
index 34fa925..f21abaa 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
@@ -18,8 +18,15 @@
*/
package org.apache.pulsar.client.impl;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.fail;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
-
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.ProducerConsumerBase;
@@ -27,22 +34,11 @@ import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.transaction.TransactionImpl;
-
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
public class ConsumerAckResponseTest extends ProducerConsumerBase {
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
index 2f6a02b..0f8da89 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
@@ -18,11 +18,14 @@
*/
package org.apache.pulsar.client.impl;
-import static org.junit.Assert.assertNotEquals;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Random;
@@ -31,7 +34,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-
import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl;
import org.apache.bookkeeper.mledger.impl.PositionImpl;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
@@ -59,12 +61,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
public class MessageChunkingTest extends ProducerConsumerBase {
private static final Logger log =
LoggerFactory.getLogger(MessageChunkingTest.class);
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
index 6de954f..7df325f 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
@@ -18,8 +18,7 @@
*/
package org.apache.pulsar.client.impl;
-import static org.junit.Assert.assertTrue;
-
+import static org.testng.Assert.assertTrue;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.AtomicDouble;
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
index 042e8a0..ca4c69e 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
@@ -18,8 +18,7 @@
*/
package org.apache.pulsar.client.impl;
-import static org.junit.Assert.assertTrue;
-
+import static org.testng.Assert.assertTrue;
import com.google.common.collect.Sets;
import org.apache.pulsar.broker.service.Producer;
import org.apache.pulsar.broker.service.PublishRateLimiter;
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
index 7e9d852..2d571c6 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
@@ -18,8 +18,7 @@
*/
package org.apache.pulsar.functions.worker;
-import static org.junit.Assert.assertEquals;
-
+import static org.testng.Assert.assertEquals;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
@@ -39,7 +38,6 @@ import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.Authentication;
import org.apache.pulsar.client.impl.auth.AuthenticationTls;
import org.apache.pulsar.common.functions.FunctionConfig;
-import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.util.ClassLoaderUtils;
import org.apache.pulsar.common.util.ObjectMapperFactory;
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
index 595da2b..4f4404b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
@@ -20,12 +20,12 @@ package org.apache.pulsar.schema;
import static org.apache.pulsar.common.naming.TopicName.PUBLIC_TENANT;
import static
org.apache.pulsar.schema.compatibility.SchemaCompatibilityCheckTest.randomName;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import com.google.common.collect.Sets;
import java.util.Collections;
-
+import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.broker.service.schema.SchemaRegistryServiceImpl;
import org.apache.pulsar.client.api.Consumer;
@@ -43,10 +43,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Sets;
-
-import lombok.extern.slf4j.Slf4j;
-
@Slf4j
public class SchemaTest extends MockedPulsarServiceBaseTest {
@@ -137,8 +133,8 @@ public class SchemaTest extends MockedPulsarServiceBaseTest
{
producer.send(personTwo);
Schemas.PersonTwo personConsume = consumer.receive().getValue();
- assertEquals("Tom", personConsume.getName());
- assertEquals(1, personConsume.getId());
+ assertEquals(personConsume.getName(), "Tom");
+ assertEquals(personConsume.getId(), 1);
producer.close();
consumer.close();
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
index 565aeb5..e9a4576 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
@@ -18,7 +18,13 @@
*/
package org.apache.pulsar.schema.compatibility;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.pulsar.common.naming.TopicName.PUBLIC_TENANT;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
import com.google.common.collect.Sets;
+import java.util.Collections;
+import java.util.concurrent.ThreadLocalRandom;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.client.api.Consumer;
@@ -44,15 +50,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import java.util.Collections;
-import java.util.concurrent.ThreadLocalRandom;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.pulsar.common.naming.TopicName.PUBLIC_TENANT;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
@Slf4j
public class SchemaCompatibilityCheckTest extends MockedPulsarServiceBaseTest {
@@ -242,7 +239,7 @@ public class SchemaCompatibilityCheckTest extends
MockedPulsarServiceBaseTest {
assertEquals(admin.namespaces().getSchemaCompatibilityStrategy(namespaceName.toString()),
SchemaCompatibilityStrategy.FULL);
-
+
admin.namespaces().setSchemaCompatibilityStrategy(namespaceName.toString(),
schemaCompatibilityStrategy);
admin.schemas().createSchema(fqtn,
Schema.AVRO(Schemas.PersonOne.class).getSchemaInfo());
@@ -332,12 +329,12 @@ public class SchemaCompatibilityCheckTest extends
MockedPulsarServiceBaseTest {
.topic(fqtn);
producerOneBuilder.create().close();
- assertArrayEquals(changeSchemaBytes,
admin.schemas().getSchemaInfo(fqtn).getSchema());
+ assertEquals(changeSchemaBytes,
admin.schemas().getSchemaInfo(fqtn).getSchema());
ProducerBuilder<Schemas.PersonThree> producerThreeBuilder =
pulsarClient
.newProducer(Schema.AVRO(Schemas.PersonThree.class))
.topic(fqtn);
-
+
try {
producerThreeBuilder.create();
fail();
@@ -390,7 +387,7 @@ public class SchemaCompatibilityCheckTest extends
MockedPulsarServiceBaseTest {
Message<Schemas.PersonOne> message = consumerOne.receive();
personOne = message.getValue();
- assertEquals(10, personOne.getId());
+ assertEquals(personOne.getId(), 10);
consumerOne.close();
producerOne.close();
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
index ade1cc8..253c029 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
@@ -18,6 +18,15 @@
*/
package org.apache.pulsar.stats.client;
+import static org.mockito.Mockito.spy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import java.net.URL;
+import java.util.concurrent.TimeUnit;
+import javax.ws.rs.ClientErrorException;
+import javax.ws.rs.ServerErrorException;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException;
@@ -39,17 +48,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.ServerErrorException;
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.spy;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
public class PulsarBrokerStatsClientTest extends ProducerConsumerBase {
@BeforeMethod
diff --git
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index 3e9dbc3..169cae5 100644
---
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.admin.cli;
-import static org.junit.Assert.assertNull;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.longThat;
import static org.mockito.Mockito.doReturn;
@@ -27,6 +26,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -55,11 +55,35 @@ import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.MessageIdImpl;
import org.apache.pulsar.client.impl.auth.AuthenticationTls;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
-import org.apache.pulsar.common.policies.data.*;
+import org.apache.pulsar.common.policies.data.AuthAction;
+import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride;
+import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride;
+import org.apache.pulsar.common.policies.data.BacklogQuota;
import org.apache.pulsar.common.policies.data.BacklogQuota.RetentionPolicy;
+import org.apache.pulsar.common.policies.data.BookieAffinityGroupData;
+import org.apache.pulsar.common.policies.data.BookieInfo;
+import org.apache.pulsar.common.policies.data.BookiesClusterInfo;
+import org.apache.pulsar.common.policies.data.BookiesRackConfiguration;
+import org.apache.pulsar.common.policies.data.BundlesData;
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
+import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.FailureDomain;
+import org.apache.pulsar.common.policies.data.InactiveTopicDeleteMode;
+import org.apache.pulsar.common.policies.data.InactiveTopicPolicies;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
+import org.apache.pulsar.common.policies.data.PersistencePolicies;
+import org.apache.pulsar.common.policies.data.Policies;
+import org.apache.pulsar.common.policies.data.PublishRate;
+import org.apache.pulsar.common.policies.data.ResourceQuota;
+import org.apache.pulsar.common.policies.data.RetentionPolicies;
+import org.apache.pulsar.common.policies.data.SubscribeRate;
+import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
+import org.testng.Assert;
import org.testng.annotations.Test;
public class PulsarAdminToolTest {
diff --git
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
index 04139af..f727c9d 100644
---
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
+++
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
@@ -18,31 +18,27 @@
*/
package org.apache.pulsar.admin.cli;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-
-import lombok.Data;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
import org.apache.pulsar.client.admin.Packages;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.packages.management.core.common.PackageMetadata;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ThreadLocalRandom;
-
/**
* Unit test for packages commands.
*/
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
index ba801a5..978eee6 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
@@ -18,18 +18,20 @@
*/
package org.apache.pulsar.common.api.raw;
-import junit.framework.TestCase;
-import org.apache.pulsar.common.api.proto.SingleMessageMetadata;
-
+import static org.testng.Assert.assertEquals;
import java.util.Map;
+import org.apache.pulsar.common.api.proto.SingleMessageMetadata;
+import org.testng.annotations.Test;
-public class RawMessageImplTest extends TestCase {
+public class RawMessageImplTest {
private static final String HARD_CODE_KEY = "__pfn_input_topic__";
private static final String KEY_VALUE_FIRST=
"persistent://first-tenant-value/first-namespace-value/first-topic-value";
private static final String KEY_VALUE_SECOND =
"persistent://second-tenant-value/second-namespace-value/second-topic-value";
private static final String HARD_CODE_KEY_ID = "__pfn_input_msg_id__";
private static final String HARD_CODE_KEY_ID_VALUE =
"__pfn_input_msg_id_value__";
+
+ @Test
public void testGetProperties() {
ReferenceCountedMessageMetadata refCntMsgMetadata =
ReferenceCountedMessageMetadata.get();
SingleMessageMetadata singleMessageMetadata = new
SingleMessageMetadata();
@@ -38,7 +40,7 @@ public class RawMessageImplTest extends TestCase {
singleMessageMetadata.addProperty().setKey(HARD_CODE_KEY_ID).setValue(HARD_CODE_KEY_ID_VALUE);
RawMessage msg = RawMessageImpl.get(refCntMsgMetadata,
singleMessageMetadata, null , 0, 0, 0);
Map<String, String> properties = msg.getProperties();
- assertEquals(KEY_VALUE_SECOND, properties.get(HARD_CODE_KEY));
- assertEquals(HARD_CODE_KEY_ID_VALUE, properties.get(HARD_CODE_KEY_ID));
+ assertEquals(properties.get(HARD_CODE_KEY), KEY_VALUE_SECOND);
+ assertEquals(properties.get(HARD_CODE_KEY_ID), HARD_CODE_KEY_ID_VALUE);
}
}
\ No newline at end of file
diff --git
a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
index 5a78a17..2e61422 100644
---
a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
+++
b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
@@ -18,8 +18,9 @@
*/
package org.apache.pulsar.functions.config;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
import org.apache.pulsar.functions.worker.WorkerConfig;
-import org.junit.Assert;
import org.testng.annotations.Test;
public class TestWorkerConfig {
@@ -28,25 +29,25 @@ public class TestWorkerConfig {
WorkerConfig workerConfig = new WorkerConfig();
workerConfig.setAuthenticationEnabled(false);
- Assert.assertFalse(workerConfig.isAuthenticationEnabled());
+ assertFalse(workerConfig.isAuthenticationEnabled());
workerConfig.setBrokerClientAuthenticationEnabled(null);
- Assert.assertFalse(workerConfig.isBrokerClientAuthenticationEnabled());
+ assertFalse(workerConfig.isBrokerClientAuthenticationEnabled());
workerConfig.setAuthenticationEnabled(true);
- Assert.assertTrue(workerConfig.isAuthenticationEnabled());
+ assertTrue(workerConfig.isAuthenticationEnabled());
workerConfig.setBrokerClientAuthenticationEnabled(null);
- Assert.assertTrue(workerConfig.isBrokerClientAuthenticationEnabled());
+ assertTrue(workerConfig.isBrokerClientAuthenticationEnabled());
workerConfig.setBrokerClientAuthenticationEnabled(true);
workerConfig.setAuthenticationEnabled(false);
- Assert.assertTrue(workerConfig.isBrokerClientAuthenticationEnabled());
+ assertTrue(workerConfig.isBrokerClientAuthenticationEnabled());
workerConfig.setAuthenticationEnabled(true);
- Assert.assertTrue(workerConfig.isBrokerClientAuthenticationEnabled());
+ assertTrue(workerConfig.isBrokerClientAuthenticationEnabled());
workerConfig.setBrokerClientAuthenticationEnabled(false);
workerConfig.setAuthenticationEnabled(false);
- Assert.assertFalse(workerConfig.isBrokerClientAuthenticationEnabled());
+ assertFalse(workerConfig.isBrokerClientAuthenticationEnabled());
workerConfig.setAuthenticationEnabled(true);
- Assert.assertFalse(workerConfig.isBrokerClientAuthenticationEnabled());
+ assertFalse(workerConfig.isBrokerClientAuthenticationEnabled());
}
}
diff --git
a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
index f667059..9620cfc 100644
---
a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
+++
b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
@@ -18,20 +18,6 @@
*/
package org.apache.pulsar.functions.worker;
-import org.apache.pulsar.client.api.CompressionType;
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.ProducerAccessMode;
-import org.apache.pulsar.client.api.ProducerBuilder;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
-import org.junit.Assert;
-import org.testng.annotations.Test;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -41,6 +27,19 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.fail;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import org.apache.pulsar.client.api.CompressionType;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.ProducerAccessMode;
+import org.apache.pulsar.client.api.ProducerBuilder;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.testng.annotations.Test;
public class WorkerUtilsTest {
@@ -64,9 +63,9 @@ public class WorkerUtilsTest {
try {
p = WorkerUtils.createExclusiveProducerWithRetry(pulsarClient,
"test-topic", "test-producer", () -> true, 0);
} catch (WorkerUtils.NotLeaderAnymore notLeaderAnymore) {
- Assert.fail();
+ fail();
}
- Assert.assertNotNull(p);
+ assertNotNull(p);
verify(builder, times(1)).topic(eq("test-topic"));
verify(builder, times(1)).producerName(eq("test-producer"));
verify(builder, times(1)).accessMode(eq(ProducerAccessMode.Exclusive));
@@ -76,7 +75,7 @@ public class WorkerUtilsTest {
when(builder.createAsync()).thenReturn(completableFuture);
try {
WorkerUtils.createExclusiveProducerWithRetry(pulsarClient,
"test-topic", "test-producer", () -> false, 0);
- Assert.fail();
+ fail();
} catch (WorkerUtils.NotLeaderAnymore notLeaderAnymore) {
}
@@ -93,7 +92,7 @@ public class WorkerUtilsTest {
return false;
}
}, 0);
- Assert.fail();
+ fail();
} catch (WorkerUtils.NotLeaderAnymore notLeaderAnymore) {
}
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractConfigurationProvider.java
index 492fdca..263ab0a 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractConfigurationProvider.java
@@ -18,11 +18,10 @@
*/
package org.apache.pulsar.io.flume.node;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
-
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
import com.google.common.collect.Maps;
import java.util.Map;
import org.apache.flume.Channel;
@@ -38,7 +37,7 @@ import org.apache.flume.conf.Configurable;
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.sink.AbstractSink;
import org.apache.flume.source.AbstractSource;
-import org.junit.Test;
+import org.testng.annotations.Test;
public class TestAbstractConfigurationProvider {
@@ -135,9 +134,9 @@ public class TestAbstractConfigurationProvider {
MemoryConfigurationProvider provider =
new MemoryConfigurationProvider(agentName, properties);
MaterializedConfiguration config = provider.getConfiguration();
- assertEquals(0, config.getSourceRunners().size());
- assertEquals(1, config.getChannels().size());
- assertEquals(1, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 0);
+ assertEquals(config.getChannels().size(), 1);
+ assertEquals(config.getSinkRunners().size(), 1);
}
@Test
@@ -151,9 +150,9 @@ public class TestAbstractConfigurationProvider {
MemoryConfigurationProvider provider =
new MemoryConfigurationProvider(agentName, properties);
MaterializedConfiguration config = provider.getConfiguration();
- assertEquals(0, config.getSourceRunners().size());
- assertEquals(0, config.getChannels().size());
- assertEquals(0, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 0);
+ assertEquals(config.getChannels().size(), 0);
+ assertEquals(config.getSinkRunners().size(), 0);
}
@Test
@@ -167,9 +166,9 @@ public class TestAbstractConfigurationProvider {
MemoryConfigurationProvider provider =
new MemoryConfigurationProvider(agentName, properties);
MaterializedConfiguration config = provider.getConfiguration();
- assertEquals(1, config.getSourceRunners().size());
- assertEquals(1, config.getChannels().size());
- assertEquals(0, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 1);
+ assertEquals(config.getChannels().size(), 1);
+ assertEquals(config.getSinkRunners().size(), 0);
}
@Test
@@ -184,9 +183,9 @@ public class TestAbstractConfigurationProvider {
MemoryConfigurationProvider provider =
new MemoryConfigurationProvider(agentName, properties);
MaterializedConfiguration config = provider.getConfiguration();
- assertEquals(0, config.getSourceRunners().size());
- assertEquals(0, config.getChannels().size());
- assertEquals(0, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 0);
+ assertEquals(config.getChannels().size(), 0);
+ assertEquals(config.getSinkRunners().size(), 0);
}
@Test
@@ -207,36 +206,36 @@ public class TestAbstractConfigurationProvider {
MemoryConfigurationProvider provider =
new MemoryConfigurationProvider(agentName, properties);
MaterializedConfiguration config = provider.getConfiguration();
- assertEquals(1, config.getSourceRunners().size());
- assertEquals(1, config.getChannels().size());
- assertEquals(1, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 1);
+ assertEquals(config.getChannels().size(), 1);
+ assertEquals(config.getSinkRunners().size(), 1);
properties.put(agentName + ".sources.source1.batchSize", "1001");
properties.put(agentName + ".sinks.sink1.batch-size", "1000");
provider = new MemoryConfigurationProvider(agentName, properties);
config = provider.getConfiguration();
- assertEquals(0, config.getSourceRunners().size());
- assertEquals(1, config.getChannels().size());
- assertEquals(1, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 0);
+ assertEquals(config.getChannels().size(), 1);
+ assertEquals(config.getSinkRunners().size(), 1);
properties.put(agentName + ".sources.source1.batchSize", "1000");
properties.put(agentName + ".sinks.sink1.batch-size", "1001");
provider = new MemoryConfigurationProvider(agentName, properties);
config = provider.getConfiguration();
- assertEquals(1, config.getSourceRunners().size());
- assertEquals(1, config.getChannels().size());
- assertEquals(0, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 1);
+ assertEquals(config.getChannels().size(), 1);
+ assertEquals(config.getSinkRunners().size(), 0);
properties.put(agentName + ".sources.source1.batchSize", "1001");
properties.put(agentName + ".sinks.sink1.batch-size", "1001");
provider = new MemoryConfigurationProvider(agentName, properties);
config = provider.getConfiguration();
- assertEquals(0, config.getSourceRunners().size());
- assertEquals(0, config.getChannels().size());
- assertEquals(0, config.getSinkRunners().size());
+ assertEquals(config.getSourceRunners().size(), 0);
+ assertEquals(config.getChannels().size(), 0);
+ assertEquals(config.getSinkRunners().size(), 0);
}
private Map<String, String> getProperties(String agentName,
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractZooKeeperConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractZooKeeperConfigurationProvider.java
index 9c75a2c..b04d402 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractZooKeeperConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestAbstractZooKeeperConfigurationProvider.java
@@ -18,10 +18,15 @@
*/
package org.apache.pulsar.io.flume.node;
+import static org.testng.Assert.assertEquals;
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import junit.framework.Assert;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -31,14 +36,9 @@ import org.apache.curator.test.TestingServer;
import org.apache.curator.utils.EnsurePath;
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.conf.FlumeConfigurationError;
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
public abstract class TestAbstractZooKeeperConfigurationProvider {
@@ -52,7 +52,7 @@ public abstract class
TestAbstractZooKeeperConfigurationProvider {
protected TestingServer zkServer;
protected CuratorFramework client;
- @Before
+ @BeforeMethod
public void setUp() throws Exception {
// start the instance without the admin server!
InstanceSpec serverSpec = new InstanceSpec(null, -1, -1, -1, true, -1,
-1, -1, Collections.singletonMap("zookeeper.admin.enableServer", "false"));
@@ -69,7 +69,7 @@ public abstract class
TestAbstractZooKeeperConfigurationProvider {
protected abstract void doSetUp() throws Exception;
- @After
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
doTearDown();
zkServer.close();
@@ -117,7 +117,7 @@ public abstract class
TestAbstractZooKeeperConfigurationProvider {
}
Collections.sort(expected);
Collections.sort(actual);
- Assert.assertEquals(expected, actual);
+ assertEquals(actual, expected);
FlumeConfiguration.AgentConfiguration agentConfiguration =
configuration
.getConfigurationFor("host1");
@@ -127,8 +127,8 @@ public abstract class
TestAbstractZooKeeperConfigurationProvider {
Set<String> sinks = Sets.newHashSet("sink1");
Set<String> channels = Sets.newHashSet("channel1");
- Assert.assertEquals(sources, agentConfiguration.getSourceSet());
- Assert.assertEquals(sinks, agentConfiguration.getSinkSet());
- Assert.assertEquals(channels, agentConfiguration.getChannelSet());
+ assertEquals(agentConfiguration.getSourceSet(), sources);
+ assertEquals(agentConfiguration.getSinkSet(), sinks);
+ assertEquals(agentConfiguration.getChannelSet(), channels);
}
}
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestApplication.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestApplication.java
index 187ef67..1788084 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestApplication.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestApplication.java
@@ -18,39 +18,40 @@
*/
package org.apache.pulsar.io.flume.node;
-import static org.mockito.Mockito.*;
-
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import com.google.common.collect.Lists;
+import com.google.common.eventbus.EventBus;
+import com.google.common.io.Files;
import java.io.File;
import java.util.List;
import java.util.Random;
import java.util.concurrent.atomic.AtomicReference;
-
import org.apache.commons.io.FileUtils;
import org.apache.flume.Channel;
import org.apache.flume.SinkRunner;
import org.apache.flume.SourceRunner;
import org.apache.flume.lifecycle.LifecycleAware;
import org.apache.flume.lifecycle.LifecycleState;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-
-import com.google.common.collect.Lists;
-import com.google.common.eventbus.EventBus;
-import com.google.common.io.Files;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class TestApplication {
private File baseDir;
- @Before
+ @BeforeMethod
public void setup() throws Exception {
baseDir = Files.createTempDir();
}
- @After
+ @AfterMethod
public void tearDown() throws Exception {
FileUtils.deleteDirectory(baseDir);
}
@@ -153,7 +154,7 @@ public class TestApplication {
}
}
- @Test(timeout = 10000L)
+ @Test(timeOut = 10000L)
public void testFLUME2786() throws Exception {
final String agentName = "test";
final int interval = 1;
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
index dc62c2b..e4d5c25 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
@@ -18,15 +18,14 @@
*/
package org.apache.pulsar.io.flume.node;
-import junit.framework.Assert;
+import java.io.File;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
-import java.io.File;
-
-public class TestEnvVarResolverProperties {
+public final class TestEnvVarResolverProperties {
private static final File TESTFILE = new File(
TestEnvVarResolverProperties.class.getClassLoader()
.getResource("flume-conf-with-envvars.properties").getFile());
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingPropertiesFileConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingPropertiesFileConfigurationProvider.java
index 7107d92..2d9a68b 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingPropertiesFileConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingPropertiesFileConfigurationProvider.java
@@ -18,22 +18,19 @@
*/
package org.apache.pulsar.io.flume.node;
+import com.google.common.collect.Lists;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.common.io.Files;
import java.io.File;
import java.util.List;
-
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
import org.apache.flume.lifecycle.LifecycleController;
import org.apache.flume.lifecycle.LifecycleState;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-import com.google.common.io.Files;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class TestPollingPropertiesFileConfigurationProvider {
@@ -46,7 +43,7 @@ public class TestPollingPropertiesFileConfigurationProvider {
private File configFile;
private EventBus eventBus;
- @Before
+ @BeforeMethod
public void setUp() throws Exception {
baseDir = Files.createTempDir();
@@ -62,13 +59,13 @@ public class TestPollingPropertiesFileConfigurationProvider
{
LifecycleController.waitForOneOf(provider,
LifecycleState.START_OR_ERROR);
}
- @After
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
FileUtils.deleteDirectory(baseDir);
provider.stop();
}
-// @Test
+ @Test(enabled = false)
public void testPolling() throws Exception {
// let first event fire
@@ -88,13 +85,13 @@ public class TestPollingPropertiesFileConfigurationProvider
{
// now wait for second event to fire
Thread.sleep(2000L);
- Assert.assertEquals(String.valueOf(events), 1, events.size());
+ Assert.assertEquals(events.size(), 1, String.valueOf(events));
MaterializedConfiguration materializedConfiguration = events.remove(0);
- Assert.assertEquals(1,
materializedConfiguration.getSourceRunners().size());
- Assert.assertEquals(1,
materializedConfiguration.getSinkRunners().size());
- Assert.assertEquals(1, materializedConfiguration.getChannels().size());
+
Assert.assertEquals(materializedConfiguration.getSourceRunners().size(),1);
+ Assert.assertEquals(materializedConfiguration.getSinkRunners().size(),
1);
+ Assert.assertEquals(materializedConfiguration.getChannels().size(), 1);
}
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
index 7191d33..9535ed5 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
@@ -18,16 +18,14 @@
*/
package org.apache.pulsar.io.flume.node;
-import junit.framework.Assert;
-
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.conf.FlumeConfiguration.AgentConfiguration;
import org.apache.flume.lifecycle.LifecycleController;
import org.apache.flume.lifecycle.LifecycleState;
-import org.junit.Test;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
+import org.testng.Assert;
+import org.testng.annotations.Test;
public class TestPollingZooKeeperConfigurationProvider extends
TestAbstractZooKeeperConfigurationProvider {
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
index 7eab211..c44423e 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
@@ -18,22 +18,22 @@
*/
package org.apache.pulsar.io.flume.node;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import junit.framework.Assert;
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
import org.apache.flume.conf.FlumeConfiguration;
import org.apache.flume.conf.FlumeConfiguration.AgentConfiguration;
import org.apache.flume.conf.FlumeConfigurationError;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class TestPropertiesFileConfigurationProvider {
@@ -46,12 +46,12 @@ public class TestPropertiesFileConfigurationProvider {
private PropertiesFileConfigurationProvider provider;
- @Before
+ @BeforeMethod
public void setUp() throws Exception {
provider = new PropertiesFileConfigurationProvider("test", TESTFILE);
}
- @After
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
}
@@ -60,7 +60,7 @@ public class TestPropertiesFileConfigurationProvider {
public void testPropertyRead() throws Exception {
FlumeConfiguration configuration = provider.getFlumeConfiguration();
- Assert.assertNotNull(configuration);
+ assertNotNull(configuration);
/*
* Test the known errors in the file
@@ -86,11 +86,11 @@ public class TestPropertiesFileConfigurationProvider {
}
Collections.sort(expected);
Collections.sort(actual);
- Assert.assertEquals(expected, actual);
+ assertEquals(actual, expected);
AgentConfiguration agentConfiguration =
configuration.getConfigurationFor("host1");
- Assert.assertNotNull(agentConfiguration);
+ assertNotNull(agentConfiguration);
LOGGER.info(agentConfiguration.getPrevalidationConfig());
LOGGER.info(agentConfiguration.getPostvalidationConfig());
@@ -99,8 +99,8 @@ public class TestPropertiesFileConfigurationProvider {
Set<String> sinks = Sets.newHashSet("sink1");
Set<String> channels = Sets.newHashSet("channel1");
- Assert.assertEquals(sources, agentConfiguration.getSourceSet());
- Assert.assertEquals(sinks, agentConfiguration.getSinkSet());
- Assert.assertEquals(channels, agentConfiguration.getChannelSet());
+ assertEquals(agentConfiguration.getSourceSet(), sources);
+ assertEquals(agentConfiguration.getSinkSet(), sinks);
+ assertEquals(agentConfiguration.getChannelSet(), channels);
}
}
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestStaticZooKeeperConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestStaticZooKeeperConfigurationProvider.java
index 79bd38d..a657010 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestStaticZooKeeperConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestStaticZooKeeperConfigurationProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.pulsar.io.flume.node;
-import org.junit.Test;
+import org.testng.annotations.Test;
public class TestStaticZooKeeperConfigurationProvider extends
TestAbstractZooKeeperConfigurationProvider {
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
index 7596716..91c13cd 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
@@ -43,10 +43,10 @@ import org.apache.flume.source.AvroSource;
import org.apache.pulsar.functions.api.Record;
import org.apache.pulsar.io.core.SinkContext;
import org.apache.pulsar.io.flume.AbstractFlumeTests;
-import org.junit.Assert;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
index 50ca8e1..3041692 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
@@ -19,12 +19,10 @@
package org.apache.pulsar.io.flume.source;
import static org.mockito.Mockito.mock;
-
+import static org.testng.Assert.assertEquals;
import com.google.common.base.Charsets;
import com.google.common.collect.Maps;
-
import java.util.Map;
-
import org.apache.flume.Channel;
import org.apache.flume.Context;
import org.apache.flume.Event;
@@ -36,7 +34,6 @@ import org.apache.flume.event.EventBuilder;
import org.apache.flume.sink.AvroSink;
import org.apache.pulsar.io.core.SourceContext;
import org.apache.pulsar.io.flume.AbstractFlumeTests;
-import org.junit.Assert;
import org.mockito.Mock;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -101,10 +98,10 @@ public class StringSourceTests extends AbstractFlumeTests {
for (int i = 0; i < 5; i++) {
Sink.Status status = sink.process();
- Assert.assertEquals(Sink.Status.READY, status);
+ assertEquals(status, Sink.Status.READY);
}
- Assert.assertEquals(Sink.Status.BACKOFF, sink.process());
+ assertEquals(sink.process(), Sink.Status.BACKOFF);
stringSource.close();
}
}
diff --git
a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
index ac8e6c4..fea40a7 100644
---
a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
+++
b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
@@ -18,17 +18,15 @@
*/
package org.apache.pulsar.io.influxdb;
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertTrue;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.pulsar.io.core.SinkContext;
import org.apache.pulsar.io.influxdb.v2.InfluxDBSink;
import org.influxdb.InfluxDBIOException;
import org.testng.annotations.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-
public class InfluxDBGenericRecordSinkTest {
diff --git
a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
index 26cb14c..c43b817 100644
---
a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
+++
b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
@@ -18,15 +18,13 @@
*/
package org.apache.pulsar.io.influxdb.v2;
-import org.testng.annotations.Test;
-
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
-
-import static org.junit.Assert.assertNotNull;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
+import org.testng.annotations.Test;
public class InfluxDBSinkConfigTest {
diff --git
a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
index ef71e00..6e003b3 100644
---
a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
+++
b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
@@ -18,10 +18,23 @@
*/
package org.apache.pulsar.io.influxdb.v2;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
import com.google.common.collect.Maps;
import com.influxdb.client.InfluxDBClient;
import com.influxdb.client.WriteApiBlocking;
import com.influxdb.client.write.Point;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import lombok.Data;
import org.apache.avro.util.Utf8;
import org.apache.pulsar.client.api.Message;
@@ -36,18 +49,9 @@ import
org.apache.pulsar.client.impl.schema.generic.GenericAvroSchema;
import org.apache.pulsar.client.impl.schema.generic.GenericSchemaImpl;
import org.apache.pulsar.functions.api.Record;
import org.apache.pulsar.functions.source.PulsarRecord;
-import org.junit.Before;
-import org.junit.Test;
import org.mockito.ArgumentCaptor;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class InfluxDBSinkTest {
@Data
@@ -68,7 +72,7 @@ public class InfluxDBSinkTest {
private Long timestamp;
- @Before
+ @BeforeMethod
public void setUp() throws Exception {
// prepare a cpu Record
cpu = new Cpu();
@@ -104,13 +108,13 @@ public class InfluxDBSinkTest {
byte[] bytes = schema.encode(cpu);
GenericRecord record = genericSchema.decode(bytes);
- assertEquals("cpu", record.getField("measurement"));
+ assertEquals(record.getField("measurement"), "cpu");
// compare the String type
- assertEquals(timestamp + "", record.getField("timestamp").toString());
+ assertEquals(record.getField("timestamp").toString(), timestamp + "");
- assertEquals("server-1",
((GenericRecord)record.getField("tags")).getField("host"));
- assertEquals(10,
((GenericRecord)record.getField("fields")).getField("value"));
+
assertEquals(((GenericRecord)record.getField("tags")).getField("host"),
"server-1");
+
assertEquals(((GenericRecord)record.getField("fields")).getField("value"), 10);
}
@Test
@@ -126,10 +130,10 @@ public class InfluxDBSinkTest {
byte[] bytes = schema.encode(cpu);
GenericRecord record = genericAvroSchema.decode(bytes);
- assertEquals("cpu", record.getField("measurement"));
- assertEquals(timestamp, record.getField("timestamp"));
- assertEquals("server-1", ((Map)record.getField("tags")).get(new
Utf8("host")).toString());
- assertEquals(10, ((Map)record.getField("fields")).get(new
Utf8("value")));
+ assertEquals(record.getField("measurement"), "cpu");
+ assertEquals(record.getField("timestamp"), timestamp);
+ assertEquals(((Map)record.getField("tags")).get(new
Utf8("host")).toString(), "server-1");
+ assertEquals(((Map)record.getField("fields")).get(new Utf8("value")),
10);
}
@Test
@@ -181,10 +185,10 @@ public class InfluxDBSinkTest {
ArgumentCaptor<List<Point>> captor =
ArgumentCaptor.forClass(List.class);
verify(writeApi).writePoints(captor.capture());
List<Point> points = captor.getValue();
- assertEquals(2, points.size());
+ assertEquals(points.size(), 2);
assertTrue(points.get(0).hasFields());
- assertEquals("ns", points.get(0).getPrecision().getValue());
- assertEquals("cpu,host=server-1,region=us-west
model=\"lenovo\",value=10i "+timestamp, points.get(0).toLineProtocol());
+ assertEquals(points.get(0).getPrecision().getValue(), "ns");
+ assertEquals(points.get(0).toLineProtocol(),
"cpu,host=server-1,region=us-west model=\"lenovo\",value=10i "+timestamp);
// test close
influxSink.close();
diff --git
a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
index c0f8b96..a045d7d 100644
---
a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
+++
b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
@@ -18,29 +18,25 @@
*/
package org.apache.pulsar.packages.management.storage.bookkeeper;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
import org.apache.distributedlog.exceptions.LogNotFoundException;
import org.apache.distributedlog.exceptions.ZKException;
import org.apache.pulsar.packages.management.core.PackagesStorage;
import org.apache.pulsar.packages.management.core.PackagesStorageProvider;
import
org.apache.pulsar.packages.management.core.impl.DefaultPackagesStorageConfiguration;
import
org.apache.pulsar.packages.management.storage.bookkeeper.bookkeeper.test.BookKeeperClusterTestCase;
-import org.junit.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
public class BookKeeperPackagesStorageTest extends BookKeeperClusterTestCase {
private PackagesStorage storage;
@@ -123,9 +119,9 @@ public class BookKeeperPackagesStorageTest extends
BookKeeperClusterTestCase {
List<String> paths = storage.listAsync(rootPath).get();
// verify the paths number
- Assert.assertEquals(writePaths.size(), paths.size());
+ assertEquals(paths.size(), writePaths.size());
paths.forEach(p -> writePaths.remove(p));
- Assert.assertEquals(0, writePaths.size());
+ assertEquals(writePaths.size(), 0);
// list non-existent path
try {
@@ -147,15 +143,15 @@ public class BookKeeperPackagesStorageTest extends
BookKeeperClusterTestCase {
// list path should have one file
List<String> paths = storage.listAsync("").get();
- Assert.assertEquals(1, paths.size());
- Assert.assertEquals(testPath, paths.get(0));
+ assertEquals(paths.size(), 1);
+ assertEquals(paths.get(0), testPath);
// delete the path
storage.deleteAsync(testPath).get();
// list again and not file under the path
paths= storage.listAsync("").get();
- Assert.assertEquals(0, paths.size());
+ assertEquals(paths.size(), 0);
// delete non-existent path
@@ -163,19 +159,19 @@ public class BookKeeperPackagesStorageTest extends
BookKeeperClusterTestCase {
storage.deleteAsync("non-existent").get();
fail("should throw exception");
} catch (Exception e) {
- Assert.assertTrue(e.getCause() instanceof ZKException);
+ assertTrue(e.getCause() instanceof ZKException);
}
}
@Test(timeOut = 60000)
public void testExistOperation() throws ExecutionException,
InterruptedException {
Boolean exist = storage.existAsync("test-path").get();
- assertFalse(exist);
+ org.testng.Assert.assertFalse(exist);
storage.writeAsync("test-path", new
ByteArrayInputStream("test".getBytes())).get();
exist = storage.existAsync("test-path").get();
- Assert.assertTrue(exist);
+ assertTrue(exist);
}
}
diff --git
a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
index feddb9f..51c0b05 100644
---
a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
+++
b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
@@ -19,21 +19,20 @@
package org.apache.pulsar.proxy.server;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.doReturn;
import static org.testng.Assert.assertEquals;
-
+import static org.testng.Assert.assertNotNull;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
-
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.broker.authentication.AuthenticationService;
import org.apache.pulsar.client.api.Consumer;
@@ -54,9 +53,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
public class ProxyStatsTest extends MockedPulsarServiceBaseTest {
private ProxyService proxyService;
@@ -103,7 +99,7 @@ public class ProxyStatsTest extends
MockedPulsarServiceBaseTest {
/**
* Validates proxy connection stats api.
- *
+ *
* @throws Exception
*/
@Test
@@ -143,7 +139,7 @@ public class ProxyStatsTest extends
MockedPulsarServiceBaseTest {
/**
* Validate proxy topic stats api
- *
+ *
* @throws Exception
*/
@Test
@@ -194,7 +190,7 @@ public class ProxyStatsTest extends
MockedPulsarServiceBaseTest {
/**
* Change proxy log level dynamically
- *
+ *
* @throws Exception
*/
@Test
diff --git
a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
index 87ae7e8..b039913 100644
---
a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
+++
b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
@@ -18,6 +18,20 @@
*/
package org.apache.pulsar.websocket;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import lombok.Getter;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.client.api.CompressionType;
@@ -33,25 +47,8 @@ import
org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
import org.apache.pulsar.common.naming.TopicName;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-import org.junit.Assert;
-import org.junit.Test;
import org.mockito.Mock;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
public class AbstractWebSocketHandlerTest {
@@ -82,41 +79,41 @@ public class AbstractWebSocketHandlerTest {
when(httpServletRequest.getRequestURI()).thenReturn(producerV1 +
URLEncoder.encode(producerV1Topic, StandardCharsets.UTF_8.name()));
WebSocketHandlerImpl webSocketHandler = new WebSocketHandlerImpl(null,
httpServletRequest, null);
TopicName topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-cluster/my-ns/" +
producerV1Topic, topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-cluster/my-ns/" + producerV1Topic);
when(httpServletRequest.getRequestURI()).thenReturn(consumerV1
+ URLEncoder.encode(consumerV1Topic,
StandardCharsets.UTF_8.name()) + "/"
+ URLEncoder.encode(consumerV1Sub,
StandardCharsets.UTF_8.name()));
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-cluster/my-ns/" +
consumerV1Topic, topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-cluster/my-ns/" + consumerV1Topic);
when(httpServletRequest.getRequestURI()).thenReturn(readerV1
+ URLEncoder.encode(readerV1Topic,
StandardCharsets.UTF_8.name()));
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-cluster/my-ns/" +
readerV1Topic, topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-cluster/my-ns/" + readerV1Topic);
when(httpServletRequest.getRequestURI()).thenReturn(producerV2
+ URLEncoder.encode(producerV2Topic,
StandardCharsets.UTF_8.name()));
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-ns/" +
producerV2Topic, topicName.toString());
+ assertEquals(topicName.toString(), "persistent://my-property/my-ns/" +
producerV2Topic);
when(httpServletRequest.getRequestURI()).thenReturn(consumerV2
+ URLEncoder.encode(consumerV2Topic,
StandardCharsets.UTF_8.name()) + "/"
+ URLEncoder.encode(consumerV2Sub,
StandardCharsets.UTF_8.name()));
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-ns/" +
consumerV2Topic, topicName.toString());
+ assertEquals(topicName.toString(), "persistent://my-property/my-ns/" +
consumerV2Topic);
String sub = ConsumerHandler.extractSubscription(httpServletRequest);
- Assert.assertEquals(consumerV2Sub, sub);
+ assertEquals(sub, consumerV2Sub);
when(httpServletRequest.getRequestURI()).thenReturn(readerV2
+ URLEncoder.encode(readerV2Topic,
StandardCharsets.UTF_8.name()));
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-ns/" + readerV2Topic,
topicName.toString());
+ assertEquals(topicName.toString(), "persistent://my-property/my-ns/" +
readerV2Topic);
}
@Test
@@ -135,37 +132,37 @@ public class AbstractWebSocketHandlerTest {
when(httpServletRequest.getRequestURI()).thenReturn(producerV1);
WebSocketHandlerImpl webSocketHandler = new WebSocketHandlerImpl(null,
httpServletRequest, null);
TopicName topicName = webSocketHandler.getTopic();
-
Assert.assertEquals("persistent://my-property/my-cluster/my-ns/my-topic",
topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-cluster/my-ns/my-topic");
when(httpServletRequest.getRequestURI()).thenReturn(consumerV1);
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
-
Assert.assertEquals("persistent://my-property/my-cluster/my-ns/my-topic",
topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-cluster/my-ns/my-topic");
when(httpServletRequest.getRequestURI()).thenReturn(readerV1);
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
-
Assert.assertEquals("persistent://my-property/my-cluster/my-ns/my-topic",
topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-cluster/my-ns/my-topic");
when(httpServletRequest.getRequestURI()).thenReturn(producerV2);
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-ns/my-topic",
topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-ns/my-topic");
when(httpServletRequest.getRequestURI()).thenReturn(consumerV2);
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-ns/my-topic",
topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-ns/my-topic");
when(httpServletRequest.getRequestURI()).thenReturn(consumerLongTopicNameV2);
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
-
Assert.assertEquals("persistent://my-tenant/my-ns/some/topic/with/slashes",
topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-tenant/my-ns/some/topic/with/slashes");
when(httpServletRequest.getRequestURI()).thenReturn(readerV2);
webSocketHandler = new WebSocketHandlerImpl(null, httpServletRequest,
null);
topicName = webSocketHandler.getTopic();
- Assert.assertEquals("persistent://my-property/my-ns/my-topic/ /
/@!$#^&*( /)1 /_、`，《》</>", topicName.toString());
+ assertEquals(topicName.toString(),
"persistent://my-property/my-ns/my-topic/ / /@!$#^&*( /)1 /_、`，《》</>");
}
diff --git
a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicyTest.java
b/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicyTest.java
index a05973b..19ecd61 100644
---
a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicyTest.java
+++
b/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicyTest.java
@@ -22,11 +22,8 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
import com.fasterxml.jackson.databind.ObjectMapper;
-
import io.netty.util.HashedWheelTimer;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -36,7 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-
import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.feature.SettableFeatureProvider;
@@ -51,7 +47,6 @@ import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -444,7 +439,7 @@ public class ZkIsolatedBookieEnsemblePlacementPolicyTest {
try {
isolationPolicy
.newEnsemble(3, 3, 2, Collections.emptyMap(), new
HashSet<>()).getResult();
- Assert.fail("Should have thrown BKNotEnoughBookiesException");
+ fail("Should have thrown BKNotEnoughBookiesException");
} catch (BKNotEnoughBookiesException ne) {
// Ok..
}
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
index 1e1decd..84f6bf9 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.pulsar.tests.integration.messaging;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import java.util.stream.IntStream;
import lombok.Cleanup;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
@@ -27,11 +30,6 @@ import
org.apache.pulsar.client.api.SubscriptionInitialPosition;
import org.apache.pulsar.client.api.SubscriptionMode;
import org.testng.annotations.Test;
-import java.util.stream.IntStream;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-
public class NonDurableConsumerMessagingTest extends MessagingBase {
@Test(dataProvider = "ServiceUrls")
@@ -62,10 +60,7 @@ public class NonDurableConsumerMessagingTest extends
MessagingBase {
for (int i = 0; i < numMessages; i++) {
Message<byte[]> msg = consumer.receive();
- assertEquals(
- "message-" + i,
- new String(msg.getValue(), UTF_8)
- );
+ assertEquals(new String(msg.getValue(), UTF_8), "message-"
+ i);
}
}
}
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
index da58713..9730f0d 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
@@ -34,7 +34,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.util.FutureUtil;
-import org.junit.Assert;
+import org.testng.Assert;
public class PulsarTestBase {
diff --git
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
index d0b433b..64e490b 100644
---
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
+++
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
@@ -18,8 +18,7 @@
*/
package org.apache.bookkeeper.mledger.offload.jcloud.impl;
-import static org.junit.Assert.assertEquals;
-import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+import static org.testng.Assert.assertEquals;
import com.google.common.io.ByteStreams;
import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
@@ -37,9 +36,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.impl.EntryImpl;
import org.apache.bookkeeper.mledger.impl.OffloadSegmentInfoImpl;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.testng.Assert;
+import org.testng.annotations.Test;
public class BufferedOffloadStreamTest {
final Random random = new Random();
@@ -74,8 +71,8 @@ public class BufferedOffloadStreamTest {
ByteStreams.readFully(inputStream, headerB);
StreamingDataBlockHeaderImpl headerRead = StreamingDataBlockHeaderImpl
.fromStream(new ByteArrayInputStream(headerB));
- Assert.assertEquals(headerRead.getBlockLength(), blockSize);
- Assert.assertEquals(headerRead.getFirstEntryId(), 0);
+ assertEquals(headerRead.getBlockLength(), blockSize);
+ assertEquals(headerRead.getFirstEntryId(), 0);
int left = blockSize - DataBlockHeaderImpl.getDataStartOffset();
for (int i = 0; i < entryCount; i++) {
@@ -87,9 +84,9 @@ public class BufferedOffloadStreamTest {
inputStream.read(lengthBuf);
inputStream.read(entryIdBuf);
inputStream.read(content);
- Assert.assertEquals(entries.get(i).getLength(),
Ints.fromByteArray(lengthBuf));
- Assert.assertEquals(i, Longs.fromByteArray(entryIdBuf));
- assertArrayEquals(entries.get(i).getData(), content);
+ assertEquals(entries.get(i).getLength(),
Ints.fromByteArray(lengthBuf));
+ assertEquals(i, Longs.fromByteArray(entryIdBuf));
+ assertEquals(entries.get(i).getData(), content);
}
assertEquals(left, paddingLen);
byte padding[] = new byte[left];
@@ -97,13 +94,13 @@ public class BufferedOffloadStreamTest {
ByteBuf paddingBuf = Unpooled.wrappedBuffer(padding);
for (int i = 0; i < paddingBuf.capacity() / 4; i++) {
- Assert.assertEquals(Integer.toHexString(paddingBuf.readInt()),
+ assertEquals(Integer.toHexString(paddingBuf.readInt()),
Integer.toHexString(0xFEDCDEAD));
}
// 4. reach end.
- Assert.assertEquals(inputStream.read(), -1);
- Assert.assertEquals(inputStream.read(), -1);
+ assertEquals(inputStream.read(), -1);
+ assertEquals(inputStream.read(), -1);
inputStream.close();
}
@@ -118,7 +115,7 @@ public class BufferedOffloadStreamTest {
testWithPadding(0);
}
- @Ignore("Disable because let offloader to ensure there is no another
ledger id")
+ @Test(enabled = false, description = "Disable because let offloader to
ensure there is no another ledger id")
public void shouldEndWhenSegmentChanged() throws IOException {
int blockSize = StreamingDataBlockHeaderImpl.getDataStartOffset();
int paddingLen = 10;
@@ -159,8 +156,8 @@ public class BufferedOffloadStreamTest {
ByteStreams.readFully(inputStream, headerB);
StreamingDataBlockHeaderImpl headerRead = StreamingDataBlockHeaderImpl
.fromStream(new ByteArrayInputStream(headerB));
- Assert.assertEquals(headerRead.getBlockLength(), blockSize);
- Assert.assertEquals(headerRead.getFirstEntryId(), 0);
+ assertEquals(headerRead.getBlockLength(), blockSize);
+ assertEquals(headerRead.getFirstEntryId(), 0);
int left = blockSize - DataBlockHeaderImpl.getDataStartOffset();
for (int i = 0; i < entryCount; i++) {
@@ -172,9 +169,9 @@ public class BufferedOffloadStreamTest {
inputStream.read(lengthBuf);
inputStream.read(entryIdBuf);
inputStream.read(content);
- Assert.assertEquals(entries.get(i).getLength(),
Ints.fromByteArray(lengthBuf));
- Assert.assertEquals(i, Longs.fromByteArray(entryIdBuf));
- assertArrayEquals(entries.get(i).getData(), content);
+ assertEquals(entries.get(i).getLength(),
Ints.fromByteArray(lengthBuf));
+ assertEquals(i, Longs.fromByteArray(entryIdBuf));
+ assertEquals(entries.get(i).getData(), content);
}
assertEquals(left, paddingLen);
byte padding[] = new byte[left];
@@ -182,13 +179,13 @@ public class BufferedOffloadStreamTest {
ByteBuf paddingBuf = Unpooled.wrappedBuffer(padding);
for (int i = 0; i < paddingBuf.capacity() / 4; i++) {
- Assert.assertEquals(Integer.toHexString(paddingBuf.readInt()),
+ assertEquals(Integer.toHexString(paddingBuf.readInt()),
Integer.toHexString(0xFEDCDEAD));
}
// 4. reach end.
- Assert.assertEquals(inputStream.read(), -1);
- Assert.assertEquals(inputStream.read(), -1);
+ assertEquals(inputStream.read(), -1);
+ assertEquals(inputStream.read(), -1);
inputStream.close();
assertEquals(entryBuffer.size(), 1);
