[cleanup][broker-common] Use TestNG instead of JUnit (apache#15573)

Signed-off-by: Zixuan Liu <[email protected]>
rkaw92 · May 13, 2022 · 952c5a9 · 952c5a9
1 parent cd54508
commit 952c5a9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/...java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java b/...java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java
@@ -19,14 +19,15 @@
 package org.apache.pulsar.broker.authorization;
 
 import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import java.util.Properties;
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
 import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
 import org.apache.pulsar.broker.resources.PulsarResources;
-import org.junit.Assert;
 import org.testng.annotations.Test;
 
 import javax.crypto.SecretKey;
@@ -59,18 +60,18 @@ public String getHttpHeader(String name) {
             }
         };
 
-        Assert.assertTrue(provider.authorize(ads, role -> {
+        assertTrue(provider.authorize(ads, role -> {
             if (role.equals(userB)) {
                 return CompletableFuture.completedFuture(true); // only userB has permission
             }
             return CompletableFuture.completedFuture(false);
         }).get());
 
-        Assert.assertTrue(provider.authorize(ads, role -> {
+        assertTrue(provider.authorize(ads, role -> {
             return CompletableFuture.completedFuture(true); // all users has permission
         }).get());
 
-        Assert.assertFalse(provider.authorize(ads, role -> {
+        assertFalse(provider.authorize(ads, role -> {
             return CompletableFuture.completedFuture(false); // all users has no permission
         }).get());
     }
@@ -98,7 +99,7 @@ public String getHttpHeader(String name) {
             }
         };
 
-        Assert.assertFalse(provider.authorize(ads, role -> CompletableFuture.completedFuture(false)).get());
+        assertFalse(provider.authorize(ads, role -> CompletableFuture.completedFuture(false)).get());
     }
 
     @Test
@@ -125,7 +126,7 @@ public String getHttpHeader(String name) {
             }
         };
 
-        Assert.assertTrue(provider.authorize(ads, role -> {
+        assertTrue(provider.authorize(ads, role -> {
             if (role.equals(testRole)) {
                 return CompletableFuture.completedFuture(true);
             }
@@ -155,7 +156,7 @@ public String getHttpHeader(String name) {
             }
         };
 
-        Assert.assertFalse(provider.authorize(ads, role -> CompletableFuture.completedFuture(false)).get());
+        assertFalse(provider.authorize(ads, role -> CompletableFuture.completedFuture(false)).get());
     }
 
     @Test
@@ -190,7 +191,7 @@ public String getHttpHeader(String name) {
             }
         };
 
-        Assert.assertTrue(provider.authorize(ads, role -> {
+        assertTrue(provider.authorize(ads, role -> {
             if (role.equals(testRole)) {
                 return CompletableFuture.completedFuture(true);
             }

diff --git a/...roker-common/src/test/java/org/apache/pulsar/broker/resources/NamespaceResourcesTest.java b/...roker-common/src/test/java/org/apache/pulsar/broker/resources/NamespaceResourcesTest.java
@@ -19,16 +19,17 @@
 
 package org.apache.pulsar.broker.resources;
 
-import org.junit.Assert;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 
 
 public class NamespaceResourcesTest {
     @Test
     public void test_pathIsFromNamespace() {
-        Assert.assertFalse(NamespaceResources.pathIsFromNamespace("/admin/clusters"));
-        Assert.assertFalse(NamespaceResources.pathIsFromNamespace("/admin/policies"));
-        Assert.assertFalse(NamespaceResources.pathIsFromNamespace("/admin/policies/my-tenant"));
-        Assert.assertTrue(NamespaceResources.pathIsFromNamespace("/admin/policies/my-tenant/my-ns"));
+        assertFalse(NamespaceResources.pathIsFromNamespace("/admin/clusters"));
+        assertFalse(NamespaceResources.pathIsFromNamespace("/admin/policies"));
+        assertFalse(NamespaceResources.pathIsFromNamespace("/admin/policies/my-tenant"));
+        assertTrue(NamespaceResources.pathIsFromNamespace("/admin/policies/my-tenant/my-ns"));
     }
 }