HBASE-30071 Upgrade hbase-server to use junit5 Part11 (#8068) (#8074) (#8079)

(cherry picked from commit 235ea44)
(cherry picked from commit 1e47a52)

Signed-off-by: Xiao Liu <liuxiaocs@apache.org>

Author: Apache9

hbase-common/src/test/java/org/apache/hadoop/hbase/TableNameTestExtension.java

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase;
+
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Returns a {@code TableName} based on currently running test method name.
+ */
+public class TableNameTestExtension implements BeforeEachCallback {
+
+  private TableName tableName;
+
+  /**
+   * Helper to handle parameterized method names. Unlike regular test methods, parameterized method
+   * names look like 'foo[x]'. This is problematic for tests that use this name for HBase tables.
+   * This helper strips out the parameter suffixes.
+   * @return current test method name without parameterized suffixes.
+   */
+  public static String cleanUpTestName(String methodName) {
+    int index = methodName.indexOf('[');
+    if (index == -1) {
+      return methodName;
+    }
+    return methodName.substring(0, index);
+  }
+
+  public TableName getTableName() {
+    return tableName;
+  }
+
+  @Override
+  public void beforeEach(ExtensionContext context) {
+    tableName = TableName.valueOf(cleanUpTestName(context.getRequiredTestMethod().getName()));
+  }
+}

hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java

@@ -18,9 +18,8 @@
 package org.apache.hadoop.hbase.security;
 
 import static org.apache.hadoop.hbase.ipc.TestProtobufRpcServiceImpl.SERVICE;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,13 +49,13 @@
 import org.bouncycastle.asn1.x500.style.BCStyle;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.operator.OperatorCreationException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestTemplate;
 
+import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
 import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
 import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
 import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
@@ -76,24 +75,20 @@ public abstract class AbstractTestMutualTls {
   protected RpcServer rpcServer;
 
   protected RpcClient rpcClient;
+
   private TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface stub;
 
-  @Parameterized.Parameter(0)
-  public X509KeyType caKeyType;
+  protected X509KeyType caKeyType;
+
+  protected X509KeyType certKeyType;
 
-  @Parameterized.Parameter(1)
-  public X509KeyType certKeyType;
+  protected String keyPassword;
 
-  @Parameterized.Parameter(2)
-  public String keyPassword;
-  @Parameterized.Parameter(3)
-  public boolean expectSuccess;
+  protected boolean expectSuccess;
 
-  @Parameterized.Parameter(4)
-  public boolean validateHostnames;
+  protected boolean validateHostnames;
 
-  @Parameterized.Parameter(5)
-  public CertConfig certConfig;
+  protected CertConfig certConfig;
 
   public enum CertConfig {
     // For no cert, we literally pass no certificate to the server. It's possible (assuming server
@@ -112,7 +107,17 @@ public enum CertConfig {
     VERIFIABLE_CERT_WITH_BAD_HOST
   }
 
-  @BeforeClass
+  protected AbstractTestMutualTls(X509KeyType caKeyType, X509KeyType certKeyType,
+    String keyPassword, boolean expectSuccess, boolean validateHostnames, CertConfig certConfig) {
+    this.caKeyType = caKeyType;
+    this.certKeyType = certKeyType;
+    this.keyPassword = keyPassword;
+    this.expectSuccess = expectSuccess;
+    this.validateHostnames = validateHostnames;
+    this.certConfig = certConfig;
+  }
+
+  @BeforeAll
   public static void setUpBeforeClass() throws IOException {
     UTIL = new HBaseCommonTestingUtility();
     Security.addProvider(new BouncyCastleProvider());
@@ -131,7 +136,7 @@ public static void setUpBeforeClass() throws IOException {
     PROVIDER = new X509TestContextProvider(conf, DIR);
   }
 
-  @AfterClass
+  @AfterAll
   public static void cleanUp() {
     Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
     UTIL.cleanupTestDir();
@@ -140,7 +145,7 @@ public static void cleanUp() {
   protected abstract void initialize(Configuration serverConf, Configuration clientConf)
     throws IOException, GeneralSecurityException, OperatorCreationException;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     x509TestContext = PROVIDER.get(caKeyType, certKeyType, keyPassword.toCharArray());
     x509TestContext.setConfigurations(KeyStoreFileType.JKS, KeyStoreFileType.JKS);
@@ -192,7 +197,7 @@ protected void handleCertConfig(Configuration confToSet)
     }
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws IOException {
     if (rpcServer != null) {
       rpcServer.stop();
@@ -208,14 +213,23 @@ public void tearDown() throws IOException {
     Security.setProperty("com.sun.security.enableCRLDP", Boolean.FALSE.toString());
   }
 
-  @Test
+  @TestTemplate
   public void testClientAuth() throws Exception {
     if (expectSuccess) {
       // we expect no exception, so if one is thrown the test will fail
       submitRequest();
     } else {
       ServiceException se = assertThrows(ServiceException.class, this::submitRequest);
-      assertThat(se.getCause(), instanceOf(SSLHandshakeException.class));
+      // The SSLHandshakeException is encapsulated differently depending on the TLS version
+      Throwable current = se;
+      do {
+        if (current instanceof SSLHandshakeException) {
+          return;
+        }
+        current = current.getCause();
+      } while (current != null);
+      fail("Exception chain does not include SSLHandshakeException: "
+        + Throwables.getStackTraceAsString(se));
     }
   }
 

hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestSecureIPC.java

@@ -26,12 +26,12 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.either;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.EOFException;
 import java.io.File;

hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestTlsRejectPlainText.java

@@ -20,14 +20,15 @@
 import static org.apache.hadoop.hbase.ipc.TestProtobufRpcServiceImpl.SERVICE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.security.Security;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
@@ -45,10 +46,10 @@
 import org.apache.hadoop.hbase.ipc.RpcServer;
 import org.apache.hadoop.hbase.ipc.RpcServerFactory;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.params.provider.Arguments;
 
 import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
 import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
@@ -65,32 +66,35 @@ public abstract class AbstractTestTlsRejectPlainText {
 
   protected static X509TestContextProvider PROVIDER;
 
-  @Parameterized.Parameter(0)
-  public X509KeyType caKeyType;
+  protected X509KeyType caKeyType;
 
-  @Parameterized.Parameter(1)
-  public X509KeyType certKeyType;
+  protected X509KeyType certKeyType;
 
-  @Parameterized.Parameter(2)
-  public char[] keyPassword;
+  protected char[] keyPassword;
 
   private X509TestContext x509TestContext;
 
   protected RpcServer rpcServer;
 
   protected RpcClient rpcClient;
 
-  @Parameterized.Parameters(name = "{index}: caKeyType={0}, certKeyType={1}, keyPassword={2}")
-  public static List<Object[]> data() {
-    List<Object[]> params = new ArrayList<>();
+  public static Stream<Arguments> parameters() {
+    List<Arguments> params = new ArrayList<>();
     for (X509KeyType caKeyType : X509KeyType.values()) {
       for (X509KeyType certKeyType : X509KeyType.values()) {
         for (char[] keyPassword : new char[][] { "".toCharArray(), "pa$$w0rd".toCharArray() }) {
-          params.add(new Object[] { caKeyType, certKeyType, keyPassword });
+          params.add(Arguments.of(caKeyType, certKeyType, keyPassword));
         }
       }
     }
-    return params;
+    return params.stream();
+  }
+
+  protected AbstractTestTlsRejectPlainText(X509KeyType caKeyType, X509KeyType certKeyType,
+    char[] keyPassword) {
+    this.caKeyType = caKeyType;
+    this.certKeyType = certKeyType;
+    this.keyPassword = keyPassword;
   }
 
   protected static void initialize() throws IOException {
@@ -115,7 +119,7 @@ protected static void cleanUp() {
     UTIL.cleanupTestDir();
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     x509TestContext = PROVIDER.get(caKeyType, certKeyType, keyPassword);
     x509TestContext.setConfigurations(KeyStoreFileType.JKS, KeyStoreFileType.JKS);
@@ -127,7 +131,7 @@ public void setUp() throws Exception {
     rpcClient = new NettyRpcClient(conf);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws IOException {
     if (rpcServer != null) {
       rpcServer.stop();
@@ -145,7 +149,7 @@ public void tearDown() throws IOException {
 
   protected abstract BlockingInterface createStub() throws Exception;
 
-  @Test
+  @TestTemplate
   public void testReject() throws Exception {
     BlockingInterface stub = createStub();
     ServiceException se = assertThrows(ServiceException.class,