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

Commit 6e1b25cb authored by Brett Chabot's avatar Brett Chabot Committed by Android (Google) Code Review
Browse files

Merge "Migrate frameworks/base/tests/testables and its users to androidx.test"

parents 43f8f8bb 51d58aa7

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ android_test { 
    test_suites: ["device-tests"],

    resource_dirs: ["res"],

    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "frameworks-base-testutils",

        "mockito-target-extended-minus-junit4",

        "NetworkStackLib",

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
    <application android:debuggable="true">

        <uses-library android:name="android.test.runner" />

    </application>

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

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

        android:targetPackage="com.android.server.networkstack.tests"

        android:label="Networking service tests">

    </instrumentation>

tests/AndroidTest.xml

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

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

        <option name="package" value="com.android.server.networkstack.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>
 
 No newline at end of file

tests/src/android/net/apf/ApfTest.java

+4 −3
Original line number Diff line number Diff line
@@ -53,14 +53,15 @@ import android.net.util.SharedLog; 
import android.os.ConditionVariable;

import android.os.Parcelable;

import android.os.SystemClock;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.system.ErrnoException;

import android.system.Os;

import android.text.format.DateUtils;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.util.HexDump;

import com.android.server.networkstack.tests.R;

import com.android.server.util.NetworkStackConstants;

tests/src/android/net/dhcp/DhcpLeaseRepositoryTest.java

+5 −4
Original line number Diff line number Diff line
@@ -31,16 +31,15 @@ import static org.junit.Assert.assertTrue; 
import static org.junit.Assert.fail;

import static org.mockito.Mockito.when;



import static java.lang.String.format;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.net.IpPrefix;

import android.net.MacAddress;

import android.net.dhcp.DhcpServer.Clock;

import android.net.util.SharedLog;

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;
@@ -48,6 +47,8 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import static java.lang.String.format;



import java.net.Inet4Address;

import java.util.Arrays;

import java.util.Collections;