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

Commit 4e854a54 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "Update SmallTest library"

parents 1f805b44 caf9b531

wifi/tests/src/android/net/wifi/ParcelUtilTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; 
import static org.junit.Assert.assertNull;



import android.os.Parcel;

import android.test.suitebuilder.annotation.SmallTest;

import android.support.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

wifi/tests/src/android/net/wifi/ScanResultTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNull; 
import static org.mockito.Mockito.validateMockitoUsage;



import android.os.Parcel;

import android.test.suitebuilder.annotation.SmallTest;

import android.support.test.filters.SmallTest;

import android.net.wifi.WifiScanner.ScanSettings;



import org.junit.After;

wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.net.wifi.WifiEnterpriseConfig.Eap; 
import android.net.wifi.WifiEnterpriseConfig.Phase2;

import android.os.Parcel;

import android.security.Credentials;

import android.test.suitebuilder.annotation.SmallTest;

import android.support.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import android.os.IBinder; 
import android.os.Message;

import android.os.Messenger;

import android.os.test.TestLooper;

import android.test.suitebuilder.annotation.SmallTest;

import android.support.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

wifi/tests/src/android/net/wifi/WifiScannerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.content.Context; 
import android.os.Handler;

import android.os.Parcel;

import android.os.test.TestLooper;

import android.test.suitebuilder.annotation.SmallTest;

import android.support.test.filters.SmallTest;

import android.net.wifi.WifiScanner.ScanSettings;



import com.android.internal.util.test.BidirectionalAsyncChannelServer;