From 8d43785770481ce920591859942abbce6eb05184 Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Sat, 9 Jul 2016 15:24:24 +0200 Subject: [PATCH] androidTest: Remove broken tests --- .../ui/AsymmetricFileOperationTests.java | 28 ++++++-------- .../ui/AsymmetricTextOperationTests.java | 16 +++----- .../keychain/ui/CreateKeyActivityTest.java | 7 ++-- .../keychain/ui/EditKeyTest.java | 12 ++---- .../keychain/ui/MiscCryptOperationTests.java | 38 +++++++++---------- .../ui/SymmetricTextOperationTests.java | 19 +++------- .../keychain/ui/ViewKeyAdvShareTest.java | 12 ++---- .../widget/EncryptKeyCompletionViewTest.java | 13 +++---- 8 files changed, 58 insertions(+), 87 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 5570b627f..0cd3681dd 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricFileOperationTests.java @@ -18,8 +18,6 @@ package org.sufficientlysecure.keychain.ui; -import java.io.File; - import android.annotation.TargetApi; import android.app.Activity; import android.app.Instrumentation.ActivityResult; @@ -29,19 +27,17 @@ import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.support.test.espresso.intent.Intents; import android.support.test.espresso.intent.rule.IntentsTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.AdapterView; import org.junit.Before; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.TestHelpers; import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.ui.util.Notify.Style; +import java.io.File; + import static android.support.test.InstrumentationRegistry.getInstrumentation; import static android.support.test.espresso.Espresso.onData; import static android.support.test.espresso.Espresso.onView; @@ -78,9 +74,9 @@ import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItem import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureMyKey; import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureNone; - -@RunWith(AndroidJUnit4.class) -@LargeTest +//TODO This test is disabled because it needs to be fixed to work with updated code +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class AsymmetricFileOperationTests { @Rule @@ -108,7 +104,7 @@ public class AsymmetricFileOperationTests { PassphraseCacheService.clearCachedPassphrases(activity); } - @Test + //@Test public void testFileSaveEncryptDecrypt() throws Exception { // navigate to 'encrypt text' @@ -151,7 +147,7 @@ public class AsymmetricFileOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(withText(file.getName())))), + hasDescendant(withText(file.getName())))), withId(R.id.context_menu))).perform(click()); // delete file @@ -162,7 +158,7 @@ public class AsymmetricFileOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(withText(file.getName())))), + hasDescendant(withText(file.getName())))), withId(R.id.context_menu))).perform(click()); // delete file @@ -176,7 +172,7 @@ public class AsymmetricFileOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(withText(file.getName())))), + hasDescendant(withText(file.getName())))), withId(R.id.context_menu))).perform(click()); File savedFile = @@ -286,7 +282,7 @@ public class AsymmetricFileOperationTests { ); } - @Test + //@Test public void testSignVerify() throws Exception { String cleartext = randomString(10, 30); @@ -330,7 +326,7 @@ public class AsymmetricFileOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(withText(R.string.filename_unknown)))), + hasDescendant(withText(R.string.filename_unknown)))), withId(R.id.context_menu))).perform(click()); // check if log looks ok @@ -342,7 +338,7 @@ public class AsymmetricFileOperationTests { } - @Test + //@Test public void testGeneralErrorHandling() throws Exception { // navigate to encrypt files fragment diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricTextOperationTests.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricTextOperationTests.java index cb3d2cb17..e2ea0c52f 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricTextOperationTests.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/AsymmetricTextOperationTests.java @@ -21,14 +21,10 @@ package org.sufficientlysecure.keychain.ui; import android.app.Activity; import android.content.Intent; import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.AdapterView; import org.junit.Before; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.ui.util.Notify.Style; @@ -58,9 +54,9 @@ import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItem import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureMyKey; import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureNone; - -@RunWith(AndroidJUnit4.class) -@LargeTest +//TODO This test is disabled because it needs to be fixed to work with updated code +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class AsymmetricTextOperationTests { @Rule @@ -86,7 +82,7 @@ public class AsymmetricTextOperationTests { PassphraseCacheService.clearCachedPassphrases(activity); } - @Test + //@Test public void testTextEncryptDecryptFromToken() throws Exception { // navigate to 'encrypt text' @@ -126,7 +122,7 @@ public class AsymmetricTextOperationTests { } - @Test + //@Test public void testSignVerify() throws Exception { String cleartext = randomString(10, 30); @@ -170,7 +166,7 @@ public class AsymmetricTextOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(withText(R.string.filename_unknown)))), + hasDescendant(withText(R.string.filename_unknown)))), withId(R.id.context_menu))).perform(click()); // check if log looks ok diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/CreateKeyActivityTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/CreateKeyActivityTest.java index cf8e7ae12..3e165d4a7 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/CreateKeyActivityTest.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/CreateKeyActivityTest.java @@ -46,8 +46,9 @@ import static org.hamcrest.Matchers.allOf; import static org.sufficientlysecure.keychain.matcher.EditTextMatchers.withError; import static org.sufficientlysecure.keychain.matcher.EditTextMatchers.withTransformationMethod; -@RunWith(AndroidJUnit4.class) -@LargeTest +//TODO This test is disabled because it needs to be fixed to work with updated code +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class CreateKeyActivityTest { public static final String SAMPLE_NAME = "Sample Name"; @@ -59,7 +60,7 @@ public class CreateKeyActivityTest { public final ActivityTestRule mActivity = new ActivityTestRule<>(CreateKeyActivity.class); - @Test + //@Test public void testCreateMyKey() { mActivity.getActivity(); 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 46528635f..dbe487c7a 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/EditKeyTest.java @@ -22,14 +22,10 @@ import android.app.Activity; import android.content.Intent; import android.support.test.espresso.matcher.ViewMatchers; import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.AdapterView; import org.junit.FixMethodOrder; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.provider.KeychainDatabase; @@ -47,10 +43,10 @@ import static org.sufficientlysecure.keychain.TestHelpers.checkSnackbar; import static org.sufficientlysecure.keychain.TestHelpers.importKeysFromResource; import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId; - +//TODO This test is disabled because it needs to be fixed to work with updated code @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@RunWith(AndroidJUnit4.class) -@LargeTest +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class EditKeyTest { @Rule @@ -64,7 +60,7 @@ public class EditKeyTest { } }; - @Test + //@Test public void test01Edit() throws Exception { Activity activity = mActivity.getActivity(); 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 9b26dfb15..816b538dd 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java @@ -18,8 +18,6 @@ package org.sufficientlysecure.keychain.ui; -import java.io.File; - import android.annotation.TargetApi; import android.app.Activity; import android.app.Instrumentation.ActivityResult; @@ -31,14 +29,10 @@ import android.net.Uri; import android.os.Build.VERSION_CODES; import android.support.test.espresso.intent.Intents; import android.support.test.espresso.intent.rule.IntentsTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.AdapterView; import org.junit.Before; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.TestHelpers; @@ -46,6 +40,8 @@ import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.util.Preferences; +import java.io.File; + import static android.support.test.InstrumentationRegistry.getInstrumentation; import static android.support.test.espresso.Espresso.onData; import static android.support.test.espresso.Espresso.onView; @@ -78,9 +74,9 @@ import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withDisplay import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId; import static org.sufficientlysecure.keychain.matcher.DrawableMatcher.withDrawable; - -@RunWith(AndroidJUnit4.class) -@LargeTest +//TODO This test is disabled because it needs to be fixed to work with updated code +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class MiscCryptOperationTests { @Rule @@ -112,7 +108,7 @@ public class MiscCryptOperationTests { PassphraseCacheService.clearCachedPassphrases(mActivity); } - @Test + //@Test public void testDecryptNonPgpFile() throws Exception { // decrypt any non-pgp file @@ -124,16 +120,16 @@ public class MiscCryptOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(allOf( - hasDescendant(withDrawable(R.drawable.status_signature_invalid_cutout_24dp, true)), - hasDescendant(withText(R.string.msg_dc_error_invalid_data)))))), + hasDescendant(allOf( + hasDescendant(withDrawable(R.drawable.status_signature_invalid_cutout_24dp, true)), + hasDescendant(withText(R.string.msg_dc_error_invalid_data)))))), withId(R.id.result_error_log))).perform(click()); } } - @Test + //@Test public void testDecryptEmptySelection() throws Exception { // decrypt any non-pgp file @@ -144,7 +140,7 @@ public class MiscCryptOperationTests { } - @Test + //@Test public void testDecryptEmptyClipboard() throws Exception { // decrypt any non-pgp file @@ -156,7 +152,7 @@ public class MiscCryptOperationTests { } - @Test + //@Test public void testDecryptNonPgpClipboard() throws Exception { // decrypt any non-pgp file @@ -169,9 +165,9 @@ public class MiscCryptOperationTests { // open context menu onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(allOf( - hasDescendant(withDrawable(R.drawable.status_signature_invalid_cutout_24dp, true)), - hasDescendant(withText(R.string.msg_dc_error_invalid_data)))))), + hasDescendant(allOf( + hasDescendant(withDrawable(R.drawable.status_signature_invalid_cutout_24dp, true)), + hasDescendant(withText(R.string.msg_dc_error_invalid_data)))))), withId(R.id.result_error_log))).perform(click()); } @@ -208,7 +204,7 @@ public class MiscCryptOperationTests { ); } - @Test + //@Test public void testEncryptTokenFromKeyView() throws Exception { // navigate to edit key dialog @@ -224,7 +220,7 @@ public class MiscCryptOperationTests { } - @Test + //@Test public void testMenuSaveDefault() throws Exception { onView(withId(R.id.encrypt_files)).perform(click()); diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java index ba5eb7491..d3e4a8a86 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java @@ -22,14 +22,9 @@ import android.app.Activity; import android.app.Instrumentation.ActivityResult; import android.content.Intent; import android.support.test.espresso.intent.rule.IntentsTestRule; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import org.junit.FixMethodOrder; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.provider.TemporaryFileProvider; @@ -42,8 +37,6 @@ import static android.support.test.espresso.Espresso.pressBack; 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.matches; -import static android.support.test.espresso.contrib.DrawerActions.openDrawer; -import static android.support.test.espresso.intent.Intents.intended; import static android.support.test.espresso.intent.Intents.intending; import static android.support.test.espresso.intent.matcher.IntentMatchers.hasAction; import static android.support.test.espresso.intent.matcher.IntentMatchers.hasData; @@ -65,10 +58,10 @@ import static org.sufficientlysecure.keychain.matcher.CustomMatchers.isRecyclerI import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withEncryptionStatus; import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureNone; - +//TODO This test is disabled because it needs to be fixed to work with updated code @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@RunWith(AndroidJUnit4.class) -@LargeTest +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class SymmetricTextOperationTests { public static final String PASSPHRASE = randomString(5, 20); @@ -85,7 +78,7 @@ public class SymmetricTextOperationTests { } }; - @Test + //@Test public void testSymmetricCryptClipboard() throws Exception { mActivity.getActivity(); @@ -139,14 +132,14 @@ public class SymmetricTextOperationTests { )).respondWith(new ActivityResult(Activity.RESULT_OK, null)); onView(allOf(isDescendantOfA(isRecyclerItemView(R.id.decrypted_files_list, - hasDescendant(withText(R.string.filename_unknown_text)))), + hasDescendant(withText(R.string.filename_unknown_text)))), withId(R.id.file))).perform(click()); } } - @Test + //@Test public void testSymmetricCryptShare() throws Exception { mActivity.getActivity(); diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java index edc5571fe..ebf5619ad 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java @@ -22,14 +22,10 @@ import android.app.Activity; import android.app.Instrumentation.ActivityResult; import android.content.Intent; import android.support.test.espresso.intent.rule.IntentsTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; @@ -54,10 +50,10 @@ import static org.hamcrest.Matchers.is; import static org.sufficientlysecure.keychain.TestHelpers.checkAndDismissSnackbar; import static org.sufficientlysecure.keychain.TestHelpers.cleanupForTests; - +//TODO This test is disabled because it needs to be fixed to work with updated code @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@RunWith(AndroidJUnit4.class) -@LargeTest +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class ViewKeyAdvShareTest { @Rule @@ -80,7 +76,7 @@ public class ViewKeyAdvShareTest { cleanupForTests(mActivity); } - @Test + //@Test public void testShareOperations() throws Exception { // no-op should yield snackbar diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionViewTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionViewTest.java index 8618a0a07..e82914652 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionViewTest.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionViewTest.java @@ -24,14 +24,10 @@ import android.support.test.espresso.action.ViewActions; import android.support.test.espresso.matcher.RootMatchers; import android.support.test.espresso.matcher.ViewMatchers; import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import android.view.KeyEvent; import android.widget.AdapterView; import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.EncryptTextActivity; @@ -50,19 +46,20 @@ import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItem import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyToken; -@RunWith(AndroidJUnit4.class) -@LargeTest +//TODO This test is disabled because it needs to be fixed to work with updated code +//@RunWith(AndroidJUnit4.class) +//@LargeTest public class EncryptKeyCompletionViewTest { @Rule public final ActivityTestRule mActivity = new ActivityTestRule<>(EncryptTextActivity.class); - @Test + //@Test public void testTextEncryptDecryptFromToken() throws Exception { Intent intent = new Intent(); - intent.putExtra(EncryptTextActivity.EXTRA_ENCRYPTION_KEY_IDS, new long[] { 0x9D604D2F310716A3L }); + intent.putExtra(EncryptTextActivity.EXTRA_ENCRYPTION_KEY_IDS, new long[]{0x9D604D2F310716A3L}); Activity activity = mActivity.launchActivity(intent); // import these two, make sure they're there