Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10685 [WINDOWS] TestKeyStoreKeyProvider fails on windows 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1575014 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Enis Soztutar 2014-03-06 19:12:04 +00:00
parent 617235b953
commit f5d80e7596
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
View File

@ -16,7 +16,8 @@
*/
package org.apache.hadoop.hbase.io.crypto;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.io.FileOutputStream;
@ -32,7 +33,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
import org.apache.hadoop.hbase.SmallTests;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@ -84,7 +84,7 @@ public class TestKeyStoreKeyProvider {
@Test(timeout=30000)
public void testKeyStoreKeyProviderWithPassword() throws Exception {
KeyProvider provider = new KeyStoreKeyProvider();
provider.init("jceks://" + storeFile.getAbsolutePath() + "?password=" + PASSWORD);
provider.init("jceks://" + storeFile.toURI().getPath() + "?password=" + PASSWORD);
Key key = provider.getKey(ALIAS);
assertNotNull(key);
byte[] keyBytes = key.getEncoded();
@ -97,7 +97,7 @@ public class TestKeyStoreKeyProvider {
@Test(timeout=30000)
public void testKeyStoreKeyProviderWithPasswordFile() throws Exception {
KeyProvider provider = new KeyStoreKeyProvider();
provider.init("jceks://" + storeFile.getAbsolutePath() + "?passwordFile=" +
provider.init("jceks://" + storeFile.toURI().getPath() + "?passwordFile=" +
URLEncoder.encode(passwordFile.getAbsolutePath(), "UTF-8"));
Key key = provider.getKey(ALIAS);
assertNotNull(key);