Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F6F119FAD for ; Wed, 2 Mar 2016 03:26:37 +0000 (UTC) Received: (qmail 67467 invoked by uid 500); 2 Mar 2016 03:26:37 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 67425 invoked by uid 500); 2 Mar 2016 03:26:37 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 67416 invoked by uid 99); 2 Mar 2016 03:26:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2016 03:26:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D037E0007; Wed, 2 Mar 2016 03:26:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Message-Id: <8fe750201e684117a19caf027d8309f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15365 Do not write to '/tmp' in TestHBaseConfiguration Date: Wed, 2 Mar 2016 03:26:37 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 231a5807b -> 12853268e HBASE-15365 Do not write to '/tmp' in TestHBaseConfiguration Conflicts: hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/12853268 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/12853268 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/12853268 Branch: refs/heads/branch-1 Commit: 12853268e1fcf91a7ef665bdd04cb9a4d21b1d9b Parents: 231a580 Author: zhangduo Authored: Wed Mar 2 09:37:07 2016 +0800 Committer: zhangduo Committed: Wed Mar 2 11:26:13 2016 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/TestHBaseConfiguration.java | 32 +++++++++++--------- 1 file changed, 18 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/12853268/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java index f8b60fd..2a8d1a2 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java @@ -20,28 +20,36 @@ package org.apache.hadoop.hbase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; -import com.google.common.collect.ImmutableMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.zookeeper.ZKConfig; +import org.junit.AfterClass; import org.junit.Test; import org.junit.experimental.categories.Category; +import com.google.common.collect.ImmutableMap; + @Category(SmallTests.class) public class TestHBaseConfiguration { private static final Log LOG = LogFactory.getLog(TestHBaseConfiguration.class); + private static HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility(); + + @AfterClass + public static void tearDown() throws IOException { + UTIL.cleanupTestDir(); + } + @Test public void testGetIntDeprecated() { int VAL = 1, VAL2 = 2; @@ -98,22 +106,19 @@ public class TestHBaseConfiguration { @Test public void testGetPassword() throws Exception { Configuration conf = HBaseConfiguration.create(); - conf.set(ReflectiveCredentialProviderClient.CREDENTIAL_PROVIDER_PATH, - "jceks://file/tmp/foo.jks"); - ReflectiveCredentialProviderClient client = - new ReflectiveCredentialProviderClient(); + conf.set(ReflectiveCredentialProviderClient.CREDENTIAL_PROVIDER_PATH, "jceks://file" + + new File(UTIL.getDataTestDir().toUri().getPath(), "foo.jks").getCanonicalPath()); + ReflectiveCredentialProviderClient client = new ReflectiveCredentialProviderClient(); if (client.isHadoopCredentialProviderAvailable()) { - char[] keyPass = {'k', 'e', 'y', 'p', 'a', 's', 's'}; - char[] storePass = {'s', 't', 'o', 'r', 'e', 'p', 'a', 's', 's'}; + char[] keyPass = { 'k', 'e', 'y', 'p', 'a', 's', 's' }; + char[] storePass = { 's', 't', 'o', 'r', 'e', 'p', 'a', 's', 's' }; client.createEntry(conf, "ssl.keypass.alias", keyPass); client.createEntry(conf, "ssl.storepass.alias", storePass); - String keypass = HBaseConfiguration.getPassword( - conf, "ssl.keypass.alias", null); + String keypass = HBaseConfiguration.getPassword(conf, "ssl.keypass.alias", null); assertEquals(keypass, new String(keyPass)); - String storepass = HBaseConfiguration.getPassword( - conf, "ssl.storepass.alias", null); + String storepass = HBaseConfiguration.getPassword(conf, "ssl.storepass.alias", null); assertEquals(storepass, new String(storePass)); } } @@ -197,7 +202,6 @@ public class TestHBaseConfiguration { getProvidersMethod = loadMethod(hadoopCredProviderFactoryClz, HADOOP_CRED_PROVIDER_FACTORY_GET_PROVIDERS_METHOD_NAME, Configuration.class); - // Load Hadoop CredentialProvider Class hadoopCredProviderClz = null; hadoopCredProviderClz = Class.forName(HADOOP_CRED_PROVIDER_CLASS_NAME);