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

Commit 97ee134a authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Android (Google) Code Review
Browse files

Revert "Move widget picker tests to Robolectric" 

This reverts commit efc24f92.

Reason for revert: Potential cause for flakiness https://android-build.corp.google.com/test_investigate/?invocationId=I07000010279081631&testResultId=TR32129311605132927

Change-Id: I4f0154bc101b6bc840c11ff0b6bf42f4ebc5ed03
parent efc24f92

tests/multivalentTests/src/com/android/launcher3/util/WidgetUtils.java

+9 −6
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ 
 */

package com.android.launcher3.util;



import static androidx.test.core.app.ApplicationProvider.getApplicationContext;

import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import android.appwidget.AppWidgetManager;

import android.appwidget.AppWidgetProviderInfo;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.os.Bundle;

import android.os.Process;



import com.android.launcher3.LauncherSettings;

import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -84,10 +87,10 @@ public class WidgetUtils { 
     * Creates a {@link AppWidgetProviderInfo} for the provided component name

     */

    public static AppWidgetProviderInfo createAppWidgetProviderInfo(ComponentName cn) {

        ActivityInfo activityInfo = new ActivityInfo();

        activityInfo.applicationInfo = new ApplicationInfo();

        AppWidgetProviderInfo info = new AppWidgetProviderInfo();

        info.providerInfo = activityInfo;

        AppWidgetProviderInfo info = AppWidgetManager.getInstance(getApplicationContext())

                .getInstalledProvidersForPackage(

                        getInstrumentation().getContext().getPackageName(), Process.myUserHandle())

                .get(0);

        info.provider = cn;

        return info;

    }

tests/multivalentTests/src/com/android/launcher3/widget/picker/WidgetRecommendationCategoryProviderTest.java→tests/src/com/android/launcher3/widget/picker/WidgetRecommendationCategoryProviderTest.java

+7 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.content.pm.ApplicationInfo.CATEGORY_UNDEFINED; 
import static android.content.pm.ApplicationInfo.CATEGORY_VIDEO;

import static android.content.pm.ApplicationInfo.FLAG_INSTALLED;



import static androidx.test.core.app.ApplicationProvider.getApplicationContext;

import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import static com.google.common.truth.Truth.assertThat;
@@ -34,6 +35,7 @@ import static org.mockito.ArgumentMatchers.eq; 
import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.when;



import android.appwidget.AppWidgetManager;

import android.appwidget.AppWidgetProviderInfo;

import android.content.ComponentName;

import android.content.Context;
@@ -51,7 +53,6 @@ import com.android.launcher3.R; 
import com.android.launcher3.icons.IconCache;

import com.android.launcher3.model.WidgetItem;

import com.android.launcher3.util.Executors;

import com.android.launcher3.util.WidgetUtils;

import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;



import com.google.common.collect.ImmutableMap;
@@ -151,8 +152,11 @@ public class WidgetRecommendationCategoryProviderTest { 


        doAnswer(invocation -> widgetLabel).when(mIconCache).getTitleNoCache(any());



        AppWidgetProviderInfo providerInfo = WidgetUtils.createAppWidgetProviderInfo(ComponentName

                .createRelative(TEST_PACKAGE, widgetClassName));

        AppWidgetProviderInfo providerInfo = AppWidgetManager.getInstance(getApplicationContext())

                .getInstalledProvidersForPackage(

                        getInstrumentation().getContext().getPackageName(), Process.myUserHandle())

                .get(0);

        providerInfo.provider = ComponentName.createRelative(TEST_PACKAGE, widgetClassName);



        LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =

                LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, providerInfo);

tests/multivalentTests/src/com/android/launcher3/widget/picker/WidgetsListHeaderAccessibilityTest.java→tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderAccessibilityTest.java

+0 −0

File moved.

View file

tests/multivalentTests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java→tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java

+0 −0

File moved.

View file