You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/20 13:14:07 UTC
[pulsar] 15/15: [Test] Cleanup ProxyPublishConsumeTest (#12607)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 91a2b1230223a3e134785dd09d17705fb0ebeb24
Author: lipenghui <pe...@apache.org>
AuthorDate: Thu Nov 4 09:51:35 2021 +0800
[Test] Cleanup ProxyPublishConsumeTest (#12607)
(cherry picked from commit 556ba0ea57a518af931edc935a8a6b4799ead10e)
---
.../websocket/proxy/ProxyPublishConsumeTest.java | 23 +++++++++-------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
index 6386c51..b12f670 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
@@ -29,14 +29,12 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.net.URI;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -56,11 +54,9 @@ import javax.ws.rs.core.Response;
import lombok.Cleanup;
import org.apache.pulsar.broker.BrokerTestUtil;
-import org.apache.pulsar.client.api.MessageCrypto;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.ProducerAccessMode;
import org.apache.pulsar.client.api.ProducerConsumerBase;
-import org.apache.pulsar.client.impl.crypto.MessageCryptoBc;
import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride;
import org.apache.pulsar.common.policies.data.BacklogQuota;
import org.apache.pulsar.common.policies.data.TopicType;
@@ -82,7 +78,6 @@ import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.logging.LoggingFeature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -295,14 +290,14 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
Future<Session> consumerFuture = consumeClient.connect(consumeSocket, consumeUri, consumeRequest);
consumerFuture.get();
List<String> subs = admin.topics().getSubscriptions(topic);
- Assert.assertEquals(subs.size(), 1);
- Assert.assertEquals(subs.get(0), subscription);
+ assertEquals(subs.size(), 1);
+ assertEquals(subs.get(0), subscription);
// do unsubscribe
consumeSocket.unsubscribe();
//wait for delete
Thread.sleep(1000);
subs = admin.topics().getSubscriptions(topic);
- Assert.assertEquals(subs.size(), 0);
+ assertEquals(subs.size(), 0);
} finally {
stopWebSocketClient(consumeClient);
}
@@ -927,11 +922,11 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
producer.flush();
consumeSocket.sendPermits(messages);
Awaitility.await().untilAsserted(() ->
- Assert.assertEquals(consumeSocket.getReceivedMessagesCount(), messages));
+ assertEquals(consumeSocket.getReceivedMessagesCount(), messages));
// The message should not be acked since we only acked 1 message of the batch message
Awaitility.await().untilAsserted(() ->
- Assert.assertEquals(admin.topics().getStats(topic).getSubscriptions()
+ assertEquals(admin.topics().getStats(topic).getSubscriptions()
.get(subscription).getMsgBacklog(), 0));
} finally {
@@ -976,7 +971,7 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
producer.flush();
consumeSocket.sendPermits(messages);
Awaitility.await().untilAsserted(() ->
- Assert.assertEquals(consumeSocket.getReceivedMessagesCount(), messages));
+ assertEquals(consumeSocket.getReceivedMessagesCount(), messages));
for (JsonObject msg : consumeSocket.messages) {
assertTrue(msg.has("encryptionContext"));
@@ -989,7 +984,7 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
// The message should not be acked since we only acked 1 message of the batch message
Awaitility.await().untilAsserted(() ->
- Assert.assertEquals(admin.topics().getStats(topic).getSubscriptions()
+ assertEquals(admin.topics().getStats(topic).getSubscriptions()
.get(subscription).getMsgBacklog(), 0));
} finally {
@@ -1051,13 +1046,13 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
// number of consumers are connected = 2 (one is reader)
assertEquals(stats.consumerStats.size(), 2);
ConsumerStats consumerStats = stats.consumerStats.iterator().next();
- // Assert.assertTrue(consumerStats.numberOfMsgDelivered > 0);
+ assertTrue(consumerStats.numberOfMsgDelivered > 0);
assertNotNull(consumerStats.remoteConnection);
// number of producers are connected = 1
assertEquals(stats.producerStats.size(), 1);
ProducerStats producerStats = stats.producerStats.iterator().next();
- // Assert.assertTrue(producerStats.numberOfMsgPublished > 0);
+ assertTrue(producerStats.numberOfMsgPublished > 0);
assertNotNull(producerStats.remoteConnection);
}