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

Commit 0a9f3ab4 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Jeff Gaston
Browse files

Converting tests to Androidx 

Bug: 112610679
Change-Id: I712826e668f1fbeb4e47cc541d4f5296d8eb74c0
parent 58ad76fd

tests/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests

LOCAL_STATIC_JAVA_LIBRARIES := \

	android-support-test \

	ub-uiautomator \

	androidx-test \

	androidx.test.uiautomator_uiautomator \

	mockito-target-minus-junit4 \

	ub-launcher-aosp-tapl
@@ -41,8 +41,8 @@ include $(BUILD_PACKAGE) 
include $(CLEAR_VARS)

LOCAL_STATIC_JAVA_LIBRARIES := \

	androidx.annotation_annotation \

	android-support-test \

	ub-uiautomator \

	androidx-test \

	androidx.test.uiautomator_uiautomator \

	libSharedSystemUI



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

tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package com.android.launcher3.allapps.search;



import android.content.ComponentName;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.AppInfo;

import com.android.launcher3.Utilities;

tests/src/com/android/launcher3/logging/FileLogTest.java

+3 −3
Original line number Diff line number Diff line 
package com.android.launcher3.logging;



import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import android.content.Context; 
import android.content.Intent;

import android.graphics.Rect;

import android.net.Uri;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;

import android.util.Pair;



import com.android.launcher3.ItemInfo;

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

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ import android.graphics.Bitmap.Config; 
import android.graphics.Color;

import android.os.Process;

import android.os.UserHandle;

import android.support.test.InstrumentationRegistry;

import android.support.test.rule.provider.ProviderTestRule;

import androidx.test.InstrumentationRegistry;

import androidx.test.rule.provider.ProviderTestRule;



import com.android.launcher3.AllAppsList;

import com.android.launcher3.AppFilter;