commit bf5c6dd77c597ace417d7283a1d2805fc647b091
author Christopher Tubbs <ctubbsii@apache.org> Thu May 05 23:51:18 2022 -0400
committer Christopher Tubbs <ctubbsii@apache.org> Thu May 05 23:51:18 2022 -0400
tree d1e270aae2bd24dc615c1746119b0d554e73d471
parent 3df6a03a2fea77ece9c09c12c413297bc09b06c1

Fix merge bug (unconverted JUnit test)

Convert TestAnnotationMetadata to JUnit5 API. This class was not
included in THRIFT-5560 (PR #2574) when the conversion was done because
this was a new class added in THRIFT-5544 (PR #2553), which was merged
first.

lib/java/src/test/java/org/apache/thrift/TestAnnotationMetadata.java

diff --git a/lib/java/src/test/java/org/apache/thrift/TestAnnotationMetadata.java b/lib/java/src/test/java/org/apache/thrift/TestAnnotationMetadata.java
index a9381e6..83be6b9 100644
--- a/lib/java/src/test/java/org/apache/thrift/TestAnnotationMetadata.java
+++ b/lib/java/src/test/java/org/apache/thrift/TestAnnotationMetadata.java
@@ -24,11 +24,12 @@
 import java.util.Map;
 
 import org.apache.thrift.meta_data.FieldMetaData;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import thrift.test.OneOfEachBeans;
 import thrift.test.annotations.OneOfEachBeansWithAnnotations;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class TestAnnotationMetadata {
 
     @Test
@@ -36,11 +37,11 @@
         Map<? extends TFieldIdEnum, FieldMetaData> structMetaDataMap = FieldMetaData.getStructMetaDataMap(OneOfEachBeans.class);
         {
             Map<String, String> metadata = structMetaDataMap.get(OneOfEachBeans._Fields.I16_LIST).getFieldAnnotations();
-            Assert.assertEquals(Collections.emptyMap(), metadata);
+            assertEquals(Collections.emptyMap(), metadata);
         }
         {
             Map<String, String> metadata = structMetaDataMap.get(OneOfEachBeans._Fields.A_BITE).getFieldAnnotations();
-            Assert.assertEquals(Collections.emptyMap(), metadata);
+            assertEquals(Collections.emptyMap(), metadata);
         }
     }
 
@@ -49,13 +50,13 @@
         Map<? extends TFieldIdEnum, FieldMetaData> structMetaDataMap = FieldMetaData.getStructMetaDataMap(OneOfEachBeansWithAnnotations.class);
         {
             Map<String, String> metadata = structMetaDataMap.get(OneOfEachBeansWithAnnotations._Fields.I16_LIST).getFieldAnnotations();
-            Assert.assertEquals(Collections.emptyMap(), metadata);
+            assertEquals(Collections.emptyMap(), metadata);
         }
         {
             Map<String, String> metadata = structMetaDataMap.get(OneOfEachBeansWithAnnotations._Fields.A_BITE).getFieldAnnotations();
             Map<String, String> expected = new HashMap<>();
             expected.put("compression", "false");
-            Assert.assertEquals(expected, metadata);
+            assertEquals(expected, metadata);
         }
     }
 }