minor test code cleanup and fixes

webapp/src/test/java/org/apache/hadoop/metadata/CredentialProviderUtilityIT.java

@@ -23,6 +23,7 @@ import org.apache.hadoop.metadata.web.service.SecureEmbeddedServer;
 import org.apache.hadoop.security.alias.CredentialProvider;
 import org.apache.hadoop.security.alias.CredentialProviderFactory;
 import org.apache.hadoop.security.alias.JavaKeyStoreProvider;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -75,11 +76,20 @@ public class CredentialProviderUtilityIT {
 
         CredentialProvider.CredentialEntry entry =
                 provider.getCredentialEntry(SecureEmbeddedServer.KEYSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.TRUSTSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.SERVER_CERT_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
+    }
+
+    protected void assertCredentialEntryCorrect(CredentialProvider.CredentialEntry entry) {
+        assertCredentialEntryCorrect(entry, defaultPass);
+    }
+
+    protected void assertCredentialEntryCorrect(CredentialProvider.CredentialEntry entry, char[] password) {
+        Assert.assertNotNull(entry);
+        Assert.assertEquals(entry.getCredential(), password);
     }
 
     @Test
@@ -129,11 +139,11 @@ public class CredentialProviderUtilityIT {
 
         CredentialProvider.CredentialEntry entry =
                 provider.getCredentialEntry(SecureEmbeddedServer.KEYSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.TRUSTSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.SERVER_CERT_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
     }
 
     @Test
@@ -183,11 +193,11 @@ public class CredentialProviderUtilityIT {
 
         CredentialProvider.CredentialEntry entry =
                 provider.getCredentialEntry(SecureEmbeddedServer.KEYSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.TRUSTSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.SERVER_CERT_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), defaultPass);
+        assertCredentialEntryCorrect(entry);
     }
 
     @Test
@@ -251,10 +261,10 @@ public class CredentialProviderUtilityIT {
         char[] newpass = "newpass".toCharArray();
         CredentialProvider.CredentialEntry entry =
                 provider.getCredentialEntry(SecureEmbeddedServer.KEYSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), newpass);
+        assertCredentialEntryCorrect(entry, newpass);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.TRUSTSTORE_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), newpass);
+        assertCredentialEntryCorrect(entry, newpass);
         entry = provider.getCredentialEntry(SecureEmbeddedServer.SERVER_CERT_PASSWORD_KEY);
-        assert entry != null && Arrays.equals(entry.getCredential(), newpass);
+        assertCredentialEntryCorrect(entry, newpass);
     }
 }

webapp/src/test/java/org/apache/hadoop/metadata/web/BaseSecurityTest.java

@@ -22,6 +22,7 @@ import org.apache.hadoop.minikdc.MiniKdc;
 import org.apache.zookeeper.Environment;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.webapp.WebAppContext;
+import org.testng.Assert;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -83,7 +84,7 @@ public class BaseSecurityTest {
         kdc = new MiniKdc(kdcConf, kdcWorkDir);
         kdc.start();
 
-        assert kdc.getRealm() != null;
+        Assert.assertNotNull(kdc.getRealm());
         return kdcWorkDir;
     }
 

webapp/src/test/java/org/apache/hadoop/metadata/web/filters/MetadataAuthenticationKerberosFilterIT.java

@@ -22,6 +22,7 @@ import org.apache.hadoop.hdfs.web.URLConnectionFactory;
 import org.apache.hadoop.metadata.web.BaseSecurityTest;
 import org.apache.hadoop.metadata.web.service.EmbeddedServer;
 import org.mortbay.jetty.Server;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import javax.security.auth.Subject;
