diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-14 12:12:28 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 18:52:19 +0200 |
commit | 442aed8a2d2c26b45e294fdaf8b4a5b6b72cdf14 (patch) | |
tree | c552823d56d309554440e5a0a4f201e6597ff6a3 /OpenKeychain/src/androidTest | |
parent | 46e75a085e6d0197c0a9f5ee6402f41b4026249a (diff) | |
download | open-keychain-442aed8a2d2c26b45e294fdaf8b4a5b6b72cdf14.tar.gz open-keychain-442aed8a2d2c26b45e294fdaf8b4a5b6b72cdf14.tar.bz2 open-keychain-442aed8a2d2c26b45e294fdaf8b4a5b6b72cdf14.zip |
update instrumentation test to JUnit4
Diffstat (limited to 'OpenKeychain/src/androidTest')
-rw-r--r-- | OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java index a20b61cf3..f85523eb7 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java @@ -17,11 +17,16 @@ package org.sufficientlysecure.keychain; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.LargeTest; import android.text.method.HideReturnsTransformationMethod; import android.text.method.PasswordTransformationMethod; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; import org.sufficientlysecure.keychain.ui.CreateKeyActivity; import static android.support.test.espresso.Espresso.onView; @@ -40,6 +45,7 @@ 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 public class CreateKeyActivityTest extends ActivityInstrumentationTestCase2<CreateKeyActivity> { @@ -52,12 +58,14 @@ public class CreateKeyActivityTest extends ActivityInstrumentationTestCase2<Crea super(CreateKeyActivity.class); } - @Override + @Before public void setUp() throws Exception { super.setUp(); + injectInstrumentation(InstrumentationRegistry.getInstrumentation()); getActivity(); } + @Test public void testCreateMyKey() { // Clicks create my key onView(withId(R.id.create_key_create_key_button)) |