Improve the unit test to cover force deleting

apache · Mar 5, 2020 · 7ec207d · 7ec207d
1 parent 3027fbc
commit 7ec207d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -82,6 +82,7 @@
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.ConsumerBuilder;
 import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.MessageRoutingMode;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
@@ -1309,11 +1310,19 @@ public void testDeleteSubscription(String topicName) throws Exception {
         final String subName = topicName;
         final String persistentTopicName = "persistent://prop-xyz/ns1/" + topicName;
 
+        // disable auto subscription creation
+        pulsar.getConfiguration().setAllowAutoSubscriptionCreation(false);
+
         // create a topic and produce some messages
         publishMessagesOnPersistentTopic("persistent://prop-xyz/ns1/" + topicName, 5);
         assertEquals(admin.topics().getList("prop-xyz/ns1"),
             Lists.newArrayList("persistent://prop-xyz/ns1/" + topicName));
 
+        // create the subscription by PulsarAdmin
+        admin.topics().createSubscription(topicName, subName, MessageId.earliest);
+
+        assertEquals(admin.topics().getSubscriptions(persistentTopicName), Lists.newArrayList(subName));
+
         // create consumer and subscription
         PulsarClient client = PulsarClient.builder()
             .serviceUrl(pulsar.getWebServiceAddress())
@@ -1322,8 +1331,6 @@ public void testDeleteSubscription(String topicName) throws Exception {
         Consumer<byte[]> consumer = client.newConsumer().topic(persistentTopicName).subscriptionName(subName)
             .subscriptionType(SubscriptionType.Exclusive).subscribe();
 
-        assertEquals(admin.topics().getSubscriptions(persistentTopicName), Lists.newArrayList(subName));
-
         // try to delete the subscription with a connected consumer
         try {
             admin.topics().deleteSubscription(persistentTopicName, subName);
@@ -1339,7 +1346,10 @@ public void testDeleteSubscription(String topicName) throws Exception {
         admin.topics().deleteSubscription(persistentTopicName, subName, true);
 
         // delete the subscription successfully
-        // assertEquals(admin.topics().getSubscriptions(persistentTopicName).size(), 0);
+        assertEquals(admin.topics().getSubscriptions(persistentTopicName).size(), 0);
+
+        // reset to default
+        pulsar.getConfiguration().setAllowAutoSubscriptionCreation(true);
 
         client.close();
     }