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

Commit b0d77fe3 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Revert "Build empty test apk until junit dependency issue is sorted out." 

This reverts commit 4c82c33a.

Change-Id: I39c142e2b0e882245a6928264465578e4ddc12c9
parent a39a98da

tests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests

#LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4



#LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java

+6 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import android.graphics.Bitmap; 
import android.graphics.Bitmap.Config;

import android.os.Process;

import android.os.UserHandle;

import android.support.annotation.NonNull;

import android.support.test.InstrumentationRegistry;

import android.test.ProviderTestCase2;
@@ -24,6 +25,7 @@ import com.android.launcher3.LauncherModel.Callbacks; 
import com.android.launcher3.compat.LauncherActivityInfoCompat;

import com.android.launcher3.config.ProviderConfig;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.Provider;

import com.android.launcher3.util.TestLauncherProvider;



import org.mockito.ArgumentCaptor;
@@ -184,9 +186,10 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP 
        }



        @Override

        protected CacheEntry cacheLocked(ComponentName componentName,

                LauncherActivityInfoCompat info, UserHandle user,

                boolean usePackageIcon, boolean useLowResIcon) {

        protected CacheEntry cacheLocked(

                @NonNull ComponentName componentName,

                @NonNull Provider<LauncherActivityInfoCompat> infoProvider,

                UserHandle user, boolean usePackageIcon, boolean useLowResIcon) {

            CacheEntry entry = mCache.get(new ComponentKey(componentName, user));

            if (entry == null) {

                entry = new CacheEntry();