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

Commit ab69c956 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents 2c081211 66506fe9

tests/src/com/android/server/telecom/tests/AnalyticsTests.java

+4 −4
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;
@@ -47,11 +47,11 @@ import android.telecom.VideoCallImpl; 
import android.telecom.VideoProfile;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Base64;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.SmallTest;



import com.android.internal.util.IndentingPrintWriter;

import com.android.server.telecom.Analytics;

tests/src/com/android/server/telecom/tests/BasicCallTests.java

+8 −10
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ import static org.junit.Assert.assertNotNull; 
import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.isNull;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.timeout;
@@ -52,6 +52,7 @@ import android.os.UserHandle; 
import android.provider.BlockedNumberContract;

import android.telecom.Call;

import android.telecom.CallAudioState;

import android.telecom.CallerInfo;

import android.telecom.Connection;

import android.telecom.ConnectionRequest;

import android.telecom.DisconnectCause;
@@ -62,16 +63,13 @@ import android.telecom.PhoneAccountHandle; 
import android.telecom.StatusHints;

import android.telecom.TelecomManager;

import android.telecom.VideoProfile;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.SmallTest;



import com.android.internal.telecom.IInCallAdapter;

import com.android.server.telecom.InCallController;



import android.telecom.CallerInfo;



import com.google.common.base.Predicate;

tests/src/com/android/server/telecom/tests/BlockCheckerFilterTest.java

+2 −4
Original line number Diff line number Diff line
@@ -32,11 +32,10 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.PersistableBundle;

import android.provider.CallLog;

import android.telecom.CallerInfo;

import android.telecom.TelecomManager;

import android.telephony.CarrierConfigManager;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Pair;



import androidx.test.filters.SmallTest;



import com.android.server.telecom.Call;

import com.android.server.telecom.CallerInfoLookupHelper;
@@ -51,7 +50,6 @@ import org.junit.runners.JUnit4; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



import java.util.concurrent.CompletableFuture;

import java.util.concurrent.CompletionStage;

import java.util.concurrent.TimeUnit;

tests/src/com/android/server/telecom/tests/BlockedNumbersUtilTests.java

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ import static org.mockito.Mockito.verify; 
import android.app.Notification;

import android.app.NotificationManager;

import android.os.UserHandle;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import com.android.server.telecom.settings.BlockedNumbersUtil;

tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java

+18 −17
Original line number Diff line number Diff line
@@ -18,6 +18,21 @@ package com.android.server.telecom.tests; 


import static android.media.AudioDeviceInfo.TYPE_BUILTIN_SPEAKER;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;
@@ -29,7 +44,8 @@ import android.media.AudioDeviceInfo; 
import android.media.AudioManager;

import android.os.Bundle;

import android.os.Parcel;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import com.android.server.telecom.CallAudioCommunicationDeviceTracker;

import com.android.server.telecom.bluetooth.BluetoothDeviceManager;
@@ -44,23 +60,8 @@ import org.junit.runners.JUnit4; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import java.util.Arrays;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



@RunWith(JUnit4.class)