[pulsar] branch master updated: [cleanup][io] Use TestNG instead of JUnit (#15580)

[technoboy]

This is an automated email from the ASF dual-hosted git repository.

technoboy 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 cfffb66a5ca [cleanup][io] Use TestNG instead of JUnit (#15580)
cfffb66a5ca is described below

commit cfffb66a5ca6b8a9d1553cfeac744574f32f2b98
Author: Zixuan Liu <node...@gmail.com>
AuthorDate: Fri May 13 22:15:20 2022 +0800

    [cleanup][io] Use TestNG instead of JUnit (#15580)
    
    Signed-off-by: Zixuan Liu <node...@gmail.com>
---
 .../io/flume/node/TestEnvVarResolverProperties.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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 42a055c7a18..3aa540df8e5 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 static org.testng.Assert.assertEquals;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-
 import lombok.SneakyThrows;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 import org.powermock.reflect.Whitebox;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public final class TestEnvVarResolverProperties {
     private static final File TESTFILE = new File(
@@ -35,7 +34,7 @@ public final class TestEnvVarResolverProperties {
 
     private PropertiesFileConfigurationProvider provider;
 
-    @Before
+    @BeforeMethod(alwaysRun = true)
     public void setUp() {
         provider = new PropertiesFileConfigurationProvider("a1", TESTFILE);
     }
@@ -44,7 +43,7 @@ public final class TestEnvVarResolverProperties {
     public void resolveEnvVar() {
         injectEnvironmentVariable("VARNAME", "varvalue");
         String resolved = EnvVarResolverProperties.resolveEnvVars("padding 
${VARNAME} padding");
-        Assert.assertEquals("padding varvalue padding", resolved);
+        assertEquals(resolved, "padding varvalue padding");
     }
 
     @Test
@@ -53,7 +52,7 @@ public final class TestEnvVarResolverProperties {
         injectEnvironmentVariable("VARNAME2", "varvalue2");
         String resolved = EnvVarResolverProperties
                 .resolveEnvVars("padding ${VARNAME1} ${VARNAME2} padding");
-        Assert.assertEquals("padding varvalue1 varvalue2 padding", resolved);
+        assertEquals(resolved, "padding varvalue1 varvalue2 padding");
     }
 
     @Test
@@ -63,9 +62,9 @@ public final class TestEnvVarResolverProperties {
         System.setProperty("propertiesImplementation",
                 "org.apache.pulsar.io.flume.node.EnvVarResolverProperties");
 
-        Assert.assertEquals(NC_PORT, provider.getFlumeConfiguration()
+        assertEquals(provider.getFlumeConfiguration()
                 .getConfigurationFor("a1")
-                .getSourceContext().get("r1").getParameters().get("port"));
+                .getSourceContext().get("r1").getParameters().get("port"), 
NC_PORT);
     }
 
     @SneakyThrows