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

Commit fd0b70c3 authored by Chris Poultney's avatar Chris Poultney
Browse files

Fixes flaky test to avoid demotion 

Makes background executor injectable from tests, and uses direct
executor in test to run code synchronously

Fixes: 333668441
Flag: NA
Test: Tests pass without flakes
Change-Id: I8447d7464b978054d0d594223762534c30b78fec
parent 15e0c4ed

src/com/android/customization/model/color/ColorCustomizationManager.java

+15 −7
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import java.util.concurrent.Executors; 
public class ColorCustomizationManager implements CustomizationManager<ColorOption> {



    private static final String TAG = "ColorCustomizationManager";

    private static final ExecutorService sExecutorService = Executors.newSingleThreadExecutor();



    private static final Set<String> COLOR_OVERLAY_SETTINGS = new HashSet<>();

    static {
@@ -80,8 +79,8 @@ public class ColorCustomizationManager implements CustomizationManager<ColorOpti 


    private final ColorOptionsProvider mProvider;

    private final OverlayManagerCompat mOverlayManagerCompat;

    private final ExecutorService mExecutorService;

    private final ContentResolver mContentResolver;

    private final ContentObserver mObserver;



    private Map<String, String> mCurrentOverlays;

    @ColorSource private String mCurrentSource;
@@ -92,22 +91,31 @@ public class ColorCustomizationManager implements CustomizationManager<ColorOpti 
    /** Returns the {@link ColorCustomizationManager} instance. */

    public static ColorCustomizationManager getInstance(Context context,

            OverlayManagerCompat overlayManagerCompat) {

        return getInstance(context, overlayManagerCompat, Executors.newSingleThreadExecutor());

    }



    /** Returns the {@link ColorCustomizationManager} instance. */

    @VisibleForTesting

    static ColorCustomizationManager getInstance(Context context,

            OverlayManagerCompat overlayManagerCompat, ExecutorService executorService) {

        if (sColorCustomizationManager == null) {

            Context appContext = context.getApplicationContext();

            sColorCustomizationManager = new ColorCustomizationManager(

                    new ColorProvider(appContext,

                            appContext.getString(R.string.themes_stub_package)),

                    appContext.getContentResolver(), overlayManagerCompat);

                    appContext.getContentResolver(), overlayManagerCompat,

                    executorService);

        }

        return sColorCustomizationManager;

    }



    @VisibleForTesting

    ColorCustomizationManager(ColorOptionsProvider provider, ContentResolver contentResolver,

            OverlayManagerCompat overlayManagerCompat) {

            OverlayManagerCompat overlayManagerCompat, ExecutorService executorService) {

        mProvider = provider;

        mContentResolver = contentResolver;

        mObserver = new ContentObserver(/* handler= */ null) {

        mExecutorService = executorService;

        ContentObserver observer = new ContentObserver(/* handler= */ null) {

            @Override

            public void onChange(boolean selfChange, Uri uri) {

                super.onChange(selfChange, uri);
@@ -122,7 +130,7 @@ public class ColorCustomizationManager implements CustomizationManager<ColorOpti 
            }

        };

        mContentResolver.registerContentObserver(

                Settings.Secure.CONTENT_URI, /* notifyForDescendants= */ true, mObserver);

                Settings.Secure.CONTENT_URI, /* notifyForDescendants= */ true, observer);

        mOverlayManagerCompat = overlayManagerCompat;

    }
@@ -137,7 +145,7 @@ public class ColorCustomizationManager implements CustomizationManager<ColorOpti 
    }



    private void applyOverlays(ColorOption colorOption, Callback callback) {

        sExecutorService.submit(() -> {

        mExecutorService.submit(() -> {

            String currentStoredOverlays = getStoredOverlays();

            if (TextUtils.isEmpty(currentStoredOverlays)) {

                currentStoredOverlays = "{}";

tests/robotests/src/com/android/customization/model/color/ColorCustomizationManagerTest.kt

+8 −9
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.customization.model.theme.OverlayManagerCompat 
import com.android.customization.picker.color.shared.model.ColorType

import com.android.systemui.monet.Style

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

import com.google.common.util.concurrent.MoreExecutors

import org.json.JSONObject

import org.junit.Before

import org.junit.Rule
@@ -58,7 +59,13 @@ class ColorCustomizationManagerTest { 
    fun setUp() {

        MockitoAnnotations.initMocks(this)

        val application = ApplicationProvider.getApplicationContext<Context>()

        manager = ColorCustomizationManager(provider, application.contentResolver, mockOM)

        manager =

            ColorCustomizationManager(

                provider,

                application.contentResolver,

                mockOM,

                MoreExecutors.newDirectExecutorService()

            )

    }



    @Test
@@ -103,8 +110,6 @@ class ColorCustomizationManagerTest { 
            }

        )



        Thread.sleep(100)



        val overlaysJson = JSONObject(manager.storedOverlays)



        assertThat(overlaysJson.getString(OVERLAY_COLOR_INDEX)).isEqualTo(value)
@@ -126,8 +131,6 @@ class ColorCustomizationManagerTest { 
            }

        )



        Thread.sleep(100)



        val overlaysJson = JSONObject(manager.storedOverlays)

        assertThat(overlaysJson.getString(OVERLAY_COLOR_INDEX)).isEqualTo(value)

    }
@@ -171,8 +174,6 @@ class ColorCustomizationManagerTest { 
            }

        )



        Thread.sleep(100)



        val overlaysJson = JSONObject(manager.storedOverlays)

        assertThat(overlaysJson.getString(OVERLAY_COLOR_BOTH)).isEqualTo("1")

    }
@@ -191,8 +192,6 @@ class ColorCustomizationManagerTest { 
            }

        )



        Thread.sleep(100)



        val overlaysJson = JSONObject(manager.storedOverlays)

        assertThat(overlaysJson.getString(OVERLAY_COLOR_BOTH)).isEqualTo("0")

    }