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

Commit 82171dc6 authored by Ram Peri's avatar Ram Peri Committed by Gerrit Code Review
Browse files

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

parents d685a0c5 6b2f376e

android/app/tests/unit/src/com/android/bluetooth/csip/CsipSetCoordinatorStateMachineTest.java

+1 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.bluetooth.BluetoothProfile.STATE_CONNECTED; 
import static android.bluetooth.BluetoothProfile.STATE_CONNECTING;

import static android.bluetooth.BluetoothProfile.STATE_DISCONNECTED;

import static android.bluetooth.BluetoothProfile.STATE_DISCONNECTING;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;
@@ -34,13 +33,10 @@ import android.content.Intent; 
import android.os.HandlerThread;

import android.os.Looper;

import android.os.Message;

import android.test.suitebuilder.annotation.MediumTest;



import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AdapterService;



import org.hamcrest.core.IsInstanceOf;

import org.junit.*;

import org.junit.runner.RunWith;

android/app/tests/unit/src/com/android/bluetooth/hap/HapClientStateMachineTest.java

+1 −4
Original line number Diff line number Diff line
@@ -31,13 +31,10 @@ import android.bluetooth.BluetoothProfile; 
import android.content.Intent;

import android.os.HandlerThread;

import android.os.Message;

import android.test.suitebuilder.annotation.MediumTest;



import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AdapterService;



import org.hamcrest.core.IsInstanceOf;

import org.junit.After;

import org.junit.Assert;

framework/tests/unit/src/android/bluetooth/BluetoothCodecConfigTest.java

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 


package android.bluetooth;



import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import junit.framework.TestCase;



/** Unit test cases for {@link BluetoothCodecConfig}. */

framework/tests/unit/src/android/bluetooth/BluetoothCodecStatusTest.java

+2 −4
Original line number Diff line number Diff line
@@ -16,12 +16,10 @@ 


package android.bluetooth;



import android.test.suitebuilder.annotation.SmallTest;



import junit.framework.TestCase;



import androidx.test.filters.SmallTest;

import java.util.List;

import java.util.Objects;

import junit.framework.TestCase;



/** Unit test cases for {@link BluetoothCodecStatus}. */

public class BluetoothCodecStatusTest extends TestCase {

framework/tests/unit/src/android/bluetooth/BluetoothLeAudioCodecConfigTest.java

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 


package android.bluetooth;



import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import junit.framework.TestCase;



/** Unit test cases for {@link BluetoothLeAudioCodecConfig}. */