Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated #94

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Remove deprecated #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ec5d3a
remove deprecated ActivityTestRule in favor of ActivityScenarioRule
RCasatta Dec 9, 2020
c85fdbe
skip some test for network != testnet
RCasatta Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dependencies {
implementation "androidx.security:security-crypto:1.1.0-alpha02"
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
Expand Down
33 changes: 18 additions & 15 deletions android/app/src/androidTest/java/it/casatta/Common.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package it.casatta

import android.app.Activity
import android.view.View
import android.widget.EditText
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.typeText
import androidx.test.espresso.assertion.ViewAssertions
import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.matcher.BoundedMatcher
import androidx.test.espresso.matcher.RootMatchers
import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.internal.util.Checks
import androidx.test.platform.app.InstrumentationRegistry
Expand Down Expand Up @@ -42,6 +41,15 @@ open class Common {
return network
}

fun isTestnet(): Boolean {
return getNetwork() == "testnet"
}

fun getString(id: Int): String {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
return appContext.getString(id)
}

fun withItemSubject(subject: String): Matcher<RecyclerView.ViewHolder?>? {
Checks.checkNotNull(subject)
return object : BoundedMatcher<RecyclerView.ViewHolder?, ItemHolder>(
Expand Down Expand Up @@ -78,7 +86,7 @@ open class Common {
onView(withId(R.id.items_list)).perform(
RecyclerViewActions.actionOnHolderItem<RecyclerView.ViewHolder>(
withItemSubject(subject),
ViewActions.click()
click()
)
)
}
Expand All @@ -87,27 +95,22 @@ open class Common {
onView(withId(R.id.items_list)).check(
ViewAssertions.matches(
Matchers.not(
ViewMatchers.hasDescendant(
hasDescendant(
withText(subject)
)
)
)
)
}

fun setTextInDialogAndConfirm(activity: Activity, value: String) {
setTextInDialogAndConfirm(activity, value, "OK")
fun setTextInDialogAndConfirm(value: String) {
setTextInDialogAndConfirm(value, "OK")

}

fun setTextInDialogAndConfirm(activity: Activity, value: String, buttonText: String) {
onView(withClassName(Matchers.containsString("EditText")))
.check { view, _ ->
activity.runOnUiThread {
(view as EditText).setText(value)
}
}
onView(withText(buttonText)).perform(ViewActions.click())
fun setTextInDialogAndConfirm(value: String, buttonText: String) {
onView(withClassName(Matchers.containsString("EditText"))).perform(click()).perform(typeText(value))
onView(withText(buttonText)).perform(click())
}

}
51 changes: 22 additions & 29 deletions android/app/src/androidTest/java/it/casatta/KeyTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,51 @@
package it.casatta

import android.content.Intent
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.pressBack
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.rules.activityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.rule.ActivityTestRule
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith

@RunWith(AndroidJUnit4::class)
class KeyTest : Common() {

@get:Rule
var activityRule: ActivityTestRule<MainActivity> = ActivityTestRule(
MainActivity::class.java,
true,
false
)
val activityScenarioRule = activityScenarioRule<MainActivity>()

@Test
fun randomKey() {
val activity = activityRule.launchActivity(Intent())
if (!isTestnet())
return

val keyName = "key${System.currentTimeMillis()}"

onView(withId(R.id.key_button)).perform(click())

onView(withId(R.id.item_new)).perform(click())
clickElementInList("Random")
setTextInDialogAndConfirm(activity, keyName)
setTextInDialogAndConfirm(keyName)
onView(withText(keyName)).check(matches(isDisplayed()))

onView(withId(R.id.item_new)).perform(click())
clickElementInList("Random")
setTextInDialogAndConfirm(activity, keyName)
setTextInDialogAndConfirm(keyName)
checkAndDismissDialog(R.string.key_exists)

onView(isRoot()).perform(pressBack())
clickElementInList(keyName)
onView(withId(R.id.delete)).perform(click())
setTextInDialogAndConfirm(activity, keyName, "DELETE")
setTextInDialogAndConfirm(keyName, "DELETE")
checkAndDismissDialog(R.string.deleted)
onView(withId(R.id.key_button)).perform(click())
checkElementNotInList(keyName)
}

@Test
fun xprv() {
val activity = activityRule.launchActivity(Intent())
val keyName = "key${System.currentTimeMillis()}"
val xprvs = mapOf(
"mainnet" to "xprv9s21ZrQH143K2qwMASoVWNtTp23waKvSFEQELUbKKkpiH8c7YL56Uc4zDWrTgyeUrMsDxEt7CuGg3PZBwdygrMa3b4KTSowCQ7LEv48AaRQ",
Expand All @@ -72,28 +67,27 @@ class KeyTest : Common() {
onView(withId(R.id.key_button)).perform(click())
onView(withId(R.id.item_new)).perform(click())
clickElementInList(importsText[network]!!)
setTextInDialogAndConfirm(activity, keyName)
setTextInDialogAndConfirm(activity, xprvs[network]!!)
setTextInDialogAndConfirm(keyName)
setTextInDialogAndConfirm(xprvs[network]!!)
onView(withText(keyName)).check(matches(isDisplayed()))
clickElementInList(keyName)
onView(withText(xpubs[network])).check(matches(isDisplayed()))
onView(withId(R.id.delete)).perform(click())
setTextInDialogAndConfirm(activity, keyName, "DELETE")
setTextInDialogAndConfirm(keyName, "DELETE")
checkAndDismissDialog(R.string.deleted)
onView(withId(R.id.key_button)).perform(click())
checkElementNotInList(keyName)

val invalidNetwork = invalidNetwork(network)
onView(withId(R.id.item_new)).perform(click())
clickElementInList(importsText[network]!!)
setTextInDialogAndConfirm(activity, keyName)
setTextInDialogAndConfirm(activity, xprvs[invalidNetwork]!!)
setTextInDialogAndConfirm(keyName)
setTextInDialogAndConfirm(xprvs[invalidNetwork]!!)
checkAndDismissDialog(R.string.invalid_xprv_or_mnemonic)
}

@Test
fun mnemonic() {
val activity = activityRule.launchActivity(Intent())
val keyName = "key${System.currentTimeMillis()}"

val expectedXpubTestnet =
Expand All @@ -111,27 +105,26 @@ class KeyTest : Common() {

onView(withId(R.id.key_button)).perform(click())
onView(withId(R.id.item_new)).perform(click())
clickElementInList(activity.getString(R.string.import_mnemonic))
setTextInDialogAndConfirm(activity, keyName)
setTextInDialogAndConfirm(activity, "invalid")
clickElementInList(getString(R.string.import_mnemonic))
setTextInDialogAndConfirm(keyName)
setTextInDialogAndConfirm("invalid")
checkAndDismissDialog(R.string.invalid_xprv_or_mnemonic)
onView(withId(R.id.item_new)).perform(click())
clickElementInList(activity.getString(R.string.import_mnemonic))
setTextInDialogAndConfirm(activity, keyName)
setTextInDialogAndConfirm(activity, mnemonic)
clickElementInList(getString(R.string.import_mnemonic))
setTextInDialogAndConfirm(keyName)
setTextInDialogAndConfirm(mnemonic)
onView(withText(keyName)).check(matches(isDisplayed()))
clickElementInList(keyName)
onView(withText(expectedXpub[network])).check(matches(isDisplayed()))
onView(withId(R.id.delete)).perform(click())
setTextInDialogAndConfirm(activity, keyName, "DELETE")
setTextInDialogAndConfirm(keyName, "DELETE")
checkAndDismissDialog(R.string.deleted)
onView(withId(R.id.key_button)).perform(click())
checkElementNotInList(keyName)
}

@Test
fun dice() {
val activity = activityRule.launchActivity(Intent())
val keyName = "key${System.currentTimeMillis()}"
val expectedXpubTestnet =
"tpubD6NzVbkrYhZ4YSC7guz8W7xZW1ftPPwsB9bAcEHrmdvmzyUSfhTDE8YV3M8WYegAmGorTpGvVGVKdXS5gWkCQ7GPZNUABkchvCyNpA51h5b"
Expand All @@ -146,8 +139,8 @@ class KeyTest : Common() {

onView(withId(R.id.key_button)).perform(click())
onView(withId(R.id.item_new)).perform(click())
clickElementInList(activity.getString(R.string.dice))
setTextInDialogAndConfirm(activity, keyName)
clickElementInList(getString(R.string.dice))
setTextInDialogAndConfirm(keyName)
clickElementInList("20")
for (i in 1..59) {
clickElementInList("2")
Expand Down
Loading