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

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

Remove qs refactor flag in tiles [1/N] 

This hardcodes the flag to true for removal in QSTileImpl and the test
that depend on that code path

Test: atest com.android.systemui.qs
Flag: EXEMPT FLAG_REMOVAL
Bug: 444180543
Change-Id: Ia12fd8bbb30ddc12726288bb708041b5a07feb56
parent 43adf227

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

+4 −26
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 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.systemui.SysuiTestCase
@@ -31,10 +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

import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIconWithRes

import com.android.systemui.res.R

import com.android.systemui.settings.UserTracker
@@ -52,17 +48,11 @@ 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(ParameterizedAndroidJunit4::class)

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

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



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }

class AirplaneModeTileTest : SysuiTestCase() {



    @Mock private lateinit var mHost: QSHost

    @Mock private lateinit var mMetricsLogger: MetricsLogger
@@ -140,18 +130,6 @@ class AirplaneModeTileTest(flags: FlagsParameterization) : SysuiTestCase() { 
    }



    private fun createExpectedIcon(resId: Int): QSTile.Icon {

        return if (isEnabled) {

            DrawableIconWithRes(mContext.getDrawable(resId), resId)

        } else {

            QSTileImpl.ResourceIcon.get(resId)

        }

    }



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return allCombinationsOf(QSComposeFragment.FLAG_NAME)

        }

        return DrawableIconWithRes(mContext.getDrawable(resId), resId)

    }

}

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

+4 −24
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 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
@@ -32,10 +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.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

import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIconWithRes

import com.android.systemui.res.R

import com.android.systemui.statusbar.policy.BatteryController
@@ -53,26 +49,14 @@ 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(ParameterizedAndroidJunit4::class)

@RunWith(AndroidJUnit4::class)

@RunWithLooper(setAsMainLooper = true)

@SmallTest

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

class BatterySaverTileTest : 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
@@ -180,10 +164,6 @@ class BatterySaverTileTest(flagsParameterization: FlagsParameterization) : Sysui 
    }



    private fun createExpectedIcon(resId: Int): QSTile.Icon {

        return if (isEnabled) {

            DrawableIconWithRes(mContext.getDrawable(resId), resId)

        } else {

            QSTileImpl.ResourceIcon.get(resId)

        }

        return DrawableIconWithRes(mContext.getDrawable(resId), resId)

    }

}

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

+4 −24
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 
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
@@ -31,10 +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.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

import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIconWithRes

import com.android.systemui.res.R

import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController
@@ -47,27 +43,15 @@ 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(ParameterizedAndroidJunit4::class)

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

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

class CameraToggleTileTest : 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
@@ -181,10 +165,6 @@ class CameraToggleTileTest(flags: FlagsParameterization) : SysuiTestCase() { 
    }



    private fun createExpectedIcon(resId: Int): QSTile.Icon {

        return if (isEnabled) {

            DrawableIconWithRes(mContext.getDrawable(resId), resId)

        } else {

            QSTileImpl.ResourceIcon.get(resId)

        }

        return DrawableIconWithRes(mContext.getDrawable(resId), resId)

    }

}

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

+3 −26
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.qs.tiles;



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



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



import static org.mockito.ArgumentMatchers.any;
@@ -27,10 +25,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;
@@ -41,8 +39,6 @@ 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;

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

import com.android.systemui.qs.shared.QSSettingsPackageRepository;

import com.android.systemui.qs.tileimpl.QSTileImpl;
@@ -59,12 +55,7 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



import java.util.List;



@RunWith(ParameterizedAndroidJunit4.class)

@RunWith(AndroidJUnit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

public class ColorInversionTileTest extends SysuiTestCase {
@@ -72,11 +63,6 @@ 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(QSComposeFragment.FLAG_NAME);

    }



    @Mock

    private QSHost mHost;

    @Mock
@@ -98,11 +84,6 @@ 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);
@@ -174,10 +155,6 @@ public class ColorInversionTileTest extends SysuiTestCase { 
    }



    private QSTile.Icon createExpectedIcon(int resId) {

        if (QsInCompose.isEnabled()) {

        return new QSTileImpl.DrawableIconWithRes(mContext.getDrawable(resId), resId);

        } else {

            return QSTileImpl.ResourceIcon.get(resId);

        }

    }

}

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

+4 −26
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
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
@@ -30,10 +29,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

import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIconWithRes

import com.android.systemui.res.R

import com.android.systemui.shade.domain.interactor.FakeShadeDialogContextInteractor
@@ -48,17 +44,11 @@ import org.junit.runner.RunWith 
import org.mockito.Mock

import org.mockito.MockitoAnnotations

import org.mockito.kotlin.eq

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@RunWith(ParameterizedAndroidJunit4::class)

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

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



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }

class DataSaverTileTest : SysuiTestCase() {



    @Mock private lateinit var mHost: QSHost

    @Mock private lateinit var mMetricsLogger: MetricsLogger
@@ -126,18 +116,6 @@ class DataSaverTileTest(flags: FlagsParameterization) : SysuiTestCase() { 
    }



    private fun createExpectedIcon(resId: Int): QSTile.Icon {

        return if (isEnabled) {

            DrawableIconWithRes(mContext.getDrawable(resId), resId)

        } else {

            QSTileImpl.ResourceIcon.get(resId)

        }

    }



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return allCombinationsOf(QSComposeFragment.FLAG_NAME)

        }

        return DrawableIconWithRes(mContext.getDrawable(resId), resId)

    }

}