HADOOP-19417. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-minikdc. (#7636)

* HADOOP-19417. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-minikdc.

Co-authored-by: Wei-Chiu Chuang <weichiu@apache.org>
Co-authored-by: He Xiaoqiao <hexiaoqiao@apache.org>
Co-authored-by: Chris Nauroth <cnauroth@apache.org>
Co-authored-by: Hualong Zhang <hualong.z@hotmail.com>
Reviewed-by: Wei-Chiu Chuang <weichiu@apache.org>
Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org>
Reviewed-by: Chris Nauroth <cnauroth@apache.org>
Reviewed-by: Hualong Zhang <hualong.z@hotmail.com>
Signed-off-by: Shilun Fan <slfan1989@apache.org>

hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java

@@ -13,6 +13,10 @@
  */
 package org.apache.hadoop.security.authentication.client;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.apache.hadoop.security.authentication.server.MultiSchemeAuthenticationHandler.SCHEMES_PROPERTY;
 import static org.apache.hadoop.security.authentication.server.MultiSchemeAuthenticationHandler.AUTH_HANDLER_PROPERTY;
 import static org.apache.hadoop.security.authentication.server.AuthenticationFilter.AUTH_TYPE;
@@ -34,10 +38,9 @@ import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
 import org.apache.hadoop.security.authentication.server.MultiSchemeAuthenticationHandler;
 import org.apache.hadoop.security.authentication.server.PseudoAuthenticationHandler;
 import org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.io.File;
 import java.net.HttpURLConnection;
@@ -54,7 +57,7 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
   public TestKerberosAuthenticator() {
   }
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
     // create keytab
     File keytabFile = new File(KerberosTestUtils.getKeytabFile());
@@ -89,7 +92,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     return props;
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testFallbacktoPseudoAuthenticator() throws Exception {
     AuthenticatorTestCase auth = new AuthenticatorTestCase();
     Properties props = new Properties();
@@ -99,7 +103,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     auth._testAuthentication(new KerberosAuthenticator(), false);
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testFallbacktoPseudoAuthenticatorAnonymous() throws Exception {
     AuthenticatorTestCase auth = new AuthenticatorTestCase();
     Properties props = new Properties();
@@ -109,7 +114,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     auth._testAuthentication(new KerberosAuthenticator(), false);
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testNotAuthenticated() throws Exception {
     AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase.setAuthenticationHandlerConfig(getAuthenticationHandlerConfiguration());
@@ -118,14 +124,15 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
       URL url = new URL(auth.getBaseURL());
       HttpURLConnection conn = (HttpURLConnection) url.openConnection();
       conn.connect();
-      Assert.assertEquals(HttpURLConnection.HTTP_UNAUTHORIZED, conn.getResponseCode());
-      Assert.assertTrue(conn.getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE) != null);
+      assertEquals(HttpURLConnection.HTTP_UNAUTHORIZED, conn.getResponseCode());
+      assertTrue(conn.getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE) != null);
     } finally {
       auth.stop();
     }
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testAuthentication() throws Exception {
     final AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase.setAuthenticationHandlerConfig(
@@ -139,7 +146,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     });
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testAuthenticationPost() throws Exception {
     final AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase.setAuthenticationHandlerConfig(
@@ -153,7 +161,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     });
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testAuthenticationHttpClient() throws Exception {
     final AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase.setAuthenticationHandlerConfig(
@@ -167,7 +176,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     });
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testAuthenticationHttpClientPost() throws Exception {
     final AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase.setAuthenticationHandlerConfig(
@@ -181,7 +191,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testNotAuthenticatedWithMultiAuthHandler() throws Exception {
     AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase
@@ -191,16 +202,17 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
       URL url = new URL(auth.getBaseURL());
       HttpURLConnection conn = (HttpURLConnection) url.openConnection();
       conn.connect();
-      Assert.assertEquals(HttpURLConnection.HTTP_UNAUTHORIZED,
+      assertEquals(HttpURLConnection.HTTP_UNAUTHORIZED,
           conn.getResponseCode());
-      Assert.assertTrue(conn
+      assertTrue(conn
           .getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE) != null);
     } finally {
       auth.stop();
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testAuthenticationWithMultiAuthHandler() throws Exception {
     final AuthenticatorTestCase auth = new AuthenticatorTestCase();
     AuthenticatorTestCase
@@ -214,7 +226,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testAuthenticationHttpClientPostWithMultiAuthHandler()
       throws Exception {
     final AuthenticatorTestCase auth = new AuthenticatorTestCase();
@@ -229,21 +242,22 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testWrapExceptionWithMessage() {
     IOException ex;
     ex = new IOException("Induced exception");
     ex = KerberosAuthenticator.wrapExceptionWithMessage(ex, "Error while "
         + "authenticating with endpoint: localhost");
-    Assert.assertEquals("Induced exception", ex.getCause().getMessage());
-    Assert.assertEquals("Error while authenticating with endpoint: localhost",
+    assertEquals("Induced exception", ex.getCause().getMessage());
+    assertEquals("Error while authenticating with endpoint: localhost",
         ex.getMessage());
 
     ex = new AuthenticationException("Auth exception");
     ex = KerberosAuthenticator.wrapExceptionWithMessage(ex, "Error while "
         + "authenticating with endpoint: localhost");
-    Assert.assertEquals("Auth exception", ex.getCause().getMessage());
-    Assert.assertEquals("Error while authenticating with endpoint: localhost",
+    assertEquals("Auth exception", ex.getCause().getMessage());
+    assertEquals("Error while authenticating with endpoint: localhost",
         ex.getMessage());
 
     // Test for Exception with  no (String) constructor
@@ -251,45 +265,48 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     ex = new CharacterCodingException();
     Exception ex2 = KerberosAuthenticator.wrapExceptionWithMessage(ex,
         "Error while authenticating with endpoint: localhost");
-    Assert.assertTrue(ex instanceof CharacterCodingException);
-    Assert.assertTrue(ex.equals(ex2));
+    assertTrue(ex instanceof CharacterCodingException);
+    assertTrue(ex.equals(ex2));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testNegotiate() throws NoSuchMethodException, InvocationTargetException,
           IllegalAccessException, IOException {
     KerberosAuthenticator kerberosAuthenticator = new KerberosAuthenticator();
 
-    HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
-    Mockito.when(conn.getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE)).
+    HttpURLConnection conn = mock(HttpURLConnection.class);
+    when(conn.getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE)).
             thenReturn(KerberosAuthenticator.NEGOTIATE);
-    Mockito.when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
+    when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
 
     Method method = KerberosAuthenticator.class.getDeclaredMethod("isNegotiate",
             HttpURLConnection.class);
     method.setAccessible(true);
 
-    Assert.assertTrue((boolean)method.invoke(kerberosAuthenticator, conn));
+    assertTrue((boolean)method.invoke(kerberosAuthenticator, conn));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testNegotiateLowerCase() throws NoSuchMethodException, InvocationTargetException,
           IllegalAccessException, IOException {
     KerberosAuthenticator kerberosAuthenticator = new KerberosAuthenticator();
 
-    HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
-    Mockito.when(conn.getHeaderField("www-authenticate"))
+    HttpURLConnection conn = mock(HttpURLConnection.class);
+    when(conn.getHeaderField("www-authenticate"))
             .thenReturn(KerberosAuthenticator.NEGOTIATE);
-    Mockito.when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
+    when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
 
     Method method = KerberosAuthenticator.class.getDeclaredMethod("isNegotiate",
             HttpURLConnection.class);
     method.setAccessible(true);
 
-    Assert.assertTrue((boolean)method.invoke(kerberosAuthenticator, conn));
+    assertTrue((boolean)method.invoke(kerberosAuthenticator, conn));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testReadToken() throws NoSuchMethodException, IOException, IllegalAccessException,
           InvocationTargetException {
     KerberosAuthenticator kerberosAuthenticator = new KerberosAuthenticator();
@@ -297,9 +314,9 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
 
     Base64 base64 = new Base64();
 
-    HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
-    Mockito.when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
-    Mockito.when(conn.getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE))
+    HttpURLConnection conn = mock(HttpURLConnection.class);
+    when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
+    when(conn.getHeaderField(KerberosAuthenticator.WWW_AUTHENTICATE))
             .thenReturn(KerberosAuthenticator.NEGOTIATE + " " +
                     Arrays.toString(base64.encode("foobar".getBytes())));
 
@@ -310,7 +327,8 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
     method.invoke(kerberosAuthenticator, conn); // expecting this not to throw an exception
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testReadTokenLowerCase() throws NoSuchMethodException, IOException,
           IllegalAccessException, InvocationTargetException {
     KerberosAuthenticator kerberosAuthenticator = new KerberosAuthenticator();
@@ -318,9 +336,9 @@ public class TestKerberosAuthenticator extends KerberosSecurityTestcase {
 
     Base64 base64 = new Base64();
 
-    HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
-    Mockito.when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
-    Mockito.when(conn.getHeaderField("www-authenticate"))
+    HttpURLConnection conn = mock(HttpURLConnection.class);
+    when(conn.getResponseCode()).thenReturn(HttpURLConnection.HTTP_UNAUTHORIZED);
+    when(conn.getHeaderField("www-authenticate"))
             .thenReturn(KerberosAuthenticator.NEGOTIATE +
                     Arrays.toString(base64.encode("foobar".getBytes())));
 

hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAltKerberosAuthenticationHandler.java

@@ -13,14 +13,17 @@
  */
 package org.apache.hadoop.security.authentication.server;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import java.io.IOException;
 import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class TestAltKerberosAuthenticationHandler
     extends TestKerberosAuthenticationHandler {
@@ -47,25 +50,41 @@ public class TestAltKerberosAuthenticationHandler
     return AltKerberosAuthenticationHandler.TYPE;
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testAlternateAuthenticationAsBrowser() throws Exception {
-    HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-    HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
+    if (handler != null) {
+      handler.destroy();
+      handler = null;
+    }
+    handler = getNewAuthenticationHandler();
+    Properties props = getDefaultProperties();
+    props.setProperty("alt-kerberos.non-browser.user-agents", "foo, bar");
+    try {
+      handler.init(props);
+    } catch (Exception ex) {
+      handler = null;
+      throw ex;
+    }
+
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    HttpServletResponse response = mock(HttpServletResponse.class);
 
     // By default, a User-Agent without "java", "curl", "wget", or "perl" in it
     // is considered a browser
-    Mockito.when(request.getHeader("User-Agent")).thenReturn("Some Browser");
+    when(request.getHeader("User-Agent")).thenReturn("Some Browser");
 
     AuthenticationToken token = handler.authenticate(request, response);
-    Assert.assertEquals("A", token.getUserName());
-    Assert.assertEquals("B", token.getName());
-    Assert.assertEquals(getExpectedType(), token.getType());
+    assertEquals("A", token.getUserName());
+    assertEquals("B", token.getName());
+    assertEquals(getExpectedType(), token.getType());
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testNonDefaultNonBrowserUserAgentAsBrowser() throws Exception {
-    HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-    HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    HttpServletResponse response = mock(HttpServletResponse.class);
 
     if (handler != null) {
       handler.destroy();
@@ -82,15 +101,16 @@ public class TestAltKerberosAuthenticationHandler
     }
 
     // Pretend we're something that will not match with "foo" (or "bar")
-    Mockito.when(request.getHeader("User-Agent")).thenReturn("blah");
+    when(request.getHeader("User-Agent")).thenReturn("blah");
     // Should use alt authentication
     AuthenticationToken token = handler.authenticate(request, response);
-    Assert.assertEquals("A", token.getUserName());
-    Assert.assertEquals("B", token.getName());
-    Assert.assertEquals(getExpectedType(), token.getType());
+    assertEquals("A", token.getUserName());
+    assertEquals("B", token.getName());
+    assertEquals(getExpectedType(), token.getType());
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testNonDefaultNonBrowserUserAgentAsNonBrowser() throws Exception {
     if (handler != null) {
       handler.destroy();

hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java

@@ -13,8 +13,13 @@
  */
 package org.apache.hadoop.security.authentication.server;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.security.KeyPair;
@@ -35,11 +40,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
 import org.apache.hadoop.security.authentication.KerberosTestUtils;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.nimbusds.jose.*;
 import com.nimbusds.jwt.JWTClaimsSet;
@@ -65,12 +68,12 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
@@ -97,17 +100,17 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("jowt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Assert.assertEquals("bob", token.getUserName());
+      assertEquals("bob", token.getUserName());
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException: "
           + se.getMessage());
@@ -130,12 +133,12 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
@@ -167,17 +170,17 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", "ljm" + jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Mockito.verify(response).sendRedirect(REDIRECT_LOCATION);
+      verify(response).sendRedirect(REDIRECT_LOCATION);
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException");
     } catch (AuthenticationException ae) {
@@ -206,17 +209,17 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Mockito.verify(response).sendRedirect(REDIRECT_LOCATION);
+      verify(response).sendRedirect(REDIRECT_LOCATION);
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException");
     } catch (AuthenticationException ae) {
@@ -236,17 +239,17 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Mockito.verify(response).sendRedirect(REDIRECT_LOCATION);
+      verify(response).sendRedirect(REDIRECT_LOCATION);
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException");
     } catch (AuthenticationException ae) {
@@ -265,18 +268,18 @@ public class TestJWTRedirectAuthenticationHandler extends
       SignedJWT jwt = getJWT("bob", null, privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Assert.assertNotNull("Token should not be null.", token);
-      Assert.assertEquals("bob", token.getUserName());
+      assertNotNull(token, "Token should not be null.");
+      assertEquals("bob", token.getUserName());
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException");
     } catch (AuthenticationException ae) {
@@ -298,17 +301,17 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Mockito.verify(response).sendRedirect(REDIRECT_LOCATION);
+      verify(response).sendRedirect(REDIRECT_LOCATION);
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException");
     } catch (AuthenticationException ae) {
@@ -330,17 +333,17 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Assert.assertEquals("bob", token.getUserName());
+      assertEquals("bob", token.getUserName());
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException");
     } catch (AuthenticationException ae) {
@@ -360,18 +363,18 @@ public class TestJWTRedirectAuthenticationHandler extends
           privateKey);
 
       Cookie cookie = new Cookie("hadoop-jwt", jwt.serialize());
-      HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-      Mockito.when(request.getCookies()).thenReturn(new Cookie[] { cookie });
-      Mockito.when(request.getRequestURL()).thenReturn(
+      HttpServletRequest request = mock(HttpServletRequest.class);
+      when(request.getCookies()).thenReturn(new Cookie[]{cookie});
+      when(request.getRequestURL()).thenReturn(
           new StringBuffer(SERVICE_URL));
-      HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
-      Mockito.when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
+      HttpServletResponse response = mock(HttpServletResponse.class);
+      when(response.encodeRedirectURL(SERVICE_URL)).thenReturn(
           SERVICE_URL);
 
       AuthenticationToken token = handler.alternateAuthenticate(request,
           response);
-      Assert.assertNotNull("Token should not be null.", token);
-      Assert.assertEquals("alice", token.getUserName());
+      assertNotNull(token, "Token should not be null.");
+      assertEquals("alice", token.getUserName());
     } catch (ServletException se) {
       fail("alternateAuthentication should NOT have thrown a ServletException.");
     } catch (AuthenticationException ae) {
@@ -386,14 +389,15 @@ public class TestJWTRedirectAuthenticationHandler extends
     Properties props = getProperties();
     handler.init(props);
 
-    HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-    Mockito.when(request.getRequestURL()).thenReturn(
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    when(request.getRequestURL()).thenReturn(
         new StringBuffer(SERVICE_URL));
-    Mockito.when(request.getQueryString()).thenReturn("name=value");
+    when(request.getQueryString()).thenReturn("name=value");
 
     String loginURL = handler.constructLoginURL(request);
-    Assert.assertNotNull("loginURL should not be null.", loginURL);
-    Assert.assertEquals("https://localhost:8443/authserver?originalUrl=" + SERVICE_URL + "?name=value", loginURL);
+    assertNotNull(loginURL, "loginURL should not be null.");
+    assertEquals("https://localhost:8443/authserver?originalUrl=" +
+        SERVICE_URL + "?name=value", loginURL);
   }
 
   @Test
@@ -403,17 +407,17 @@ public class TestJWTRedirectAuthenticationHandler extends
     Properties props = getProperties();
     handler.init(props);
 
-    HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-    Mockito.when(request.getRequestURL()).thenReturn(
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    when(request.getRequestURL()).thenReturn(
         new StringBuffer(SERVICE_URL));
-    Mockito.when(request.getQueryString()).thenReturn(null);
+    when(request.getQueryString()).thenReturn(null);
 
     String loginURL = handler.constructLoginURL(request);
-    Assert.assertNotNull("LoginURL should not be null.", loginURL);
-    Assert.assertEquals("https://localhost:8443/authserver?originalUrl=" + SERVICE_URL, loginURL);
+    assertNotNull(loginURL, "LoginURL should not be null.");
+    assertEquals("https://localhost:8443/authserver?originalUrl=" + SERVICE_URL, loginURL);
   }
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception, NoSuchAlgorithmException {
     setupKerberosRequirements();
 
@@ -434,7 +438,7 @@ public class TestJWTRedirectAuthenticationHandler extends
     getKdc().createPrincipal(new File(keytab), keytabUsers);
   }
 
-  @After
+  @AfterEach
   public void teardown() throws Exception {
     handler.destroy();
   }

hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java

@@ -13,6 +13,11 @@
  */
 package org.apache.hadoop.security.authentication.server;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
 import org.apache.hadoop.security.authentication.KerberosTestUtils;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -23,12 +28,10 @@ import org.apache.hadoop.security.authentication.util.KerberosUtil;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSManager;
 import org.ietf.jgss.GSSName;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mockito.Mockito;
 import org.ietf.jgss.Oid;
 
@@ -46,12 +49,10 @@ import java.util.concurrent.Callable;
 /**
  * Tests for Kerberos Authentication Handler.
  */
+@Timeout(60)
 public class TestKerberosAuthenticationHandler
     extends KerberosSecurityTestcase {
 
-  @Rule
-  public Timeout globalTimeout = Timeout.millis(60000);
-
   protected KerberosAuthenticationHandler handler;
 
   protected KerberosAuthenticationHandler getNewAuthenticationHandler() {
@@ -75,7 +76,7 @@ public class TestKerberosAuthenticationHandler
     return props;
   }
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
     // create keytab
     File keytabFile = new File(KerberosTestUtils.getKeytabFile());
@@ -103,7 +104,7 @@ public class TestKerberosAuthenticationHandler
   @Test
   public void testNameRulesHadoop() throws Exception {
     KerberosName kn = new KerberosName(KerberosTestUtils.getServerPrincipal());
-    Assert.assertEquals(KerberosTestUtils.getRealm(), kn.getRealm());
+    assertEquals(KerberosTestUtils.getRealm(), kn.getRealm());
 
     //destroy handler created in setUp()
     handler.destroy();
@@ -118,11 +119,11 @@ public class TestKerberosAuthenticationHandler
     } catch (Exception ex) {
     }
     kn = new KerberosName("bar@BAR");
-    Assert.assertEquals("bar", kn.getShortName());
+    assertEquals("bar", kn.getShortName());
     kn = new KerberosName("bar@FOO");
     try {
       kn.getShortName();
-      Assert.fail();
+      fail();
     } catch (Exception ex) {
     }
   }
@@ -130,7 +131,7 @@ public class TestKerberosAuthenticationHandler
   @Test
   public void testNameRulesCompat() throws Exception {
     KerberosName kn = new KerberosName(KerberosTestUtils.getServerPrincipal());
-    Assert.assertEquals(KerberosTestUtils.getRealm(), kn.getRealm());
+    assertEquals(KerberosTestUtils.getRealm(), kn.getRealm());
 
     //destroy handler created in setUp()
     handler.destroy();
@@ -145,15 +146,15 @@ public class TestKerberosAuthenticationHandler
     } catch (Exception ex) {
     }
     kn = new KerberosName("bar@BAR");
-    Assert.assertEquals("bar", kn.getShortName());
+    assertEquals("bar", kn.getShortName());
     kn = new KerberosName("bar@FOO");
-    Assert.assertEquals("bar@FOO", kn.getShortName());
+    assertEquals("bar@FOO", kn.getShortName());
   }
 
   @Test
   public void testNullProperties() throws Exception {
     KerberosName kn = new KerberosName(KerberosTestUtils.getServerPrincipal());
-    Assert.assertEquals(KerberosTestUtils.getRealm(), kn.getRealm());
+    assertEquals(KerberosTestUtils.getRealm(), kn.getRealm());
 
     KerberosName.setRuleMechanism("MIT");
     KerberosName.setRules("DEFAULT");
@@ -171,18 +172,18 @@ public class TestKerberosAuthenticationHandler
     } catch (Exception ex) {
     }
 
-    Assert.assertEquals("MIT", KerberosName.getRuleMechanism());
-    Assert.assertEquals("DEFAULT", KerberosName.getRules());
+    assertEquals("MIT", KerberosName.getRuleMechanism());
+    assertEquals("DEFAULT", KerberosName.getRules());
   }
 
   @Test
   public void testInit() throws Exception {
-    Assert.assertEquals(KerberosTestUtils.getKeytabFile(), handler.getKeytab());
+    assertEquals(KerberosTestUtils.getKeytabFile(), handler.getKeytab());
     Set<KerberosPrincipal> principals = handler.getPrincipals();
     Principal expectedPrincipal =
         new KerberosPrincipal(KerberosTestUtils.getServerPrincipal());
-    Assert.assertTrue(principals.contains(expectedPrincipal));
-    Assert.assertEquals(1, principals.size());
+    assertTrue(principals.contains(expectedPrincipal));
+    assertEquals(1, principals.size());
   }
 
   /**
@@ -205,7 +206,7 @@ public class TestKerberosAuthenticationHandler
     handler = getNewAuthenticationHandler();
     handler.init(props);
 
-    Assert.assertEquals(KerberosTestUtils.getKeytabFile(),
+    assertEquals(KerberosTestUtils.getKeytabFile(),
         handler.getKeytab());
     
     Set<KerberosPrincipal> loginPrincipals = handler.getPrincipals();
@@ -213,8 +214,8 @@ public class TestKerberosAuthenticationHandler
       Principal principal = new KerberosPrincipal(
           user + "@" + KerberosTestUtils.getRealm());
       boolean expected = user.startsWith("HTTP/");
-      Assert.assertEquals("checking for "+user, expected, 
-          loginPrincipals.contains(principal));
+      assertEquals(expected,
+          loginPrincipals.contains(principal), "checking for " + user);
     }
   }
 
@@ -237,18 +238,18 @@ public class TestKerberosAuthenticationHandler
     handler = getNewAuthenticationHandler();
     try {
       handler.init(props);
-      Assert.fail("init should have failed");
+      fail("init should have failed");
     } catch (ServletException ex) {
-      Assert.assertEquals("Principals do not exist in the keytab",
+      assertEquals("Principals do not exist in the keytab",
           ex.getCause().getMessage());
     } catch (Throwable t) {
-      Assert.fail("wrong exception: "+t);
+      fail("wrong exception: "+t);
     }
   }
 
   @Test
   public void testType() {
-    Assert.assertEquals(getExpectedType(), handler.getType());
+    assertEquals(getExpectedType(), handler.getType());
   }
 
   @Test
@@ -256,7 +257,7 @@ public class TestKerberosAuthenticationHandler
     HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
     HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
 
-    Assert.assertNull(handler.authenticate(request, response));
+    assertNull(handler.authenticate(request, response));
     Mockito.verify(response).setHeader(KerberosAuthenticator.WWW_AUTHENTICATE,
         KerberosAuthenticator.NEGOTIATE);
     Mockito.verify(response).setStatus(HttpServletResponse.SC_UNAUTHORIZED);
@@ -269,7 +270,7 @@ public class TestKerberosAuthenticationHandler
 
     Mockito.when(request.getHeader(KerberosAuthenticator.AUTHORIZATION))
         .thenReturn("invalid");
-    Assert.assertNull(handler.authenticate(request, response));
+    assertNull(handler.authenticate(request, response));
     Mockito.verify(response).setHeader(KerberosAuthenticator.WWW_AUTHENTICATE,
         KerberosAuthenticator.NEGOTIATE);
     Mockito.verify(response).setStatus(HttpServletResponse.SC_UNAUTHORIZED);
@@ -284,11 +285,11 @@ public class TestKerberosAuthenticationHandler
       .thenReturn(KerberosAuthenticator.NEGOTIATE);
     try {
       handler.authenticate(request, response);
-      Assert.fail();
+      fail();
     } catch (AuthenticationException ex) {
       // Expected
     } catch (Exception ex) {
-      Assert.fail();
+      fail();
     }
   }
 
@@ -339,11 +340,11 @@ public class TestKerberosAuthenticationHandler
               Mockito.matches(KerberosAuthenticator.NEGOTIATE + " .*"));
       Mockito.verify(response).setStatus(HttpServletResponse.SC_OK);
 
-      Assert.assertEquals(KerberosTestUtils.getClientPrincipal(),
+      assertEquals(KerberosTestUtils.getClientPrincipal(),
           authToken.getName());
-      Assert.assertTrue(KerberosTestUtils.getClientPrincipal()
+      assertTrue(KerberosTestUtils.getClientPrincipal()
           .startsWith(authToken.getUserName()));
-      Assert.assertEquals(getExpectedType(), authToken.getType());
+      assertEquals(getExpectedType(), authToken.getType());
     } else {
       Mockito.verify(response).setHeader(
           Mockito.eq(KerberosAuthenticator.WWW_AUTHENTICATE),
@@ -365,11 +366,11 @@ public class TestKerberosAuthenticationHandler
 
     try {
       handler.authenticate(request, response);
-      Assert.fail();
+      fail();
     } catch (AuthenticationException ex) {
       // Expected
     } catch (Exception ex) {
-      Assert.fail();
+      fail();
     }
   }
 
@@ -386,15 +387,15 @@ public class TestKerberosAuthenticationHandler
     Mockito.when(request.getServletPath()).thenReturn("/white4");
     try {
       handler.authenticate(request, response);
-      Assert.fail();
+      fail();
     } catch (AuthenticationException ex) {
       // Expected
     } catch (Exception ex) {
-      Assert.fail();
+      fail();
     }
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     if (handler != null) {
       handler.destroy();

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java

@@ -37,23 +37,24 @@ import org.apache.hadoop.security.authentication.KerberosTestUtils;
 import org.apache.hadoop.security.authentication.client.KerberosAuthenticator;
 import org.apache.hadoop.security.authorize.AccessControlList;
 import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
-import org.junit.Assert;
 
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test LogLevel.
@@ -72,7 +73,7 @@ public class TestLogLevel extends KerberosSecurityTestcase {
   private final static String KEYTAB  = "loglevel.keytab";
   private static final String PREFIX = "hadoop.http.authentication.";
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     org.slf4j.Logger logger =
         LoggerFactory.getLogger(KerberosAuthenticator.class);
@@ -94,7 +95,7 @@ public class TestLogLevel extends KerberosSecurityTestcase {
     sslConf = KeyStoreTestUtil.getSslConfig();
   }
 
-  @Before
+  @BeforeEach
   public void setupKerberos() throws Exception {
     File keytabFile = new File(KerberosTestUtils.getKeytabFile());
     clientPrincipal = KerberosTestUtils.getClientPrincipal();
@@ -106,7 +107,7 @@ public class TestLogLevel extends KerberosSecurityTestcase {
     getKdc().createPrincipal(keytabFile, clientPrincipal, serverPrincipal);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir);
     FileUtil.fullyDelete(BASEDIR);
@@ -116,7 +117,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    * Test client command line options. Does not validate server behavior.
    * @throws Exception
    */
-  @Test(timeout=120000)
+  @Test
+  @Timeout(value = 120)
   public void testCommandOptions() throws Exception {
     final String className = this.getClass().getName();
 
@@ -251,8 +253,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
       throw new Exception("Invalid client protocol " + connectProtocol);
     }
     Level oldLevel = log.getEffectiveLevel();
-    Assert.assertNotEquals("Get default Log Level which shouldn't be ERROR.",
-        Level.ERROR, oldLevel);
+    assertNotEquals(Level.ERROR, oldLevel,
+        "Get default Log Level which shouldn't be ERROR.");
 
     // configs needed for SPNEGO at server side
     if (isSpnego) {
@@ -321,8 +323,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
     CLI cli = new CLI(sslConf);
     cli.run(setLevelArgs);
 
-    assertEquals("new level not equal to expected: ", newLevel.toUpperCase(),
-        log.getEffectiveLevel().toString());
+    assertEquals(newLevel.toUpperCase(), log.getEffectiveLevel().toString(),
+        "new level not equal to expected: ");
   }
 
   /**
@@ -330,7 +332,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    *
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testInfoLogLevel() throws Exception {
     testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, false,
         "Info");
@@ -341,7 +344,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    *
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testErrorLogLevel() throws Exception {
     testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, false,
         "Error");
@@ -352,7 +356,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    *
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testLogLevelByHttp() throws Exception {
     testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, false);
     try {
@@ -373,7 +378,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    *
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testLogLevelByHttpWithSpnego() throws Exception {
     testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, true);
     try {
@@ -394,7 +400,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    *
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testLogLevelByHttps() throws Exception {
     testDynamicLogLevel(LogLevel.PROTOCOL_HTTPS, LogLevel.PROTOCOL_HTTPS,
         false);
@@ -416,7 +423,8 @@ public class TestLogLevel extends KerberosSecurityTestcase {
    *
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testLogLevelByHttpsWithSpnego() throws Exception {
     testDynamicLogLevel(LogLevel.PROTOCOL_HTTPS, LogLevel.PROTOCOL_HTTPS,
         true);

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestFixKerberosTicketOrder.java

@@ -18,8 +18,8 @@
 package org.apache.hadoop.security;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.security.PrivilegedExceptionAction;
@@ -37,8 +37,8 @@ import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
 import org.apache.hadoop.security.SaslRpcServer.AuthMethod;
 import org.apache.hadoop.security.SaslRpcServer.QualityOfProtection;
 import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Testcase for HADOOP-13433 that verifies the logic of fixKerberosTicketOrder.
@@ -63,7 +63,7 @@ public class TestFixKerberosTicketOrder extends KerberosSecurityTestcase {
 
   private Map<String, String> props;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     keytabFile = new File(getWorkDir(), "keytab");
     getKdc().createPrincipal(keytabFile, clientPrincipal, server1Principal,
@@ -106,13 +106,13 @@ public class TestFixKerberosTicketOrder extends KerberosSecurityTestcase {
     }
     // make sure the first ticket is not tgt
     assertFalse(
-        "The first ticket is still tgt, "
-            + "the implementation in jdk may have been changed, "
-            + "please reconsider the problem in HADOOP-13433",
         subject.getPrivateCredentials().stream()
             .filter(c -> c instanceof KerberosTicket)
             .map(c -> ((KerberosTicket) c).getServer().getName()).findFirst()
-            .get().startsWith("krbtgt"));
+            .get().startsWith("krbtgt"),
+        "The first ticket is still tgt, "
+        + "the implementation in jdk may have been changed, "
+        + "please reconsider the problem in HADOOP-13433");
     // should fail as we send a service ticket instead of tgt to KDC.
     intercept(SaslException.class,
         () -> ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -131,11 +131,12 @@ public class TestFixKerberosTicketOrder extends KerberosSecurityTestcase {
     ugi.fixKerberosTicketOrder();
 
     // check if TGT is the first ticket after the fix.
-    assertTrue("The first ticket is not tgt",
+    assertTrue(
         subject.getPrivateCredentials().stream()
-            .filter(c -> c instanceof KerberosTicket)
-            .map(c -> ((KerberosTicket) c).getServer().getName()).findFirst()
-            .get().startsWith("krbtgt"));
+        .filter(c -> c instanceof KerberosTicket)
+        .map(c -> ((KerberosTicket) c).getServer().getName()).findFirst()
+        .get().startsWith("krbtgt"),
+        "The first ticket is not tgt");
 
     // make sure we can still get new service ticket after the fix.
     ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -150,10 +151,11 @@ public class TestFixKerberosTicketOrder extends KerberosSecurityTestcase {
         return null;
       }
     });
-    assertTrue("No service ticket for " + server2Protocol + " found",
+    assertTrue(
         subject.getPrivateCredentials(KerberosTicket.class).stream()
-            .filter(t -> t.getServer().getName().startsWith(server2Protocol))
-            .findAny().isPresent());
+        .filter(t -> t.getServer().getName().startsWith(server2Protocol))
+        .findAny().isPresent(),
+        "No service ticket for " + server2Protocol + " found");
   }
 
   @Test
@@ -188,11 +190,11 @@ public class TestFixKerberosTicketOrder extends KerberosSecurityTestcase {
     ugi.fixKerberosTicketOrder();
 
     // verify that after fixing, the tgt ticket should be removed
-    assertFalse("The first ticket is not tgt",
+    assertFalse(
         subject.getPrivateCredentials().stream()
-            .filter(c -> c instanceof KerberosTicket)
-            .map(c -> ((KerberosTicket) c).getServer().getName()).findFirst()
-            .isPresent());
+        .filter(c -> c instanceof KerberosTicket)
+        .map(c -> ((KerberosTicket) c).getServer().getName()).findFirst()
+        .isPresent(), "The first ticket is not tgt");
 
 
     // should fail as we send a service ticket instead of tgt to KDC.
@@ -227,9 +229,10 @@ public class TestFixKerberosTicketOrder extends KerberosSecurityTestcase {
       }
     });
 
-    assertTrue("No service ticket for " + server2Protocol + " found",
+    assertTrue(
         subject.getPrivateCredentials(KerberosTicket.class).stream()
-            .filter(t -> t.getServer().getName().startsWith(server2Protocol))
-            .findAny().isPresent());
+        .filter(t -> t.getServer().getName().startsWith(server2Protocol))
+        .findAny().isPresent(),
+        "No service ticket for " + server2Protocol + " found");
   }
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestRaceWhenRelogin.java

@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.security;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,8 +37,8 @@ import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
 import org.apache.hadoop.security.SaslRpcServer.AuthMethod;
 import org.apache.hadoop.security.SaslRpcServer.QualityOfProtection;
 import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Testcase for HADOOP-13433 that confirms that tgt will always be the first
@@ -68,7 +68,7 @@ public class TestRaceWhenRelogin extends KerberosSecurityTestcase {
 
   private UserGroupInformation ugi;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     keytabFile = new File(getWorkDir(), "keytab");
     serverProtocols = new String[numThreads];
@@ -157,6 +157,6 @@ public class TestRaceWhenRelogin extends KerberosSecurityTestcase {
     for (Thread getServiceTicketThread : getServiceTicketThreads) {
       getServiceTicketThread.join();
     }
-    assertTrue("tgt is not the first ticket after relogin", pass.get());
+    assertTrue(pass.get(), "tgt is not the first ticket after relogin");
   }
 }

hadoop-common-project/hadoop-minikdc/pom.xml

@@ -48,6 +48,36 @@
       <artifactId>junit</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>

hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/KerberosSecurityTestcase.java

@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.minikdc;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.File;
 import java.util.Properties;
@@ -40,7 +40,7 @@ public class KerberosSecurityTestcase {
   private File workDir;
   private Properties conf;
 
-  @Before
+  @BeforeEach
   public void startMiniKdc() throws Exception {
     createTestDir();
     createMiniKdcConf();
@@ -65,7 +65,7 @@ public class KerberosSecurityTestcase {
     conf = MiniKdc.createConf();
   }
 
-  @After
+  @AfterEach
   public void stopMiniKdc() {
     if (kdc != null) {
       kdc.stop();

hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java

@@ -18,10 +18,12 @@
 
 package org.apache.hadoop.minikdc;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
 import org.apache.kerby.kerberos.kerb.keytab.Keytab;
 import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -70,7 +72,7 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
   @Test
   public void testMiniKdcStart() {
     MiniKdc kdc = getKdc();
-    Assert.assertNotSame(0, kdc.getPort());
+    assertNotSame(0, kdc.getPort());
   }
 
   @Test
@@ -87,7 +89,7 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
       principals.add(principalName.getName());
     }
 
-    Assert.assertEquals(new HashSet<String>(Arrays.asList(
+    assertEquals(new HashSet<String>(Arrays.asList(
             "foo/bar@" + kdc.getRealm(), "bar/foo@" + kdc.getRealm())),
             principals);
   }
@@ -170,10 +172,10 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
               KerberosConfiguration.createClientConfig(principal, keytab));
       loginContext.login();
       subject = loginContext.getSubject();
-      Assert.assertEquals(1, subject.getPrincipals().size());
-      Assert.assertEquals(KerberosPrincipal.class,
+      assertEquals(1, subject.getPrincipals().size());
+      assertEquals(KerberosPrincipal.class,
               subject.getPrincipals().iterator().next().getClass());
-      Assert.assertEquals(principal + "@" + kdc.getRealm(),
+      assertEquals(principal + "@" + kdc.getRealm(),
               subject.getPrincipals().iterator().next().getName());
       loginContext.logout();
 
@@ -184,10 +186,10 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
               KerberosConfiguration.createServerConfig(principal, keytab));
       loginContext.login();
       subject = loginContext.getSubject();
-      Assert.assertEquals(1, subject.getPrincipals().size());
-      Assert.assertEquals(KerberosPrincipal.class,
+      assertEquals(1, subject.getPrincipals().size());
+      assertEquals(KerberosPrincipal.class,
               subject.getPrincipals().iterator().next().getClass());
-      Assert.assertEquals(principal + "@" + kdc.getRealm(),
+      assertEquals(principal + "@" + kdc.getRealm(),
               subject.getPrincipals().iterator().next().getName());
       loginContext.logout();