@@ -78,7 +79,7 @@ public class MetadataAuthenticationKerberosFilterIT extends BaseSecurityTest {
             connection.setRequestMethod("GET");
             connection.connect();
 
-            assert connection.getResponseCode() == 401;
+            Assert.assertEquals(connection.getResponseCode(), 401);
 
             // need to populate the ticket cache with a local user, so logging in...
             Subject subject = loginTestUser();
@@ -92,7 +93,7 @@ public class MetadataAuthenticationKerberosFilterIT extends BaseSecurityTest {
                     connection.setRequestMethod("GET");
                     connection.connect();
 
-                    assert connection.getResponseCode() == 200;
+                    Assert.assertEquals(connection.getResponseCode(), 200);
 
                     return null;
                 }

webapp/src/test/java/org/apache/hadoop/metadata/web/filters/MetadataAuthenticationSimpleFilterIT.java

@@ -20,6 +20,7 @@ import org.apache.commons.configuration.ConfigurationException;
 import org.apache.hadoop.metadata.web.BaseSecurityTest;
 import org.apache.hadoop.metadata.web.service.EmbeddedServer;
 import org.mortbay.jetty.Server;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -57,7 +58,7 @@ public class MetadataAuthenticationSimpleFilterIT extends BaseSecurityTest {
             connection.connect();
 
             try {
-                assert connection.getResponseCode() == 403;
+                Assert.assertEquals(connection.getResponseCode(), 403);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -67,7 +68,7 @@ public class MetadataAuthenticationSimpleFilterIT extends BaseSecurityTest {
             connection.setRequestMethod("GET");
             connection.connect();
 
-            assert connection.getResponseCode() == 200;
+            Assert.assertEquals(connection.getResponseCode(), 200);
         } finally {
             server.getServer().stop();
         }

webapp/src/test/java/org/apache/hadoop/metadata/web/listeners/LoginProcessorIT.java

@@ -24,6 +24,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.metadata.web.BaseSecurityTest;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.Shell;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -46,9 +47,9 @@ public class LoginProcessorIT extends BaseSecurityTest {
         };
         processor.login();
 
-        assert UserGroupInformation.getCurrentUser() != null;
-        assert !UserGroupInformation.isLoginKeytabBased();
-        assert !UserGroupInformation.isSecurityEnabled();
+        Assert.assertNotNull(UserGroupInformation.getCurrentUser());
+        Assert.assertFalse(UserGroupInformation.isLoginKeytabBased());
+        Assert.assertFalse(UserGroupInformation.isSecurityEnabled());
     }
 
     @Test
@@ -82,10 +83,10 @@ public class LoginProcessorIT extends BaseSecurityTest {
         };
         processor.login();
 
-        assert UserGroupInformation.getLoginUser().getShortUserName().endsWith("dgi");
-        assert UserGroupInformation.getCurrentUser() != null;
-        assert UserGroupInformation.isLoginKeytabBased();
-        assert UserGroupInformation.isSecurityEnabled();
+        Assert.assertTrue(UserGroupInformation.getLoginUser().getShortUserName().endsWith("dgi"));
+        Assert.assertNotNull(UserGroupInformation.getCurrentUser());
+        Assert.assertTrue(UserGroupInformation.isLoginKeytabBased());
+        Assert.assertTrue(UserGroupInformation.isSecurityEnabled());
 
         kdc.stop();
 
@@ -95,7 +96,7 @@ public class LoginProcessorIT extends BaseSecurityTest {
         // set up the KDC
         File kdcWorkDir = startKDC();
 
-        assert kdc.getRealm() != null;
+        Assert.assertNotNull(kdc.getRealm());
 
         File keytabFile = createKeytab(kdc, kdcWorkDir, "dgi", "dgi.keytab");
         String dgiServerPrincipal = Shell.WINDOWS ? "dgi/127.0.0.1" : "dgi/localhost";

webapp/src/test/java/org/apache/hadoop/metadata/web/service/SecureEmbeddedServerITBase.java

@@ -112,7 +112,7 @@ public class SecureEmbeddedServerITBase {
 
             Assert.fail("Should have thrown an exception");
         } catch (IOException e) {
-            assert e.getMessage().equals("No credential provider path configured for storage of certificate store passwords");
+            Assert.assertEquals("No credential provider path configured for storage of certificate store passwords", e.getMessage());
         } finally {
             secureEmbeddedServer.server.stop();
         }
@@ -133,7 +133,7 @@ public class SecureEmbeddedServerITBase {
             };
             Assert.fail("No entries should generate an exception");
         } catch (IOException e) {
-            assert e.getMessage().startsWith("No credential entry found for");
+            Assert.assertTrue(e.getMessage().startsWith("No credential entry found for"));
         } finally {
             secureEmbeddedServer.server.stop();
         }