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

Commit c6d06bf1 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

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

parents 0bf11c8b 2db90491

core/tests/ConnectivityManagerTest/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ android_test { 
        "android.test.runner",

        "android.test.base",

    ],

    static_libs: ["junit"],

    static_libs: [

        "junit",

        "androidx.test.rules",

    ],

    // Include all test java files.

    srcs: ["src/**/*.java"],

    platform_apis: true,

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import android.net.NetworkInfo.State; 
import android.net.wifi.WifiManager;

import android.os.SystemClock;

import android.provider.Settings;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;



import com.android.connectivitymanagertest.ConnectivityManagerTestBase;

import com.android.connectivitymanagertest.ConnectivityManagerTestRunner;

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ import android.net.wifi.WifiConfiguration.GroupCipher; 
import android.net.wifi.WifiConfiguration.PairwiseCipher;

import android.net.wifi.WifiConfiguration.Protocol;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;



import com.android.connectivitymanagertest.ConnectivityManagerTestBase;

import com.android.connectivitymanagertest.WifiAssociationTestRunner;

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiConnectionTest.java

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ package com.android.connectivitymanagertest.functional; 


import android.net.wifi.WifiConfiguration;

import android.os.SystemClock;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;



import com.android.connectivitymanagertest.ConnectivityManagerTestBase;

import com.android.connectivitymanagertest.WifiConfigurationHelper;

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java

+2 −1
Original line number Diff line number Diff line
@@ -29,9 +29,10 @@ import android.os.Environment; 
import android.os.PowerManager;

import android.os.SystemClock;

import android.provider.Settings;

import android.test.suitebuilder.annotation.LargeTest;

import android.util.Log;



import androidx.test.filters.LargeTest;



import com.android.connectivitymanagertest.ConnectivityManagerStressTestRunner;

import com.android.connectivitymanagertest.ConnectivityManagerTestBase;

import com.android.connectivitymanagertest.WifiConfigurationHelper;