Fix TopicPoliciesTest

BewareMyPower · Sep 3, 2024 · 614d804 · 614d804
1 parent 0829ec5
commit 614d804
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
@@ -3041,15 +3041,15 @@ public void testGlobalTopicPolicies() throws Exception {
         Awaitility.await().untilAsserted(() -> assertNotNull(
                 TestUtils.getGlobalTopicPolicies(topicPoliciesService, TopicName.get(topic))));
         TopicPolicies topicPolicies = TestUtils.getGlobalTopicPolicies(topicPoliciesService, TopicName.get(topic));
-        assertNull(TestUtils.getTopicPolicies(topicPoliciesService, (TopicName.get(topic))));
+        assertNull(TestUtils.getLocalTopicPolicies(topicPoliciesService, TopicName.get(topic)));
         assertEquals(topicPolicies.getRetentionPolicies().getRetentionTimeInMinutes(), 1);
         assertEquals(topicPolicies.getRetentionPolicies().getRetentionSizeInMB(), 2);
 
         // check global topic policies can be updated correctly.
         admin.topicPolicies(true).setRetention(topic, new RetentionPolicies(3, 4));
         Awaitility.await().untilAsserted(() -> {
             TopicPolicies tempPolicies = TestUtils.getGlobalTopicPolicies(topicPoliciesService, TopicName.get(topic));
-            assertNull(TestUtils.getTopicPolicies(topicPoliciesService, (TopicName.get(topic))));
+            assertNull(TestUtils.getLocalTopicPolicies(topicPoliciesService, (TopicName.get(topic))));
             assertEquals(tempPolicies.getRetentionPolicies().getRetentionTimeInMinutes(), 3);
             assertEquals(tempPolicies.getRetentionPolicies().getRetentionSizeInMB(), 4);
         });

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TestUtils.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TestUtils.java
@@ -33,6 +33,12 @@ public static TopicPolicies getTopicPolicies(TopicPoliciesService topicPoliciesS
                 .orElse(null);
     }
 
+    public static TopicPolicies getLocalTopicPolicies(TopicPoliciesService topicPoliciesService, TopicName topicName)
+            throws ExecutionException, InterruptedException {
+        return topicPoliciesService.getTopicPoliciesAsync(topicName, TopicPoliciesService.GetType.LOCAL_ONLY).get()
+                .orElse(null);
+    }
+
     public static TopicPolicies getGlobalTopicPolicies(TopicPoliciesService topicPoliciesService, TopicName topicName)
             throws ExecutionException, InterruptedException {
         return topicPoliciesService.getTopicPoliciesAsync(topicName, TopicPoliciesService.GetType.GLOBAL_ONLY).get()