From 5f6bac8017d90f4584b08e2018cd0c261ccc5113 Mon Sep 17 00:00:00 2001
From: Tobias Erthal <tobias.erthal@gmail.com>
Date: Tue, 20 Sep 2016 16:40:51 +0200
Subject: [PATCH] updated MiscCryptOperationTests, cosmetic changes

---
 .../keychain/ui/EditKeyTest.java                  |  8 +++++---
 .../keychain/ui/MiscCryptOperationTests.java      | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java
index 1bf405fe5..2e0d41f13 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java
@@ -39,6 +39,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import static android.support.test.espresso.Espresso.onData;
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnHolderItem;
 import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
@@ -46,6 +47,7 @@ import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.sufficientlysecure.keychain.TestHelpers.checkSnackbar;
 import static org.sufficientlysecure.keychain.TestHelpers.importKeysFromResource;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyHolderId;
 import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId;
 
 //TODO This test is disabled because it needs to be fixed to work with updated code
@@ -77,9 +79,9 @@ public class EditKeyTest {
         // navigate to edit key dialog
         onView(allOf(
                 isAssignableFrom(RecyclerView.class),
-                withId(android.R.id.list)
-        )).perform(RecyclerViewActions.actionOnHolderItem(
-                                CustomMatchers.withKeyHolderId(0x9D604D2F310716A3L), click()));
+                withId(android.R.id.list)))
+                .perform(actionOnHolderItem(
+                        withKeyHolderId(0x9D604D2F310716A3L), click()));
 
         onView(withId(R.id.view_key_card_user_ids_edit)).perform(click());
 
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java
index 816b538dd..784f26fe0 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java
@@ -27,8 +27,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
+import android.support.test.espresso.contrib.RecyclerViewActions;
 import android.support.test.espresso.intent.Intents;
 import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.v7.widget.RecyclerView;
 import android.widget.AdapterView;
 
 import org.junit.Before;
@@ -36,6 +38,7 @@ import org.junit.Rule;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.TestHelpers;
+import org.sufficientlysecure.keychain.matcher.CustomMatchers;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.Preferences;
@@ -49,6 +52,7 @@ import static android.support.test.espresso.Espresso.openActionBarOverflowOrOpti
 import static android.support.test.espresso.Espresso.pressBack;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnHolderItem;
 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.hasType;
@@ -71,6 +75,7 @@ import static org.sufficientlysecure.keychain.TestHelpers.pickRandom;
 import static org.sufficientlysecure.keychain.TestHelpers.randomString;
 import static org.sufficientlysecure.keychain.matcher.CustomMatchers.isRecyclerItemView;
 import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withDisplayedChild;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyHolderId;
 import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId;
 import static org.sufficientlysecure.keychain.matcher.DrawableMatcher.withDrawable;
 
@@ -206,12 +211,12 @@ public class MiscCryptOperationTests {
 
     //@Test
     public void testEncryptTokenFromKeyView() throws Exception {
+        onView(allOf(
+                isAssignableFrom(RecyclerView.class),
+                withId(android.R.id.list)))
+                .perform(actionOnHolderItem(
+                        withKeyHolderId(0x9D604D2F310716A3L), click()));
 
-        // navigate to edit key dialog
-        onData(withKeyItemId(0x9D604D2F310716A3L))
-                .inAdapterView(allOf(isAssignableFrom(AdapterView.class),
-                        isDescendantOfA(withId(R.id.key_list_list))))
-                .perform(click());
         onView(withId(R.id.view_key_action_encrypt_text)).perform(click());
 
         // make sure the encrypt is correctly set