diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-26 02:44:59 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-26 02:44:59 +0200 |
commit | dce4503ac5223b7b8e3daa5ecd47c1438607885e (patch) | |
tree | 89f5cf9c40902e0db0f5353db5967437cf0c9373 /OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java | |
parent | a990044fd9eab711e4de7c74aa453f362456050b (diff) | |
parent | 51d35c7a834bce7c49e74ded61b9434ffd94a911 (diff) | |
download | open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.tar.gz open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.tar.bz2 open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.zip |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java')
-rw-r--r-- | OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java index 6f7e193cd..958c589cb 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java @@ -41,7 +41,9 @@ import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow; +import org.sufficientlysecure.keychain.provider.KeychainDatabase; import org.sufficientlysecure.keychain.provider.ProviderHelper; +import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.util.ProgressScaler; @@ -148,5 +150,16 @@ public class TestHelpers { return passbuilder.toString(); } + public static void cleanupForTests(Context context) throws Exception { + + new KeychainDatabase(context).clearDatabase(); + + // import these two, make sure they're there + importKeysFromResource(context, "x.sec.asc"); + + // make sure no passphrases are cached + PassphraseCacheService.clearCachedPassphrases(context); + + } } |