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

Commit 58038da9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Migrate frameworks/base/tests/net/ to androidx.test"

parents 3da7809a 1ae2aa66

tests/net/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java) 
LOCAL_STATIC_JAVA_LIBRARIES := \

    frameworks-base-testutils \

    framework-protos \

    android-support-test \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    platform-test-annotations \

    services.core \

tests/net/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
    </application>



    <instrumentation

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

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

        android:targetPackage="com.android.frameworks.tests.net"

        android:label="Frameworks Networking Tests" />

</manifest>

tests/net/AndroidTest.xml

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

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

        <option name="package" value="com.android.frameworks.tests.net" />

        <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/net/java/android/app/usage/NetworkStatsManagerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static org.mockito.ArgumentMatchers.anyLong; 
import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -38,9 +37,10 @@ import android.net.NetworkStats.Entry; 
import android.net.NetworkStatsHistory;

import android.net.NetworkTemplate;

import android.os.RemoteException;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

tests/net/java/android/net/ConnectivityManagerTest.java

+7 −7
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI; 


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.junit.Assert.fail;

import static org.mockito.Mockito.any;
@@ -47,19 +46,20 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.PendingIntent;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.NetworkCapabilities;

import android.content.Context;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.content.pm.ApplicationInfo;

import android.os.Build.VERSION_CODES;

import android.net.ConnectivityManager.NetworkCallback;

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;