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

Commit ec6bcbce authored by Brett Chabot's avatar Brett Chabot
Browse files

Fix FrameworksServicesTests:StorageManagerServiceTest 

Use androidx.test not android.support.test.
And remove android.support.test from build by removing unnecessary
frameworks-base-testutils > android.support.test dependency

Bug: 117990406
Test: m checkbuild; atest FrameworksServicesTests:StorageManagerServiceTest
Change-Id: Ia825e0926b46855f9056739441cb21a065692076
parent aad97b23

services/tests/servicestests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    testables \

    testng \

    ub-uiautomator\

    platformprotosnano

    platformprotosnano \

    hamcrest-library



LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl

services/tests/servicestests/src/com/android/server/StorageManagerServiceTest.java

+3 −2
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ import android.content.pm.PackageManagerInternal; 
import android.os.UserHandle;

import android.os.UserManagerInternal;

import android.os.storage.StorageManagerInternal;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java

+2 −1
Original line number Diff line number Diff line
@@ -38,12 +38,13 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.os.UserManagerInternal;

import android.security.KeyChain;

import android.support.annotation.NonNull;

import android.telephony.TelephonyManager;

import android.util.ArrayMap;

import android.util.Pair;

import android.view.IWindowManager;



import androidx.annotation.NonNull;



import com.android.internal.util.FunctionalUtils.ThrowingRunnable;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.net.NetworkPolicyManagerInternal;

services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java

+2 −1
Original line number Diff line number Diff line
@@ -30,11 +30,12 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.UserHandle;

import android.os.UserManagerInternal;

import android.support.annotation.NonNull;

import android.test.mock.MockContext;

import android.util.ArrayMap;

import android.util.ExceptionUtils;



import androidx.annotation.NonNull;



import com.android.internal.util.FunctionalUtils;



import org.junit.Assert;

services/tests/wmtests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    truth-prebuilt \

    testables \

    ub-uiautomator \

    hamcrest-library



LOCAL_JAVA_LIBRARIES := \

    android.test.mock \