From b8c2da95a227d5f039f9bc6e5520aecf31436af2 Mon Sep 17 00:00:00 2001 From: stargateprovider Date: Tue, 7 Dec 2021 00:37:38 +0200 Subject: [PATCH] rebase --- .../tarkvaraprojekt/mobileauthapp/UC4Test.kt | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/MobileAuthApp/app/src/androidTest/java/com/tarkvaraprojekt/mobileauthapp/UC4Test.kt b/MobileAuthApp/app/src/androidTest/java/com/tarkvaraprojekt/mobileauthapp/UC4Test.kt index c41ab64..3c03951 100644 --- a/MobileAuthApp/app/src/androidTest/java/com/tarkvaraprojekt/mobileauthapp/UC4Test.kt +++ b/MobileAuthApp/app/src/androidTest/java/com/tarkvaraprojekt/mobileauthapp/UC4Test.kt @@ -1,18 +1,14 @@ package com.tarkvaraprojekt.mobileauthapp -import androidx.fragment.app.testing.launchFragmentInContainer -import androidx.lifecycle.Lifecycle +//import androidx.fragment.app.testing.launchFragmentInContainer import androidx.test.espresso.Espresso.onView import androidx.test.espresso.IdlingPolicies +import androidx.test.espresso.NoMatchingViewException import androidx.test.espresso.action.ViewActions.* import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.RootMatchers.* import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.rule.ActivityTestRule -import org.hamcrest.CoreMatchers.`is` -import org.hamcrest.CoreMatchers.not -import org.junit.Assert.* import org.junit.* import org.junit.runner.RunWith @@ -27,8 +23,8 @@ class UC4Test { @Before fun setUp() { - IdlingPolicies.setMasterPolicyTimeout(1, TimeUnit.SECONDS) - IdlingPolicies.setIdlingResourceTimeout(1, TimeUnit.SECONDS) + IdlingPolicies.setMasterPolicyTimeout(3, TimeUnit.SECONDS) + IdlingPolicies.setIdlingResourceTimeout(3, TimeUnit.SECONDS) activityActivityTestRule.activity .supportFragmentManager.beginTransaction() } @@ -37,14 +33,30 @@ class UC4Test { fun tearDown() { } - @Test - fun test() { + fun navigateToCANView() { onView(withId(R.id.menu_settings_option)).perform(click()) + try { + // Delete existing CAN + onView(withText(R.string.can_delete)).perform(click()) + } catch (ignore: NoMatchingViewException) {} + onView(withId(R.id.can_menu_action)).perform(click()) + } + + @Test + fun validCAN() { + navigateToCANView() + onView(withText(R.string.can_helper_text)).check(matches(isDisplayed())) onView(supportsInputMethods()).perform(typeText("123456")) - onView(withId(R.id.next_button)).perform(click()) - onView(withText(R.string.can_status_saved)).inRoot( - withDecorView(not(`is`(activityActivityTestRule.activity.getWindow().getDecorView()))) - ).check(matches(isDisplayed())) + onView(withText(R.string.can_delete)).perform(closeSoftKeyboard()) + + onView(withText(R.string.can_status_saved)).check(matches(isDisplayed())) + } + + @Test + fun invalidCAN() { + navigateToCANView() + onView(supportsInputMethods()).perform(typeText("12345")) + onView(withText(R.string.can_helper_text)).check(matches(isDisplayed())) } } \ No newline at end of file