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

Commit d7183512 authored by Fan Zhang's avatar Fan Zhang
Browse files

Clean up ShadowTheadUtils. 

Individual tests don't need to specify it in their own @Config

Bug: 135698296
Test: robotests
Change-Id: I66dc0bfdaec9c6cac9b48f3e7906f71dfb3a6b28
parent 14f1fc0e

tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java

+6 −5
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ public class DashboardFeatureProviderImplTest { 
    }



    @Test

    @Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})

    @Config(shadows = {ShadowTileUtils.class})

    public void bindPreference_hasSummaryUri_shouldLoadSummaryFromContentProvider() {

        final Preference preference = new Preference(RuntimeEnvironment.application);

        final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
@@ -274,7 +274,7 @@ public class DashboardFeatureProviderImplTest { 
    }



    @Test

    @Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})

    @Config(shadows = {ShadowTileUtils.class})

    public void bindPreference_withIconUri_shouldLoadIconFromContentProvider() {

        final Preference preference = new Preference(RuntimeEnvironment.application);

        mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
@@ -341,7 +341,8 @@ public class DashboardFeatureProviderImplTest { 
        final Intent launchIntent = shadowActivity.getNextStartedActivityForResult().intent;

        assertThat(launchIntent.getAction())

                .isEqualTo("TestAction");

        assertThat(launchIntent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))

        assertThat(

                launchIntent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))

                .isEqualTo(MetricsEvent.SETTINGS_GESTURES);

    }

tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java

+0 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.Context; 


import com.android.settings.R;

import com.android.settings.testutils.DatabaseTestUtils;

import com.android.settings.testutils.shadow.ShadowThreadUtils;



import org.junit.After;

import org.junit.Before;
@@ -45,13 +44,11 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import java.util.List;

import java.util.concurrent.TimeUnit;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowThreadUtils.class)

public class AnomalyCleanupJobServiceTest {

    private static final int UID = 1234;

    private static final String PACKAGE_NAME = "com.android.package";

tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java

+0 −2
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ import org.junit.runner.RunWith; 
import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowThreadUtils.class)

public class CardContentProviderTest {



    private Context mContext;

tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.Context; 


import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowThreadUtils;

import com.android.settingslib.suggestions.SuggestionController;



import org.junit.Before;
@@ -38,7 +37,6 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowThreadUtils.class)

public class LegacySuggestionContextualCardControllerTest {



    @Mock

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ import java.util.Set; 
 * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)

 */

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUserManager.class, ShadowThreadUtils.class, ShadowUtils.class,

@Config(shadows = {ShadowUserManager.class, ShadowUtils.class,

        SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class,

        ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class,

        SettingsSliceProviderTest.ShadowWifiScanWorker.class})