diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-22 13:43:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-22 13:44:14 +0200 |
| commit | 2e8fb9cbddec54660f7a68f45a35f95c5b0abefc (patch) | |
| tree | 93d95587958a1ef0a100a64a0b530897e52eef18 /OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java | |
| parent | 804a58e779e8bbb5c8c2d53211626dcfd5556ed7 (diff) | |
| download | open-keychain-2e8fb9cbddec54660f7a68f45a35f95c5b0abefc.tar.gz open-keychain-2e8fb9cbddec54660f7a68f45a35f95c5b0abefc.tar.bz2 open-keychain-2e8fb9cbddec54660f7a68f45a35f95c5b0abefc.zip | |
instrument: restructure some tests, add bad clipboard data test
Diffstat (limited to 'OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java')
| -rw-r--r-- | OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java index 7bef6833f..e0c44be9a 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java @@ -22,13 +22,11 @@ import java.io.File; import android.annotation.TargetApi; import android.app.Activity; -import android.app.Instrumentation; import android.app.Instrumentation.ActivityResult; import android.content.Intent; import android.net.Uri; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.test.InstrumentationRegistry; import android.support.test.espresso.intent.Intents; import android.support.test.espresso.intent.rule.IntentsTestRule; import android.support.test.runner.AndroidJUnit4; @@ -45,7 +43,7 @@ import org.sufficientlysecure.keychain.TestHelpers; import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.ui.util.Notify.Style; -import static android.support.test.InstrumentationRegistry.*; +import static android.support.test.InstrumentationRegistry.getInstrumentation; import static android.support.test.espresso.Espresso.onData; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.Espresso.pressBack; @@ -195,6 +193,7 @@ public class AsymmetricFileOperationTests { private void handleSaveFileIntent(File file) { try { + //noinspection ResultOfMethodCallIgnored file.delete(); } catch (Exception e) { // nvm |