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

Commit 47285c68 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate packages/inputmethods/LatinIME to androidx.test"

parents 328d0b6f c05a70a4

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ android { 


        applicationId 'com.android.inputmethod.latin'

        testApplicationId 'com.android.inputmethod.latin.tests'

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        vectorDrawables.useSupportLibrary = false



        signingConfig signingConfigs.debug

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ android_test { 
    ],



    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

    ],

    libs: [

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        <!-- meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" /-->

    </application>



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

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

        android:targetPackage="com.android.inputmethod.latin"

        android:label="LatinIME tests">

    </instrumentation>

tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    <option name="test-tag" value="LatinIMETests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.inputmethod.latin.tests" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java

+4 −5
Original line number Diff line number Diff line
@@ -22,19 +22,18 @@ import static org.junit.Assert.assertTrue; 


import android.graphics.Typeface;

import android.os.Build;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.style.StyleSpan;



import java.util.Locale;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.Locale;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class LocaleSpanCompatUtilsTests {