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

Commit 854fc9e0 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Fix unit tests due to icons with flag on 

Also, properly parameterized the tests so they run correctly regardless
of the actual state of the flag.

Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Bug: 382236958
Test: atest SystemUITests:com.android.systemui.qs.tiles
Change-Id: If559a342f7522d3cdfdce34709dd4902bbb84e6b
parent a424fedc

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/AirplaneModeTileTest.kt

+19 −3
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ package com.android.systemui.qs.tiles 


import android.net.ConnectivityManager

import android.os.Handler

import android.platform.test.flag.junit.FlagsParameterization

import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf

import android.testing.TestableLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.logging.MetricsLogger

import com.android.internal.telephony.flags.Flags
@@ -31,6 +32,7 @@ import com.android.systemui.plugins.qs.QSTile 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.qs.QSHost

import com.android.systemui.qs.QsEventLogger

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.qs.flags.QsInCompose.isEnabled

import com.android.systemui.qs.logging.QSLogger

import com.android.systemui.qs.tileimpl.QSTileImpl
@@ -51,11 +53,17 @@ import org.mockito.MockitoAnnotations 
import org.mockito.kotlin.any

import org.mockito.kotlin.times

import org.mockito.kotlin.verify

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@RunWith(AndroidJUnit4::class)

@RunWith(ParameterizedAndroidJunit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

class AirplaneModeTileTest : SysuiTestCase() {

class AirplaneModeTileTest(flags: FlagsParameterization) : SysuiTestCase() {



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Mock private lateinit var mHost: QSHost

    @Mock private lateinit var mMetricsLogger: MetricsLogger
@@ -149,4 +157,12 @@ class AirplaneModeTileTest : SysuiTestCase() { 
            QSTileImpl.ResourceIcon.get(resId)

        }

    }



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return allCombinationsOf(QSComposeFragment.FLAG_NAME)

        }

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/BatterySaverTileTest.kt

+17 −3
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.systemui.qs.tiles 


import android.content.Context

import android.os.Handler

import android.platform.test.flag.junit.FlagsParameterization

import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf

import android.testing.TestableLooper

import android.testing.TestableLooper.RunWithLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.logging.MetricsLogger

import com.android.systemui.SysuiTestCase
@@ -31,6 +32,7 @@ import com.android.systemui.plugins.qs.QSTile 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.qs.QSHost

import com.android.systemui.qs.QsEventLogger

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.qs.flags.QsInCompose.isEnabled

import com.android.systemui.qs.logging.QSLogger

import com.android.systemui.qs.tileimpl.QSTileImpl
@@ -51,14 +53,26 @@ import org.mockito.Mockito.never 
import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@RunWith(AndroidJUnit4::class)

@RunWith(ParameterizedAndroidJunit4::class)

@RunWithLooper(setAsMainLooper = true)

@SmallTest

class BatterySaverTileTest : SysuiTestCase() {

class BatterySaverTileTest(flagsParameterization: FlagsParameterization) : SysuiTestCase() {



    companion object {

        private const val USER = 10



        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return allCombinationsOf(QSComposeFragment.FLAG_NAME)

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flagsParameterization)

    }



    @Mock private lateinit var userContext: Context

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/CameraToggleTileTest.kt

+17 −3
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
package com.android.systemui.qs.tiles



import android.os.Handler

import android.platform.test.flag.junit.FlagsParameterization

import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf

import android.provider.Settings

import android.safetycenter.SafetyCenterManager

import android.testing.TestableLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.logging.MetricsLogger

import com.android.systemui.SysuiTestCase
@@ -30,6 +31,7 @@ import com.android.systemui.plugins.qs.QSTile 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.qs.QSHost

import com.android.systemui.qs.QsEventLoggerFake

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.qs.flags.QsInCompose.isEnabled

import com.android.systemui.qs.logging.QSLogger

import com.android.systemui.qs.tileimpl.QSTileImpl
@@ -45,15 +47,27 @@ import org.junit.runner.RunWith 
import org.mockito.Mock

import org.mockito.Mockito.`when` as whenever

import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@RunWith(AndroidJUnit4::class)

@RunWith(ParameterizedAndroidJunit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

class CameraToggleTileTest : SysuiTestCase() {

class CameraToggleTileTest(flags: FlagsParameterization) : SysuiTestCase() {

    companion object {

        /* isBlocked */

        const val CAMERA_TOGGLE_ENABLED: Boolean = false

        const val CAMERA_TOGGLE_DISABLED: Boolean = true



        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return allCombinationsOf(QSComposeFragment.FLAG_NAME)

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Mock private lateinit var host: QSHost

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ColorInversionTileTest.java

+21 −2
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.systemui.qs.tiles;



import static android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf;



import static com.android.systemui.Flags.FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;
@@ -25,10 +29,10 @@ import static org.mockito.Mockito.when; 


import android.content.Intent;

import android.os.Handler;

import android.platform.test.flag.junit.FlagsParameterization;

import android.provider.Settings;

import android.testing.TestableLooper;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.logging.MetricsLogger;
@@ -55,13 +59,23 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



@RunWith(AndroidJUnit4.class)

import java.util.List;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



@RunWith(ParameterizedAndroidJunit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

public class ColorInversionTileTest extends SysuiTestCase {

    private static final Integer COLOR_INVERSION_DISABLED = 0;

    private static final Integer COLOR_INVERSION_ENABLED = 1;



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return allCombinationsOf(FLAG_QS_CUSTOM_TILE_CLICK_GUARANTEED_BUG_FIX);

    }



    @Mock

    private QSHost mHost;

    @Mock
@@ -81,6 +95,11 @@ public class ColorInversionTileTest extends SysuiTestCase { 
    private SecureSettings mSecureSettings;

    private ColorInversionTile mTile;



    public ColorInversionTileTest(FlagsParameterization flags) {

        super();

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt

+19 −3
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 
package com.android.systemui.qs.tiles



import android.os.Handler

import android.platform.test.flag.junit.FlagsParameterization

import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf

import android.testing.TestableLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.logging.MetricsLogger

import com.android.systemui.SysuiTestCase
@@ -29,6 +30,7 @@ import com.android.systemui.plugins.qs.QSTile 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.qs.QSHost

import com.android.systemui.qs.QsEventLogger

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.qs.flags.QsInCompose.isEnabled

import com.android.systemui.qs.logging.QSLogger

import com.android.systemui.qs.tileimpl.QSTileImpl
@@ -44,11 +46,17 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@RunWith(AndroidJUnit4::class)

@RunWith(ParameterizedAndroidJunit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

class DataSaverTileTest : SysuiTestCase() {

class DataSaverTileTest(flags: FlagsParameterization) : SysuiTestCase() {



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Mock private lateinit var mHost: QSHost

    @Mock private lateinit var mMetricsLogger: MetricsLogger
@@ -121,4 +129,12 @@ class DataSaverTileTest : SysuiTestCase() { 
            QSTileImpl.ResourceIcon.get(resId)

        }

    }



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return allCombinationsOf(QSComposeFragment.FLAG_NAME)

        }

    }

}