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

Adjustments in Settings UI tests to avoid flakyness #2737

Merged
merged 3 commits into from
Dec 3, 2019
Merged

Adjustments in Settings UI tests to avoid flakyness #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
178e729
restrict view of camera uploads preferences. wait for activity in loc…
jesmrec Nov 27, 2019
94d7a8e
adapt Log tests to new Log implementation
jesmrec Nov 28, 2019
b535e51
Fix intent problems
davigonz Nov 28, 2019
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
18 changes: 15 additions & 3 deletions ...droidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsCameraUploadsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ package com.owncloud.android.settings.camerauploads

import android.os.Environment
import android.preference.CheckBoxPreference
import android.preference.PreferenceCategory
import android.preference.PreferenceManager
import android.preference.PreferenceScreen
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
Expand All @@ -36,15 +38,16 @@ import androidx.test.rule.ActivityTestRule
import com.owncloud.android.R
import com.owncloud.android.ui.activity.LocalFolderPickerActivity
import com.owncloud.android.ui.activity.Preferences
import org.junit.Assert
import org.junit.Assert.assertTrue
import org.junit.After
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.After
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith



@RunWith(AndroidJUnit4::class)
class OCSettingsCameraUploadsTest {

Expand All @@ -65,6 +68,15 @@ class OCSettingsCameraUploadsTest {

mPrefCameraPictureUploads = activityRule.activity.findPreference(CAMERA_PICTURE_UPLOADS) as CheckBoxPreference
mPrefCameraVideoUploads = activityRule.activity.findPreference(CAMERA_VIDEO_UPLOADS) as CheckBoxPreference

//Only interested in "Camera Uploads" section, so we can get rid of the other categories.
val preferenceScreen = activityRule.activity.getPreferenceScreen() as PreferenceScreen
val securityCategory =
activityRule.activity.findPreference("security_category") as PreferenceCategory
val moreCategory =
activityRule.activity.findPreference("more") as PreferenceCategory
preferenceScreen.removePreference(securityCategory)
preferenceScreen.removePreference(moreCategory)
}

@After
Expand Down
17 changes: 12 additions & 5 deletions owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/OCSettingsLogTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,22 @@ class OCSettingsLogTest {
val activityRule = ActivityTestRule(LogHistoryActivity::class.java, true, true)

@Test
fun checkTitle() {
onView(withText(R.string.actionbar_logger)).check(matches(isDisplayed()))
fun itemsToolbar() {
onView(withId(R.id.search_button)).check(matches(isDisplayed()))
//Values not i18n
onView(withText("LOGCAT")).check(matches(isDisplayed()))
onView(withText("LOGFILE")).check(matches(isDisplayed()))
}

@Test
fun itemsToolbar() {
onView(withId(R.id.menu_search)).check(matches(isDisplayed()))
fun itemsLogLevel() {
openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getInstrumentation().targetContext)
onView(withText("Logcat")).check(matches(isDisplayed()))
//Values not i18n
onView(withText("Verbose")).check(matches(isDisplayed()))
onView(withText("Debug")).check(matches(isDisplayed()))
onView(withText("Info")).check(matches(isDisplayed()))
onView(withText("Warning")).check(matches(isDisplayed()))
onView(withText("Error")).check(matches(isDisplayed()))
}

}
95 changes: 51 additions & 44 deletions owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/OCSettingsMoreTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import com.owncloud.android.ui.activity.LogHistoryActivity
import com.owncloud.android.ui.activity.Preferences
import com.owncloud.android.ui.activity.PrivacyPolicyActivity
import org.hamcrest.Matchers.allOf
import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test
Expand All @@ -56,10 +57,11 @@ class OCSettingsMoreTest {

@Rule
@JvmField
val activityRule = ActivityTestRule(Preferences::class.java, true, true)
var activityRule = ActivityTestRule(Preferences::class.java, true, true)

@Before
fun setUp() {
Intents.init()
//Only interested in "More" section, so we can get rid of the other categories. SmoothScroll is not
//working fine to reach the bottom of the screen, so this approach was taken to display the section
val preferenceScreen = activityRule.activity.getPreferenceScreen() as PreferenceScreen
Expand All @@ -71,108 +73,113 @@ class OCSettingsMoreTest {
preferenceScreen.removePreference(securityCategory)
}

@After
fun cleanUp() {
Intents.release()
}

@Test
fun helpView(){
fun helpView() {
onView(withText(R.string.prefs_help)).check(matches(isDisplayed()))
}

@Test
fun helpOptionOpensWeb(){
Intents.init()
fun helpOptionOpensWeb() {
onView(withText(R.string.prefs_help)).perform(click())
val intentResult = ActivityResult(Activity.RESULT_OK, Intent())
intending(hasAction(Intent.ACTION_VIEW)).respondWith(intentResult);
intended(hasData(activityRule.activity.getString(R.string.url_help)))
Intents.release()
}

@Test
fun davx5View(){
fun davx5View() {
onView(withText(R.string.prefs_sync_calendar_contacts)).check(matches(isDisplayed()))
onView(withText(R.string.prefs_sync_calendar_contacts_summary)).check(matches(isDisplayed()))
}

@Test
fun davx5OpensLink(){
Intents.init()
fun davx5OpensLink() {
val intentResult = ActivityResult(Activity.RESULT_OK, Intent())
intending(hasAction(Intent.ACTION_VIEW)).respondWith(intentResult);
onView(withText(R.string.prefs_sync_calendar_contacts)).perform(click())
intended(hasData(activityRule.activity.getString(R.string.url_sync_calendar_contacts)))
Intents.release()
}

@Test
fun recommendView(){
fun recommendView() {
onView(withText(R.string.prefs_recommend)).check(matches(isDisplayed()))
}

@Test
fun recommendOpenSender(){
Intents.init()
fun recommendOpenSender() {
val intentResult = ActivityResult(Activity.RESULT_OK, Intent())
intending(hasAction(Intent.ACTION_SENDTO)).respondWith(intentResult);
onView(withText(R.string.prefs_recommend)).perform(click())
intended(allOf(
hasAction(Intent.ACTION_SENDTO),
hasExtra(Intent.EXTRA_SUBJECT,
String.format(
activityRule.activity.getString(R.string.recommend_subject),
activityRule.activity.getString(R.string.app_name))),
hasExtra(Intent.EXTRA_TEXT,
String.format(
activityRule.activity.getString(R.string.recommend_text),
activityRule.activity.getString(R.string.app_name),
activityRule.activity.getString(R.string.url_app_download)
)),
hasFlag(Intent.FLAG_ACTIVITY_NEW_TASK)))
Intents.release()
intended(
allOf(
hasAction(Intent.ACTION_SENDTO),
hasExtra(
Intent.EXTRA_SUBJECT,
String.format(
activityRule.activity.getString(R.string.recommend_subject),
activityRule.activity.getString(R.string.app_name)
)
),
hasExtra(
Intent.EXTRA_TEXT,
String.format(
activityRule.activity.getString(R.string.recommend_text),
activityRule.activity.getString(R.string.app_name),
activityRule.activity.getString(R.string.url_app_download)
)
),
hasFlag(Intent.FLAG_ACTIVITY_NEW_TASK)
)
)
}

@Test
fun feedbackView(){
fun feedbackView() {
onView(withText(R.string.drawer_feedback)).check(matches(isDisplayed()))
}

@Test
fun feedbackOpenSender(){
Intents.init()
fun feedbackOpenSender() {
val intentResult = ActivityResult(Activity.RESULT_OK, Intent())
intending(hasAction(Intent.ACTION_SENDTO)).respondWith(intentResult);
onView(withText(R.string.drawer_feedback)).perform(click())
intended(allOf(
hasAction(Intent.ACTION_SENDTO),
hasExtra(Intent.EXTRA_SUBJECT,
"Android v" + BuildConfig.VERSION_NAME + " - " + activityRule.activity.getText(R.string.prefs_feedback)),
hasData(Uri.parse(activityRule.activity.getText(R.string.mail_feedback) as String)),
hasFlag(Intent.FLAG_ACTIVITY_NEW_TASK)))
Intents.release()
intended(
allOf(
hasAction(Intent.ACTION_SENDTO),
hasExtra(
Intent.EXTRA_SUBJECT,
"Android v" + BuildConfig.VERSION_NAME + " - " + activityRule.activity.getText(R.string.prefs_feedback)
),
hasData(Uri.parse(activityRule.activity.getText(R.string.mail_feedback) as String)),
hasFlag(Intent.FLAG_ACTIVITY_NEW_TASK)
)
)
}

@Test
fun loggerView(){
fun loggerView() {
onView(withText(R.string.actionbar_logger)).check(matches(isDisplayed()))
}

@Test
fun loggerOpen(){
Intents.init()
fun loggerOpen() {
onView(withText(R.string.actionbar_logger)).perform(click())
intended(hasComponent(LogHistoryActivity::class.java.name))
Intents.release()
}

@Test
fun privacyPolicyView(){
fun privacyPolicyView() {
onView(withText(R.string.prefs_privacy_policy)).check(matches(isDisplayed()))
}

@Test
fun privacyPolicyOpenWeb(){
Intents.init()
fun privacyPolicyOpenWeb() {
onView(withText(R.string.prefs_privacy_policy)).perform(click())
intended(hasComponent(PrivacyPolicyActivity::class.java.name))
Intents.release()
}
}
12 changes: 0 additions & 12 deletions .../src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPatternLockTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ package com.owncloud.android.settings.security
import android.content.Intent
import android.preference.PreferenceManager
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
Expand All @@ -31,10 +30,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.ActivityTestRule
import com.owncloud.android.R
import com.owncloud.android.ui.activity.PassCodeActivity
import com.owncloud.android.ui.activity.PatternLockActivity
import org.junit.After
import org.junit.Assert.assertTrue
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
Expand Down Expand Up @@ -68,15 +65,6 @@ class OCSettingsPatternLockTest {
onView(withId(R.id.cancel_pattern)).check(matches(isDisplayed()))
}

@Test
fun cancelPatternLock(){
//Open Activity in pattern creation mode
openPatternActivity(PatternLockActivity.ACTION_REQUEST_WITH_RESULT)

onView(withId(R.id.cancel_pattern)).perform(click())
assertTrue(errorMessage, activityRule.activity.isFinishing)
}

@Test
fun removePatternLock() {
//Save a pattern in Preferences
Expand Down