Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development

This commit is contained in:
Dominik Schürmann 2015-05-04 14:18:10 +02:00
commit 39c610c2d1
4 changed files with 286 additions and 2 deletions

View File

@ -11,6 +11,12 @@ dependencies {
compile 'com.android.support:recyclerview-v7:22.1.0' compile 'com.android.support:recyclerview-v7:22.1.0'
compile 'com.android.support:cardview-v7:22.1.0' compile 'com.android.support:cardview-v7:22.1.0'
// UI testing libs
androidTestCompile 'com.android.support.test:runner:0.2'
androidTestCompile 'com.android.support.test:rules:0.2'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.1'
androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.1'
// JCenter etc. // JCenter etc.
compile 'com.eftimoff:android-patternview:1.0.1@aar' compile 'com.eftimoff:android-patternview:1.0.1@aar'
compile 'com.journeyapps:zxing-android-embedded:2.3.0@aar' compile 'com.journeyapps:zxing-android-embedded:2.3.0@aar'
@ -85,6 +91,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
compileOptions { compileOptions {
@ -135,6 +143,10 @@ android {
dexOptions { dexOptions {
preDexLibraries = false preDexLibraries = false
} }
packagingOptions {
exclude 'LICENSE.txt'
}
} }
// NOTE: This disables Lint! // NOTE: This disables Lint!

View File

@ -0,0 +1,194 @@
/*
* 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.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.swipeLeft;
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.matcher.RootMatchers.isDialog;
import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
import static android.support.test.espresso.matcher.ViewMatchers.hasSibling;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
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)
public class CreateKeyActivityTest {
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";
@Rule
public ActivityTestRule<CreateKeyActivity> mActivityRule = new ActivityTestRule<>(CreateKeyActivity.class);
@Test
public void testCreateMyKey() {
// 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());
}
}

View File

@ -0,0 +1,74 @@
/*
* 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.matcher;
import android.content.Context;
import android.text.method.TransformationMethod;
import android.view.View;
import android.widget.EditText;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
public class EditTextMatchers {
public static TypeSafeMatcher<View> withError(final int errorResId) {
return new TypeSafeMatcher<View>() {
@Override
public boolean matchesSafely(View view) {
Context context = view.getContext();
if (view instanceof EditText) {
CharSequence error = ((EditText) view).getError();
return error != null && error.equals(context.getString(errorResId));
}
return false;
}
@Override
public void describeTo(Description description) {
description.appendText("EditText with error");
}
};
}
public static TypeSafeMatcher<View> withTransformationMethod(final Class<? extends TransformationMethod> transformationClass) {
return new TypeSafeMatcher<View>() {
@Override
public boolean matchesSafely(View view) {
if (view instanceof EditText) {
TransformationMethod transformation = ((EditText) view).getTransformationMethod();
return transformation != null && transformationClass.isInstance(transformation);
}
return false;
}
@Override
public void describeTo(Description description) {
description.appendText("EditText with transformation method");
}
};
}
}

View File

@ -133,6 +133,10 @@ public class CreateKeyEmailFragment extends Fragment {
addEmail(); addEmail();
} }
}); });
if (mCreateKeyActivity.mAdditionalEmails != null) {
mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails);
}
} }
if (mAdditionalEmailModels.isEmpty() && mCreateKeyActivity.mAdditionalEmails != null) { if (mAdditionalEmailModels.isEmpty() && mCreateKeyActivity.mAdditionalEmails != null) {
mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails); mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails);
@ -156,7 +160,7 @@ public class CreateKeyEmailFragment extends Fragment {
email.equals(mEmailEdit.getText().toString())) { email.equals(mEmailEdit.getText().toString())) {
Notify.create(getActivity(), Notify.create(getActivity(),
getString(R.string.create_key_email_already_exists_text), getString(R.string.create_key_email_already_exists_text),
Notify.LENGTH_LONG, Notify.Style.ERROR).show(); Notify.LENGTH_LONG, Notify.Style.ERROR).show(CreateKeyEmailFragment.this);
return; return;
} }
//check for duplicated emails inside the adapter //check for duplicated emails inside the adapter
@ -164,7 +168,7 @@ public class CreateKeyEmailFragment extends Fragment {
if (email.equals(model.email)) { if (email.equals(model.email)) {
Notify.create(getActivity(), Notify.create(getActivity(),
getString(R.string.create_key_email_already_exists_text), getString(R.string.create_key_email_already_exists_text),
Notify.LENGTH_LONG, Notify.Style.ERROR).show(); Notify.LENGTH_LONG, Notify.Style.ERROR).show(CreateKeyEmailFragment.this);
return; return;
} }
} }