stash away stuff

OpenKeychain/build.gradle

@@ -197,6 +197,8 @@ android {
     }
 }
 
+// apply plugin: 'spoon'
+
 task jacocoTestReport(type:JacocoReport) {
     group = "Reporting"
     description = "Generate Jacoco coverage reports"

OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/EncryptDecryptTests.java

@@ -0,0 +1,217 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain;
+
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.matcher.ViewMatchers;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.MainActivity;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static org.sufficientlysecure.keychain.actions.CustomActions.actionOpenDrawer;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class EncryptDecryptTests extends ActivityInstrumentationTestCase2<MainActivity> {
+
+    public static final String SAMPLE_NAME = "Sample Name";
+    public static final String SAMPLE_EMAIL = "sample_email@gmail.com";
+    public static final String SAMPLE_ADDITIONAL_EMAIL = "sample_additional_email@gmail.com";
+    public static final String SAMPLE_PASSWORD = "sample_password";
+    private MainActivity mActivity;
+
+    public EncryptDecryptTests() {
+        super(MainActivity.class);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        injectInstrumentation(InstrumentationRegistry.getInstrumentation());
+        mActivity = getActivity();
+    }
+
+    @Test
+    public void test01ImportKeys() throws Exception {
+
+        UncachedKeyRing pubkey = readRingFromResource("valodim.pub.asc");
+        new ProviderHelper(mActivity).savePublicKeyRing(pubkey);
+
+        // open drawer
+        onView(withId(R.id.drawer_layout)).perform(actionOpenDrawer());
+
+        // go to encrypt/decrypt overview
+        onView(ViewMatchers.withText(R.string.nav_keys)).perform(click());
+
+        /*
+        // Clicks create my key
+        onView(withId(R.id.create_key_create_key_button))
+                .perform(click());
+
+        // Clicks next with empty name
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+        onView(withId(R.id.create_key_name))
+                .check(matches(withError(R.string.create_key_empty)));
+
+        // Types name and clicks next
+        onView(withId(R.id.create_key_name))
+                .perform(typeText(SAMPLE_NAME));
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+
+        // Clicks next with empty email
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+        onView(withId(R.id.create_key_email))
+                .check(matches(withError(R.string.create_key_empty)));
+
+        // Types email
+        onView(withId(R.id.create_key_email))
+                .perform(typeText(SAMPLE_EMAIL));
+
+        // Adds same email as additional email and dismisses the snackbar
+        onView(withId(R.id.create_key_add_email))
+                .perform(click());
+        onView(withId(R.id.add_email_address))
+                .perform(typeText(SAMPLE_EMAIL));
+        onView(withText(android.R.string.ok))
+                .inRoot(isDialog())
+                .perform(click());
+        onView(allOf(withId(R.id.sb__text), withText(R.string.create_key_email_already_exists_text)))
+                .check(matches(isDisplayed()));
+        onView(allOf(withId(R.id.sb__text), withText(R.string.create_key_email_already_exists_text)))
+                .perform(swipeLeft());
+
+        // Adds additional email
+        onView(withId(R.id.create_key_add_email))
+                .perform(click());
+        onView(withId(R.id.add_email_address))
+                .perform(typeText(SAMPLE_ADDITIONAL_EMAIL));
+        onView(withText(android.R.string.ok))
+                .inRoot(isDialog())
+                .perform(click());
+        onView(withId(R.id.create_key_emails))
+                .check(matches(hasDescendant(allOf(withId(R.id.create_key_email_item_email), withText(SAMPLE_ADDITIONAL_EMAIL)))));
+
+        // Removes additional email and clicks next
+        onView(allOf(withId(R.id.create_key_email_item_delete_button), hasSibling(allOf(withId(R.id.create_key_email_item_email), withText(SAMPLE_ADDITIONAL_EMAIL)))))
+                .perform(click())
+                .check(doesNotExist());
+        onView(withId(R.id.create_key_next_button))
+                .perform(click(click()));
+
+        // Clicks next with empty password
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+        onView(withId(R.id.create_key_passphrase))
+                .check(matches(withError(R.string.create_key_empty)));
+
+        // Types password
+        onView(withId(R.id.create_key_passphrase))
+                .perform(typeText(SAMPLE_PASSWORD));
+
+        // Clicks next with empty confirm password
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+        onView(withId(R.id.create_key_passphrase_again))
+                .check(matches(withError(R.string.create_key_passphrases_not_equal)));
+
+        // Types confirm password
+        onView(withId(R.id.create_key_passphrase_again))
+                .perform(typeText(SAMPLE_PASSWORD));
+
+        // Clicks show password twice and clicks next
+        onView(withId(R.id.create_key_show_passphrase))
+                .perform(click());
+        onView(withId(R.id.create_key_passphrase))
+                .check(matches(withTransformationMethod(HideReturnsTransformationMethod.class)));
+        onView(withId(R.id.create_key_passphrase_again))
+                .check(matches(withTransformationMethod(HideReturnsTransformationMethod.class)));
+        onView(withId(R.id.create_key_show_passphrase))
+                .perform(click());
+        onView(withId(R.id.create_key_passphrase))
+                .check(matches(withTransformationMethod(PasswordTransformationMethod.class)));
+        onView(withId(R.id.create_key_passphrase_again))
+                .check(matches(withTransformationMethod(PasswordTransformationMethod.class)));
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+
+        // Verifies name and email
+        onView(withId(R.id.name))
+                .check(matches(withText(SAMPLE_NAME)));
+        onView(withId(R.id.email))
+                .check(matches(withText(SAMPLE_EMAIL)));
+
+        // Verifies backstack
+        onView(withId(R.id.create_key_back_button))
+                .perform(click());
+        onView(withId(R.id.create_key_back_button))
+                .perform(click());
+        onView(withId(R.id.create_key_back_button))
+                .perform(click());
+
+        onView(withId(R.id.create_key_name))
+                .check(matches(withText(SAMPLE_NAME)));
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+
+        onView(withId(R.id.create_key_email))
+                .check(matches(withText(SAMPLE_EMAIL)));
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+
+        // TODO: Uncomment when fixed in main
+//        onView(withId(R.id.create_key_passphrase))
+//                .check(matches(withText(SAMPLE_PASSWORD)));
+//        onView(withId(R.id.create_key_passphrase_again))
+//                .check(matches(withText(SAMPLE_PASSWORD)));
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+
+        onView(withId(R.id.name))
+                .check(matches(withText(SAMPLE_NAME)));
+        onView(withId(R.id.email))
+                .check(matches(withText(SAMPLE_EMAIL)));
+
+        // Clicks create key
+        onView(withId(R.id.create_key_next_button))
+                .perform(click());
+        */
+
+    }
+
+    UncachedKeyRing readRingFromResource(String name) throws Exception {
+        return UncachedKeyRing.fromStream(getInstrumentation().getContext().getAssets().open(name)).next();
+    }
+
+}

OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/actions/CustomActions.java

@@ -0,0 +1,54 @@
+package org.sufficientlysecure.keychain.actions;
+
+
+import android.support.test.espresso.UiController;
+import android.support.test.espresso.ViewAction;
+import android.support.test.espresso.matcher.ViewMatchers;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.view.View;
+
+import org.hamcrest.Matcher;
+
+
+public abstract class CustomActions {
+
+    public static ViewAction actionOpenDrawer() {
+        return new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return ViewMatchers.isAssignableFrom(DrawerLayout.class);
+            }
+
+            @Override
+            public String getDescription() {
+                return "open drawer";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                ((DrawerLayout) view).openDrawer(GravityCompat.START);
+            }
+        };
+    }
+
+    public static ViewAction actionCloseDrawer() {
+        return new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return ViewMatchers.isAssignableFrom(DrawerLayout.class);
+            }
+
+            @Override
+            public String getDescription() {
+                return "close drawer";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                ((DrawerLayout) view).closeDrawer(GravityCompat.START);
+            }
+        };
+    }
+
+}

build.gradle

@@ -11,6 +11,7 @@ buildscript {
         classpath 'com.novoda:bintray-release:0.2.7'
         
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1'
+        // classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.0.2'
     }
 }
 
@@ -44,4 +45,4 @@ project(':extern:spongycastle') {
 ext {
     compileSdkVersion = 22
     buildToolsVersion = '22.0.1'
-}
+}