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

Commit e4b05909 authored by koushik's avatar koushik Committed by android-build-merger
Browse files

Merge "Migrate packages/apps/Bluetooth to androidx.test" 

am: 50db58cc

Change-Id: I4a0bc1aefa655ef63f4ad622fe4a4bc8cd191d64
parents 90f67103 50db58cc

android/app/tests/unit/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ LOCAL_JAVA_LIBRARIES := \ 


LOCAL_STATIC_JAVA_LIBRARIES :=  \

    com.android.emailcommon \

    android-support-test \

    androidx.test.rules \

    mockito-target \

    espresso-intents

    androidx.test.espresso.intents



# Include all test java files.

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

android/app/tests/unit/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
    the package of com.android.bluetooth.  To run the tests use the command:

    "adb shell am instrument -w com.android.bluetooth.tests/android.test.InstrumentationTestRunner"

    -->

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.bluetooth"

                     android:label="Tests for com.android.bluetooth"/>

</manifest>

android/app/tests/unit/src/com/android/bluetooth/FileSystemWriteTest.java

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */

package com.android.bluetooth;



import android.support.test.filters.MediumTest;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Assert;

import org.junit.Test;

android/app/tests/unit/src/com/android/bluetooth/TestUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ import android.bluetooth.BluetoothDevice; 
import android.content.Intent;

import android.os.Handler;

import android.os.Looper;

import android.support.test.InstrumentationRegistry;

import android.support.test.rule.ServiceTestRule;



import androidx.test.InstrumentationRegistry;

import androidx.test.rule.ServiceTestRule;



import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpCodecConfigTest.java

+4 −3
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ import android.bluetooth.BluetoothCodecConfig; 
import android.bluetooth.BluetoothCodecStatus;

import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.MediumTest;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Assert;