commit 65e04e1efb262a07890b4b99a8c0aa997bea06ca
author Kenny Root <kroot@google.com> Fri Oct 17 23:43:02 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 17 23:43:02 2014 +0000
tree 4cf7bf5db5b30d9faa73bc9a6977496a5d9a0c1f
parent 1f7fcec1e92df937952e9996a7fc42947501e1d9
parent 218699c1451b91c24d6f65c8b25cf7ac8fffbf7f

Merge "Track change to bouncycastle"

luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java

diff --git a/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java b/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java
index 6d033d3..83d9478 100644
--- a/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java
+++ b/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java
@@ -133,7 +133,7 @@
 
     private Set<String> getPubkeyBlacklist(String path) throws IOException {
         // set our blacklist path
-        CertBlacklist bl = new CertBlacklist(path, CertBlacklist.DEFAULT_SERIAL_BLACKLIST_PATH);
+        CertBlacklist bl = new CertBlacklist(path, "");
         // call readPubkeyBlacklist
         Set<byte[]> arr = bl.pubkeyBlacklist;
         // convert the results to a hashset of strings
@@ -146,7 +146,7 @@
 
     private Set<String> getSerialBlacklist(String path) throws IOException {
         // set our blacklist path
-        CertBlacklist bl = new CertBlacklist(CertBlacklist.DEFAULT_PUBKEY_BLACKLIST_PATH, path);
+        CertBlacklist bl = new CertBlacklist("", path);
         // call readPubkeyBlacklist
         Set<BigInteger> arr = bl.serialBlacklist;
         // convert the results to a hashset of strings
@@ -231,8 +231,7 @@
         // write that to the test blacklist
         writeBlacklist(new HashSet<String>());
         // set our blacklist path
-        CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(),
-                                             CertBlacklist.DEFAULT_SERIAL_BLACKLIST_PATH);
+        CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(), "");
         // check to make sure it isn't blacklisted
         assertEquals(bl.isPublicKeyBlackListed(pk), false);
     }
@@ -247,8 +246,7 @@
         testBlackList.add(hash);
         writeBlacklist(testBlackList);
         // set our blacklist path
-        CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(),
-                                             CertBlacklist.DEFAULT_SERIAL_BLACKLIST_PATH);
+        CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(), "");
         // check to make sure it isn't blacklited
         assertTrue(bl.isPublicKeyBlackListed(pk));
     }