Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c010e304 authored by Nergi Rahardi's avatar Nergi Rahardi
Browse files

Cleanup ResolutionPreferenceFragmentTest 

- Removed duplicated test (testCreateAndStart and
testCreateAndStartDefaultDisplayNotAllowed). Both tests are basically
the same since both -1 and 0 id not in set up displays
- Make TestableResolutionPreferenceFragment static class, this is to be
used in the next CL so this fragment can be added to a test Activity (to
validate `Activity.finishFragment()`
- Make displayId as initFragment param, as it should be init only once
when fragment started
- Modify to use displays[id] rather than specifying numbers

Bug: 407007697
Test: atest ResolutionPreferenceFragmentTest
Flag: EXEMPT cleanup test
Change-Id: I81f4696f13e4e64acd3e70e09098b130f5d87d43
parent 649a1980

tests/robotests/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragmentTest.kt

+29 −33
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.connecteddevice.display 


import android.content.Context

import android.content.res.Resources

import android.view.Display.INVALID_DISPLAY

import android.view.View

import android.widget.TextView

import androidx.preference.Preference
@@ -34,7 +33,6 @@ import com.android.settingslib.widget.SelectorWithWidgetPreference 
import com.google.common.truth.Truth.assertThat

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.doReturn

import org.mockito.Mockito.mock

import org.mockito.Mockito.verify
@@ -43,18 +41,15 @@ import org.mockito.Mockito.verify 
@RunWith(AndroidJUnit4::class)

class ResolutionPreferenceFragmentTest : ExternalDisplayTestBase() {



    private lateinit var fragment: ResolutionPreferenceFragment

    @Mock private lateinit var mockedMetricsLogger: MetricsLogger



    private var preferenceIdFromResource: Int = 0

    private var displayId: Int = INVALID_DISPLAY

    private lateinit var fragment: TestableResolutionPreferenceFragment

    private val metricsLogger: MetricsLogger = mock(MetricsLogger::class.java)



    @Test

    @UiThreadTest

    fun testCreateAndStart() {

        initFragment()

    fun testCreateAndStart_invalidDisplay() {

        initFragment(/* displayId= */ -1)

        mHandler.flush()

        assertThat(preferenceIdFromResource)

        assertThat(fragment.preferenceIdFromResource)

            .isEqualTo(EXTERNAL_DISPLAY_RESOLUTION_SETTINGS_RESOURCE)

        var pref = mPreferenceScreen.findPreference<Preference>(TOP_OPTIONS_KEY)

        assertThat(pref).isNull()
@@ -62,18 +57,6 @@ class ResolutionPreferenceFragmentTest : ExternalDisplayTestBase() { 
        assertThat(pref).isNull()

    }



    @Test

    @UiThreadTest

    fun testCreateAndStartDefaultDisplayNotAllowed() {

        displayId = 0

        initFragment()

        mHandler.flush()

        var pref = mPreferenceScreen.findPreference<Preference>(TOP_OPTIONS_KEY)

        assertThat(pref).isNull()

        pref = mPreferenceScreen.findPreference(MORE_OPTIONS_KEY)

        assertThat(pref).isNull()

    }



    @Test

    @UiThreadTest

    fun testModePreferences_modeLimitFlagIsOn_noOverride() {
@@ -120,8 +103,8 @@ class ResolutionPreferenceFragmentTest : ExternalDisplayTestBase() { 
    @UiThreadTest

    fun testModeChange() {

        val display = mDisplays[0]

        displayId = display.id

        initFragment()

        val displayId = display.id

        initFragment(displayId)

        mHandler.flush()

        val topPref = mPreferenceScreen.findPreference<PreferenceCategory>(TOP_OPTIONS_KEY)

        assertThat(topPref).isNotNull()
@@ -132,8 +115,7 @@ class ResolutionPreferenceFragmentTest : ExternalDisplayTestBase() { 
    }



    private fun runTestModePreferences(): Pair<PreferenceCategory, PreferenceCategory> {

        displayId = 1

        initFragment()

        initFragment(mDisplays[0].id)

        mHandler.flush()

        val topPref = mPreferenceScreen.findPreference<PreferenceCategory>(TOP_OPTIONS_KEY)

        assertThat(topPref).isNotNull()
@@ -142,22 +124,36 @@ class ResolutionPreferenceFragmentTest : ExternalDisplayTestBase() { 
        return Pair(topPref!!, morePref!!)

    }



    private fun initFragment() {

    private fun initFragment(displayId: Int) {

        if (::fragment.isInitialized) {

            return

        }

        fragment = TestableResolutionPreferenceFragment()

        fragment =

            TestableResolutionPreferenceFragment(

                displayId,

                mPreferenceScreen,

                mContext,

                mMockedInjector,

                metricsLogger,

            )

        fragment.onCreateCallback(null)

        fragment.onActivityCreatedCallback(null)

        fragment.onStartCallback()

    }



    private inner class TestableResolutionPreferenceFragment :

        ResolutionPreferenceFragment(mMockedInjector) {

    private class TestableResolutionPreferenceFragment(

        private val displayId: Int,

        private val preferenceScreen: PreferenceScreen,

        context: Context,

        injector: ConnectedDisplayInjector,

        logger: MetricsLogger,

    ) : ResolutionPreferenceFragment(injector) {

        private val mockRootView: View

        private val emptyView: TextView

        private val mockResources: Resources = mock(Resources::class.java)

        private val logger: MetricsLogger

        var preferenceIdFromResource: Int = -1

            private set



        init {

            doReturn(61)
@@ -173,13 +169,13 @@ class ResolutionPreferenceFragmentTest : ExternalDisplayTestBase() { 
                .`when`(mockResources)

                .getBoolean(com.android.internal.R.bool.config_refreshRateSynchronizationEnabled)

            mockRootView = mock(View::class.java)

            emptyView = TextView(mContext)

            emptyView = TextView(context)

            doReturn(emptyView).`when`(mockRootView).findViewById<View>(android.R.id.empty)

            logger = mockedMetricsLogger

            this.logger = logger

        }



        override fun getPreferenceScreen(): PreferenceScreen {

            return super@ResolutionPreferenceFragmentTest.mPreferenceScreen

            return preferenceScreen

        }



        override fun getView(): View {