cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

instrument: adapt to new decrypt file dialog, and some minor fixes

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-23 00:00:19 +02:00
parent 4826e0a8c8
commit 558cc6befc
6 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java
View File

@@ -52,7 +52,6 @@ import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.typeText;
import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.contrib.DrawerActions.openDrawer;
import static android.support.test.espresso.intent.matcher.IntentMatchers.hasAction;
import static android.support.test.espresso.intent.matcher.IntentMatchers.hasCategories;
import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra;
@@ -140,8 +139,6 @@ public class AsymmetricFileOperationTests {
handleOpenFileIntentKitKat(outputFile);
onView(withId(R.id.decrypt_files)).perform(click());
onView(withId(R.id.decrypt_files_action_decrypt)).perform(click());
{ // decrypt
onView(withId(R.id.passphrase_passphrase)).perform(typeText("x"));
onView(withText(R.string.btn_unlock)).perform(click());

30
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscFileOperationTests.java
View File

@@ -39,6 +39,7 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.TestHelpers;
import org.sufficientlysecure.keychain.compatibility.ClipboardReflection;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.ui.util.Notify.Style;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
@@ -51,6 +52,7 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.sufficientlysecure.keychain.TestHelpers.checkSnackbar;
import static org.sufficientlysecure.keychain.TestHelpers.getImageNames;
import static org.sufficientlysecure.keychain.TestHelpers.importKeysFromResource;
import static org.sufficientlysecure.keychain.TestHelpers.pickRandom;
@@ -97,8 +99,6 @@ public class MiscFileOperationTests {
handleOpenFileIntentKitKat(file);
onView(withId(R.id.decrypt_files)).perform(click());
onView(withId(R.id.decrypt_files_action_decrypt)).perform(click());
{ // decrypt
// open context menu
@@ -112,6 +112,17 @@ public class MiscFileOperationTests {
}
@Test
public void testDecryptEmptySelection() throws Exception {
// decrypt any non-pgp file
handleOpenFileEmptyKitKat();
onView(withId(R.id.decrypt_files)).perform(click());
checkSnackbar(Style.ERROR, R.string.no_file_selected);
}
@Test
public void testDecryptNonPgpClipboard() throws Exception {
@@ -134,6 +145,21 @@ public class MiscFileOperationTests {
}
@TargetApi(VERSION_CODES.KITKAT)
private void handleOpenFileEmptyKitKat() {
Intent data = new Intent();
data.setData(null);
Intents.intending(allOf(
hasAction(Intent.ACTION_OPEN_DOCUMENT),
hasType("*/*"),
hasCategories(hasItem(Intent.CATEGORY_OPENABLE))
// hasExtraWithKey(Intent.EXTRA_ALLOW_MULTIPLE)
)).respondWith(
new ActivityResult(Activity.RESULT_OK, data)
);
}
@TargetApi(VERSION_CODES.KITKAT)
private void handleOpenFileIntentKitKat(File file) {
Intent data = new Intent();